Changeset 108072 in vbox for trunk/src/VBox/Installer

Timestamp:

Feb 5, 2025 2:48:28 PM (3 months ago)

Author:

vboxsync

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

167365

Message:

Windows/InstallHelper: Replaced RegQueryValueExW() for querying DWORDs with VBoxMsiRegQueryDWORD(). bugref:10762

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (3 diffs)

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

@@ -1053 +1053 @@
 UINT __stdcall IsMSCRTInstalled(MSIHANDLE hModule)
 {
-    HKEY hKeyVS = NULL;
+    HKEY hKey;
     LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
                                 L"SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64",
-                                0, KEY_READ, &hKeyVS);
+                                0, KEY_READ, &hKey);
     if (lrc == ERROR_SUCCESS)
     {
-        DWORD dwVal = 0;
-        DWORD cbVal = sizeof(dwVal);
-        lrc = RegQueryValueExW(hKeyVS, L"Installed", NULL /* lpReserved */, NULL /* lpType */, (LPBYTE)&dwVal, &cbVal);
-        if (lrc == ERROR_SUCCESS)
+        DWORD dwVal;
+        int rc = VBoxMsiRegQueryDWORD(hModule, hKey, "Installed", &dwVal);
+        if (RT_SUCCESS(rc))
         {
             if (dwVal >= 1)
             {
                 DWORD dwMaj;
-                lrc = RegQueryValueExW(hKeyVS, L"Major", NULL /* lpReserved */, NULL /* lpType */, (LPBYTE)&dwMaj, &cbVal);
-                if (lrc == ERROR_SUCCESS)
+                rc = VBoxMsiRegQueryDWORD(hModule, hKey, "Major", &dwMaj);
+                if (RT_SUCCESS(rc))
                 {
                     VBoxMsiSetPropDWORD(hModule, L"VBOX_MSCRT_VER_MAJ", dwMaj);
 
-                    DWORD dwMin = 0;
-                    lrc = RegQueryValueExW(hKeyVS, L"Minor", NULL /* lpReserved */, NULL /* lpType */, (LPBYTE)&dwMin, &cbVal);
-                    if (lrc == ERROR_SUCCESS)
+                    DWORD dwMin;
+                    lrc = VBoxMsiRegQueryDWORD(hModule, hKey, "Minor", &dwMin);
+                    if (RT_SUCCESS(rc))
                     {
                         VBoxMsiSetPropDWORD(hModule, L"VBOX_MSCRT_VER_MIN", dwMin);
@@ -1098 +1097 @@
         else
             logStringF(hModule, "IsMSCRTInstalled: Found, but 'Installed' key not present (lrc=%d)", lrc);
+
+        RegCloseKey(hKey);
     }
 
@@ -1123 +1124 @@
      *       number from the registry.
      */
-    HKEY hKeyCurVer = NULL;
-    LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hKeyCurVer);
+    HKEY hKey;
+    LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hKey);
     if (lrc == ERROR_SUCCESS)
     {
-        DWORD dwVal = 0;
-        DWORD cbVal = sizeof(dwVal);
-        lrc = RegQueryValueExW(hKeyCurVer, L"CurrentMajorVersionNumber", NULL /* lpReserved */, NULL /* lpType */, (LPBYTE)&dwVal, &cbVal);
-        if (lrc == ERROR_SUCCESS)
-        {
-            logStringF(hModule, "IsWindows10/CurrentMajorVersionNumber: %u", dwVal);
-
-            VBoxMsiSetProp(hModule, L"VBOX_IS_WINDOWS_10", dwVal >= 10 ? L"1" : L"");
+        DWORD dwMaj;
+        int rc = VBoxMsiRegQueryDWORD(hModule, hKey, "CurrentMajorVersionNumber", &dwMaj);
+        if (RT_SUCCESS(rc))
+        {
+            VBoxMsiSetProp(hModule, L"VBOX_IS_WINDOWS_10", dwMaj >= 10 ? L"1" : L"");
+
         }
         else
-            logStringF(hModule, "IsWindows10/RegOpenKeyExW: Error reading CurrentMajorVersionNumber (%ld)", lrc);
-
-        RegCloseKey(hKeyCurVer);
+            logStringF(hModule, "IsWindows10: Error reading CurrentMajorVersionNumber (%Rrc)", rc);
+
+        RegCloseKey(hKey);
     }
     else