kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KWSys: Teach SystemInformation about WinXP Pro and Win7

Browse Source 
Modify a few lines in the function QueryOSInformation.

Change-Id: Ief8327144fdf5588354d4ce8240eb0206722e77e
Author: Marius Staring <m.staring@lumc.nl>
This commit is contained in:
Brad King 2010-11-09 10:41:45 -05:00
parent bbb3d81d38
commit d8e0bfa786
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/kwsys/SystemInformation.cxx
View File

@ -3304,28 +3304,37 @@ bool SystemInformationImplementation::QueryOSInformation()
{ {
case VER_PLATFORM_WIN32_NT: case VER_PLATFORM_WIN32_NT:
// Test for the product. // Test for the product.
if (osvi.dwMajorVersion <= 4) if (osvi.dwMajorVersion <= 4)
{ {
this->OSRelease = "NT"; this->OSRelease = "NT";
} }
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
{ {
this->OSRelease = "2000"; this->OSRelease = "2000";
} }
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
{
this->OSRelease = "XP";
}
// XP Professional x64
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
{ {
this->OSRelease = "XP"; this->OSRelease = "XP";
} }
#ifdef VER_NT_WORKSTATION #ifdef VER_NT_WORKSTATION
// Test for product type. // Test for product type.
if (bOsVersionInfoEx) if (bOsVersionInfoEx)
{ {
if (osvi.wProductType == VER_NT_WORKSTATION) if (osvi.wProductType == VER_NT_WORKSTATION)
{ {
if (osvi.dwMajorVersion == 6) if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
{ {
this->OSRelease = "Vista"; this->OSRelease = "Vista";
} }
if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1)
{
this->OSRelease = "7";
}
// VER_SUITE_PERSONAL may not be defined // VER_SUITE_PERSONAL may not be defined
#ifdef VER_SUITE_PERSONAL #ifdef VER_SUITE_PERSONAL
else else