diff options
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 23 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 2 |
2 files changed, 16 insertions, 9 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 373f959..45fc9b6 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -2980,15 +2980,22 @@ bool SystemInformationImplementation::QueryOSInformation() { if (osvi.wProductType == VER_NT_WORKSTATION) { -// VER_SUITE_PERSONAL may not be defined -#ifdef VER_SUITE_PERSONAL - if (osvi.wSuiteMask & VER_SUITE_PERSONAL) + if (osvi.dwMajorVersion == 6) { - this->OSRelease += " Personal"; + this->OSRelease = "Vista"; } - else +// VER_SUITE_PERSONAL may not be defined +#ifdef VER_SUITE_PERSONAL + else { - this->OSRelease += " Professional"; + if (osvi.wSuiteMask & VER_SUITE_PERSONAL) + { + this->OSRelease += " Personal"; + } + else + { + this->OSRelease += " Professional"; + } } #endif } @@ -3015,7 +3022,7 @@ bool SystemInformationImplementation::QueryOSInformation() } } - sprintf (operatingSystem, "%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); + sprintf (operatingSystem, "%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); this->OSVersion = operatingSystem; } else @@ -3095,7 +3102,7 @@ bool SystemInformationImplementation::QueryOSInformation() else { // Windows 2000 and everything else. - sprintf (operatingSystem,"%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); + sprintf (operatingSystem,"%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); this->OSVersion = operatingSystem; } break; diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 8de4d94..72b109c 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -4182,7 +4182,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() res += "Microsoft Windows Server 2008 family"; } #else - res += "Microsoft Windows Vista or Windows Server 2003"; + res += "Microsoft Windows Vista or Windows Server 2008"; #endif } |