From d46aded39cf49e669e3ec6c01d1ac2793843f36a Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 9 Nov 2010 10:41:45 -0500
Subject: [PATCH] KWSys: Teach SystemInformation about WinXP Pro and Win7
Modify a few lines in the function QueryOSInformation.
Change-Id: Ief8327144fdf5588354d4ce8240eb0206722e77e
Author: Marius Staring <m.staring@lumc.nl>
---
SystemInformation.cxx | 21 +++++++++++++++------
kwsysDateStamp.cmake | 4 ++--
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 936c1f71..4818ce9a 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -3304,28 +3304,37 @@ bool SystemInformationImplementation::QueryOSInformation()
{
case VER_PLATFORM_WIN32_NT:
// Test for the product.
- if (osvi.dwMajorVersion <= 4)
+ if (osvi.dwMajorVersion <= 4)
{
this->OSRelease = "NT";
}
- if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
+ if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
{
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";
}
#ifdef VER_NT_WORKSTATION
// 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";
}
+ if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1)
+ {
+ this->OSRelease = "7";
+ }
// VER_SUITE_PERSONAL may not be defined
#ifdef VER_SUITE_PERSONAL
else
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 4b0fb024..5ff8eec6 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -15,7 +15,7 @@
SET(KWSYS_DATE_STAMP_YEAR 2010)
# KWSys version date month component. Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 09)
+SET(KWSYS_DATE_STAMP_MONTH 11)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 10)
+SET(KWSYS_DATE_STAMP_DAY 09)
--
GitLab