Changeset 82626 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Dec 19, 2019 4:21:19 PM (5 years ago)

Author:

vboxsync

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

135513

Message:

Windows Additions/Installer: More work required for the VBoxGuestInstallHelper plugin to respect ANSI/Unicode with NSIS 3.x (NSIS uses TCHAR), extended the testcase, bugref:9529.

File:

• trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -449 +449 @@
     EXDLL_INIT();
 
-    int rc = VINF_SUCCESS;
-
     TCHAR szMsg[256];
     TCHAR szTitle[128];
-    HRESULT hr = vboxPopString(szMsg, sizeof(szMsg) / sizeof(TCHAR));
-    if (SUCCEEDED(hr))
-        hr = vboxPopString(szTitle, sizeof(szTitle) / sizeof(TCHAR));
+    int rc = vboxPopString(szMsg, sizeof(szMsg) / sizeof(TCHAR));
+    if (RT_SUCCESS(rc))
+        rc = vboxPopString(szTitle, sizeof(szTitle) / sizeof(TCHAR));
 
     /** @todo Do we need to restore the stack on failure? */
 
-    if (SUCCEEDED(hr))
+    if (RT_SUCCESS(rc))
     {
         RTR3InitDll(0);
@@ -515 +513 @@
             else
                 rc = VERR_NO_MEMORY;
+#ifdef UNICODE
+            RTStrFree(pszMsgUtf8);
+            RTStrFree(pszTitleUtf8);
+#endif
         }
     }