diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 19:58:44 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 20:25:06 -0600 |
| commit | a98115d996d65834e7c8d593c10d2cfa66096ccd (patch) | |
| tree | 11857990bfadee576b4a8d6d8ccc2db04dfafe7b /src/engine/dependency.cpp | |
| parent | 4f4c85ed66f1b2dfb1bec76d54d7b50c637d5bfa (diff) | |
| download | wix-a98115d996d65834e7c8d593c10d2cfa66096ccd.tar.gz wix-a98115d996d65834e7c8d593c10d2cfa66096ccd.tar.bz2 wix-a98115d996d65834e7c8d593c10d2cfa66096ccd.zip | |
Fix patch registration states during plan and apply.
Add logging for slipstreamed patches.
#6297
Diffstat (limited to 'src/engine/dependency.cpp')
| -rw-r--r-- | src/engine/dependency.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/engine/dependency.cpp b/src/engine/dependency.cpp index a6a8fe4d..3d978740 100644 --- a/src/engine/dependency.cpp +++ b/src/engine/dependency.cpp | |||
| @@ -774,6 +774,18 @@ static HRESULT DetectPackageDependents( | |||
| 774 | { | 774 | { |
| 775 | pPackage->installRegistrationState = BURN_PACKAGE_REGISTRATION_STATE_IGNORED; | 775 | pPackage->installRegistrationState = BURN_PACKAGE_REGISTRATION_STATE_IGNORED; |
| 776 | } | 776 | } |
| 777 | if (BURN_PACKAGE_TYPE_MSP == pPackage->type) | ||
| 778 | { | ||
| 779 | for (DWORD i = 0; i < pPackage->Msp.cTargetProductCodes; ++i) | ||
| 780 | { | ||
| 781 | BURN_MSPTARGETPRODUCT* pTargetProduct = pPackage->Msp.rgTargetProducts + i; | ||
| 782 | |||
| 783 | if (BURN_PACKAGE_REGISTRATION_STATE_PRESENT == pTargetProduct->registrationState) | ||
| 784 | { | ||
| 785 | pTargetProduct->registrationState = BURN_PACKAGE_REGISTRATION_STATE_IGNORED; | ||
| 786 | } | ||
| 787 | } | ||
| 788 | } | ||
| 777 | } | 789 | } |
| 778 | 790 | ||
| 779 | LExit: | 791 | LExit: |
