Fix decompiling multiple AppSearches with nested searches.

3 files changed, 35 insertions, 10 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 961e1a13..b1222d3d 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -2000,7 +2000,7 @@ namespace WixToolset.Core.WindowsInstaller
             var drLocators = new Hashtable();
             var locators = new Hashtable();
             var usedSearchElements = new Hashtable();
-            var unusedSearchElements = new ArrayList();
+            var unusedSearchElements = new Dictionary<string, Wix.IParentElement>();
 
             Wix.ComplianceCheck complianceCheck = null;
 
@@ -2131,6 +2131,7 @@ namespace WixToolset.Core.WindowsInstaller
                     }
                     else if ("DrLocator" == locatorRow.TableDefinition.Name && null != locatorRow[1])
                     {
+                        var drSearchElement = (Wix.DirectorySearch)searchElement;
                         var parentSignature = Convert.ToString(locatorRow[1]);
 
                         if ("CCP_DRIVE" == parentSignature)
@@ -2266,7 +2267,7 @@ namespace WixToolset.Core.WindowsInstaller
                                             }
 
                                             parentSearchElement = directorySeachRef;
-                                            unusedSearchElements.Add(directorySeachRef);
+                                            unusedSearchElements.Add(directorySeachRef.Id, directorySeachRef);
                                         }
 
                                         if (!usedSearchElements.Contains(searchElement))
@@ -2305,7 +2306,7 @@ namespace WixToolset.Core.WindowsInstaller
                                 // keep track of unused DrLocator rows
                                 if (!usedDrLocator)
                                 {
-                                    unusedSearchElements.Add(searchElement);
+                                    unusedSearchElements.Add(drSearchElement.Id, drSearchElement);
                                 }
                             }
                             else
@@ -2370,10 +2371,13 @@ namespace WixToolset.Core.WindowsInstaller
                     }
                     else
                     {
-                        if ("DrLocator" == locatorRow.TableDefinition.Name ||
-                            "RegLocator" == locatorRow.TableDefinition.Name)
+                        if (searchElement is Wix.DirectorySearch directorySearch)
                         {
-                            unusedSearchElements.Add(searchElement);
+                            unusedSearchElements.Add(directorySearch.Id, directorySearch);
+                        }
+                        else if (searchElement is Wix.RegistrySearch registrySearch)
+                        {
+                            unusedSearchElements.Add(registrySearch.Id, registrySearch);
                         }
                         else
                         {
@@ -2390,8 +2394,12 @@ namespace WixToolset.Core.WindowsInstaller
                 }
             }
 
-            foreach (Wix.IParentElement unusedSearchElement in unusedSearchElements)
+            // Iterate through the unused elements through a sorted list of their ids so the output is deterministic.
+            var unusedSearchElementKeys = unusedSearchElements.Keys.ToList();
+            unusedSearchElementKeys.Sort();
+            foreach (var unusedSearchElementKey in unusedSearchElementKeys)
             {
+                var unusedSearchElement = unusedSearchElements[unusedSearchElementKey];
                 var used = false;
 
                 Wix.DirectorySearch leafDirectorySearch = null;
@@ -2422,13 +2430,11 @@ namespace WixToolset.Core.WindowsInstaller
 
                         property.AddChild(unusedSearchSchemaElement);
                         used = true;
-                        break;
                     }
                     else if (ccpSearches.Contains(leafDirectorySearch.Id))
                     {
                         complianceCheck.AddChild(unusedSearchSchemaElement);
                         used = true;
-                        break;
                     }
                     else
                     {
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
index 6d78b2db..26649485 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="{F71CC1C8-8EDC-4FCD-8946-D92AE30B3ABE}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0">
+  <Product Id="{33C58183-7333-4257-AEFD-6705DA66E617}" Codepage="1252" Language="1033" Manufacturer="Example Corporation" Name="MsiPackage" UpgradeCode="{12E4699F-E774-4D05-8A01-5BDD41BBA127}" Version="1.0.0.0">
     <Package Description="MsiPackage" InstallerVersion="500" Languages="1033" Manufacturer="Example Corporation" Platform="x86" />
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
@@ -17,6 +17,25 @@
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <Media Id="1" />
     <Property Id="ALLUSERS" Value="1" />
+    <Property Id="SAMPLEREGFOUND">
+      <RegistrySearch Id="RegSearch" Root="HKLM" Key="Reg" Type="raw" Win64="no" />
+    </Property>
+    <Property Id="NESTEDDIRFOUND">
+      <RegistrySearch Id="ARegKeySearch" Root="HKLM" Key="ARegKey" Type="raw" Win64="no">
+        <DirectorySearch Id="TopDirSearch" Path="TopDir">
+          <DirectorySearch Id="SecondDirSearch" Path="SecondDir">
+            <DirectorySearch Id="ThirdDirSearch" Path="ThirdDir">
+              <DirectorySearch Id="FourthDirSearch" Path="FourthDir" />
+            </DirectorySearch>
+          </DirectorySearch>
+        </DirectorySearch>
+      </RegistrySearch>
+    </Property>
+    <Property Id="SAMPLENESTEDDIRFOUND">
+      <RegistrySearch Id="NestedRegSearch" Root="HKLM" Key="NestedReg" Type="raw" Win64="no">
+        <DirectorySearch Id="SampleNestedDirSearch" Path="NestedDir" />
+      </RegistrySearch>
+    </Property>
     <Property Id="SAMPLEDIRFOUND">
       <RegistrySearch Id="SubRegSearch" Root="HKLM" Key="SampleReg" Type="raw" Win64="no">
         <DirectorySearch Id="SampleDirSearch" Path="SampleDir">
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi
index 7e0f8060..ea1296c3 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi