Changeset 15954 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 14, 2009 7:46:17 PM (16 years ago)

Author:

vboxsync

Message:

IPRT: Added Windows 2008 and Windows 7 OS detection.

File:

• trunk/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp

@@ -67 +67 @@
     kRTWinOSType_2003,
     kRTWinOSType_VISTA,
+    kRTWinOSType_2008,
+    kRTWinOSType_7,
     kRTWinOSType_NT_UNKNOWN = 199,
     kRTWinOSType_NT_LAST    = kRTWinOSType_UNKNOWN
@@ -147 +149 @@
 {
     RTWINOSTYPE enmVer         = kRTWinOSType_UNKNOWN;
+    BYTE  const bProductType   = pOSInfoEx->wProductType;
     DWORD const dwPlatformId   = pOSInfoEx->dwPlatformId;
     DWORD const dwMinorVersion = pOSInfoEx->dwMinorVersion;
@@ -197 +200 @@
         else if (   dwMajorVersion == 6
                  && dwMinorVersion == 0)
-            enmVer = kRTWinOSType_VISTA;
-        /** @todo check Windows Server 2008! */
+        {
+            if (bProductType != VER_NT_WORKSTATION)
+                enmVer = kRTWinOSType_2008;
+            else
+                enmVer = kRTWinOSType_VISTA;
+        }
+        else if (   dwMajorVersion == 6
+                 && dwMinorVersion == 1)
+            enmVer = kRTWinOSType_7;
         else
             enmVer = kRTWinOSType_NT_UNKNOWN;
@@ -364 +374 @@
                     break;
                 }
+                case kRTWinOSType_2008:         strcpy(szTmp, "Windows 2008"); break;
+                case kRTWinOSType_7:            strcpy(szTmp, "Windows 7"); break;
 
                 case kRTWinOSType_NT_UNKNOWN: