Changeset 46851 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jun 27, 2013 4:55:20 PM (12 years ago)

Author:

vboxsync

Message:

ga/win/graphics: fix win version support

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Files:

• common/VBoxMPUtils.cpp (modified) (1 diff)
• common/VBoxMPUtils.h (modified) (1 diff)
• common/VBoxMPVidModes.cpp (modified) (1 diff)
• wddm/VBoxMPMisc.cpp (modified) (1 diff)

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

@@ -62 +62 @@
     if(major == 6)
     {
-        if (minor == 2)
+        if (minor == 3)
+            s_WinVersion = WIN8_1;
+        else if (minor == 2)
             s_WinVersion = WIN8;
         else if (minor == 1)

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

@@ -94 +94 @@
     WINVISTA  = 4,
     WIN7      = 5,
-    WIN8      = 6
+    WIN8      = 6,
+    WIN8_1    = 7
 } vboxWinVersion_t;
 

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

@@ -357 +357 @@
                      * if the framebuffer window requires scrolling to fit the guest resolution.
                      * So add 1024x768 resolution for win8 guest to allow user switch to it */
-                    (VBoxQueryWinVersion() != WIN8 || resolutionMatrix[resIndex].xRes != 1024 || resolutionMatrix[resIndex].yRes != 768) &&
+                    ((VBoxQueryWinVersion() != WIN8 && VBoxQueryWinVersion() != WIN8_1) || resolutionMatrix[resIndex].xRes != 1024 || resolutionMatrix[resIndex].yRes != 768) &&
 #endif
                     !VBoxLikesVideoMode(iDisplay, resolutionMatrix[resIndex].xRes, resolutionMatrix[resIndex].yRes - yOffset, bitsPerPixel))

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

@@ -619 +619 @@
     else
     {
-        Assert(ver == WIN7 || ver == WIN8);
+        Assert(ver == WIN7 || ver == WIN8 || ver == WIN8_1);
         pKeyPrefix = VBOXWDDM_REG_DISPLAYSETTINGSKEY_PREFIX_WIN7;
         cbKeyPrefix = sizeof (VBOXWDDM_REG_DISPLAYSETTINGSKEY_PREFIX_WIN7);