Fixes wixtoolset/issues#5220: Automatically add logging flag for any burn ExePackage, BundlePackage, and related bundles

1 files changed, 60 insertions, 0 deletions

diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
index 6d6d99d5..ca2e41c2 100644
--- a/src/burn/engine/core.cpp
+++ b/src/burn/engine/core.cpp
@@ -1301,6 +1301,66 @@ LExit:
     return hr;
 }
 
+HRESULT CoreAppendLogToCommandLine(
+    __deref_inout_z LPWSTR* psczCommandLine,
+    __deref_inout_z_opt LPWSTR* psczObfuscatedCommandLine,
+    __in BOOL fRollback,
+    __in BURN_VARIABLES* pVariables,
+    __in BURN_PACKAGE *pPackage
+    )
+{
+    HRESULT hr = S_OK;
+    INT ccArgs = 0;
+    LPWSTR* rgszArgs = nullptr;
+    LPWSTR szLogArg = nullptr;
+    LPWSTR szLogArgFormatted = nullptr;
+    LPCWSTR szLogVar = fRollback ? pPackage->sczRollbackLogPathVariable : pPackage->sczLogPathVariable;
+
+    if (!szLogVar || !*szLogVar)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+
+    hr = AppParseCommandLine(*psczCommandLine, &ccArgs, &rgszArgs);
+    ExitOnFailure(hr, "Failed parsing command line");
+
+    // Log flag already present?
+    for (INT i = 0; i < ccArgs; ++i)
+    {
+        if (rgszArgs[i][0] == L'-' || rgszArgs[i][0] == L'/')
+        {
+            // Now looking for 'log' or 'l'
+            if ((CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &rgszArgs[i][1], -1, L"log", -1))
+                || (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &rgszArgs[i][1], -1, L"l", -1)))
+            {
+                ExitFunction1(hr = S_FALSE);
+            }
+        }
+    }
+
+    hr = StrAllocFormatted(&szLogArg, L" -log \"[%ls]\"", szLogVar);
+    ExitOnFailure(hr, "Failed creating log argument");
+
+    hr = VariableFormatString(pVariables, szLogArg, &szLogArgFormatted, NULL);
+    ExitOnFailure(hr, "Failed to format argument string.");
+
+    hr = StrAllocConcat(psczCommandLine, szLogArgFormatted, 0);
+    ExitOnFailure(hr, "Failed concatenating '-log' to command line");
+
+    hr = StrAllocConcat(psczObfuscatedCommandLine, szLogArgFormatted, 0);
+    ExitOnFailure(hr, "Failed concatenating '-log' to obfuscated command line");
+
+LExit:
+    if (rgszArgs)
+    {
+        AppFreeCommandLineArgs(rgszArgs);
+    }
+    ReleaseStr(szLogArg);
+    ReleaseStr(szLogArgFormatted);
+
+    return hr;
+}
+
 extern "C" HRESULT CoreAppendSplashScreenWindowToCommandLine(
     __in_opt HWND hwndSplashScreen,
     __deref_inout_z LPWSTR* psczCommandLine