If there are no saved sessions, put a grayed "(No sessions)" entry on the saved

[u/mdw/putty] / windows / winmisc.c

diff --git a/windows/winmisc.c b/windows/winmisc.c
index 518eb15..e5143d9 100644 (file)
--- a/windows/winmisc.c
+++ b/windows/winmisc.c
@@ -8,14 +8,6 @@
 
 OSVERSIONINFO osVersion;
 
-void platform_get_x11_auth(char *display, int *proto,
-                           unsigned char *data, int *datalen)
-{
-    /* We don't support this at all under Windows. */
-}
-
-const char platform_x11_best_transport[] = "localhost";
-
 char *platform_get_x_display(void) {
     /* We may as well check for DISPLAY in case it's useful. */
     return dupstr(getenv("DISPLAY"));
@@ -50,8 +42,14 @@ char *get_username(void)
     char *user;
 
     namelen = 0;
-    if (GetUserName(NULL, &namelen) == FALSE)
-       return NULL;
+    if (GetUserName(NULL, &namelen) == FALSE) {
+       /*
+        * Apparently this doesn't work at least on Windows XP SP2.
+        * Thus assume a maximum of 256. It will fail again if it
+        * doesn't fit.
+        */
+       namelen = 256;
+    }
 
     user = snewn(namelen, char);
     GetUserName(user, &namelen);
@@ -59,57 +57,6 @@ char *get_username(void)
     return user;
 }
 
-int SaneDialogBox(HINSTANCE hinst,
-                 LPCTSTR tmpl,
-                 HWND hwndparent,
-                 DLGPROC lpDialogFunc)
-{
-    WNDCLASS wc;
-    HWND hwnd;
-    MSG msg;
-    int flags;
-    int ret;
-    int gm;
-
-    wc.style = CS_DBLCLKS | CS_SAVEBITS | CS_BYTEALIGNWINDOW;
-    wc.lpfnWndProc = DefDlgProc;
-    wc.cbClsExtra = 0;
-    wc.cbWndExtra = DLGWINDOWEXTRA + 8;
-    wc.hInstance = hinst;
-    wc.hIcon = NULL;
-    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wc.hbrBackground = (HBRUSH) (COLOR_BACKGROUND +1);
-    wc.lpszMenuName = NULL;
-    wc.lpszClassName = "PuTTYConfigBox";
-    RegisterClass(&wc);
-
-    hwnd = CreateDialog(hinst, tmpl, hwndparent, lpDialogFunc);
-
-    SetWindowLong(hwnd, BOXFLAGS, 0); /* flags */
-    SetWindowLong(hwnd, BOXRESULT, 0); /* result from SaneEndDialog */
-
-    while ((gm=GetMessage(&msg, NULL, 0, 0)) > 0) {
-       flags=GetWindowLong(hwnd, BOXFLAGS);
-       if (!(flags & DF_END) && !IsDialogMessage(hwnd, &msg))
-           DispatchMessage(&msg);
-       if (flags & DF_END)
-           break;
-    }
-
-    if (gm == 0)
-        PostQuitMessage(msg.wParam); /* We got a WM_QUIT, pass it on */
-
-    ret=GetWindowLong(hwnd, BOXRESULT);
-    DestroyWindow(hwnd);
-    return ret;
-}
-
-void SaneEndDialog(HWND hwnd, int ret)
-{
-    SetWindowLong(hwnd, BOXRESULT, ret);
-    SetWindowLong(hwnd, BOXFLAGS, DF_END);
-}
-
 BOOL init_winver(void)
 {
     ZeroMemory(&osVersion, sizeof(osVersion));