Fix themes to account for UnsafeUninstall action.
Sean Hall committed
Mar 16, 2022 at 14:57 UTC
c1694843f7c54c7f9feb3f7074a31ff8499c9644
8 files changed
+75
-35
src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml
+12
-6
@@ -82,9 +82,12 @@
82
<Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
83
<Text>#(loc.SuccessHeader)</Text>
84
<Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
85
- <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
86
- <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
87
- <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
85
+ <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
86
+ <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
87
+ <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
88
+ <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
89
+ <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
90
+ <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
91
</Label>
92
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
93
<Label X="185" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -103,9 +106,12 @@
106
<Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
107
<Text>#(loc.FailureHeader)</Text>
108
<Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
106
- <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
107
- <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
108
- <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
109
+ <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
110
+ <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
111
+ <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
112
+ <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
113
+ <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
114
+ <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
115
</Label>
116
<Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
117
<Hypertext Name="FailureMessageText" X="185" Y="-115" Width="-11" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl
+6
@@ -39,20 +39,26 @@
39
<String Id="ModifyUninstallButton">&Uninstall</String>
40
<String Id="ModifyCancelButton">&Cancel</String>
41
<String Id="SuccessHeader">Setup Successful</String>
42
+ <String Id="SuccessCacheHeader">Cache Successfully Completed</String>
43
<String Id="SuccessInstallHeader">Installation Successfully Completed</String>
44
<String Id="SuccessLayoutHeader">Layout Successfully Completed</String>
45
+ <String Id="SuccessModifyHeader">Modify Successfully Completed</String>
46
<String Id="SuccessRepairHeader">Repair Successfully Completed</String>
47
<String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
48
+ <String Id="SuccessUnsafeUninstallHeader">Uninstall Successfully Completed</String>
49
<String Id="SuccessLaunchButton">&Launch</String>
50
<String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
51
<String Id="SuccessUninstallRestartText">You must restart your computer to complete the removal of the software.</String>
52
<String Id="SuccessRestartButton">&Restart</String>
53
<String Id="SuccessCloseButton">&Close</String>
54
<String Id="FailureHeader">Setup Failed</String>
55
+ <String Id="FailureCacheHeader">Cache Failed</String>
56
<String Id="FailureInstallHeader">Setup Failed</String>
57
<String Id="FailureLayoutHeader">Layout Failed</String>
58
+ <String Id="FailureModifyHeader">Modify Failed</String>
59
<String Id="FailureRepairHeader">Repair Failed</String>
60
<String Id="FailureUninstallHeader">Uninstall Failed</String>
61
+ <String Id="FailureUnsafeUninstallHeader">Uninstall Failed</String>
62
<String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>.</String>
63
<String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
64
<String Id="FailureRestartButton">&Restart</String>
src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml
+12
-6
@@ -70,9 +70,12 @@
70
<Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
71
<Text>#(loc.SuccessHeader)</Text>
72
<Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
73
- <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
74
- <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
75
- <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
73
+ <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
74
+ <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
75
+ <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
76
+ <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
77
+ <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
78
+ <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
79
</Label>
80
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
81
<Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -89,9 +92,12 @@
92
<Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
93
<Text>#(loc.FailureHeader)</Text>
94
<Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
92
- <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
93
- <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
94
- <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
95
+ <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
96
+ <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
97
+ <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
98
+ <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
99
+ <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
100
+ <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
101
</Label>
102
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
103
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml
+12
-6
@@ -72,9 +72,12 @@
72
<Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
73
<Text>#(loc.SuccessHeader)</Text>
74
<Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
75
- <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
76
- <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
77
- <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
75
+ <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
76
+ <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
77
+ <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
78
+ <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
79
+ <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
80
+ <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
81
</Label>
82
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
83
<Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -91,9 +94,12 @@
94
<Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
95
<Text>#(loc.FailureHeader)</Text>
96
<Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
94
- <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
95
- <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
96
- <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
97
+ <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
98
+ <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
99
+ <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
100
+ <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
101
+ <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
102
+ <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
103
</Label>
104
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
105
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
src/ext/Bal/wixstdba/Resources/RtfTheme.wxl
+6
@@ -36,20 +36,26 @@
36
<String Id="ModifyUninstallButton">&Uninstall</String>
37
<String Id="ModifyCancelButton">&Cancel</String>
38
<String Id="SuccessHeader">Setup Successful</String>
39
+ <String Id="SuccessCacheHeader">Cache Successfully Completed</String>
40
<String Id="SuccessInstallHeader">Installation Successfully Completed</String>
41
<String Id="SuccessLayoutHeader">Layout Successfully Completed</String>
42
+ <String Id="SuccessModifyHeader">Modify Successfully Completed</String>
43
<String Id="SuccessRepairHeader">Repair Successfully Completed</String>
44
<String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
45
+ <String Id="SuccessUnsafeUninstallHeader">Uninstall Successfully Completed</String>
46
<String Id="SuccessLaunchButton">&Launch</String>
47
<String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
48
<String Id="SuccessUninstallRestartText">You must restart your computer to complete the removal of the software.</String>
49
<String Id="SuccessRestartButton">&Restart</String>
50
<String Id="SuccessCloseButton">&Close</String>
51
<String Id="FailureHeader">Setup Failed</String>
52
+ <String Id="FailureCacheHeader">Cache Failed</String>
53
<String Id="FailureInstallHeader">Setup Failed</String>
54
<String Id="FailureLayoutHeader">Layout Failed</String>
55
+ <String Id="FailureModifyHeader">Modify Failed</String>
56
<String Id="FailureRepairHeader">Repair Failed</String>
57
<String Id="FailureUninstallHeader">Uninstall Failed</String>
58
+ <String Id="FailureUnsafeUninstallHeader">Uninstall Failed</String>
59
<String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>.</String>
60
<String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
61
<String Id="FailureRestartButton">&Restart</String>
src/ext/Bal/wixstdba/Resources/RtfTheme.xml
+13
-7
@@ -70,9 +70,12 @@
70
<Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
71
<Text>#(loc.SuccessHeader)</Text>
72
<Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
73
- <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
74
- <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
75
- <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
73
+ <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
74
+ <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
75
+ <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
76
+ <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
77
+ <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
78
+ <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
79
</Label>
80
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
81
<Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -89,9 +92,12 @@
92
<Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
93
<Text>#(loc.FailureHeader)</Text>
94
<Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
92
- <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
93
- <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
94
- <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
95
+ <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
96
+ <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
97
+ <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
98
+ <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
99
+ <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
100
+ <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
101
</Label>
102
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
103
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
@@ -101,6 +107,6 @@
107
<Text>#(loc.FailureCloseButton)</Text>
108
<CloseWindowAction />
109
</Button>
104
- </Page>
110
+ </Page>
111
</Window>
112
</Theme>
src/libs/dutil/WixToolset.DUtil/thmutil.cpp
+2
-4
@@ -5609,8 +5609,8 @@ static HRESULT ShowControl(
5609
// Try to format each control's text based on context, except for editboxes since their text comes from the user.
5610
if (pTheme->pfnFormatString && ((pControl->sczText && *pControl->sczText) || pControl->cConditionalText) && THEME_CONTROL_TYPE_EDITBOX != pControl->type)
5611
{
5612
- LPWSTR wzText = pControl->sczText;
5613
- LPWSTR wzNote = pControl->sczNote;
5612
+ LPCWSTR wzText = pControl->sczText;
5613
+ LPCWSTR wzNote = pControl->sczNote;
5614
5615
if (pTheme->pfnEvaluateCondition)
5616
{
@@ -5619,7 +5619,6 @@ static HRESULT ShowControl(
5619
for (DWORD j = 0; j < pControl->cConditionalText; ++j)
5620
{
5621
THEME_CONDITIONAL_TEXT* pConditionalText = pControl->rgConditionalText + j;
5622
- wzText = pConditionalText->sczText;
5622
5623
if (pConditionalText->sczCondition)
5624
{
@@ -5641,7 +5640,6 @@ static HRESULT ShowControl(
5640
for (DWORD j = 0; j < pControl->CommandLink.cConditionalNotes; ++j)
5641
{
5642
THEME_CONDITIONAL_TEXT* pConditionalNote = pControl->CommandLink.rgConditionalNotes + j;
5644
- wzNote = pConditionalNote->sczText;
5643
5644
if (pConditionalNote->sczCondition)
5645
{
src/test/burn/TestData/Manual/BundleA/CustomHyperlinkTheme.xml
+12
-6
@@ -71,9 +71,12 @@
71
<Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
72
<Text>#(loc.SuccessHeader)</Text>
73
<Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
74
- <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
75
- <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
76
- <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
74
+ <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
75
+ <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
76
+ <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
77
+ <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
78
+ <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
79
+ <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
80
</Label>
81
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
82
<Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -90,9 +93,12 @@
93
<Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
94
<Text>#(loc.FailureHeader)</Text>
95
<Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
93
- <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
94
- <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
95
- <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
96
+ <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
97
+ <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
98
+ <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
99
+ <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
100
+ <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
101
+ <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
102
</Label>
103
<Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
104
<Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />