X forwarding changes:

[u/mdw/putty] / winmisc.c

diff --git a/winmisc.c b/winmisc.c
index 10c9fe3..518eb15 100644 (file)
--- a/winmisc.c
+++ b/winmisc.c
@@ -1,12 +1,10 @@
 /*
- * 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;
 
@@ -16,6 +14,13 @@ 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";
+
+char *platform_get_x_display(void) {
+    /* We may as well check for DISPLAY in case it's useful. */
+    return dupstr(getenv("DISPLAY"));
+}
+
 Filename filename_from_str(const char *str)
 {
     Filename ret;
@@ -39,6 +44,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,