diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-03 15:26:07 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-04 10:05:21 -0500 |
commit | e3671abae2f22c3ad7d205aa743bed73ff55e512 (patch) | |
tree | b8d8e84e5d71f21e02c89a0da7a819e7a2078e50 /src/burn/engine/engine.cpp | |
parent | 5b04bce6567855325810bc4e6bcd2f6e05b329c7 (diff) | |
download | wix-e3671abae2f22c3ad7d205aa743bed73ff55e512.tar.gz wix-e3671abae2f22c3ad7d205aa743bed73ff55e512.tar.bz2 wix-e3671abae2f22c3ad7d205aa743bed73ff55e512.zip |
Allow burn.runonce with burn.clean.room and create runonce log.
Diffstat (limited to 'src/burn/engine/engine.cpp')
-rw-r--r-- | src/burn/engine/engine.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp index 9b94552b..821626f8 100644 --- a/src/burn/engine/engine.cpp +++ b/src/burn/engine/engine.cpp | |||
@@ -33,7 +33,7 @@ static HRESULT RunEmbedded( | |||
33 | __in BURN_ENGINE_STATE* pEngineState | 33 | __in BURN_ENGINE_STATE* pEngineState |
34 | ); | 34 | ); |
35 | static HRESULT RunRunOnce( | 35 | static HRESULT RunRunOnce( |
36 | __in const BURN_REGISTRATION* pRegistration, | 36 | __in BURN_ENGINE_STATE* pEngineState, |
37 | __in int nCmdShow | 37 | __in int nCmdShow |
38 | ); | 38 | ); |
39 | static HRESULT RunApplication( | 39 | static HRESULT RunApplication( |
@@ -221,7 +221,7 @@ extern "C" HRESULT EngineRun( | |||
221 | break; | 221 | break; |
222 | 222 | ||
223 | case BURN_MODE_RUNONCE: | 223 | case BURN_MODE_RUNONCE: |
224 | hr = RunRunOnce(&engineState.registration, nCmdShow); | 224 | hr = RunRunOnce(&engineState, nCmdShow); |
225 | ExitOnFailure(hr, "Failed to run RunOnce mode."); | 225 | ExitOnFailure(hr, "Failed to run RunOnce mode."); |
226 | break; | 226 | break; |
227 | 227 | ||
@@ -703,7 +703,7 @@ LExit: | |||
703 | } | 703 | } |
704 | 704 | ||
705 | static HRESULT RunRunOnce( | 705 | static HRESULT RunRunOnce( |
706 | __in const BURN_REGISTRATION* pRegistration, | 706 | __in BURN_ENGINE_STATE* pEngineState, |
707 | __in int nCmdShow | 707 | __in int nCmdShow |
708 | ) | 708 | ) |
709 | { | 709 | { |
@@ -712,7 +712,11 @@ static HRESULT RunRunOnce( | |||
712 | LPWSTR sczBurnPath = NULL; | 712 | LPWSTR sczBurnPath = NULL; |
713 | HANDLE hProcess = NULL; | 713 | HANDLE hProcess = NULL; |
714 | 714 | ||
715 | hr = RegistrationGetResumeCommandLine(pRegistration, &sczNewCommandLine); | 715 | // Initialize logging. |
716 | hr = LoggingOpen(&pEngineState->log, &pEngineState->internalCommand, &pEngineState->command, &pEngineState->variables, pEngineState->registration.sczDisplayName); | ||
717 | ExitOnFailure(hr, "Failed to open run once log."); | ||
718 | |||
719 | hr = RegistrationGetResumeCommandLine(&pEngineState->registration, &sczNewCommandLine); | ||
716 | ExitOnFailure(hr, "Unable to get resume command line from the registry"); | 720 | ExitOnFailure(hr, "Unable to get resume command line from the registry"); |
717 | 721 | ||
718 | // and re-launch | 722 | // and re-launch |