@joebigelow / wix-1 / commits / b58b204d

WIXBUG:6158 - Fix bug with m_fShowingInternalUiThisPackage where it was calculated with the bundle action instead of the package action.

Sean Hall committed Apr 21, 2020 at 17:48 UTC b58b204df1be70c95a5393ff22ed0f7afa0a0068

1 file changed +6 -2

src/wixstdba/WixStandardBootstrapperApplication.cpp

+6 -2

@@ -748,8 +748,12 @@ public: // IBootstrapperApplication

748 wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId;

749 }

750

751 - //Burn engine doesn't show internal UI for msi packages during uninstall or repair actions.

752 - m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && BOOTSTRAPPER_ACTION_UNINSTALL != m_plannedAction && BOOTSTRAPPER_ACTION_REPAIR != m_plannedAction;

751 + // Needs to match MsiEngineCalculateInstallUiLevel in msiengine.cpp in Burn.

752 + m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI &&

753 + BOOTSTRAPPER_ACTION_STATE_UNINSTALL != action &&

754 + BOOTSTRAPPER_ACTION_STATE_REPAIR != action &&

755 + (BOOTSTRAPPER_DISPLAY_FULL == m_command.display ||

756 + BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display);

757

758 ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz);

759 ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz);