diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-07-25 22:01:07 -0400 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2026-07-26 10:15:34 -0400 |
| commit | ccfda4f4a158b19f61b018b944eb86272f427f55 (patch) | |
| tree | 28460c23c443fff9811b3093243b1557ab4a35d8 /src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp | |
| parent | 3b6428b593ff4b8e1ca5e9c2240d539751a96c9a (diff) | |
| download | wix-ccfda4f4a158b19f61b018b944eb86272f427f55.tar.gz wix-ccfda4f4a158b19f61b018b944eb86272f427f55.tar.bz2 wix-ccfda4f4a158b19f61b018b944eb86272f427f55.zip | |
Add UAC shield for fixed-scope per-machine bundles
Fixes https://github.com/wixtoolset/issues/issues/9321
Diffstat (limited to 'src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp')
| -rw-r--r-- | src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp index e0b03f98..85ff8263 100644 --- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp | |||
| @@ -3967,8 +3967,6 @@ private: | |||
| 3967 | // Enable disable controls per-page. | 3967 | // Enable disable controls per-page. |
| 3968 | if (m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL] == dwNewPageId) // on the "Install" page, ensure the install button is enabled/disabled correctly. | 3968 | if (m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL] == dwNewPageId) // on the "Install" page, ensure the install button is enabled/disabled correctly. |
| 3969 | { | 3969 | { |
| 3970 | ThemeControlElevates(m_pControlInstallButton, (m_Bundle.fPerMachine && !llElevated)); | ||
| 3971 | |||
| 3972 | // If the EULA control exists, show it only if a license URL is provided as well. | 3970 | // If the EULA control exists, show it only if a license URL is provided as well. |
| 3973 | if (m_pControlEulaHyperlink) | 3971 | if (m_pControlEulaHyperlink) |
| 3974 | { | 3972 | { |
| @@ -3982,9 +3980,6 @@ private: | |||
| 3982 | } | 3980 | } |
| 3983 | else if (m_rgdwPageIds[WIXSTDBA_PAGE_MODIFY] == dwNewPageId) | 3981 | else if (m_rgdwPageIds[WIXSTDBA_PAGE_MODIFY] == dwNewPageId) |
| 3984 | { | 3982 | { |
| 3985 | ThemeControlElevates(m_pControlRepairButton, (m_Bundle.fPerMachine && !llElevated)); | ||
| 3986 | ThemeControlElevates(m_pControlUninstallButton, (m_Bundle.fPerMachine && !llElevated)); | ||
| 3987 | |||
| 3988 | ThemeControlEnable(m_pControlRepairButton, !m_fSuppressRepair); | 3983 | ThemeControlEnable(m_pControlRepairButton, !m_fSuppressRepair); |
| 3989 | } | 3984 | } |
| 3990 | else if (m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS] == dwNewPageId) // on the "Success" page, check if the restart or launch button should be enabled. | 3985 | else if (m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS] == dwNewPageId) // on the "Success" page, check if the restart or launch button should be enabled. |
