Changeset 109032 in vbox for trunk/src/VBox/Runtime/r3/win/RTMpGetDescription-win.cpp

Timestamp:

Apr 21, 2025 12:44:58 AM (4 weeks ago)

Author:

vboxsync

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

168561

Message:

IPRT: Reimplemented RTMpGetDescription for windows/arm taking info from the registry. jiraref:VBP-1598

File:

• trunk/src/VBox/Runtime/r3/win/RTMpGetDescription-win.cpp (copied) (copied from trunk/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp ) (4 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Multiprocessor, Generic RTMpGetDescription stub.
+ * IPRT - Multiprocessor, RTMpGetDescription, edition for newer Windows versions.
  */
 
@@ -39 +39 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#include <iprt/win/windows.h>
 #include <iprt/mp.h>
 #include "internal/iprt.h"
 
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <iprt/err.h>
 
@@ -48 +50 @@
 RTDECL(int) RTMpGetDescription(RTCPUID idCpu, char *pszBuf, size_t cbBuf)
 {
-    static const char s_szUnknown[] = "Unknown";
-
     if (idCpu != NIL_RTCPUID && !RTMpIsCpuOnline(idCpu))
         return RTMpIsCpuPossible(idCpu)
@@ -55 +55 @@
              : VERR_CPU_NOT_FOUND;
 
-    if (cbBuf < sizeof(s_szUnknown))
-        return VERR_BUFFER_OVERFLOW;
+    /*
+     * Newer windows versions (at least 11), keeps info about the CPU in the
+     * registry.
+     *
+     * 'Get-WmiObject win32_processor' queries this information for instance
+     * (probably by way of cimwin32.dll and framedynos.dll).
+     */
+    HKEY    hKeyCpuRoot = NULL;
+    LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor", 0 /* ulOptions*/,
+                                KEY_ENUMERATE_SUB_KEYS | KEY_READ, &hKeyCpuRoot);
+    AssertMsg(lrc == ERROR_SUCCESS, ("lrc=%u\n", lrc));
+    if (lrc == ERROR_SUCCESS)
+    {
+        HKEY hKeyCpu = NULL;
+        if (idCpu == NIL_RTCPUID)
+        {
+            lrc = RegOpenKeyExW(hKeyCpuRoot, L"0", 0 /* ulOptions*/, KEY_ENUMERATE_SUB_KEYS | KEY_READ, &hKeyCpu);
+            AssertMsg(lrc == ERROR_SUCCESS, ("lrc=%u\n", lrc));
+            /** @todo if (lrc != ERROR_SUCCESS) enumerate subkeys */
+        }
+        else
+        {
+            WCHAR wszCpuNo[32];
+            RTUtf16Printf(wszCpuNo, RT_ELEMENTS(wszCpuNo), "%u", idCpu);
+            lrc = RegOpenKeyExW(hKeyCpuRoot, wszCpuNo, 0 /* ulOptions*/, KEY_ENUMERATE_SUB_KEYS | KEY_READ, &hKeyCpu);
+            AssertMsg(lrc == ERROR_SUCCESS, ("lrc=%u\n", lrc));
+        }
+        if (lrc == ERROR_SUCCESS)
+        {
+            WCHAR wszBuf[1536] = {0}; /* reasonable buffer size, right... */
+            DWORD dwType = REG_NONE;
+            DWORD cbData = sizeof(wszBuf) - sizeof(WCHAR);
+            lrc = RegQueryValueExW(hKeyCpu, L"ProcessorNameString", NULL /*lpReserved*/, &dwType, (PBYTE)&wszBuf[0], &cbData);
+            if (lrc == ERROR_SUCCESS)
+            {
+                if (dwType == REG_SZ)
+                {
+                    if (cbBuf != 0 && pszBuf)
+                        return RTUtf16ToUtf8Ex(wszBuf, cbData / sizeof(WCHAR), &pszBuf, cbBuf, NULL);
+                    return VERR_BUFFER_OVERFLOW;
+                }
+            }
+        }
+    }
 
-    memcpy(pszBuf, s_szUnknown, sizeof(s_szUnknown));
-    return VINF_SUCCESS;
+    /* Fallback... */
+    return RTStrCopy(pszBuf, cbBuf, "Unknown");
 }
 RT_EXPORT_SYMBOL(RTMpGetDescription);