X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/88485e4deec3c3bc63c9456de87b8bc336666a23..6bb26b30935b575ae7e0e4e5b230ab21d151ea5e:/window.c

diff --git a/window.c b/window.c
index 3fd445f8..15ad7b3c 100644
--- 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;
     }