diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 16:16:12 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 20:25:06 -0600 |
| commit | 4f4c85ed66f1b2dfb1bec76d54d7b50c637d5bfa (patch) | |
| tree | 6de8e63ad46626ec457af256d481e81d726f3860 /src/engine/plan.cpp | |
| parent | d0d93beac0b79fa9c3d43398813954988afda18f (diff) | |
| download | wix-4f4c85ed66f1b2dfb1bec76d54d7b50c637d5bfa.tar.gz wix-4f4c85ed66f1b2dfb1bec76d54d7b50c637d5bfa.tar.bz2 wix-4f4c85ed66f1b2dfb1bec76d54d7b50c637d5bfa.zip | |
Add patch target for slipstream MSI package even if not installed.
Fixes #3897
Diffstat (limited to 'src/engine/plan.cpp')
| -rw-r--r-- | src/engine/plan.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/plan.cpp b/src/engine/plan.cpp index 95ea0b05..86a07dfb 100644 --- a/src/engine/plan.cpp +++ b/src/engine/plan.cpp | |||
| @@ -2168,7 +2168,7 @@ static HRESULT AddCacheSlipstreamMsps( | |||
| 2168 | 2168 | ||
| 2169 | for (DWORD i = 0; i < pPackage->Msi.cSlipstreamMspPackages; ++i) | 2169 | for (DWORD i = 0; i < pPackage->Msi.cSlipstreamMspPackages; ++i) |
| 2170 | { | 2170 | { |
| 2171 | BURN_PACKAGE* pMspPackage = pPackage->Msi.rgpSlipstreamMspPackages[i]; | 2171 | BURN_PACKAGE* pMspPackage = pPackage->Msi.rgSlipstreamMsps[i].pMspPackage; |
| 2172 | AssertSz(BURN_PACKAGE_TYPE_MSP == pMspPackage->type, "Only MSP packages can be slipstream patches."); | 2172 | AssertSz(BURN_PACKAGE_TYPE_MSP == pMspPackage->type, "Only MSP packages can be slipstream patches."); |
| 2173 | 2173 | ||
| 2174 | hr = AddCachePackageHelper(pPlan, pMspPackage, &hIgnored); | 2174 | hr = AddCachePackageHelper(pPlan, pMspPackage, &hIgnored); |
| @@ -2791,7 +2791,7 @@ static HRESULT FinalizeSlipstreamPatchActions( | |||
| 2791 | { | 2791 | { |
| 2792 | for (DWORD j = 0; j < pPackage->Msi.cSlipstreamMspPackages; ++j) | 2792 | for (DWORD j = 0; j < pPackage->Msi.cSlipstreamMspPackages; ++j) |
| 2793 | { | 2793 | { |
| 2794 | BURN_PACKAGE* pMspPackage = pPackage->Msi.rgpSlipstreamMspPackages[j]; | 2794 | BURN_PACKAGE* pMspPackage = pPackage->Msi.rgSlipstreamMsps[j].pMspPackage; |
| 2795 | AssertSz(BURN_PACKAGE_TYPE_MSP == pMspPackage->type, "Only MSP packages can be slipstream patches."); | 2795 | AssertSz(BURN_PACKAGE_TYPE_MSP == pMspPackage->type, "Only MSP packages can be slipstream patches."); |
| 2796 | 2796 | ||
| 2797 | pAction->msiPackage.rgSlipstreamPatches[j] = fExecute ? pMspPackage->execute : pMspPackage->rollback; | 2797 | pAction->msiPackage.rgSlipstreamPatches[j] = fExecute ? pMspPackage->execute : pMspPackage->rollback; |
