Remove extension data after extensions get PreDecompileTables callback

Also update Util.wixext decompiler extension to handle the new
elements that compile into CustomActions with no additional table data.
These exposed the weakness in the decompiler where extension data was
removed before extensions got a chance to pre-decompile.

Fixes 7151

1 files changed, 6 insertions, 0 deletions

diff --git a/src/ext/Util/wixext/UtilConstants.cs b/src/ext/Util/wixext/UtilConstants.cs
index 93616e44..c1f5f820 100644
--- a/src/ext/Util/wixext/UtilConstants.cs
+++ b/src/ext/Util/wixext/UtilConstants.cs
@@ -11,6 +11,9 @@ namespace WixToolset.Util
     {
         internal static readonly XNamespace Namespace = "http://wixtoolset.org/schemas/v4/wxs/util";
 
+        internal static readonly XName BroadcastEnvironmentChange = Namespace + "BroadcastEnvironmentChange";
+        internal static readonly XName BroadcastSettingChange = Namespace + "BroadcastSettingChange";
+        internal static readonly XName CheckRebootRequired = Namespace + "CheckRebootRequired";
         internal static readonly XName CloseApplicationName = Namespace + "CloseApplication";
         internal static readonly XName EventManifestName = Namespace + "EventManifest";
         internal static readonly XName FileShareName = Namespace + "FileShare";
@@ -21,6 +24,9 @@ namespace WixToolset.Util
         internal static readonly XName PerfCounterName = Namespace + "PerfCounter";
         internal static readonly XName PerfCounterManifestName = Namespace + "PerfCounterManifest";
         internal static readonly XName PermissionExName = Namespace + "PermissionEx";
+        internal static readonly XName QueryNativeMachine = Namespace + "QueryNativeMachine";
+        internal static readonly XName QueryWindowsDriverInfo = Namespace + "QueryWindowsDriverInfo";
+        internal static readonly XName QueryWindowsSuiteInfo = Namespace + "QueryWindowsSuiteInfo";
         internal static readonly XName RemoveFolderExName = Namespace + "RemoveFolderEx";
         internal static readonly XName RestartResourceName = Namespace + "RestartResource";
         internal static readonly XName ServiceConfigName = Namespace + "ServiceConfig";