Changeset 99828 in vbox for trunk/src/VBox/Installer/win

Timestamp:

May 17, 2023 1:48:57 PM (22 months ago)

Author:

vboxsync

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

157464

Message:

*: A bunch of adjustments that allows using /permissive- with Visual C++ (qt 6.x necessity).

Location:

trunk/src/VBox/Installer/win/InstallHelper

Files:

• VBoxCommon.cpp (modified) (1 diff)
• VBoxInstallHelper.cpp (modified) (2 diffs)

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

@@ -46 +46 @@
     /** @todo r=bird: why do we need to query the size first and then the data.
      *        The API should be perfectly capable of doing that without our help. */
+    WCHAR wcDummy   = 0;
     DWORD cwcNeeded = 0;
-    UINT  uiRet = MsiGetPropertyW(hMsi, pwszName, L"", &cwcNeeded);
+    UINT  uiRet = MsiGetPropertyW(hMsi, pwszName, &wcDummy, &cwcNeeded);
     if (uiRet == ERROR_MORE_DATA)
     {

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

@@ -772 +772 @@
 
 /** RTPathAppend-like function. */
-static UINT AppendToPath(wchar_t *pwszPath, size_t cwcPath, wchar_t *pwszAppend, bool fDoubleTerm = false)
+static UINT AppendToPath(wchar_t *pwszPath, size_t cwcPath, const wchar_t *pwszAppend, bool fDoubleTerm = false)
 {
     size_t cwcCurPath = RTUtf16Len(pwszPath);
@@ -792 +792 @@
 
 /** RTPathJoin-like function. */
-static UINT JoinPaths(wchar_t *pwszPath, size_t cwcPath, wchar_t *pwszPath1, wchar_t *pwszAppend, bool fDoubleTerm = false)
+static UINT JoinPaths(wchar_t *pwszPath, size_t cwcPath, wchar_t *pwszPath1, const wchar_t *pwszAppend, bool fDoubleTerm = false)
 {
     size_t cwcCurPath = RTUtf16Len(pwszPath1);