Graphics

Timestamp:

Sep 15, 2011 2:11:47 PM (13 years ago)

Author:

vboxsync

Message:

more Windows 8 fixes

Location:

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

Files:

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

-              r36955
+              r38765
     if (s_WinVersion != UNKNOWN_WINVERSION)
+    {
         return s_WinVersion;
+    }
     checkedBuild = PsGetVersion(&major, &minor, &build, NULL);
 …
     if(major == 6)
+    {
+        if (minor == 1)
+        {
+        if (minor == 2)
+            s_WinVersion = WIN8;
+        else if (minor == 1)
             s_WinVersion = WIN7;
+        }
         else if (minor == 0)
+        {
             s_WinVersion = WINVISTA; /* Or Windows Server 2008. */
+        }
+    }
     else if (major == 5)
+    {
         s_WinVersion = (minor>=1) ? WINXP:WIN2K;
+    }
     else if (major == 4)
+    {
         s_WinVersion = WINNT4;
+    }
+    else
+    {
+    else
         WARN(("NT4 required!"));
+    }
     return s_WinVersion;
+}

-              r38739
+              r38765
     WINXP     = 3,
     WINVISTA  = 4,
+    WIN7      = 5
+    WIN7      = 5,
+    WIN8      = 6
 } vboxWinVersion_t;

r38405	r38765
606	606	else
607	607	{
608		Assert(ver == WIN7);
	608	Assert(ver == WIN7 \|\| ver == WIN8);
609	609	pKeyPrefix = VBOXWDDM_REG_DISPLAYSETTINGSKEY_PREFIX_WIN7;
610	610	cbKeyPrefix = sizeof (VBOXWDDM_REG_DISPLAYSETTINGSKEY_PREFIX_WIN7);

Note: See TracChangeset for help on using the changeset viewer.