Send all tables to extension decompilers.wix601

Also fix Firewall decompiler to decompile all possible Firewall tables.

Fixes https://github.com/wixtoolset/issues/issues/9070

6 files changed, 98 insertions, 19 deletions

diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
index 4b9aecd7..9b4cb2b1 100644
--- a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
@@ -621,6 +621,39 @@ namespace WixToolsetTest.Firewall
             }, locals.ToArray());
         }
 
+        [TestMethod]
+        public void CanDecompileWix4FirewallPackage()
+        {
+            var folder = TestData.Get(@"TestData\DecompileWix4Firewall");
+            var output = Path.Combine(folder, "DecompiledWix4Firewall.xml");
+
+            var result = WixRunner.Execute(
+                "msi",
+                "decompile",
+                "-ext", Path.GetFullPath(typeof(FirewallExtensionFactory).Assembly.Location),
+                Path.Combine(folder, "Firewall4.msi"),
+                "-o", output
+                );
+            result.AssertSuccess();
+
+            var doc = XDocument.Load(output);
+            var actual = doc.Descendants()
+                .Where(e => e.Name.Namespace == "http://wixtoolset.org/schemas/v4/wxs/firewall")
+                .Select(fe => new { Name = fe.Name.LocalName, Attributes = fe.Attributes().Select(a => $"{a.Name.LocalName}={a.Value}").ToArray() })
+                .ToArray();
+
+            WixAssert.CompareLineByLine(new[]
+            {
+                "FirewallException",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "FirewallException",
+            }, actual.Select(a => a.Name).ToArray());
+        }
+
         private static void Build(string[] args)
         {
             var result = WixRunner.Execute(args);
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/Firewall4.msi b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/Firewall4.msi
new file mode 100644
index 00000000..1dde5df4
--- /dev/null
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/Firewall4.msi
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wixproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wixproj
new file mode 100644
index 00000000..0098d7ac
--- /dev/null
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wixproj
@@ -0,0 +1,6 @@
+<Project Sdk="WixToolset.Sdk/4.0.6">
+  <ItemGroup>
+    <PackageVersion Update="WixToolset.Firewall.wixext" Version="4.0.6" />
+    <PackageReference Include="WixToolset.Firewall.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wxs b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wxs
new file mode 100644
index 00000000..8a89ad6c
--- /dev/null
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wxs
@@ -0,0 +1,36 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <MajorUpgrade DowngradeErrorMessage="(DowngradeError)" />
+    <MediaTemplate EmbedCab="yes" />
+
+    <Feature Id="FAll">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
+  </Fragment>
+
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component>
+        <File Name="fw.exe" Source="$(sys.SOURCEFILEPATH)">
+          <Shortcut Id="FwShortcut" Directory="INSTALLFOLDER" Name="Firewall" />
+          <fw:FirewallException Id="ExampleFirewall" Description="An app-based firewall exception" Name="ExampleApp" Port="42">
+              <fw:RemoteAddress Value="Defaultgateway" />
+              <fw:RemoteAddress Value="DHCP" />
+              <fw:RemoteAddress Value="DNS" />
+              <fw:RemoteAddress Value="255.255.255.0" />
+              <fw:RemoteAddress Value="1.1.1.1-2.2.2.2" />
+          </fw:FirewallException>
+        </File>
+
+        <fw:FirewallException Description="A port-based firewall exception" Name="ExamplePort" Port="42" Outbound="yes" Scope="localSubnet" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/ext/Firewall/wixext/FirewallDecompiler.cs b/src/ext/Firewall/wixext/FirewallDecompiler.cs
index 4fafc0a0..dbfc882e 100644
--- a/src/ext/Firewall/wixext/FirewallDecompiler.cs
+++ b/src/ext/Firewall/wixext/FirewallDecompiler.cs
@@ -4,8 +4,6 @@ namespace WixToolset.Firewall
 {
     using System;
     using System.Collections.Generic;
-    using System.Reflection;
-    using System.Security;
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
@@ -83,7 +81,7 @@ namespace WixToolset.Firewall
                     string[] addresses = ((string)row[2]).Split(',');
                     if (addresses.Length == 1)
                     {
-                        switch(addresses[0])
+                        switch (addresses[0])
                         {
                             case "*":
                                 firewallException.Add(new XAttribute("Scope", "any"));
@@ -482,20 +480,25 @@ namespace WixToolset.Firewall
         /// <param name="tables">Collection of all tables.</param>
         private void FinalizeFirewallExceptionTable(TableIndexedCollection tables)
         {
-            if (tables.TryGetTable("Wix5FirewallException", out var firewallExceptionTable))
+            var possibleTableNames = new List<string>() { "WixFirewallException", "Wix4FirewallException", "Wix5FirewallException", };
+
+            foreach (var tableName in possibleTableNames)
             {
-                foreach (var row in firewallExceptionTable.Rows)
+                if (tables.TryGetTable(tableName, out var firewallExceptionTable))
                 {
-                    var xmlConfig = this.DecompilerHelper.GetIndexedElement(row);
-
-                    var componentId = row.FieldAsString(8);
-                    if (this.DecompilerHelper.TryGetIndexedElement("Component", componentId, out var component))
-                    {
-                        component.Add(xmlConfig);
-                    }
-                    else
+                    foreach (var row in firewallExceptionTable.Rows)
                     {
-                        this.Messaging.Write(WarningMessages.ExpectedForeignRow(row.SourceLineNumbers, firewallExceptionTable.Name, row.GetPrimaryKey(), "Component_", componentId, "Component"));
+                        var xmlConfig = this.DecompilerHelper.GetIndexedElement(row);
+
+                        var componentId = row.FieldAsString(8);
+                        if (this.DecompilerHelper.TryGetIndexedElement("Component", componentId, out var component))
+                        {
+                            component.Add(xmlConfig);
+                        }
+                        else
+                        {
+                            this.Messaging.Write(WarningMessages.ExpectedForeignRow(row.SourceLineNumbers, firewallExceptionTable.Name, row.GetPrimaryKey(), "Component_", componentId, "Component"));
+                        }
                     }
                 }
             }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index ebf0ae8c..7e28df5d 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -2852,15 +2852,16 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                         break;
 
                     default:
-                        if (this.ExtensionsByTableName.TryGetValue(table.Name, out var extension))
-                        {
-                            extension.TryDecompileTable(table);
-                        }
-                        else if (!this.SuppressCustomTables)
+                    {
+                        var decompiled = this.Extensions.FirstOrDefault(x => x.TryDecompileTable(table)) != null;
+
+                        if (!decompiled && !this.SuppressCustomTables)
                         {
                             this.DecompileCustomTable(table);
                         }
+
                         break;
+                    }
                 }
             }
         }