X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d5859615f641e5bbd853cd42aafd4fa577da17eb..5055f918c94d049bdeba40a10412348f62d2fdde:/noise.c

diff --git a/noise.c b/noise.c
index 88b13a97..1d764d5f 100644
--- a/noise.c
+++ b/noise.c
@@ -4,6 +4,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 
 #include "putty.h"
@@ -11,6 +18,12 @@
 #include "storage.h"
 
 /*
+ * GetSystemPowerStatus function.
+ */
+typedef BOOL (WINAPI *gsps_t)(LPSYSTEM_POWER_STATUS);
+static gsps_t gsps;
+
+/*
  * This function is called once, at PuTTY startup, and will do some
  * seriously silly things like listing directories and getting disk
  * free space and a process snapshot.
@@ -20,6 +33,7 @@ void noise_get_heavy(void (*func) (void *, int)) {
     HANDLE srch;
     WIN32_FIND_DATA finddata;
     char winpath[MAX_PATH+3];
+    HMODULE mod;
 
     GetWindowsDirectory(winpath, sizeof(winpath));
     strcat(winpath, "\\*");
@@ -32,6 +46,12 @@ void noise_get_heavy(void (*func) (void *, int)) {
     }
 
     read_random_seed(func);
+
+    gsps = NULL;
+    mod = GetModuleHandle("KERNEL32");
+    if (mod) {
+        gsps = (gsps_t)GetProcAddress(mod, "GetSystemPowerStatus");
+    }
 }
 
 void random_save_seed(void) {
@@ -59,10 +79,13 @@ void noise_get_light(void (*func) (void *, int)) {
     GetSystemTimeAdjustment(&adjust[0], &adjust[1], &rubbish);
     func(&adjust, sizeof(adjust));
 
-#ifndef WIN32S_COMPAT
-    if (GetSystemPowerStatus(&pwrstat))
-	func(&pwrstat, sizeof(pwrstat));
-#endif
+    /*
+     * Call GetSystemPowerStatus if present.
+     */
+    if (gsps) {
+        if (gsps(&pwrstat))
+            func(&pwrstat, sizeof(pwrstat));
+    }
 }
 
 /*