Remove GetSystemPowerStatus() - should resolve hard-hangs

[originally from svn r3938]

diff --git a/noise.c b/noise.c
index 00719bbd851f97f2603e755d042834351479fa0a..5b82fa76f23679e133f7d9d7c82a0c5e394885ae 100644 (file)
--- a/noise.c
+++ b/noise.c
@@ -9,12 +9,6 @@
 #include "ssh.h"
 #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
@@ -26,7 +20,6 @@ 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, "\\*");
@@ -41,12 +34,6 @@ void noise_get_heavy(void (*func) (void *, int))
     read_random_seed(func);
     /* Update the seed immediately, in case another instance uses it. */
     random_save_seed();
-
-    gsps = NULL;
-    mod = GetModuleHandle("KERNEL32");
-    if (mod) {
-       gsps = (gsps_t) GetProcAddress(mod, "GetSystemPowerStatus");
-    }
 }
 
 void random_save_seed(void)
@@ -78,14 +65,6 @@ void noise_get_light(void (*func) (void *, int))
 
     GetSystemTimeAdjustment(&adjust[0], &adjust[1], &rubbish);
     func(&adjust, sizeof(adjust));
-
-    /*
-     * Call GetSystemPowerStatus if present.
-     */
-    if (gsps) {
-       if (gsps(&pwrstat))
-           func(&pwrstat, sizeof(pwrstat));
-    }
 }
 
 /*