Changeset 25021 in vbox

Timestamp:

Nov 26, 2009 4:03:39 PM (15 years ago)

Author:

vboxsync

Message:

VBoxGuest: Fixed runtime OS detection on Windows 7.

Location:

trunk/src/VBox/Additions/WINNT/VBoxGuest

Files:

• Helper.cpp (modified) (2 diffs)
• VBoxGuest.cpp (modified) (5 diffs)
• VBoxGuest_Internal.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxGuest/Helper.cpp

@@ -193 +193 @@
 }
 
+/** @todo maybe we should drop this routine entirely later because we detecting
+ *        the running OS via VBoxService in ring 3 using guest properties since a while. */
 NTSTATUS hlpVBoxReportGuestInfo (PVBOXGUESTDEVEXT pDevExt)
 {
@@ -223 +225 @@
                 req->guestInfo.osType = VBOXOSTYPE_WinVista;
                 break;
+            case WIN7:
+                req->guestInfo.osType = VBOXOSTYPE_Win7;
+                break;
             default:
                 /* we don't know, therefore NT family */

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -126 +126 @@
     ULONG buildNumber;
     PsGetVersion(&majorVersion, &minorVersion, &buildNumber, NULL);
-    dprintf(("VBoxGuest::DriverEntry: running on Windows NT version %d.%d, build %d\n", majorVersion, minorVersion, buildNumber));
+    dprintf(("VBoxGuest::DriverEntry: Running on Windows NT version %d.%d, build %d\n", majorVersion, minorVersion, buildNumber));
 #ifdef DEBUG
     testVBoxGuest();
@@ -132 +132 @@
     switch (majorVersion)
     {
-        case 6:
-            winVersion = WINVISTA;
+        case 6: /* Windows Vista or Windows 7 (based on minor ver) */
+            switch (minorVersion)
+            {
+                case 0: /* Note: Also could be Windows 2008 Server! */
+                    winVersion = WINVISTA;
+                    break;
+                case 1: /* Note: Also could be Windows 2008 Server R2! */
+                    winVersion = WIN7;
+                    break;
+                default:
+                    dprintf(("VBoxGuest::DriverEntry: Unknown version of Windows, refusing!\n"));
+                    return STATUS_DRIVER_UNABLE_TO_LOAD;
+            }
             break;
         case 5:
@@ -148 +159 @@
                     break;
                 default:
-                    dprintf(("VBoxGuest::DriverEntry: unknown version of Windows, refusing!\n"));
+                    dprintf(("VBoxGuest::DriverEntry: Unknown version of Windows, refusing!\n"));
                     return STATUS_DRIVER_UNABLE_TO_LOAD;
             }
@@ -156 +167 @@
             break;
         default:
-            dprintf(("VBoxGuest::DriverEntry: NT4 required!\n"));
+            dprintf(("VBoxGuest::DriverEntry: At least Windows NT4 required!\n"));
             return STATUS_DRIVER_UNABLE_TO_LOAD;
     }
@@ -1839 +1850 @@
                 dprintf(("VBoxGuest::reserveHypervisorMemory: VMMDevReq_DeregisterPatchMemory error!"
                             "rc = %d, VMMDev rc = %Rrc\n", rc, req->header.rc));
-                /* We intentially leak the memory object here as there still could 
+                /* We intentially leak the memory object here as there still could
                  * be references to it!!!
                  */

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest_Internal.h

@@ -238 +238 @@
     WINXP    = 3,
     WIN2K3   = 4,
-    WINVISTA = 5
+    WINVISTA = 5,
+    WIN7     = 6,
 } winVersion_t;
 extern winVersion_t winVersion;