11 files changed, 85 insertions, 2 deletions

diff --git a/src/ext/Util/ca/test.cpp b/src/ext/Util/ca/test.cpp
index e9d02ed3..8f1c238b 100644
--- a/src/ext/Util/ca/test.cpp
+++ b/src/ext/Util/ca/test.cpp
@@ -40,6 +40,21 @@ static LRESULT CALLBACK WndProc(
 
 
 /******************************************************************
+WixCancelWhenDeferred - entry point for WixCancelWhenDeferred
+    custom action which always cancels when running as a deferred
+    custom action (otherwise it blindly succeeds). It's useful when
+    testing the rollback of deferred custom actions: Schedule it
+    immediately after the rollback/deferred CA pair you're testing
+    and it will fail, causing your rollback CA to get invoked.
+********************************************************************/
+extern "C" UINT __stdcall WixCancelWhenDeferred(
+    __in MSIHANDLE hInstall
+)
+{
+    return ::MsiGetMode(hInstall, MSIRUNMODE_SCHEDULED) ? ERROR_INSTALL_USEREXIT : ERROR_SUCCESS;
+}
+
+/******************************************************************
 WixFailWhenDeferred - entry point for WixFailWhenDeferred
     custom action which always fails when running as a deferred
     custom action (otherwise it blindly succeeds). It's useful when
diff --git a/src/ext/Util/ca/utilca.def b/src/ext/Util/ca/utilca.def
index 2aeb54f4..f525233d 100644
--- a/src/ext/Util/ca/utilca.def
+++ b/src/ext/Util/ca/utilca.def
@@ -82,6 +82,7 @@ EXPORTS
     WixShellExecBinary
     WixUnelevatedShellExec
 ; test.cpp
+    WixCancelWhenDeferred
     WixFailWhenDeferred
     WixWaitForEvent
 ; TouchFile.cpp
diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/Failures/Package.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/Failures/Package.wxs
new file mode 100644
index 00000000..76975b69
--- /dev/null
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/Failures/Package.wxs
@@ -0,0 +1,9 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+        <File Source="$(sys.SOURCEFILEPATH)" />
+
+        <!-- Dead or alive, you're coming with me. -->
+        <util:FailWhenDeferred />
+        <util:CancelWhenDeferred />
+    </Package>
+</Wix>
diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index b29607c7..1f39601d 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -101,6 +101,21 @@ namespace WixToolsetTest.Util
         }
 
         [TestMethod]
+        public void CanBuildWithFailures()
+        {
+            var folder = TestData.Get(@"TestData\Failures");
+            var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder });
+
+            var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction");
+            WixAssert.CompareLineByLine(
+            [
+                "Binary:Wix4UtilCA_X64\t[Binary data]",
+                "CustomAction:Wix4FailWhenDeferred_X64\t1025\tWix4UtilCA_X64\tWixFailWhenDeferred\t",
+                "CustomAction:Wix8CancelWhenDeferred_X64\t1025\tWix4UtilCA_X64\tWixCancelWhenDeferred\t",
+            ], [.. results.OrderBy(s => s)]);
+        }
+
+        [TestMethod]
         public void CanBuildInternetShortcutInProduct()
         {
             var folder = TestData.Get(@"TestData\InternetShortcut");
diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs
index 919cc49b..1d11f37f 100644
--- a/src/ext/Util/wixext/UtilCompiler.cs
+++ b/src/ext/Util/wixext/UtilCompiler.cs
@@ -210,6 +210,7 @@ namespace WixToolset.Util
                             break;
                         case "BroadcastEnvironmentChange":
                         case "BroadcastSettingChange":
+                        case "CancelWhenDeferred":
                         case "CheckRebootRequired":
                         case "ExitEarlyWithSuccess":
                         case "FailWhenDeferred":
@@ -328,6 +329,7 @@ namespace WixToolset.Util
                     {
                         case "BroadcastEnvironmentChange":
                         case "BroadcastSettingChange":
+                        case "CancelWhenDeferred":
                         case "CheckRebootRequired":
                         case "ExitEarlyWithSuccess":
                         case "FailWhenDeferred":
@@ -358,6 +360,7 @@ namespace WixToolset.Util
                 return;
             }
 
+            var prefix = "Wix4";
             var customAction = element.Name.LocalName;
             switch (element.Name.LocalName)
             {
@@ -370,6 +373,10 @@ namespace WixToolset.Util
                 case "WaitForEventDeferred":
                     //default: customAction = element.Name.LocalName;
                     break;
+                case "CancelWhenDeferred":
+                    prefix = "Wix8";
+                    //default: customAction = element.Name.LocalName;
+                    break;
                 case "QueryWindowsDirectories":
                     customAction = "QueryOsDirs";
                     break;
@@ -400,7 +407,7 @@ namespace WixToolset.Util
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4" + customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, prefix + customAction, this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
         }
 
         /// <summary>
diff --git a/src/ext/Util/wixlib/UtilExtension_Platform.wxi b/src/ext/Util/wixlib/UtilExtension_Platform.wxi
index d28c8df9..6316eaf1 100644
--- a/src/ext/Util/wixlib/UtilExtension_Platform.wxi
+++ b/src/ext/Util/wixlib/UtilExtension_Platform.wxi
@@ -5,6 +5,14 @@
     <?include ..\..\caDecor.wxi ?>
 
     <Fragment>
+        <CustomAction Id="$(Prefix8)CancelWhenDeferred$(Suffix)" DllEntry="WixCancelWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(Prefix)UtilCA$(Suffix)" />
+
+        <InstallExecuteSequence>
+            <Custom Action="virtual $(Prefix8)CancelWhenDeferred$(Suffix)" Before="InstallFinalize" Condition="WIXCANCELWHENDEFERRED=1 AND VersionNT &gt; 400" />
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
         <CustomAction Id="$(var.Prefix)FailWhenDeferred$(var.Suffix)" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" BinaryRef="$(var.Prefix)UtilCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
diff --git a/src/ext/caDecor.h b/src/ext/caDecor.h
index 4a09e075..9484d74c 100644
--- a/src/ext/caDecor.h
+++ b/src/ext/caDecor.h
@@ -31,3 +31,13 @@
 #else
 #define CUSTOM_ACTION_DECORATION6(f) L"Wix6" f L"_X86"
 #endif
+
+#if defined(_M_ARM64)
+#define CUSTOM_ACTION_DECORATION8(f) L"Wix8" f L"_A64"
+#elif defined(_M_AMD64)
+#define CUSTOM_ACTION_DECORATION8(f) L"Wix8" f L"_X64"
+#elif defined(_M_ARM)
+#define CUSTOM_ACTION_DECORATION8(f) L"Wix8" f L"_ARM"
+#else
+#define CUSTOM_ACTION_DECORATION8(f) L"Wix8" f L"_X86"
+#endif
diff --git a/src/ext/caDecor.wxi b/src/ext/caDecor.wxi
index 236b2154..c92af980 100644
--- a/src/ext/caDecor.wxi
+++ b/src/ext/caDecor.wxi
@@ -19,6 +19,12 @@
     <?endif?>
     <?define Prefix6="Wix6" ?>
 
+    <?ifdef Prefix8 ?>
+    <?undef Prefix8 ?>
+    <?endif?>
+    <?define Prefix8="Wix8" ?>
+
+
     <?ifndef platform ?>
         <?define platform="x86" ?>
     <?endif?>
diff --git a/src/wix/Directory.Build.targets b/src/wix/Directory.Build.targets
index 78b83e60..28749932 100644
--- a/src/wix/Directory.Build.targets
+++ b/src/wix/Directory.Build.targets
@@ -4,7 +4,7 @@
   <Import Project="..\Directory.Build.targets" />
 
   <ItemGroup Condition=" '$(RequiresNativeWixAssets)'=='true' and ('$(TargetFrameworkIdentifier)'=='.NETFramework' or '$(RuntimeIdentifier)'!='' ) ">
-    <!-- Copy the x64 binaries when there is no RuntimeIdentifier since we've standardized on VS2022 (which is 64-bit) -->
+    <!-- Copy the x64 binaries when there is no RuntimeIdentifier since we've standardized on VS2026 (which is 64-bit) -->
     <None Include="$(MSBuildThisFileDirectory)wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
     <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
 
diff --git a/src/xsd/util/CancelWhenDeferred.xsd b/src/xsd/util/CancelWhenDeferred.xsd
new file mode 100644
index 00000000..062be147
--- /dev/null
+++ b/src/xsd/util/CancelWhenDeferred.xsd
@@ -0,0 +1,11 @@
+<element name="CancelWhenDeferred">
+    <annotation>
+      <documentation>Schedules the CancelWhenDeferred custom action for the current platform.</documentation>
+      <appinfo>
+        <parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Package" />
+        <parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
+        <parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+        <parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="UI" />
+      </appinfo>
+    </annotation>
+  </element>
\ No newline at end of file
diff --git a/src/xsd/util/order.txt b/src/xsd/util/order.txt
index 63f854ae..1181e97a 100644
--- a/src/xsd/util/order.txt
+++ b/src/xsd/util/order.txt
@@ -33,6 +33,7 @@ element|XmlFile
 element|XmlConfig
 element|BroadcastEnvironmentChange
 element|BroadcastSettingChange
+element|CancelWhenDeferred
 element|CheckRebootRequired
 element|ExitEarlyWithSuccess
 element|FailWhenDeferred