diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-11-15 19:54:20 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-11-17 19:06:00 -0600 |
commit | 0d873d28c2dd18444afa08b748e91f495ed1cf5c (patch) | |
tree | c82e70b9ac047b316f976e6078bf19ff19cc7d95 /src/engine/core.cpp | |
parent | d6aceb1277606fe1f1688d40ee0895d0b89c6705 (diff) | |
download | wix-0d873d28c2dd18444afa08b748e91f495ed1cf5c.tar.gz wix-0d873d28c2dd18444afa08b748e91f495ed1cf5c.tar.bz2 wix-0d873d28c2dd18444afa08b748e91f495ed1cf5c.zip |
Add plan tests.
Diffstat (limited to 'src/engine/core.cpp')
-rw-r--r-- | src/engine/core.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/engine/core.cpp b/src/engine/core.cpp index c34024fd..aeae6bea 100644 --- a/src/engine/core.cpp +++ b/src/engine/core.cpp | |||
@@ -96,6 +96,9 @@ extern "C" HRESULT CoreInitialize( | |||
96 | hr = ManifestLoadXmlFromBuffer(pbBuffer, cbBuffer, pEngineState); | 96 | hr = ManifestLoadXmlFromBuffer(pbBuffer, cbBuffer, pEngineState); |
97 | ExitOnFailure(hr, "Failed to load manifest."); | 97 | ExitOnFailure(hr, "Failed to load manifest."); |
98 | 98 | ||
99 | hr = ContainersInitialize(&pEngineState->containers, &pEngineState->section); | ||
100 | ExitOnFailure(hr, "Failed to intialize containers."); | ||
101 | |||
99 | // Parse command line. | 102 | // Parse command line. |
100 | hr = ParseCommandLine(pEngineState->argc, pEngineState->argv, &pEngineState->command, &pEngineState->companionConnection, &pEngineState->embeddedConnection, &pEngineState->variables, &pEngineState->mode, &pEngineState->automaticUpdates, &pEngineState->fDisableSystemRestore, &sczSourceProcessPath, &sczOriginalSource, &pEngineState->fDisableUnelevate, &pEngineState->log.dwAttributes, &pEngineState->log.sczPath, &pEngineState->registration.sczActiveParent, &pEngineState->sczIgnoreDependencies, &pEngineState->registration.sczAncestors, &sczSanitizedCommandLine); | 103 | hr = ParseCommandLine(pEngineState->argc, pEngineState->argv, &pEngineState->command, &pEngineState->companionConnection, &pEngineState->embeddedConnection, &pEngineState->variables, &pEngineState->mode, &pEngineState->automaticUpdates, &pEngineState->fDisableSystemRestore, &sczSourceProcessPath, &sczOriginalSource, &pEngineState->fDisableUnelevate, &pEngineState->log.dwAttributes, &pEngineState->log.sczPath, &pEngineState->registration.sczActiveParent, &pEngineState->sczIgnoreDependencies, &pEngineState->registration.sczAncestors, &sczSanitizedCommandLine); |
101 | ExitOnFailure(hr, "Failed to parse command line."); | 104 | ExitOnFailure(hr, "Failed to parse command line."); |
@@ -411,6 +414,7 @@ extern "C" HRESULT CorePlan( | |||
411 | pEngineState->plan.action = action; | 414 | pEngineState->plan.action = action; |
412 | pEngineState->plan.wzBundleId = pEngineState->registration.sczId; | 415 | pEngineState->plan.wzBundleId = pEngineState->registration.sczId; |
413 | pEngineState->plan.wzBundleProviderKey = pEngineState->registration.sczId; | 416 | pEngineState->plan.wzBundleProviderKey = pEngineState->registration.sczId; |
417 | pEngineState->plan.fDisableRollback = pEngineState->fDisableRollback; | ||
414 | 418 | ||
415 | hr = PlanSetVariables(action, &pEngineState->variables); | 419 | hr = PlanSetVariables(action, &pEngineState->variables); |
416 | ExitOnFailure(hr, "Failed to update action."); | 420 | ExitOnFailure(hr, "Failed to update action."); |