Fix WcaErrorMessage cArgs==-1 case.

Count args before creating message record. Fixes wixtoolset/issues#7422. Fixes wixtoolset/issues#7444.
wixtoolset · Apr 25, 2023 · 3298b9a · 3298b9a
1 parent eadea8a
commit 3298b9a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/src/ext/Util/ca/scaexec.cpp b/src/ext/Util/ca/scaexec.cpp
@@ -1024,6 +1024,8 @@ extern "C" UINT __stdcall CreateUser(
         ::CoUninitialize();
     }
 
+    WcaLog(LOGMSG_VERBOSE, "iAttributes = %d, er = %d, hr = 0x%08x", iAttributes, er, hr);
+
     if (SCAU_NON_VITAL & iAttributes)
     {
         er = ERROR_SUCCESS;
@@ -1033,6 +1035,8 @@ extern "C" UINT __stdcall CreateUser(
         er = ERROR_INSTALL_FAILURE;
     }
 
+    WcaLog(LOGMSG_VERBOSE, "iAttributes = %d, er = %d, hr = 0x%08x", iAttributes, er, hr);
+
     return WcaFinalize(er);
 }
 

diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcawrap.cpp b/src/libs/wcautil/WixToolset.WcaUtil/wcawrap.cpp
@@ -41,6 +41,19 @@ extern "C" UINT __cdecl WcaErrorMessage(
     MSIHANDLE hRec = NULL;
     va_list args = NULL;
 
+    va_start(args, cArgs);
+    if (-1 == cArgs)
+    {
+        LPCWSTR wzArg = NULL;
+        va_list iter = args;
+        cArgs = 0;
+
+        while (NULL != (wzArg = va_arg(iter, WCHAR*)) && L'\0' != *wzArg)
+        {
+            ++cArgs;
+        }
+    }
+
     uiType |= INSTALLMESSAGE_ERROR;  // ensure error type is set
     hRec = ::MsiCreateRecord(cArgs + 2);
     if (!hRec)
@@ -55,19 +68,6 @@ extern "C" UINT __cdecl WcaErrorMessage(
     er = ::MsiRecordSetInteger(hRec, 2, hrError);
     ExitOnFailure(HRESULT_FROM_WIN32(er), "failed to set hresult code into error message");
 
-    va_start(args, cArgs);
-    if (-1 == cArgs)
-    {
-        LPCWSTR wzArg = NULL;
-        va_list iter = args;
-        cArgs = 0;
-
-        while (NULL != (wzArg = va_arg(iter, WCHAR*)) && L'\0' != *wzArg)
-        {
-            ++cArgs;
-        }
-    }
-
     for (INT i = 0; i < cArgs; i++)
     {
         er = ::MsiRecordSetStringW(hRec, i + 3, va_arg(args, WCHAR*));

diff --git a/src/test/burn/WixTestTools/MSIExec.cs b/src/test/burn/WixTestTools/MSIExec.cs
@@ -111,7 +111,7 @@ public void SetDefaultArguments()
             this.ForceRestart = false;
             this.PromptRestart = false;
             this.LogFile = String.Empty;
-            this.LoggingOptions = MSIExecLoggingOptions.VOICEWARMUP;
+            this.LoggingOptions = MSIExecLoggingOptions.Log_All_Information | MSIExecLoggingOptions.Verbose_Output | MSIExecLoggingOptions.Extra_Debugging_Information; // `/l*vx`
             this.OtherArguments = String.Empty;
         }