Changeset 108069 in vbox

Timestamp:

Feb 5, 2025 11:43:53 AM (2 weeks ago)

Author:

vboxsync

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

167349

Message:

Windows/InstallHelper: Resolved some @todos. We should use something more generic (from IPRT probably) there anyway. Later.

File:

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

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

@@ -1061 +1061 @@
         DWORD dwVal = 0;
         DWORD cbVal = sizeof(dwVal);
-        DWORD dwValueType = REG_DWORD; /** @todo r=bird: output only parameter, optional, so pointless. */
-        lrc = RegQueryValueExW(hKeyVS, L"Installed", NULL, &dwValueType, (LPBYTE)&dwVal, &cbVal);
+        lrc = RegQueryValueExW(hKeyVS, L"Installed", NULL /* lpReserved */, NULL /* lpType */, (LPBYTE)&dwVal, &cbVal);
         if (lrc == ERROR_SUCCESS)
         {
             if (dwVal >= 1)
             {
-                DWORD dwMaj = 0; /** @todo r=bird: It's purdent to initialize values if you don't bother to check the type and size! */
-                lrc = RegQueryValueExW(hKeyVS, L"Major", NULL, &dwValueType, (LPBYTE)&dwMaj, &cbVal);
+                DWORD dwMaj;
+                lrc = RegQueryValueExW(hKeyVS, L"Major", NULL /* lpReserved */, NULL /* lpType */, (LPBYTE)&dwMaj, &cbVal);
                 if (lrc == ERROR_SUCCESS)
                 {
@@ -1074 +1073 @@
 
                     DWORD dwMin = 0;
-                    lrc = RegQueryValueExW(hKeyVS, L"Minor", NULL, &dwValueType, (LPBYTE)&dwMin, &cbVal);
+                    lrc = RegQueryValueExW(hKeyVS, L"Minor", NULL /* lpReserved */, NULL /* lpType */, (LPBYTE)&dwMin, &cbVal);
                     if (lrc == ERROR_SUCCESS)
                     {
@@ -1130 +1129 @@
         DWORD dwVal = 0;
         DWORD cbVal = sizeof(dwVal);
-        DWORD dwValueType = REG_DWORD; /** @todo r=bird: Again, the type is an optional output parameter. pointless to init or pass it unless you check.  */
-        lrc = RegQueryValueExW(hKeyCurVer, L"CurrentMajorVersionNumber", NULL, &dwValueType, (LPBYTE)&dwVal, &cbVal);
+        lrc = RegQueryValueExW(hKeyCurVer, L"CurrentMajorVersionNumber", NULL /* lpReserved */, NULL /* lpType */, (LPBYTE)&dwVal, &cbVal);
         if (lrc == ERROR_SUCCESS)
         {