Changeset 77150 in vbox for trunk/src/VBox

Timestamp:

Feb 4, 2019 1:48:58 PM (6 years ago)

Author:

vboxsync

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

128623

Message:

Graphics/VideoMP: Fixed retrieving the product build version of VBoxQueryWinVersion() when being called the first time. Added a @todo.

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp (modified) (1 diff)

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

@@ -40 +40 @@
 
 /*Returns the windows version we're running on*/
+/** @todo r=andy Use RTSystemQueryOSInfo() instead? This also does caching and stuff. */
 vboxWinVersion_t VBoxQueryWinVersion(uint32_t *pbuild)
 {
+    static ULONG            s_pbuild     = 0;
+    static vboxWinVersion_t s_WinVersion = WINVERSION_UNKNOWN;
+
     ULONG major, minor;
-    static ULONG build = 0;
     BOOLEAN checkedBuild;
-    static vboxWinVersion_t s_WinVersion = WINVERSION_UNKNOWN;
-
-    if (s_WinVersion != WINVERSION_UNKNOWN)
-    {
-        if (pbuild)
-            *pbuild = build;
-
-        return s_WinVersion;
-    }
-
-    checkedBuild = PsGetVersion(&major, &minor, &build, NULL);
-    LOG(("running on version %d.%d, build %d(checked=%d)", major, minor, build, (int)checkedBuild));
-
-    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)
+
+    if (s_WinVersion == WINVERSION_UNKNOWN)
+    {
+        checkedBuild = PsGetVersion(&major, &minor, &s_pbuild, NULL);
+        LOG(("running on version %d.%d, build %d(checked=%d)", major, minor, s_pbuild, (int)checkedBuild));
+
+        if (major > 6)
+        {
+            /* Everything newer than Windows 8.1, i.e. Windows 10 with major == 10. */
             s_WinVersion = WINVERSION_10;
-        else if (minor == 3)
-            s_WinVersion = WINVERSION_81;
-        else if (minor == 2)
-            s_WinVersion = WINVERSION_8;
-        else if (minor == 1)
-            s_WinVersion = WINVERSION_7;
-        else if (minor == 0)
-            s_WinVersion = WINVERSION_VISTA; /* Or Windows Server 2008. */
-    }
-    else if (major == 5)
-        s_WinVersion = (minor>=1) ? WINVERSION_XP: WINVERSION_2K;
-    else if (major == 4)
-        s_WinVersion = WINVERSION_NT4;
-    else
-        WARN(("NT4 required!"));
+        }
+        else if (major == 6)
+        {
+            if (minor >= 4)
+                s_WinVersion = WINVERSION_10;
+            else if (minor == 3)
+                s_WinVersion = WINVERSION_81;
+            else if (minor == 2)
+                s_WinVersion = WINVERSION_8;
+            else if (minor == 1)
+                s_WinVersion = WINVERSION_7;
+            else if (minor == 0)
+                s_WinVersion = WINVERSION_VISTA; /* Or Windows Server 2008. */
+        }
+        else if (major == 5)
+            s_WinVersion = (minor>=1) ? WINVERSION_XP: WINVERSION_2K;
+        else if (major == 4)
+            s_WinVersion = WINVERSION_NT4;
+        else
+            WARN(("NT4 required!"));
+    }
+
+    if (pbuild)
+        *pbuild = s_pbuild;
+
     return s_WinVersion;
 }