diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-12-12 23:09:03 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-12-13 00:09:33 -0600 |
commit | bd0f3491f36f4e24dd899e0c3479beed6e3c00f9 (patch) | |
tree | 4deaaf2aa7b0ec717735497f975f06b55b8ec7df /src/ext | |
parent | 701b31e26c3b3dfb6c140cbc0d48c6d39bf1f552 (diff) | |
download | wix-bd0f3491f36f4e24dd899e0c3479beed6e3c00f9.tar.gz wix-bd0f3491f36f4e24dd899e0c3479beed6e3c00f9.tar.bz2 wix-bd0f3491f36f4e24dd899e0c3479beed6e3c00f9.zip |
wixstdba should not change the action if not showing full UI.
wixstdba should not block downgrading if run from an upgrade related bundle.
Fixes 7081
Diffstat (limited to 'src/ext')
-rw-r--r-- | src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp index 3539450e..998fe4cf 100644 --- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | |||
@@ -271,8 +271,9 @@ public: // IBootstrapperApplication | |||
271 | } | 271 | } |
272 | } | 272 | } |
273 | } | 273 | } |
274 | else // maybe modify the action state if the bundle is or is not already installed. | 274 | else if (BOOTSTRAPPER_DISPLAY_FULL <= m_command.display) // only modify the action state if showing full UI. |
275 | { | 275 | { |
276 | // Maybe modify the action state if the bundle is or is not already installed. | ||
276 | if (fInstalled && BOOTSTRAPPER_RESUME_TYPE_REBOOT != m_command.resumeType && BOOTSTRAPPER_ACTION_INSTALL == m_command.action) | 277 | if (fInstalled && BOOTSTRAPPER_RESUME_TYPE_REBOOT != m_command.resumeType && BOOTSTRAPPER_ACTION_INSTALL == m_command.action) |
277 | { | 278 | { |
278 | m_command.action = BOOTSTRAPPER_ACTION_MODIFY; | 279 | m_command.action = BOOTSTRAPPER_ACTION_MODIFY; |
@@ -329,7 +330,7 @@ public: // IBootstrapperApplication | |||
329 | // Best effort | 330 | // Best effort |
330 | } | 331 | } |
331 | 332 | ||
332 | if (BOOTSTRAPPER_ACTION_INSTALL == m_command.action && BOOTSTRAPPER_RELATION_UPGRADE == relationType) | 333 | if (BOOTSTRAPPER_ACTION_INSTALL == m_command.action && BOOTSTRAPPER_RELATION_UPGRADE != m_command.relationType && BOOTSTRAPPER_RELATION_UPGRADE == relationType) |
333 | { | 334 | { |
334 | int nResult = 0; | 335 | int nResult = 0; |
335 | HRESULT hr = VerCompareStringVersions(m_sczBundleVersion, wzVersion, TRUE/*fStrict*/, &nResult); | 336 | HRESULT hr = VerCompareStringVersions(m_sczBundleVersion, wzVersion, TRUE/*fStrict*/, &nResult); |