diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-08-03 15:41:53 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-08-04 10:03:57 -0500 |
| commit | 9ae1c04d5fa02ac020885cdad7c592f7bb43d83e (patch) | |
| tree | 2832850289c8b703fa39e5d1c97666331e2310b1 /src/burn/engine/externalengine.cpp | |
| parent | ce8acddf52bde840571535c3dfd56a2371d80684 (diff) | |
| download | wix-9ae1c04d5fa02ac020885cdad7c592f7bb43d83e.tar.gz wix-9ae1c04d5fa02ac020885cdad7c592f7bb43d83e.tar.bz2 wix-9ae1c04d5fa02ac020885cdad7c592f7bb43d83e.zip | |
Parse most of Burn command line parameters into BURN_ENGINE_COMMAND.
Diffstat (limited to 'src/burn/engine/externalengine.cpp')
| -rw-r--r-- | src/burn/engine/externalengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/burn/engine/externalengine.cpp b/src/burn/engine/externalengine.cpp index 60497640..27db35cc 100644 --- a/src/burn/engine/externalengine.cpp +++ b/src/burn/engine/externalengine.cpp | |||
| @@ -197,7 +197,7 @@ HRESULT ExternalEngineSendEmbeddedError( | |||
| 197 | SIZE_T cbData = 0; | 197 | SIZE_T cbData = 0; |
| 198 | DWORD dwResult = *pnResult = 0; | 198 | DWORD dwResult = *pnResult = 0; |
| 199 | 199 | ||
| 200 | if (BURN_MODE_EMBEDDED != pEngineState->mode) | 200 | if (BURN_MODE_EMBEDDED != pEngineState->internalCommand.mode) |
| 201 | { | 201 | { |
| 202 | hr = HRESULT_FROM_WIN32(ERROR_INVALID_STATE); | 202 | hr = HRESULT_FROM_WIN32(ERROR_INVALID_STATE); |
| 203 | ExitOnRootFailure(hr, "BA requested to send embedded message when not in embedded mode."); | 203 | ExitOnRootFailure(hr, "BA requested to send embedded message when not in embedded mode."); |
| @@ -235,7 +235,7 @@ HRESULT ExternalEngineSendEmbeddedProgress( | |||
| 235 | SIZE_T cbData = 0; | 235 | SIZE_T cbData = 0; |
| 236 | DWORD dwResult = *pnResult = 0; | 236 | DWORD dwResult = *pnResult = 0; |
| 237 | 237 | ||
| 238 | if (BURN_MODE_EMBEDDED != pEngineState->mode) | 238 | if (BURN_MODE_EMBEDDED != pEngineState->internalCommand.mode) |
| 239 | { | 239 | { |
| 240 | hr = HRESULT_FROM_WIN32(ERROR_INVALID_STATE); | 240 | hr = HRESULT_FROM_WIN32(ERROR_INVALID_STATE); |
| 241 | ExitOnRootFailure(hr, "BA requested to send embedded progress message when not in embedded mode."); | 241 | ExitOnRootFailure(hr, "BA requested to send embedded progress message when not in embedded mode."); |
| @@ -295,7 +295,7 @@ HRESULT ExternalEngineSetUpdate( | |||
| 295 | { | 295 | { |
| 296 | UpdateUninitialize(&pEngineState->update); | 296 | UpdateUninitialize(&pEngineState->update); |
| 297 | 297 | ||
| 298 | hr = CoreRecreateCommandLine(&sczCommandline, BOOTSTRAPPER_ACTION_INSTALL, &pEngineState->internalCommand, &pEngineState->command, BOOTSTRAPPER_RELATION_NONE, FALSE, pEngineState->registration.sczAncestors, NULL, pEngineState->command.wzCommandLine); | 298 | hr = CoreRecreateCommandLine(&sczCommandline, BOOTSTRAPPER_ACTION_INSTALL, &pEngineState->internalCommand, &pEngineState->command, BOOTSTRAPPER_RELATION_NONE, FALSE, NULL); |
| 299 | ExitOnFailure(hr, "Failed to recreate command-line for update bundle."); | 299 | ExitOnFailure(hr, "Failed to recreate command-line for update bundle."); |
| 300 | 300 | ||
| 301 | // Bundles would fail to use the downloaded update bundle, as the running bundle would be one of the search paths. | 301 | // Bundles would fail to use the downloaded update bundle, as the running bundle would be one of the search paths. |
