Fix decompilation for TARGETDIR-rooted components.

Also ensure modularization Guid is decompiled.

4 files changed, 22 insertions, 9 deletions

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 0b45a8b3..9c338293 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -767,6 +767,13 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
             // set the component keypaths
             if (null != componentTable)
             {
+                // Add the TARGETDIR StandardDirectory if a component is directly parented there.
+                if (componentTable.Rows.Any(row => row.FieldAsString(2) == "TARGETDIR")
+                    && this.TryGetIndexedElement("Directory", out var xDirectory, "TARGETDIR"))
+                {
+                    this.RootElement.Add(xDirectory);
+                }
+
                 foreach (var row in componentTable.Rows)
                 {
                     var attributes = row.FieldAsInteger(3);
@@ -2449,6 +2456,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                 var table = tables["_SummaryInformation"];
                 var row = table.Rows.SingleOrDefault(r => r.FieldAsInteger(0) == 9);
                 this.ModularizationGuid = row?.FieldAsString(1);
+                this.RootElement.SetAttributeValue("Guid", this.ModularizationGuid);
             }
 
             // index the rows from the extension libraries
@@ -4352,7 +4360,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
 
                 if (id == "TARGETDIR")
                 {
-                    // Skip TARGETDIR (but see below!).
+                    // Skip TARGETDIR -- but it will be added for any components directly targeted.
                 }
                 else if (row.IsColumnNull(1) || WindowsInstallerStandard.IsStandardDirectory(id))
                 {
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
index ab04da15..e87bbfee 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
@@ -24,9 +24,9 @@ namespace WixToolsetTest.CoreIntegration
                     Path.Combine(folder, msiName),
                     "-intermediateFolder", intermediateFolder,
                     "-o", outputPath
-                });
+                }, out var messages);
 
-                result.AssertSuccess();
+                Assert.Equal(0, result);
 
                 WixAssert.CompareXml(Path.Combine(folder, expectedWxsName), outputPath);
             }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs
index 7c5fe3cf..4a89f56b 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/Expected.wxs
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" InstallerVersion="200">
-      <Directory Id="MergeRedirectFolder">
-        <Component Id="ModuleComponent2" Guid="{BB222EE8-229B-4051-9443-49E348F0CC77}" Bitness="always32">
-          <File Id="File2" ShortName="sfmxqeab.wxs" Name="MergeModule.wxs" KeyPath="yes" Source="SourceDir\File\File2.F844F0E3_8CB4_4A0F_973E_31C4F9338382" />
-        </Component>
-      </Directory>
+  <Module Codepage="65001" Id="MergeModule1" Language="1033" Version="1.0.0.0" InstallerVersion="200" Guid="{F844F0E3-8CB4-4A0F-973E-31C4F9338382}">
     <StandardDirectory Id="ProgramFilesFolder">
       <Directory Id="WixTestDir" ShortName="7bhhvaai" Name="WiX Toolset Test Directory">
         <Component Id="ModuleComponent1" Guid="{D86EC5A2-9576-4699-BDC3-00586FF72CBE}" Bitness="always32">
@@ -13,6 +8,16 @@
         </Component>
       </Directory>
     </StandardDirectory>
+    <Directory Id="MergeRedirectFolder">
+      <Component Id="ModuleComponent2" Guid="{BB222EE8-229B-4051-9443-49E348F0CC77}" Bitness="always32">
+        <File Id="File2" ShortName="sfmxqeab.wxs" Name="MergeModule.wxs" KeyPath="yes" Source="SourceDir\File\File2.F844F0E3_8CB4_4A0F_973E_31C4F9338382" />
+      </Component>
+    </Directory>
     <SummaryInformation Description="MergeModule1" Manufacturer="WiX Toolset contributors" />
+    <StandardDirectory Id="TARGETDIR">
+      <Component Id="ModuleComponent3" Guid="{63A2B2B1-32BE-46FF-8863-4C85A2745F62}" Bitness="always32">
+        <RegistryValue KeyPath="yes" Id="Reg1" Root="HKLM" Key="SOFTWARE\WiX Toolset\MergeModuleDecompileTest" Name="DoesntReallyMatter" Value="Hello" Type="string" />
+      </Component>
+    </StandardDirectory>
   </Module>
 </Wix>
\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm
index 2a7b5e3a..a09cab20 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DecompileTargetDirMergeModule/MergeModule1.msm