nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Remove /DWIN32S_COMPAT by detecting presence of GetSystemPowerStatus at

Browse Source 
runtime using GetProcAddress

[originally from svn r672]
This commit is contained in:
Simon Tatham 2000-10-05 16:48:37 +00:00
parent 8805d0b50e
commit 76746a7d61
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -18,9 +18,6 @@
# Generates executables whose About box report them as being a # Generates executables whose About box report them as being a
# release version. # release version.
# #
# - COMPAT=/DWIN32S_COMPAT
# Generates a binary that works (minimally) with Win32s.
#
# - COMPAT=/DAUTO_WINSOCK # - COMPAT=/DAUTO_WINSOCK
# Causes PuTTY to assume that <windows.h> includes its own WinSock # Causes PuTTY to assume that <windows.h> includes its own WinSock
# header file, so that it won't try to include <winsock.h>. # header file, so that it won't try to include <winsock.h>.

25
noise.c
View File

@ -10,6 +10,12 @@
#include "ssh.h" #include "ssh.h"
#include "storage.h" #include "storage.h"
/*
* GetSystemPowerStatus function.
*/
typedef BOOL (WINAPI *gsps_t)(LPSYSTEM_POWER_STATUS);
gsps_t gsps;
/* /*
* This function is called once, at PuTTY startup, and will do some * This function is called once, at PuTTY startup, and will do some
* seriously silly things like listing directories and getting disk * seriously silly things like listing directories and getting disk
@ -20,6 +26,7 @@ void noise_get_heavy(void (*func) (void *, int)) {
HANDLE srch; HANDLE srch;
WIN32_FIND_DATA finddata; WIN32_FIND_DATA finddata;
char winpath[MAX_PATH+3]; char winpath[MAX_PATH+3];
HMODULE mod;
GetWindowsDirectory(winpath, sizeof(winpath)); GetWindowsDirectory(winpath, sizeof(winpath));
strcat(winpath, "\\*"); strcat(winpath, "\\*");
@ -32,6 +39,13 @@ void noise_get_heavy(void (*func) (void *, int)) {
} }
read_random_seed(func); read_random_seed(func);
gsps = NULL;
mod = GetModuleHandle("KERNEL32");
if (mod) {
gsps = (gsps_t)GetProcAddress(mod, "GetSystemPowerStatus");
debug(("got gsps=%p\n", gsps));
}
} }
void random_save_seed(void) { void random_save_seed(void) {
@ -59,10 +73,13 @@ void noise_get_light(void (*func) (void *, int)) {
GetSystemTimeAdjustment(&adjust[0], &adjust[1], &rubbish); GetSystemTimeAdjustment(&adjust[0], &adjust[1], &rubbish);
func(&adjust, sizeof(adjust)); func(&adjust, sizeof(adjust));
#ifndef WIN32S_COMPAT /*
if (GetSystemPowerStatus(&pwrstat)) * Call GetSystemPowerStatus if present.
func(&pwrstat, sizeof(pwrstat)); */
#endif if (gsps) {
if (gsps(&pwrstat))
func(&pwrstat, sizeof(pwrstat));
}
} }
/* /*