aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/engine.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-06-03 17:48:57 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-06-07 19:44:36 -0500
commit648f370f7966b2738c1446601057d888bbd2c70f (patch)
tree9022566b1016f94127dfb7e84c9b4dfa057993cd /src/burn/engine/engine.cpp
parent6b0f2d978504da82070523eb6adb0b59f9812e93 (diff)
downloadwix-648f370f7966b2738c1446601057d888bbd2c70f.tar.gz
wix-648f370f7966b2738c1446601057d888bbd2c70f.tar.bz2
wix-648f370f7966b2738c1446601057d888bbd2c70f.zip
Make PathGetSystemPath return an array of paths ordered by preference.
Diffstat (limited to 'src/burn/engine/engine.cpp')
-rw-r--r--src/burn/engine/engine.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp
index a408ed4a..aca43438 100644
--- a/src/burn/engine/engine.cpp
+++ b/src/burn/engine/engine.cpp
@@ -97,6 +97,7 @@ extern "C" HRESULT EngineRun(
97 LPWSTR sczExePath = NULL; 97 LPWSTR sczExePath = NULL;
98 BOOL fRunUntrusted = FALSE; 98 BOOL fRunUntrusted = FALSE;
99 BOOL fRunNormal = FALSE; 99 BOOL fRunNormal = FALSE;
100 BOOL fRunRunOnce = FALSE;
100 BOOL fRestart = FALSE; 101 BOOL fRestart = FALSE;
101 102
102 BURN_ENGINE_STATE engineState = { }; 103 BURN_ENGINE_STATE engineState = { };
@@ -221,6 +222,8 @@ extern "C" HRESULT EngineRun(
221 break; 222 break;
222 223
223 case BURN_MODE_RUNONCE: 224 case BURN_MODE_RUNONCE:
225 fRunRunOnce = TRUE;
226
224 hr = RunRunOnce(&engineState, nCmdShow); 227 hr = RunRunOnce(&engineState, nCmdShow);
225 ExitOnFailure(hr, "Failed to run RunOnce mode."); 228 ExitOnFailure(hr, "Failed to run RunOnce mode.");
226 break; 229 break;
@@ -303,6 +306,10 @@ LExit:
303 { 306 {
304 LogId(REPORT_STANDARD, MSG_EXITING_CLEAN_ROOM, FAILED(hr) ? (int)hr : *pdwExitCode); 307 LogId(REPORT_STANDARD, MSG_EXITING_CLEAN_ROOM, FAILED(hr) ? (int)hr : *pdwExitCode);
305 } 308 }
309 else if (fRunRunOnce)
310 {
311 LogId(REPORT_STANDARD, MSG_EXITING_RUN_ONCE, FAILED(hr) ? (int)hr : *pdwExitCode);
312 }
306 313
307 if (fLogInitialized) 314 if (fLogInitialized)
308 { 315 {