Fix MsiLockPermissionsEx decompilation.bob/DecompileMsiLockPermissionsEx

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

8 files changed, 120 insertions, 3 deletions

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 7e28df5d..9cc3d88e 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -1444,12 +1444,13 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
         /// </remarks>
         private void FinalizePermissionsTable(TableIndexedCollection tables, string tableName)
         {
-            var createFoldersById = this.IndexTableOneToMany(tables, tableName);
+            var createFoldersById = this.IndexTableOneToMany(tables, "CreateFolder");
+            var msiLockPermissionsEx = tableName == "MsiLockPermissionsEx";
 
             foreach (var row in tables[tableName]?.Rows ?? Enumerable.Empty<Row>())
             {
-                var id = row.FieldAsString(0);
-                var table = row.FieldAsString(1);
+                var id = row.FieldAsString(msiLockPermissionsEx ? 1 : 0);
+                var table = row.FieldAsString(msiLockPermissionsEx ? 2 : 1);
                 var xPermission = this.DecompilerHelper.GetIndexedElement(row);
 
                 if ("CreateFolder" == table)
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
index 86da7ebd..b9d14ed9 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
@@ -108,6 +108,18 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanDecompileMsiLockPermissionsEx()
+        {
+            DecompileAndCompare("MsiLockPermissionsEx.msi", extract: false, "MsiLockPermissionsEx_expected.wxs", "TestData", "Decompile");
+        }
+
+        [Fact]
+        public void CanDecompileLockPermissions()
+        {
+            DecompileAndCompare("LockPermissions.msi", extract: false, "LockPermissions_expected.wxs", "TestData", "Decompile");
+        }
+
+        [Fact]
         public void CanDecompileMergeModuleWithKeepModularizationIds()
         {
             using (var fs = new DisposableFileSystem())
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions.msi b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions.msi
new file mode 100644
index 00000000..510990ac
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions.msi
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions_expected.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions_expected.wxs
new file mode 100644
index 00000000..253f2cda
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions_expected.wxs
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Codepage="65001" Id="Acme.HelloWorld" Manufacturer="Acme" ProductCode="{AC257DA2-5CFB-42E6-9392-E96BFE70EBBE}" Language="0" Name="HelloWorld" Version="6.0.0" UpgradeCode="{002C7487-6DD2-5C30-9445-8D02984AC904}">
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="INSTALLFOLDER" ShortName="fwpsjck5" Name="Acme HelloWorld">
+        <Directory Id="dRmny_KvyDONxhM5Hhb1TRAHxI2Y" Name="Blargh" />
+        <Component Id="nkf88TB7NualpER94lroZ5_cgKEJZk" Guid="{F89F8234-8CBF-5EB3-AE62-71C2F5EA966C}" Bitness="always32" Condition="INSTALLCOOLFONTS">
+          <File Id="nkf88TB7NualpER94lroZ5_cgKEJZk" ShortName="uj0jcrbw.wxs" Name="LockPermissions_src.wxs" FontTitle="Helvetibob Bold Oblique" KeyPath="yes" Source="SourceDir\File\nkf88TB7NualpER94lroZ5_cgKEJZk">
+            <Permission User="Bob" Write="yes" WriteAttributes="yes" Delete="yes" />
+          </File>
+        </Component>
+        <Component Id="Permissions" Guid="{9E0E9393-9F96-48D1-991E-A99EDAE3F345}" Bitness="always32">
+          <CreateFolder Directory="dRmny_KvyDONxhM5Hhb1TRAHxI2Y">
+            <Permission User="Bob" CreateFile="yes" CreateChild="yes" Delete="yes" />
+          </CreateFolder>
+          <RegistryValue Id="regWNla9n07njmsmnBd7dVCQVPibZM" Key="SOFTWARE\Acme\HelloWorld" Name="EnvironmentVariables" Root="HKLM" Type="integer" Value="1" KeyPath="yes">
+            <Permission User="Bob" Write="yes" Delete="yes" />
+          </RegistryValue>
+        </Component>
+      </Directory>
+    </StandardDirectory>
+    <StandardDirectory Id="ProgramFilesFolder" />
+    <Feature Id="WixDefaultFeature" Level="1" Display="hidden">
+      <ComponentRef Id="nkf88TB7NualpER94lroZ5_cgKEJZk" />
+      <ComponentRef Id="Permissions" />
+    </Feature>
+    <Media Id="1" EmbedCab="yes" Cabinet="cab1.cab" />
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+  </Package>
+</Wix>
\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions_src.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions_src.wxs
new file mode 100644
index 00000000..dcb2fd50
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/LockPermissions_src.wxs
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+        <Package Id="Acme.HelloWorld" Name="HelloWorld" Version="6.0.0" Manufacturer="Acme">
+                <MediaTemplate EmbedCab="yes" />
+
+                <File Source="$(sys.SOURCEFILEPATH)" FontTitle="Helvetibob Bold Oblique" Condition="INSTALLCOOLFONTS">
+      <Permission User="Bob" Write="yes" WriteAttributes="yes" Delete="yes" />
+                </File>
+
+                <Component Id="Permissions" Guid="{9E0E9393-9F96-48D1-991E-A99EDAE3F345}">
+                        <RegistryKey Root="HKLM" Key="SOFTWARE\Acme\HelloWorld">
+                                <RegistryValue Name="EnvironmentVariables" Value="1" Type="integer" KeyPath="yes">
+          <Permission User="Bob" Write="yes" Delete="yes" />
+                                </RegistryValue>
+                        </RegistryKey>
+
+                        <CreateFolder Subdirectory="Blargh">
+                                <Permission User="Bob" CreateChild="yes" CreateFile="yes" Delete="yes" />
+                        </CreateFolder>
+                </Component>
+        </Package>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx.msi b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx.msi
new file mode 100644
index 00000000..e117dcc3
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx.msi
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx_expected.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx_expected.wxs
new file mode 100644
index 00000000..7cf9df67
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx_expected.wxs
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Codepage="65001" Id="Acme.HelloWorld" Manufacturer="Acme" ProductCode="{6068AC19-D69C-4862-8A30-05EDBDA2AE84}" Language="0" Name="HelloWorld" Version="6.0.0" UpgradeCode="{002C7487-6DD2-5C30-9445-8D02984AC904}">
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="INSTALLFOLDER" ShortName="fwpsjck5" Name="Acme HelloWorld">
+        <Directory Id="dRmny_KvyDONxhM5Hhb1TRAHxI2Y" Name="Blargh" />
+        <Component Id="nkf.QewusgIMYDSgIl11WJ5JrljyXg" Guid="{98E2424B-98B4-5561-AAFF-87374A41B6DA}" Bitness="always32" Condition="INSTALLCOOLFONTS">
+          <File Id="nkf.QewusgIMYDSgIl11WJ5JrljyXg" ShortName="kot60v3u.wxs" Name="MsiLockPermissionsEx_src.wxs" FontTitle="Helvetibob Bold Oblique" KeyPath="yes" Source="SourceDir\File\nkf.QewusgIMYDSgIl11WJ5JrljyXg">
+            <PermissionEx Id="pmeWXloTBzPOCqmZnvaF6EFmtnWGyg" Sddl="asdf" Condition="INSTALLCOOLFONTSWITHPERMISSIONS" />
+          </File>
+        </Component>
+        <Component Id="Permissions" Guid="{9E0E9393-9F96-48D1-991E-A99EDAE3F345}" Bitness="always32">
+          <CreateFolder Directory="dRmny_KvyDONxhM5Hhb1TRAHxI2Y">
+            <PermissionEx Id="pmeIGYDv2CC.loRcT25hwAabyEVb1k" Sddl="zxcv" />
+          </CreateFolder>
+          <RegistryValue Id="regWNla9n07njmsmnBd7dVCQVPibZM" Key="SOFTWARE\Acme\HelloWorld" Name="EnvironmentVariables" Root="HKLM" Type="integer" Value="1" KeyPath="yes">
+            <PermissionEx Id="pmeAxeHnEF3Y.VKHIK5m8RywpU1Jz0" Sddl="qwer" />
+          </RegistryValue>
+        </Component>
+      </Directory>
+    </StandardDirectory>
+    <StandardDirectory Id="ProgramFilesFolder" />
+    <Feature Id="WixDefaultFeature" Level="1" Display="hidden">
+      <ComponentRef Id="nkf.QewusgIMYDSgIl11WJ5JrljyXg" />
+      <ComponentRef Id="Permissions" />
+    </Feature>
+    <Media Id="1" EmbedCab="yes" Cabinet="cab1.cab" />
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+  </Package>
+</Wix>
\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx_src.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx_src.wxs
new file mode 100644
index 00000000..9ffc7b56
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/MsiLockPermissionsEx_src.wxs
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+        <Package Id="Acme.HelloWorld" Name="HelloWorld" Version="6.0.0" Manufacturer="Acme">
+                <MediaTemplate EmbedCab="yes" />
+
+                <File Source="$(sys.SOURCEFILEPATH)" FontTitle="Helvetibob Bold Oblique" Condition="INSTALLCOOLFONTS">
+                        <PermissionEx Condition="INSTALLCOOLFONTSWITHPERMISSIONS" Sddl="asdf" />
+                </File>
+
+                <Component Id="Permissions" Guid="{9E0E9393-9F96-48D1-991E-A99EDAE3F345}">
+                        <RegistryKey Root="HKLM" Key="SOFTWARE\Acme\HelloWorld">
+                                <RegistryValue Name="EnvironmentVariables" Value="1" Type="integer" KeyPath="yes">
+                                        <PermissionEx Sddl="qwer" />
+                                </RegistryValue>
+                        </RegistryKey>
+
+                        <CreateFolder Subdirectory="Blargh">
+                                <PermissionEx Sddl="zxcv" />
+                        </CreateFolder>
+                </Component>
+        </Package>
+</Wix>