SSH port forwarding! How cool is that?

[u/mdw/putty] / window.c

diff --git a/window.c b/window.c
index 3fd445f..15ad7b3 100644 (file)
--- a/window.c
+++ b/window.c
@@ -128,7 +128,7 @@ static char *window_name, *icon_name;
 
 static int compose_state = 0;
 
-static OSVERSIONINFOEX osVersion;
+static OSVERSIONINFO osVersion;
 
 /* Dummy routine, only required in plink. */
 void ldisc_update(int echo, int edit)
@@ -170,15 +170,12 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
     {
        ZeroMemory(&osVersion, sizeof(osVersion));
-       osVersion.dwOSVersionInfoSize = sizeof(osVersion);
-
-       if(!GetVersionEx ((OSVERSIONINFO *) &osVersion)) {
-       // If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO.
-
-       osVersion.dwOSVersionInfoSize = sizeof (osVersion);
-       if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion))
-           return FALSE;
-       }
+       osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
+       if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion)) {
+            MessageBox(NULL, "Windows refuses to report a version",
+                       "PuTTY Fatal Error", MB_OK | MB_ICONEXCLAMATION);
+           return 1;
+        }
     }
 
     /*
@@ -709,7 +706,7 @@ char *do_select(SOCKET skt, int startup)
     int msg, events;
     if (startup) {
        msg = WM_NETEVENT;
-       events = FD_READ | FD_WRITE | FD_OOB | FD_CLOSE;
+       events = FD_READ | FD_WRITE | FD_OOB | FD_CLOSE | FD_ACCEPT;
     } else {
        msg = events = 0;
     }