Changeset 83807 in vbox for trunk

Timestamp:

Apr 18, 2020 11:30:25 PM (5 years ago)

Author:

vboxsync

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

137333

Message:

VBoxInstallHelper.cpp,VBoxSerial.cpp: VC++ 14.1 says we've been using the wrong format specifier for VBOX_VENDOR_SHORT when accessing the branding path. Probably outdated/unused code. bugref:8489

File:

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

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

@@ -54 +54 @@
 
 /*********************************************************************************************************************************
-*   Header Files                                                                                                                 *
+*   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
 #ifdef DEBUG
@@ -313 +313 @@
 
         if (wcsicmp(L"General", pwszSection) != 0)
-            swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%s\\VirtualBox\\Branding\\%s", VBOX_VENDOR_SHORT, pwszSection);
+            swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%S\\VirtualBox\\Branding\\%s", VBOX_VENDOR_SHORT, pwszSection);
         else
-            swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%s\\VirtualBox\\Branding", VBOX_VENDOR_SHORT);
+            swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%S\\VirtualBox\\Branding", VBOX_VENDOR_SHORT);
 
         rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszKey, 0, KEY_WRITE, &hkBranding);
@@ -885 +885 @@
         {
             WCHAR wszInf[MAX_PATH];
-            DWORD cchInf = RT_ELEMENTS(wszInf) - sizeof(NETLWF_INF_NAME) - 1;
-            UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", wszInf, &cchInf);
+            DWORD cwcInf = RT_ELEMENTS(wszInf) - sizeof(NETLWF_INF_NAME) - 1;
+            uErr = MsiGetPropertyW(hModule, L"CustomActionData", wszInf, &cwcInf);
             if (uErr == ERROR_SUCCESS)
             {
-                if (cchInf)
+                if (cwcInf)
                 {
-                    if (wszInf[cchInf - 1] != L'\\')
+                    if (wszInf[cwcInf - 1] != L'\\')
                     {
-                        wszInf[cchInf++] = L'\\';
-                        wszInf[cchInf]   = L'\0';
+                        wszInf[cwcInf++] = L'\\';
+                        wszInf[cwcInf]   = L'\0';
                     }