Changeset 46876 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Timestamp:

Jul 1, 2013 10:09:35 AM (11 years ago)

Author:

vboxsync

Message:

added Win8.1 OS type

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

@@ -63 +63 @@
     {
         if (minor == 3)
-            s_WinVersion = WIN8_1;
+            s_WinVersion = WIN81;
         else if (minor == 2)
             s_WinVersion = WIN8;

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

@@ -95 +95 @@
     WIN7      = 5,
     WIN8      = 6,
-    WIN8_1    = 7
+    WIN81     = 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 && VBoxQueryWinVersion() != WIN8_1) || resolutionMatrix[resIndex].xRes != 1024 || resolutionMatrix[resIndex].yRes != 768) &&
-#endif
-                    !VBoxLikesVideoMode(iDisplay, resolutionMatrix[resIndex].xRes, resolutionMatrix[resIndex].yRes - yOffset, bitsPerPixel))
+                       (   (VBoxQueryWinVersion() != WIN8 && VBoxQueryWinVersion() != WIN81)
+                        || resolutionMatrix[resIndex].xRes != 1024
+                        || resolutionMatrix[resIndex].yRes != 768)
+                    &&
+#endif
+                       !VBoxLikesVideoMode(iDisplay, resolutionMatrix[resIndex].xRes,
+                                           resolutionMatrix[resIndex].yRes - yOffset, bitsPerPixel))
             {
                 /* host doesn't like this mode */

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

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