RJK's patch to enable PuTTY's X forwarding to connect to local X

[u/mdw/putty] / winmisc.c

diff --git a/winmisc.c b/winmisc.c
index 916e988..71f09a8 100644 (file)
--- a/winmisc.c
+++ b/winmisc.c
@@ -1,12 +1,12 @@
 /*
- * winmisc.c: miscellaneous Windows-specific things.
+ * winmisc.c: miscellaneous Windows-specific things
  */
 
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "putty.h"
-#include "winstuff.h"
+
+OSVERSIONINFO osVersion;
 
 void platform_get_x11_auth(char *display, int *proto,
                            unsigned char *data, int *datalen)
@@ -14,6 +14,8 @@ void platform_get_x11_auth(char *display, int *proto,
     /* We don't support this at all under Windows. */
 }
 
+const char platform_x11_best_transport[] = "localhost";
+
 Filename filename_from_str(const char *str)
 {
     Filename ret;
@@ -37,6 +39,21 @@ int filename_is_null(Filename fn)
     return !*fn.path;
 }
 
+char *get_username(void)
+{
+    DWORD namelen;
+    char *user;
+
+    namelen = 0;
+    if (GetUserName(NULL, &namelen) == FALSE)
+       return NULL;
+
+    user = snewn(namelen, char);
+    GetUserName(user, &namelen);
+
+    return user;
+}
+
 int SaneDialogBox(HINSTANCE hinst,
                  LPCTSTR tmpl,
                  HWND hwndparent,
@@ -88,6 +105,13 @@ void SaneEndDialog(HWND hwnd, int ret)
     SetWindowLong(hwnd, BOXFLAGS, DF_END);
 }
 
+BOOL init_winver(void)
+{
+    ZeroMemory(&osVersion, sizeof(osVersion));
+    osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+    return GetVersionEx ( (OSVERSIONINFO *) &osVersion);
+}
+
 #ifdef DEBUG
 static FILE *debug_fp = NULL;
 static HANDLE debug_hdl = INVALID_HANDLE_VALUE;