diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-01-31 15:44:00 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-02-01 23:36:23 -0600 |
| commit | 56c980318e7167be591f7807c2fc34cea7d5cb42 (patch) | |
| tree | e074b3548d8dfe51f420b6d0278a6fe17191b6ec /src/burn/engine/detect.cpp | |
| parent | bfe5ab76b5ecc1a21078534e6fba90d12cfd3c00 (diff) | |
| download | wix-56c980318e7167be591f7807c2fc34cea7d5cb42.tar.gz wix-56c980318e7167be591f7807c2fc34cea7d5cb42.tar.bz2 wix-56c980318e7167be591f7807c2fc34cea7d5cb42.zip | |
The bundle provider's presence needs to follow ARP registration.
Diffstat (limited to 'src/burn/engine/detect.cpp')
| -rw-r--r-- | src/burn/engine/detect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/detect.cpp b/src/burn/engine/detect.cpp index 37b034ae..617b418b 100644 --- a/src/burn/engine/detect.cpp +++ b/src/burn/engine/detect.cpp | |||
| @@ -39,6 +39,7 @@ extern "C" void DetectReset( | |||
| 39 | { | 39 | { |
| 40 | RelatedBundlesUninitialize(&pRegistration->relatedBundles); | 40 | RelatedBundlesUninitialize(&pRegistration->relatedBundles); |
| 41 | ReleaseNullStr(pRegistration->sczDetectedProviderKeyBundleId); | 41 | ReleaseNullStr(pRegistration->sczDetectedProviderKeyBundleId); |
| 42 | pRegistration->fDetectedForeignProviderKeyBundleId = FALSE; | ||
| 42 | pRegistration->fSelfRegisteredAsDependent = FALSE; | 43 | pRegistration->fSelfRegisteredAsDependent = FALSE; |
| 43 | pRegistration->fParentRegisteredAsDependent = FALSE; | 44 | pRegistration->fParentRegisteredAsDependent = FALSE; |
| 44 | pRegistration->fForwardCompatibleBundleExists = FALSE; | 45 | pRegistration->fForwardCompatibleBundleExists = FALSE; |
| @@ -118,8 +119,7 @@ extern "C" HRESULT DetectForwardCompatibleBundles( | |||
| 118 | HRESULT hr = S_OK; | 119 | HRESULT hr = S_OK; |
| 119 | int nCompareResult = 0; | 120 | int nCompareResult = 0; |
| 120 | 121 | ||
| 121 | if (pRegistration->sczDetectedProviderKeyBundleId && | 122 | if (pRegistration->fDetectedForeignProviderKeyBundleId) |
| 122 | CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pRegistration->sczDetectedProviderKeyBundleId, -1, pRegistration->sczId, -1)) | ||
| 123 | { | 123 | { |
| 124 | for (DWORD iRelatedBundle = 0; iRelatedBundle < pRegistration->relatedBundles.cRelatedBundles; ++iRelatedBundle) | 124 | for (DWORD iRelatedBundle = 0; iRelatedBundle < pRegistration->relatedBundles.cRelatedBundles; ++iRelatedBundle) |
| 125 | { | 125 | { |