zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added Windows 7 (aka Windows NT 6.1) and Server 2008 identification to

Browse source 
I_DetectOS().


SVN r1996 (trunk)
This commit is contained in:
Randy Heit 2009-11-24 04:29:36 +00:00
parent 754fe70a79
commit 53b1b7efab
2 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/rh-log.txt
View file

@ -1,4 +1,6 @@
November 23, 2009 November 23, 2009
- Added Windows 7 (aka Windows NT 6.1) and Server 2008 identification to
I_DetectOS().
- Fixed: ArtiPork did not use all its sprite frames. - Fixed: ArtiPork did not use all its sprite frames.
- Fixed: FWadCollection::AddFile() did not call FixPathSeperator(), so - Fixed: FWadCollection::AddFile() did not call FixPathSeperator(), so
savegames would hold the full file path for wads that had been specified savegames would hold the full file path for wads that had been specified

34
src/win32/i_system.cpp
View file

@ -480,11 +480,16 @@ void I_WaitVBL(int count)
void I_DetectOS(void) void I_DetectOS(void)
{ {
OSVERSIONINFO info; OSVERSIONINFOEX info;
const char *osname; const char *osname;
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
if (!GetVersionEx((OSVERSIONINFO *)&info))
{
// Retry with the older OSVERSIONINFO structure.
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx (&info); GetVersionEx((OSVERSIONINFO *)&info);
}
switch (info.dwPlatformId) switch (info.dwPlatformId)
{ {
@ -522,10 +527,31 @@ void I_DetectOS(void)
osname = "Server 2003"; osname = "Server 2003";
} }
} }
else if (info.dwMajorVersion == 6 && info.dwMinorVersion == 0) else if (info.dwMajorVersion == 6)
{
if (info.dwMinorVersion == 0)
{
if (info.wProductType == VER_NT_WORKSTATION)
{ {
osname = "Vista"; osname = "Vista";
} }
else
{
osname = "Server 2008";
}
}
else if (info.dwMinorVersion == 1)
{
if (info.wProductType == VER_NT_WORKSTATION)
{
osname = "7";
}
else
{
osname = "Server 2008 R2";
}
}
}
break; break;
default: default:
@ -543,7 +569,7 @@ void I_DetectOS(void)
} }
else else
{ {
Printf ("OS: Windows %s %lu.%lu (Build %lu)\n %s\n", Printf ("OS: Windows %s (NT %lu.%lu) Build %lu\n %s\n",
osname, osname,
info.dwMajorVersion, info.dwMinorVersion, info.dwMajorVersion, info.dwMinorVersion,
info.dwBuildNumber, info.szCSDVersion); info.dwBuildNumber, info.szCSDVersion);