Changeset 108071 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Feb 5, 2025 2:14:02 PM (3 months ago)

Author:

vboxsync

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

167361

Message:

Windows driver installation: Added VBoxWinDrvRegQueryDWORD[W] to have a common base for querying registry values. Required as a prerequisite for unifying the InstallHelper.dll. bugref:10762

Location:

trunk/src/VBox/GuestHost/installation

Files:

• VBoxWinDrvCommon.cpp (modified) (1 diff)
• VBoxWinDrvCommon.h (modified) (1 diff)

trunk/src/VBox/GuestHost/installation/VBoxWinDrvCommon.cpp

@@ -697 +697 @@
 }
 
+/**
+ * Queries a DWORD value from a Windows registry key, Unicode (wide char) version.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_FILE_NOT_FOUND if the value has not been found.
+ * @retval  VERR_WRONG_TYPE if the type (DWORD) of the value does not match.
+ * @retval  VERR_MISMATCH if the type sizes do not match.
+ * @param   hKey                    Registry handle of key to query.
+ * @param   pwszName                Name of the value to query.
+ * @param   pdwValue                Where to return the actual value on success.
+ *
+ * @note    Taken from IPRT's rtSystemWinRegistryQueryDWORDW.
+ */
+int VBoxWinDrvRegQueryDWORDW(HKEY hKey, LPCWSTR pwszName, DWORD *pdwValue)
+{
+    int rc = VINF_SUCCESS;
+
+    DWORD cbType = sizeof(DWORD);
+    DWORD dwType = 0;
+    DWORD dwValue;
+    LONG lErr = RegQueryValueExW(hKey, pwszName, NULL, &dwType, (BYTE *)&dwValue, &cbType);
+    if (lErr == ERROR_SUCCESS)
+    {
+        if (cbType == sizeof(DWORD))
+        {
+            if (dwType == REG_DWORD)
+            {
+                *pdwValue = dwValue;
+            }
+            else
+                rc = VERR_WRONG_TYPE;
+        }
+        else
+            rc = VERR_MISMATCH;
+    }
+    else
+        rc = RTErrConvertFromWin32(lErr);
+
+    return rc;
+}
+
+/**
+ * Queries a DWORD value from a Windows registry key.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_FILE_NOT_FOUND if the value has not been found.
+ * @retval  VERR_WRONG_TYPE if the type (DWORD) of the value does not match.
+ * @retval  VERR_MISMATCH if the type sizes do not match.
+ * @param   hKey                    Registry handle of key to query.
+ * @param   pszName                 Name of the value to query.
+ * @param   pdwValue                Where to return the actual value on success.
+ */
+int VBoxWinDrvRegQueryDWORD(HKEY hKey, const char *pszName, DWORD *pdwValue)
+{
+    PRTUTF16 pwszName;
+    int rc = RTStrToUtf16Ex(pszName, RTSTR_MAX, &pwszName, 0, NULL);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VBoxWinDrvRegQueryDWORDW(hKey, pwszName, pdwValue);
+        RTUtf16Free(pwszName);
+    }
+
+    return rc;
+}
+

trunk/src/VBox/GuestHost/installation/VBoxWinDrvCommon.h

@@ -75 +75 @@
 int VBoxWinDrvInstErrorFromWin32(unsigned uNativeCode);
 
+int VBoxWinDrvRegQueryDWORDW(HKEY hKey, LPCWSTR pwszName, DWORD *pdwValue);
+int VBoxWinDrvRegQueryDWORD(HKEY hKey, const char *pszName, DWORD *pdwValue);
+
 #endif /* !VBOX_INCLUDED_SRC_installation_VBoxWinDrvCommon_h */