aboutsummaryrefslogtreecommitdiff
path: root/src/burn
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2022-08-26 19:48:42 -0400
committerBob Arnson <github@bobs.org>2022-08-26 21:16:20 -0400
commit2f8bf7c0cc4402777315e93536fbc63e1e1f0fee (patch)
tree1e850f522da2e7f001f85065cf9e8c292381c8af /src/burn
parent46c5b7c03dd1cfcba83995217e7c5c34120b5e7e (diff)
downloadwix-2f8bf7c0cc4402777315e93536fbc63e1e1f0fee.tar.gz
wix-2f8bf7c0cc4402777315e93536fbc63e1e1f0fee.tar.bz2
wix-2f8bf7c0cc4402777315e93536fbc63e1e1f0fee.zip
Pass `/xlog` to elevated engine.
Fixes https://github.com/wixtoolset/issues/issues/6534.
Diffstat (limited to 'src/burn')
-rw-r--r--src/burn/engine/elevation.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp
index c27289c5..4d2e8544 100644
--- a/src/burn/engine/elevation.cpp
+++ b/src/burn/engine/elevation.cpp
@@ -1644,6 +1644,12 @@ static HRESULT LaunchElevatedProcess(
1644 hr = StrAllocFormatted(&sczParameters, L"-q -%ls %ls %ls %u", BURN_COMMANDLINE_SWITCH_ELEVATED, pConnection->sczName, pConnection->sczSecret, dwCurrentProcessId); 1644 hr = StrAllocFormatted(&sczParameters, L"-q -%ls %ls %ls %u", BURN_COMMANDLINE_SWITCH_ELEVATED, pConnection->sczName, pConnection->sczSecret, dwCurrentProcessId);
1645 ExitOnFailure(hr, "Failed to allocate parameters for elevated process."); 1645 ExitOnFailure(hr, "Failed to allocate parameters for elevated process.");
1646 1646
1647 if (BURN_LOGGING_ATTRIBUTE_EXTRADEBUG & pEngineState->internalCommand.dwLoggingAttributes)
1648 {
1649 hr = StrAllocConcatFormatted(&sczParameters, L" -%ls=%ls", BURN_COMMANDLINE_SWITCH_LOG_MODE, L"x");
1650 ExitOnFailure(hr, "Failed to set log mode in elevated process command-line.");
1651 }
1652
1647 // Since ShellExecuteEx doesn't support passing inherited handles, don't bother with CoreAppendFileHandleSelfToCommandLine. 1653 // Since ShellExecuteEx doesn't support passing inherited handles, don't bother with CoreAppendFileHandleSelfToCommandLine.
1648 // We could fallback to using ::DuplicateHandle to inject the file handle later if necessary. 1654 // We could fallback to using ::DuplicateHandle to inject the file handle later if necessary.
1649 hr = ShelExec(pEngineState->sczBundleEngineWorkingPath, sczParameters, L"runas", NULL, SW_SHOWNA, hwndParent, &hProcess); 1655 hr = ShelExec(pEngineState->sczBundleEngineWorkingPath, sczParameters, L"runas", NULL, SW_SHOWNA, hwndParent, &hProcess);