diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-16 10:09:26 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-19 23:12:55 -0500 |
commit | 90cdf39e6e6b7d676ca33bee031fa2b865bb5fbd (patch) | |
tree | 901feb035d5ea9a13f306582cedd6668b539953f /src/engine/mspengine.cpp | |
parent | c88806b89293f5bb92c42e90230e48be6b79b7f4 (diff) | |
download | wix-90cdf39e6e6b7d676ca33bee031fa2b865bb5fbd.tar.gz wix-90cdf39e6e6b7d676ca33bee031fa2b865bb5fbd.tar.bz2 wix-90cdf39e6e6b7d676ca33bee031fa2b865bb5fbd.zip |
Don't plan payloads.
Contributes to #3640 and #5253
Diffstat (limited to 'src/engine/mspengine.cpp')
-rw-r--r-- | src/engine/mspengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/mspengine.cpp b/src/engine/mspengine.cpp index 5ccb6718..6addfa90 100644 --- a/src/engine/mspengine.cpp +++ b/src/engine/mspengine.cpp | |||
@@ -581,6 +581,7 @@ extern "C" HRESULT MspEngineExecutePackage( | |||
581 | { | 581 | { |
582 | LPCWSTR wzAppend = NULL; | 582 | LPCWSTR wzAppend = NULL; |
583 | BURN_PACKAGE* pMspPackage = pExecuteAction->mspTarget.rgOrderedPatches[i].pPackage; | 583 | BURN_PACKAGE* pMspPackage = pExecuteAction->mspTarget.rgOrderedPatches[i].pPackage; |
584 | BURN_PAYLOAD* pMspPackagePayload = pMspPackage->payloads.rgpPayloads[0]; | ||
584 | AssertSz(BURN_PACKAGE_TYPE_MSP == pMspPackage->type, "Invalid package type added to ordered patches."); | 585 | AssertSz(BURN_PACKAGE_TYPE_MSP == pMspPackage->type, "Invalid package type added to ordered patches."); |
585 | 586 | ||
586 | if (BOOTSTRAPPER_ACTION_STATE_INSTALL == pExecuteAction->mspTarget.action) | 587 | if (BOOTSTRAPPER_ACTION_STATE_INSTALL == pExecuteAction->mspTarget.action) |
@@ -592,7 +593,7 @@ extern "C" HRESULT MspEngineExecutePackage( | |||
592 | // Best effort to set the execute package cache folder variable. | 593 | // Best effort to set the execute package cache folder variable. |
593 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_CACHE_FOLDER, sczCachedDirectory, TRUE, FALSE); | 594 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_CACHE_FOLDER, sczCachedDirectory, TRUE, FALSE); |
594 | 595 | ||
595 | hr = PathConcat(sczCachedDirectory, pMspPackage->rgPayloads[0].pPayload->sczFilePath, &sczMspPath); | 596 | hr = PathConcat(sczCachedDirectory, pMspPackagePayload->sczFilePath, &sczMspPath); |
596 | ExitOnFailure(hr, "Failed to build MSP path."); | 597 | ExitOnFailure(hr, "Failed to build MSP path."); |
597 | 598 | ||
598 | wzAppend = sczMspPath; | 599 | wzAppend = sczMspPath; |