aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-03-16 14:57:16 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-03-16 20:14:37 -0500
commitc1694843f7c54c7f9feb3f7074a31ff8499c9644 (patch)
tree959d8e60bedecbc76abc22c0ce52decad6dbcfea /src
parent04b84e3b55402707497dab249a300f9cf1d216c7 (diff)
downloadwix-c1694843f7c54c7f9feb3f7074a31ff8499c9644.tar.gz
wix-c1694843f7c54c7f9feb3f7074a31ff8499c9644.tar.bz2
wix-c1694843f7c54c7f9feb3f7074a31ff8499c9644.zip
Fix themes to account for UnsafeUninstall action.
Diffstat (limited to 'src')
-rw-r--r--src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml18
-rw-r--r--src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl6
-rw-r--r--src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml18
-rw-r--r--src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml18
-rw-r--r--src/ext/Bal/wixstdba/Resources/RtfTheme.wxl6
-rw-r--r--src/ext/Bal/wixstdba/Resources/RtfTheme.xml20
-rw-r--r--src/libs/dutil/WixToolset.DUtil/thmutil.cpp6
-rw-r--r--src/test/burn/TestData/Manual/BundleA/CustomHyperlinkTheme.xml18
8 files changed, 75 insertions, 35 deletions
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml b/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml
index 1dff9d7e..d9076a5d 100644
--- a/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml
+++ b/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml
@@ -82,9 +82,12 @@
82 <Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 82 <Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
83 <Text>#(loc.SuccessHeader)</Text> 83 <Text>#(loc.SuccessHeader)</Text>
84 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text> 84 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
85 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text> 85 <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
86 <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text> 86 <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
87 <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</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>
88 </Label> 91 </Label>
89 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button> 92 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
90 <Label X="185" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired"> 93 <Label X="185" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -103,9 +106,12 @@
103 <Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 106 <Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
104 <Text>#(loc.FailureHeader)</Text> 107 <Text>#(loc.FailureHeader)</Text>
105 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text> 108 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
106 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text> 109 <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
107 <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text> 110 <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
108 <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</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>
109 </Label> 115 </Label>
110 <Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext> 116 <Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
111 <Hypertext Name="FailureMessageText" X="185" Y="-115" Width="-11" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" /> 117 <Hypertext Name="FailureMessageText" X="185" Y="-115" Width="-11" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl
index e6e3f8ab..43b43970 100644
--- a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl
+++ b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl
@@ -39,20 +39,26 @@
39 <String Id="ModifyUninstallButton">&amp;Uninstall</String> 39 <String Id="ModifyUninstallButton">&amp;Uninstall</String>
40 <String Id="ModifyCancelButton">&amp;Cancel</String> 40 <String Id="ModifyCancelButton">&amp;Cancel</String>
41 <String Id="SuccessHeader">Setup Successful</String> 41 <String Id="SuccessHeader">Setup Successful</String>
42 <String Id="SuccessCacheHeader">Cache Successfully Completed</String>
42 <String Id="SuccessInstallHeader">Installation Successfully Completed</String> 43 <String Id="SuccessInstallHeader">Installation Successfully Completed</String>
43 <String Id="SuccessLayoutHeader">Layout Successfully Completed</String> 44 <String Id="SuccessLayoutHeader">Layout Successfully Completed</String>
45 <String Id="SuccessModifyHeader">Modify Successfully Completed</String>
44 <String Id="SuccessRepairHeader">Repair Successfully Completed</String> 46 <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
45 <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String> 47 <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
48 <String Id="SuccessUnsafeUninstallHeader">Uninstall Successfully Completed</String>
46 <String Id="SuccessLaunchButton">&amp;Launch</String> 49 <String Id="SuccessLaunchButton">&amp;Launch</String>
47 <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String> 50 <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> 51 <String Id="SuccessUninstallRestartText">You must restart your computer to complete the removal of the software.</String>
49 <String Id="SuccessRestartButton">&amp;Restart</String> 52 <String Id="SuccessRestartButton">&amp;Restart</String>
50 <String Id="SuccessCloseButton">&amp;Close</String> 53 <String Id="SuccessCloseButton">&amp;Close</String>
51 <String Id="FailureHeader">Setup Failed</String> 54 <String Id="FailureHeader">Setup Failed</String>
55 <String Id="FailureCacheHeader">Cache Failed</String>
52 <String Id="FailureInstallHeader">Setup Failed</String> 56 <String Id="FailureInstallHeader">Setup Failed</String>
53 <String Id="FailureLayoutHeader">Layout Failed</String> 57 <String Id="FailureLayoutHeader">Layout Failed</String>
58 <String Id="FailureModifyHeader">Modify Failed</String>
54 <String Id="FailureRepairHeader">Repair Failed</String> 59 <String Id="FailureRepairHeader">Repair Failed</String>
55 <String Id="FailureUninstallHeader">Uninstall Failed</String> 60 <String Id="FailureUninstallHeader">Uninstall Failed</String>
61 <String Id="FailureUnsafeUninstallHeader">Uninstall Failed</String>
56 <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 &lt;a href="#"&gt;log file&lt;/a&gt;.</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 &lt;a href="#"&gt;log file&lt;/a&gt;.</String>
57 <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> 63 <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
58 <String Id="FailureRestartButton">&amp;Restart</String> 64 <String Id="FailureRestartButton">&amp;Restart</String>
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml
index 657db34b..e654fe23 100644
--- a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml
+++ b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml
@@ -70,9 +70,12 @@
70 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 70 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
71 <Text>#(loc.SuccessHeader)</Text> 71 <Text>#(loc.SuccessHeader)</Text>
72 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text> 72 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
73 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text> 73 <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
74 <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text> 74 <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
75 <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</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>
76 </Label> 79 </Label>
77 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button> 80 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
78 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired"> 81 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -89,9 +92,12 @@
89 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 92 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
90 <Text>#(loc.FailureHeader)</Text> 93 <Text>#(loc.FailureHeader)</Text>
91 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text> 94 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
92 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text> 95 <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
93 <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text> 96 <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
94 <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</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>
95 </Label> 101 </Label>
96 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext> 102 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
97 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" /> 103 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
diff --git a/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml b/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml
index 3571e13a..e5d18ec7 100644
--- a/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml
+++ b/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml
@@ -72,9 +72,12 @@
72 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 72 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
73 <Text>#(loc.SuccessHeader)</Text> 73 <Text>#(loc.SuccessHeader)</Text>
74 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text> 74 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
75 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text> 75 <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
76 <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text> 76 <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
77 <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</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>
78 </Label> 81 </Label>
79 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button> 82 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
80 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired"> 83 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -91,9 +94,12 @@
91 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 94 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
92 <Text>#(loc.FailureHeader)</Text> 95 <Text>#(loc.FailureHeader)</Text>
93 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text> 96 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
94 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text> 97 <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
95 <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text> 98 <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
96 <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</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>
97 </Label> 103 </Label>
98 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext> 104 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
99 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" /> 105 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
diff --git a/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl b/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl
index f73fb994..7b8e1c65 100644
--- a/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl
+++ b/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl
@@ -36,20 +36,26 @@
36 <String Id="ModifyUninstallButton">&amp;Uninstall</String> 36 <String Id="ModifyUninstallButton">&amp;Uninstall</String>
37 <String Id="ModifyCancelButton">&amp;Cancel</String> 37 <String Id="ModifyCancelButton">&amp;Cancel</String>
38 <String Id="SuccessHeader">Setup Successful</String> 38 <String Id="SuccessHeader">Setup Successful</String>
39 <String Id="SuccessCacheHeader">Cache Successfully Completed</String>
39 <String Id="SuccessInstallHeader">Installation Successfully Completed</String> 40 <String Id="SuccessInstallHeader">Installation Successfully Completed</String>
40 <String Id="SuccessLayoutHeader">Layout Successfully Completed</String> 41 <String Id="SuccessLayoutHeader">Layout Successfully Completed</String>
42 <String Id="SuccessModifyHeader">Modify Successfully Completed</String>
41 <String Id="SuccessRepairHeader">Repair Successfully Completed</String> 43 <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
42 <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String> 44 <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
45 <String Id="SuccessUnsafeUninstallHeader">Uninstall Successfully Completed</String>
43 <String Id="SuccessLaunchButton">&amp;Launch</String> 46 <String Id="SuccessLaunchButton">&amp;Launch</String>
44 <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String> 47 <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
45 <String Id="SuccessUninstallRestartText">You must restart your computer to complete the removal of the software.</String> 48 <String Id="SuccessUninstallRestartText">You must restart your computer to complete the removal of the software.</String>
46 <String Id="SuccessRestartButton">&amp;Restart</String> 49 <String Id="SuccessRestartButton">&amp;Restart</String>
47 <String Id="SuccessCloseButton">&amp;Close</String> 50 <String Id="SuccessCloseButton">&amp;Close</String>
48 <String Id="FailureHeader">Setup Failed</String> 51 <String Id="FailureHeader">Setup Failed</String>
52 <String Id="FailureCacheHeader">Cache Failed</String>
49 <String Id="FailureInstallHeader">Setup Failed</String> 53 <String Id="FailureInstallHeader">Setup Failed</String>
50 <String Id="FailureLayoutHeader">Layout Failed</String> 54 <String Id="FailureLayoutHeader">Layout Failed</String>
55 <String Id="FailureModifyHeader">Modify Failed</String>
51 <String Id="FailureRepairHeader">Repair Failed</String> 56 <String Id="FailureRepairHeader">Repair Failed</String>
52 <String Id="FailureUninstallHeader">Uninstall Failed</String> 57 <String Id="FailureUninstallHeader">Uninstall Failed</String>
58 <String Id="FailureUnsafeUninstallHeader">Uninstall Failed</String>
53 <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 &lt;a href="#"&gt;log file&lt;/a&gt;.</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 &lt;a href="#"&gt;log file&lt;/a&gt;.</String>
54 <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String> 60 <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
55 <String Id="FailureRestartButton">&amp;Restart</String> 61 <String Id="FailureRestartButton">&amp;Restart</String>
diff --git a/src/ext/Bal/wixstdba/Resources/RtfTheme.xml b/src/ext/Bal/wixstdba/Resources/RtfTheme.xml
index d6535bac..72345343 100644
--- a/src/ext/Bal/wixstdba/Resources/RtfTheme.xml
+++ b/src/ext/Bal/wixstdba/Resources/RtfTheme.xml
@@ -70,9 +70,12 @@
70 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 70 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
71 <Text>#(loc.SuccessHeader)</Text> 71 <Text>#(loc.SuccessHeader)</Text>
72 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text> 72 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
73 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text> 73 <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
74 <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text> 74 <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
75 <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</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>
76 </Label> 79 </Label>
77 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button> 80 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
78 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired"> 81 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -89,9 +92,12 @@
89 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 92 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
90 <Text>#(loc.FailureHeader)</Text> 93 <Text>#(loc.FailureHeader)</Text>
91 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text> 94 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
92 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text> 95 <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
93 <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text> 96 <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
94 <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</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>
95 </Label> 101 </Label>
96 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext> 102 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
97 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" /> 103 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
@@ -101,6 +107,6 @@
101 <Text>#(loc.FailureCloseButton)</Text> 107 <Text>#(loc.FailureCloseButton)</Text>
102 <CloseWindowAction /> 108 <CloseWindowAction />
103 </Button> 109 </Button>
104 </Page> 110 </Page>
105 </Window> 111 </Window>
106</Theme> 112</Theme>
diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
index ab1a2233..d3d32176 100644
--- a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
@@ -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. 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) 5610 if (pTheme->pfnFormatString && ((pControl->sczText && *pControl->sczText) || pControl->cConditionalText) && THEME_CONTROL_TYPE_EDITBOX != pControl->type)
5611 { 5611 {
5612 LPWSTR wzText = pControl->sczText; 5612 LPCWSTR wzText = pControl->sczText;
5613 LPWSTR wzNote = pControl->sczNote; 5613 LPCWSTR wzNote = pControl->sczNote;
5614 5614
5615 if (pTheme->pfnEvaluateCondition) 5615 if (pTheme->pfnEvaluateCondition)
5616 { 5616 {
@@ -5619,7 +5619,6 @@ static HRESULT ShowControl(
5619 for (DWORD j = 0; j < pControl->cConditionalText; ++j) 5619 for (DWORD j = 0; j < pControl->cConditionalText; ++j)
5620 { 5620 {
5621 THEME_CONDITIONAL_TEXT* pConditionalText = pControl->rgConditionalText + j; 5621 THEME_CONDITIONAL_TEXT* pConditionalText = pControl->rgConditionalText + j;
5622 wzText = pConditionalText->sczText;
5623 5622
5624 if (pConditionalText->sczCondition) 5623 if (pConditionalText->sczCondition)
5625 { 5624 {
@@ -5641,7 +5640,6 @@ static HRESULT ShowControl(
5641 for (DWORD j = 0; j < pControl->CommandLink.cConditionalNotes; ++j) 5640 for (DWORD j = 0; j < pControl->CommandLink.cConditionalNotes; ++j)
5642 { 5641 {
5643 THEME_CONDITIONAL_TEXT* pConditionalNote = pControl->CommandLink.rgConditionalNotes + j; 5642 THEME_CONDITIONAL_TEXT* pConditionalNote = pControl->CommandLink.rgConditionalNotes + j;
5644 wzNote = pConditionalNote->sczText;
5645 5643
5646 if (pConditionalNote->sczCondition) 5644 if (pConditionalNote->sczCondition)
5647 { 5645 {
diff --git a/src/test/burn/TestData/Manual/BundleA/CustomHyperlinkTheme.xml b/src/test/burn/TestData/Manual/BundleA/CustomHyperlinkTheme.xml
index b8157193..19271978 100644
--- a/src/test/burn/TestData/Manual/BundleA/CustomHyperlinkTheme.xml
+++ b/src/test/burn/TestData/Manual/BundleA/CustomHyperlinkTheme.xml
@@ -71,9 +71,12 @@
71 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 71 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
72 <Text>#(loc.SuccessHeader)</Text> 72 <Text>#(loc.SuccessHeader)</Text>
73 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text> 73 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
74 <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text> 74 <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
75 <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text> 75 <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
76 <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</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>
77 </Label> 80 </Label>
78 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button> 81 <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
79 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired"> 82 <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -90,9 +93,12 @@
90 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes"> 93 <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
91 <Text>#(loc.FailureHeader)</Text> 94 <Text>#(loc.FailureHeader)</Text>
92 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text> 95 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
93 <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text> 96 <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
94 <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text> 97 <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
95 <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</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>
96 </Label> 102 </Label>
97 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext> 103 <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
98 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" /> 104 <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 19:50:05 +0000