Changeset 54006 in vbox

Timestamp:

Jan 28, 2015 7:39:54 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97911

Message:

Windows additions: OS version check fixes

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp (modified) (1 diff)
• WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (2 diffs)
• WINNT/Installer/winver.nsh (modified) (1 diff)
• common/VBoxGuest/VBoxGuest-win.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp

@@ -60 +60 @@
     LOG(("running on version %d.%d, build %d(checked=%d)", major, minor, build, (int)checkedBuild));
 
-    if (major == 6)
+    if (major > 6)
+    {
+        /* Everything newer than Windows 8.1, i.e. Windows 10 with major == 10. */
+        s_WinVersion = WINVERSION_10;
+    }
+    else if (major == 6)
     {
         if (minor >= 4)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -7426 +7426 @@
         if (major > 6)
         {
-            WARN(("Unknow win version, newer major release, assuming 3D check is required"));
+            /* Windows 10 and newer. */
             f3DRequired = TRUE;
         }
         else if (major == 6)
         {
-            if (minor > 4)
-            {
-                WARN(("Unknow win version, newer minor release, assuming 3D check is required"));
+            if (minor >= 2)
+            {
+                /* Windows 8, 8.1 and 10 preview. */
                 f3DRequired = TRUE;
             }
-            else if (minor >= 2)
-            {
-                LOG(("3D check is required!"));
-                f3DRequired = TRUE;
-            }
             else
             {
-                LOG(("3D is NOT required!"));
                 f3DRequired = FALSE;
             }
@@ -7452 +7446 @@
             f3DRequired = FALSE;
         }
+
+        LOG(("3D is %srequired!", f3DRequired? "": "NOT "));
 
         Status = STATUS_SUCCESS;

trunk/src/VBox/Additions/WINNT/Installer/winver.nsh

@@ -67 +67 @@
   StrCmp $R1 '6.1' lbl_winnt_7
   StrCmp $R1 '6.2' lbl_winnt_8
+
+  ; Windows 10 preview 9926 has CurrentVersion == 6.3
+  ; Check Windows 10 registry values
+  ReadRegDWORD $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" "CurrentMajorVersionNumber"
+  ${If} $R0 == "10"
+    Goto lbl_winnt_10
+  ${EndIf}
+
   StrCmp $R1 '6.3' lbl_winnt_8_1
   StrCmp $R1 '6.4' lbl_winnt_10 lbl_error

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -108 +108 @@
     ULONG ulBuildNo;
     BOOLEAN fCheckedBuild = PsGetVersion(&ulMajorVer, &ulMinorVer, &ulBuildNo, NULL);
-    LogRelFunc(("Running on Windows NT version %u.%u, build %u\n", ulMajorVer, ulMinorVer, ulBuildNo));
+
+    /* Use RTLogBackdoorPrintf to make sure that this goes to VBox.log */
+    RTLogBackdoorPrintf("VBoxGuest: Windows version %u.%u, build %u\n", ulMajorVer, ulMinorVer, ulBuildNo);
     if (fCheckedBuild)
-        LogRelFunc(("Running on a Windows checked build (debug)!\n"));
+        RTLogBackdoorPrintf("VBoxGuest: Windows checked build\n");
+
 #ifdef DEBUG
     vbgdNtDoTests();
@@ -116 +119 @@
     switch (ulMajorVer)
     {
+        case 10:
+            switch (ulMinorVer)
+            {
+                case 0:
+                    /* Windows 10 Preview builds starting with 9926. */
+                default:
+                    /* Also everything newer. */
+                    g_enmVbgdNtVer = VBGDNTVER_WIN10;
+                    break;
+            }
+            break;
         case 6: /* Windows Vista or Windows 7 (based on minor ver) */
             switch (ulMinorVer)
@@ -132 +146 @@
                     break;
                 case 4:
+                    /* Windows 10 Preview builds. */
+                default:
+                    /* Also everything newer. */
                     g_enmVbgdNtVer = VBGDNTVER_WIN10;
-                    break;
-                default:
-                    LogRelFunc(("Unknown version of Windows (%u.%u), refusing!\n", ulMajorVer, ulMinorVer));
-                    rc = STATUS_DRIVER_UNABLE_TO_LOAD;
                     break;
             }
@@ -143 +156 @@
             switch (ulMinorVer)
             {
+                default:
                 case 2:
                     g_enmVbgdNtVer = VBGDNTVER_WIN2K3;
@@ -152 +166 @@
                     g_enmVbgdNtVer = VBGDNTVER_WIN2K;
                     break;
-                default:
-                    LogRelFunc(("Unknown version of Windows (%u.%u), refusing!\n", ulMajorVer, ulMinorVer));
-                    rc = STATUS_DRIVER_UNABLE_TO_LOAD;
             }
             break;
@@ -161 +172 @@
             break;
         default:
-            if (ulMajorVer < 4)
-                LogRelFunc(("At least Windows NT4 required! (%u.%u)\n", ulMajorVer, ulMinorVer));
+            if (ulMajorVer > 6)
+            {
+                /* "Windows 10 mode" for Windows 8.1+. */
+                g_enmVbgdNtVer = VBGDNTVER_WIN10;
+            }
             else
-                LogRelFunc(("Too new version %u.%u!\n", ulMajorVer, ulMinorVer));
-            rc = STATUS_DRIVER_UNABLE_TO_LOAD;
+            {
+                if (ulMajorVer < 4)
+                    LogRelFunc(("At least Windows NT4 required! (%u.%u)\n", ulMajorVer, ulMinorVer));
+                else
+                    LogRelFunc(("Unknown version %u.%u!\n", ulMajorVer, ulMinorVer));
+                rc = STATUS_DRIVER_UNABLE_TO_LOAD;
+            }
             break;
     }