From c1694843f7c54c7f9feb3f7074a31ff8499c9644 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 16 Mar 2022 14:57:16 -0500
Subject: Fix themes to account for UnsafeUninstall action.

---
 .../Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml | 18 ++++++++++++------
 src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl    |  6 ++++++
 src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml    | 18 ++++++++++++------
 src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml     | 18 ++++++++++++------
 src/ext/Bal/wixstdba/Resources/RtfTheme.wxl          |  6 ++++++
 src/ext/Bal/wixstdba/Resources/RtfTheme.xml          | 20 +++++++++++++-------
 src/libs/dutil/WixToolset.DUtil/thmutil.cpp          |  6 ++----
 .../TestData/Manual/BundleA/CustomHyperlinkTheme.xml | 18 ++++++++++++------
 8 files changed, 75 insertions(+), 35 deletions(-)

(limited to 'src')

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 @@
             <Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.SuccessHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
             </Label>
             <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
             <Label X="185" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -103,9 +106,12 @@
             <Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.FailureHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
             </Label>
             <Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
             <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 @@
   <String Id="ModifyUninstallButton">&amp;Uninstall</String>
   <String Id="ModifyCancelButton">&amp;Cancel</String>
   <String Id="SuccessHeader">Setup Successful</String>
+  <String Id="SuccessCacheHeader">Cache Successfully Completed</String>
   <String Id="SuccessInstallHeader">Installation Successfully Completed</String>
   <String Id="SuccessLayoutHeader">Layout Successfully Completed</String>
+  <String Id="SuccessModifyHeader">Modify Successfully Completed</String>
   <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
   <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
+  <String Id="SuccessUnsafeUninstallHeader">Uninstall Successfully Completed</String>
   <String Id="SuccessLaunchButton">&amp;Launch</String>
   <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
   <String Id="SuccessUninstallRestartText">You must restart your computer to complete the removal of the software.</String>
   <String Id="SuccessRestartButton">&amp;Restart</String>
   <String Id="SuccessCloseButton">&amp;Close</String>
   <String Id="FailureHeader">Setup Failed</String>
+  <String Id="FailureCacheHeader">Cache Failed</String>
   <String Id="FailureInstallHeader">Setup Failed</String>
   <String Id="FailureLayoutHeader">Layout Failed</String>
+  <String Id="FailureModifyHeader">Modify Failed</String>
   <String Id="FailureRepairHeader">Repair Failed</String>
   <String Id="FailureUninstallHeader">Uninstall Failed</String>
+  <String Id="FailureUnsafeUninstallHeader">Uninstall Failed</String>
   <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>
   <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
   <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 @@
             <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.SuccessHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
             </Label>
             <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
             <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -89,9 +92,12 @@
             <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.FailureHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
             </Label>
             <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
             <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 @@
             <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.SuccessHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
             </Label>
             <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
             <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -91,9 +94,12 @@
             <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.FailureHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
             </Label>
             <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
             <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 @@
   <String Id="ModifyUninstallButton">&amp;Uninstall</String>
   <String Id="ModifyCancelButton">&amp;Cancel</String>
   <String Id="SuccessHeader">Setup Successful</String>
+  <String Id="SuccessCacheHeader">Cache Successfully Completed</String>
   <String Id="SuccessInstallHeader">Installation Successfully Completed</String>
   <String Id="SuccessLayoutHeader">Layout Successfully Completed</String>
+  <String Id="SuccessModifyHeader">Modify Successfully Completed</String>
   <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
   <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
+  <String Id="SuccessUnsafeUninstallHeader">Uninstall Successfully Completed</String>
   <String Id="SuccessLaunchButton">&amp;Launch</String>
   <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
   <String Id="SuccessUninstallRestartText">You must restart your computer to complete the removal of the software.</String>
   <String Id="SuccessRestartButton">&amp;Restart</String>
   <String Id="SuccessCloseButton">&amp;Close</String>
   <String Id="FailureHeader">Setup Failed</String>
+  <String Id="FailureCacheHeader">Cache Failed</String>
   <String Id="FailureInstallHeader">Setup Failed</String>
   <String Id="FailureLayoutHeader">Layout Failed</String>
+  <String Id="FailureModifyHeader">Modify Failed</String>
   <String Id="FailureRepairHeader">Repair Failed</String>
   <String Id="FailureUninstallHeader">Uninstall Failed</String>
+  <String Id="FailureUnsafeUninstallHeader">Uninstall Failed</String>
   <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>
   <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
   <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 @@
             <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.SuccessHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
             </Label>
             <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
             <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -89,9 +92,12 @@
             <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.FailureHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
             </Label>
             <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
             <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
@@ -101,6 +107,6 @@
                 <Text>#(loc.FailureCloseButton)</Text>
                 <CloseWindowAction />
             </Button>
-        </Page>        
+        </Page>
     </Window>
 </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(
         // Try to format each control's text based on context, except for editboxes since their text comes from the user.
         if (pTheme->pfnFormatString && ((pControl->sczText && *pControl->sczText) || pControl->cConditionalText) && THEME_CONTROL_TYPE_EDITBOX != pControl->type)
         {
-            LPWSTR wzText = pControl->sczText;
-            LPWSTR wzNote = pControl->sczNote;
+            LPCWSTR wzText = pControl->sczText;
+            LPCWSTR wzNote = pControl->sczNote;
 
             if (pTheme->pfnEvaluateCondition)
             {
@@ -5619,7 +5619,6 @@ static HRESULT ShowControl(
                 for (DWORD j = 0; j < pControl->cConditionalText; ++j)
                 {
                     THEME_CONDITIONAL_TEXT* pConditionalText = pControl->rgConditionalText + j;
-                    wzText = pConditionalText->sczText;
 
                     if (pConditionalText->sczCondition)
                     {
@@ -5641,7 +5640,6 @@ static HRESULT ShowControl(
                     for (DWORD j = 0; j < pControl->CommandLink.cConditionalNotes; ++j)
                     {
                         THEME_CONDITIONAL_TEXT* pConditionalNote = pControl->CommandLink.rgConditionalNotes + j;
-                        wzNote = pConditionalNote->sczText;
 
                         if (pConditionalNote->sczCondition)
                         {
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 @@
             <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.SuccessHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.SuccessInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.SuccessRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
             </Label>
             <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
             <Label X="-11" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
@@ -90,9 +93,12 @@
             <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
                 <Text>#(loc.FailureHeader)</Text>
                 <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.FailureUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.FailureInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.FailureRepairHeader)</Text>
+                <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
+                <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
+                <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
+                <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
+                <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
             </Label>
             <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
             <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-- 
cgit v1.2.3-55-g6feb