diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-10 18:18:38 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-11 20:24:18 -0600 |
| commit | af68033509730ffe01602f839861a47287bb709f (patch) | |
| tree | 2960f6cdd023e74a4ca2bbc49d0294b7bfbed5c5 /src/engine/userexperience.cpp | |
| parent | 10ef9d5bfbf81f454113a1c2716009831a916222 (diff) | |
| download | wix-af68033509730ffe01602f839861a47287bb709f.tar.gz wix-af68033509730ffe01602f839861a47287bb709f.tar.bz2 wix-af68033509730ffe01602f839861a47287bb709f.zip | |
Handle when related bundles have an uninstall key but aren't cached.
#4991
Diffstat (limited to 'src/engine/userexperience.cpp')
| -rw-r--r-- | src/engine/userexperience.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/userexperience.cpp b/src/engine/userexperience.cpp index e1e32a87..ad1529ea 100644 --- a/src/engine/userexperience.cpp +++ b/src/engine/userexperience.cpp | |||
| @@ -763,7 +763,8 @@ EXTERN_C BAAPI UserExperienceOnDetectForwardCompatibleBundle( | |||
| 763 | __in BOOTSTRAPPER_RELATION_TYPE relationType, | 763 | __in BOOTSTRAPPER_RELATION_TYPE relationType, |
| 764 | __in_z LPCWSTR wzBundleTag, | 764 | __in_z LPCWSTR wzBundleTag, |
| 765 | __in BOOL fPerMachine, | 765 | __in BOOL fPerMachine, |
| 766 | __in VERUTIL_VERSION* pVersion | 766 | __in VERUTIL_VERSION* pVersion, |
| 767 | __in BOOL fMissingFromCache | ||
| 767 | ) | 768 | ) |
| 768 | { | 769 | { |
| 769 | HRESULT hr = S_OK; | 770 | HRESULT hr = S_OK; |
| @@ -776,6 +777,7 @@ EXTERN_C BAAPI UserExperienceOnDetectForwardCompatibleBundle( | |||
| 776 | args.wzBundleTag = wzBundleTag; | 777 | args.wzBundleTag = wzBundleTag; |
| 777 | args.fPerMachine = fPerMachine; | 778 | args.fPerMachine = fPerMachine; |
| 778 | args.wzVersion = pVersion->sczVersion; | 779 | args.wzVersion = pVersion->sczVersion; |
| 780 | args.fMissingFromCache = fMissingFromCache; | ||
| 779 | 781 | ||
| 780 | results.cbSize = sizeof(results); | 782 | results.cbSize = sizeof(results); |
| 781 | 783 | ||
| @@ -879,7 +881,8 @@ EXTERN_C BAAPI UserExperienceOnDetectRelatedBundle( | |||
| 879 | __in_z LPCWSTR wzBundleTag, | 881 | __in_z LPCWSTR wzBundleTag, |
| 880 | __in BOOL fPerMachine, | 882 | __in BOOL fPerMachine, |
| 881 | __in VERUTIL_VERSION* pVersion, | 883 | __in VERUTIL_VERSION* pVersion, |
| 882 | __in BOOTSTRAPPER_RELATED_OPERATION operation | 884 | __in BOOTSTRAPPER_RELATED_OPERATION operation, |
| 885 | __in BOOL fMissingFromCache | ||
| 883 | ) | 886 | ) |
| 884 | { | 887 | { |
| 885 | HRESULT hr = S_OK; | 888 | HRESULT hr = S_OK; |
| @@ -893,6 +896,7 @@ EXTERN_C BAAPI UserExperienceOnDetectRelatedBundle( | |||
| 893 | args.fPerMachine = fPerMachine; | 896 | args.fPerMachine = fPerMachine; |
| 894 | args.wzVersion = pVersion->sczVersion; | 897 | args.wzVersion = pVersion->sczVersion; |
| 895 | args.operation = operation; | 898 | args.operation = operation; |
| 899 | args.fMissingFromCache = fMissingFromCache; | ||
| 896 | 900 | ||
| 897 | results.cbSize = sizeof(results); | 901 | results.cbSize = sizeof(results); |
| 898 | 902 | ||
