diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-16 10:52:26 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-19 23:12:55 -0500 |
commit | 22fb11c03329380fcffff253c7b2d4d1fccd23b4 (patch) | |
tree | 1a4fee8d61e2efafa24c90c8db1e8d2f5396e02d /src/engine/msiengine.cpp | |
parent | 8c77de737aaea1b4857c724c730446bca8da2dd0 (diff) | |
download | wix-22fb11c03329380fcffff253c7b2d4d1fccd23b4.tar.gz wix-22fb11c03329380fcffff253c7b2d4d1fccd23b4.tar.bz2 wix-22fb11c03329380fcffff253c7b2d4d1fccd23b4.zip |
Add BURN_PAYLOAD_GROUP_ITEM to be able to move payloads during caching.
Diffstat (limited to 'src/engine/msiengine.cpp')
-rw-r--r-- | src/engine/msiengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/msiengine.cpp b/src/engine/msiengine.cpp index b081b9ca..e3dc4671 100644 --- a/src/engine/msiengine.cpp +++ b/src/engine/msiengine.cpp | |||
@@ -1100,7 +1100,7 @@ extern "C" HRESULT MsiEngineExecutePackage( | |||
1100 | LPWSTR sczProperties = NULL; | 1100 | LPWSTR sczProperties = NULL; |
1101 | LPWSTR sczObfuscatedProperties = NULL; | 1101 | LPWSTR sczObfuscatedProperties = NULL; |
1102 | BURN_PACKAGE* pPackage = pExecuteAction->msiPackage.pPackage; | 1102 | BURN_PACKAGE* pPackage = pExecuteAction->msiPackage.pPackage; |
1103 | BURN_PAYLOAD* pPackagePayload = pPackage->payloads.rgpPayloads[0]; | 1103 | BURN_PAYLOAD* pPackagePayload = pPackage->payloads.rgItems[0].pPayload; |
1104 | 1104 | ||
1105 | // During rollback, if the package is already in the rollback state we expect don't | 1105 | // During rollback, if the package is already in the rollback state we expect don't |
1106 | // touch it again. | 1106 | // touch it again. |
@@ -1981,7 +1981,7 @@ static HRESULT ConcatPatchProperty( | |||
1981 | { | 1981 | { |
1982 | BURN_SLIPSTREAM_MSP* pSlipstreamMsp = pPackage->Msi.rgSlipstreamMsps + i; | 1982 | BURN_SLIPSTREAM_MSP* pSlipstreamMsp = pPackage->Msi.rgSlipstreamMsps + i; |
1983 | BURN_PACKAGE* pMspPackage = pSlipstreamMsp->pMspPackage; | 1983 | BURN_PACKAGE* pMspPackage = pSlipstreamMsp->pMspPackage; |
1984 | BURN_PAYLOAD* pMspPackagePayload = pMspPackage->payloads.rgpPayloads[0]; | 1984 | BURN_PAYLOAD* pMspPackagePayload = pMspPackage->payloads.rgItems[0].pPayload; |
1985 | BOOTSTRAPPER_ACTION_STATE patchExecuteAction = fRollback ? pSlipstreamMsp->rollback : pSlipstreamMsp->execute; | 1985 | BOOTSTRAPPER_ACTION_STATE patchExecuteAction = fRollback ? pSlipstreamMsp->rollback : pSlipstreamMsp->execute; |
1986 | 1986 | ||
1987 | if (BOOTSTRAPPER_ACTION_STATE_UNINSTALL < patchExecuteAction) | 1987 | if (BOOTSTRAPPER_ACTION_STATE_UNINSTALL < patchExecuteAction) |