Changeset 54931 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2015 5:40:16 PM (10 years ago)

Author:

vboxsync

Message:

Runtime/r3/win: GetLogicalProcessorInformation is useless for querying the number of cores before Vista.

File:

• trunk/src/VBox/Runtime/r3/win/mp-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/mp-win.cpp

@@ -101 +101 @@
     /*
      * Resolve the API dynamically (one try) as it requires XP w/ sp3 or later.
-     */
+     */    
     typedef BOOL (WINAPI *PFNGETLOGICALPROCINFO)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
     static PFNGETLOGICALPROCINFO s_pfnGetLogicalProcInfo = (PFNGETLOGICALPROCINFO)~(uintptr_t)0;
@@ -107 +107 @@
         s_pfnGetLogicalProcInfo = (PFNGETLOGICALPROCINFO)RTLdrGetSystemSymbol("kernel32.dll", "GetLogicalProcessorInformation");
 
-    if (s_pfnGetLogicalProcInfo)
+    /*
+     * Sadly, on XP and Server 2003, even if the API is present, it does not tell us
+     * how many physical cores there are (any package will look like a single core).
+     * That is worse than not using the API at all, so just skip it unless it's Vista+.
+     */
+    bool fIsVistaOrLater = false;
+    OSVERSIONINFOEX OSInfoEx = { 0 };
+    OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+    if (   GetVersionEx((LPOSVERSIONINFO) &OSInfoEx)
+        && (OSInfoEx.dwPlatformId == VER_PLATFORM_WIN32_NT)
+        && (OSInfoEx.dwMajorVersion >= 6))
+        fIsVistaOrLater = true;
+
+    if (s_pfnGetLogicalProcInfo && fIsVistaOrLater)
     {
         /*