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/elevation.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/elevation.cpp')
| -rw-r--r-- | src/burn/engine/elevation.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp index a0ad6685..03674f0b 100644 --- a/src/burn/engine/elevation.cpp +++ b/src/burn/engine/elevation.cpp | |||
| @@ -339,7 +339,7 @@ extern "C" HRESULT ElevationElevate( | |||
| 339 | __in_opt HWND hwndParent | 339 | __in_opt HWND hwndParent |
| 340 | ) | 340 | ) |
| 341 | { | 341 | { |
| 342 | Assert(BURN_MODE_ELEVATED != pEngineState->mode); | 342 | Assert(BURN_MODE_ELEVATED != pEngineState->internalCommand.mode); |
| 343 | Assert(!pEngineState->companionConnection.sczName); | 343 | Assert(!pEngineState->companionConnection.sczName); |
| 344 | Assert(!pEngineState->companionConnection.sczSecret); | 344 | Assert(!pEngineState->companionConnection.sczSecret); |
| 345 | Assert(!pEngineState->companionConnection.hProcess); | 345 | Assert(!pEngineState->companionConnection.hProcess); |
| @@ -407,9 +407,7 @@ extern "C" HRESULT ElevationApplyInitialize( | |||
| 407 | __in HANDLE hPipe, | 407 | __in HANDLE hPipe, |
| 408 | __in BURN_USER_EXPERIENCE* pBA, | 408 | __in BURN_USER_EXPERIENCE* pBA, |
| 409 | __in BURN_VARIABLES* pVariables, | 409 | __in BURN_VARIABLES* pVariables, |
| 410 | __in BOOTSTRAPPER_ACTION action, | 410 | __in BURN_PLAN* pPlan |
| 411 | __in BURN_AU_PAUSE_ACTION auAction, | ||
| 412 | __in BOOL fTakeSystemRestorePoint | ||
| 413 | ) | 411 | ) |
| 414 | { | 412 | { |
| 415 | HRESULT hr = S_OK; | 413 | HRESULT hr = S_OK; |
| @@ -421,13 +419,13 @@ extern "C" HRESULT ElevationApplyInitialize( | |||
| 421 | context.pBA = pBA; | 419 | context.pBA = pBA; |
| 422 | 420 | ||
| 423 | // serialize message data | 421 | // serialize message data |
| 424 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)action); | 422 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)pPlan->action); |
| 425 | ExitOnFailure(hr, "Failed to write action to message buffer."); | 423 | ExitOnFailure(hr, "Failed to write action to message buffer."); |
| 426 | 424 | ||
| 427 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)auAction); | 425 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)pPlan->pInternalCommand->automaticUpdates); |
| 428 | ExitOnFailure(hr, "Failed to write update action to message buffer."); | 426 | ExitOnFailure(hr, "Failed to write update action to message buffer."); |
| 429 | 427 | ||
| 430 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)fTakeSystemRestorePoint); | 428 | hr = BuffWriteNumber(&pbData, &cbData, (DWORD)!pPlan->pInternalCommand->fDisableSystemRestore); |
| 431 | ExitOnFailure(hr, "Failed to write system restore point action to message buffer."); | 429 | ExitOnFailure(hr, "Failed to write system restore point action to message buffer."); |
| 432 | 430 | ||
| 433 | hr = VariableSerialize(pVariables, FALSE, &pbData, &cbData); | 431 | hr = VariableSerialize(pVariables, FALSE, &pbData, &cbData); |
