Changeset 108071 in vbox

Timestamp:

Feb 5, 2025 2:14:02 PM (2 weeks 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

Files:

• GuestHost/installation/VBoxWinDrvCommon.cpp (modified) (1 diff)
• GuestHost/installation/VBoxWinDrvCommon.h (modified) (1 diff)
• Installer/win/InstallHelper/Makefile.kmk (modified) (1 diff)
• Installer/win/InstallHelper/VBoxCommon.cpp (modified) (2 diffs)
• Installer/win/InstallHelper/VBoxCommon.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 */
 

trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

@@ -51 +51 @@
         VBoxInstallHelper.rc \
         VBoxCommon.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvCommon.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvInst.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/Installation/VBoxWinDrvStore.cpp
+        $(PATH_ROOT)/src/VBox/GuestHost/installation/VBoxWinDrvCommon.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/installation/VBoxWinDrvStore.cpp
+VBoxInstallHelper_INCS    += \
+        $(PATH_ROOT)/src/VBox/GuestHost/installation
 ifndef VBOX_OSE
  VBoxInstallHelper_SOURCES += \

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp

@@ -39 +39 @@
 #include <iprt/utf16.h>
 
+#include <VBox/GuestHost/VBoxWinDrvInst.h>
+#include <VBoxWinDrvCommon.h>
 #include "VBoxCommon.h"
 
@@ -206 +208 @@
     return VBoxMsiSetProp(hMsi, pwszName, wszTemp);
 }
+
+/**
+ * Queries a DWORD value from a Windows registry key, Unicode (wide char) version.
+ *
+ * @returns VBox 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   hMsi                MSI handle to use.
+ * @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.
+ */
+int VBoxMsiRegQueryDWORDW(MSIHANDLE hMsi, HKEY hKey, LPCWSTR pwszName, DWORD *pdwValue)
+{
+    RT_NOREF(hMsi);
+
+    return VBoxWinDrvRegQueryDWORDW(hKey, pwszName, pdwValue);
+}
+
+/**
+ * Queries a DWORD value from a Windows registry key.
+ *
+ * @returns VBox 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 VBoxMsiRegQueryDWORD(MSIHANDLE hMsi, HKEY hKey, const char *pszName, DWORD *pdwValue)
+{
+    PRTUTF16 pwszName;
+    int rc = RTStrToUtf16Ex(pszName, RTSTR_MAX, &pwszName, 0, NULL);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VBoxMsiRegQueryDWORDW(hMsi, hKey, pwszName, pdwValue);
+        RTUtf16Free(pwszName);
+    }
+
+    return rc;
+}
+

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.h

@@ -43 +43 @@
 int VBoxMsiSetPropUtf8(MSIHANDLE hMsi, const char *pszName, const char *pszValue);
 UINT VBoxMsiSetPropDWORD(MSIHANDLE hMsi, const WCHAR *pwszName, DWORD dwVal);
+int VBoxMsiRegQueryDWORDW(MSIHANDLE hMsi, HKEY hKey, LPCWSTR pwszName, DWORD *pdwValue);
+int VBoxMsiRegQueryDWORD(MSIHANDLE hMsi, HKEY hKey, const char *pszName, DWORD *pdwValue);
 
 #endif /* !VBOX_INCLUDED_SRC_InstallHelper_VBoxCommon_h */