projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the OSVERSIONINFOEX code because there's no obvious way to
[u/mdw/putty]
/
window.c
diff --git
a/window.c
b/window.c
index
42e4d6d
..
ff7ae2a
100644
(file)
--- a/
window.c
+++ b/
window.c
@@
-128,7
+128,7
@@
static char *window_name, *icon_name;
static int compose_state = 0;
static int compose_state = 0;
-static OSVERSIONINFO
EX
osVersion;
+static OSVERSIONINFO osVersion;
/* Dummy routine, only required in plink. */
void ldisc_update(int echo, int edit)
/* 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));
{
ZeroMemory(&osVersion, sizeof(osVersion));
- osVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-
- if(!GetVersionEx ((OSVERSIONINFO *) &osVersion)) {
- // If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO.
-
osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
- if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion))
- return FALSE;
- }
+ if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion)) {
+ MessageBox(NULL, "Windows refuses to report a version",
+ "PuTTY Fatal Error", MB_OK | MB_ICONEXCLAMATION);
+ return 1;
+ }
}
/*
}
/*