Fix test CanDecompileNestedDirSearchUnderRegSearch.

3 files changed, 46 insertions, 24 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 5afaace9..961e1a13 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -2292,6 +2292,14 @@ namespace WixToolset.Core.WindowsInstaller
                                             usedDrLocator = true;
                                         }
                                     }
+                                    else if ("RegLocator" == parentLocatorRow.TableDefinition.Name)
+                                    {
+                                        var parentSearchElement = (Wix.IParentElement)this.core.GetIndexedElement(parentLocatorRow);
+
+                                        parentSearchElement.AddChild(searchElement);
+                                        usedSearchElements[searchElement] = null;
+                                        usedDrLocator = true;
+                                    }
                                 }
 
                                 // keep track of unused DrLocator rows
@@ -2362,7 +2370,8 @@ namespace WixToolset.Core.WindowsInstaller
                     }
                     else
                     {
-                        if ("DrLocator" == locatorRow.TableDefinition.Name)
+                        if ("DrLocator" == locatorRow.TableDefinition.Name ||
+                            "RegLocator" == locatorRow.TableDefinition.Name)
                         {
                             unusedSearchElements.Add(searchElement);
                         }
@@ -2385,32 +2394,45 @@ namespace WixToolset.Core.WindowsInstaller
             {
                 var used = false;
 
-                foreach (Wix.ISchemaElement schemaElement in unusedSearchElement.Children)
+                Wix.DirectorySearch leafDirectorySearch = null;
+                var parentElement = unusedSearchElement;
+                var updatedLeaf = true;
+                while (updatedLeaf)
                 {
-                    var directorySearch = schemaElement as Wix.DirectorySearch;
-                    if (null != directorySearch)
+                    updatedLeaf = false;
+                    foreach (var schemaElement in parentElement.Children)
                     {
-                        var appSearchProperties = (StringCollection)appSearches[directorySearch.Id];
-
-                        var unusedSearchSchemaElement = unusedSearchElement as Wix.ISchemaElement;
-                        if (null != appSearchProperties)
+                        if (schemaElement is Wix.DirectorySearch directorySearch)
                         {
-                            var property = this.EnsureProperty(appSearchProperties[0]);
-
-                            property.AddChild(unusedSearchSchemaElement);
-                            used = true;
+                            parentElement = leafDirectorySearch = directorySearch;
+                            updatedLeaf = true;
                             break;
                         }
-                        else if (ccpSearches.Contains(directorySearch.Id))
-                        {
-                            complianceCheck.AddChild(unusedSearchSchemaElement);
-                            used = true;
-                            break;
-                        }
-                        else
-                        {
-                            // TODO: warn
-                        }
+                    }
+                }
+
+                if (leafDirectorySearch != null)
+                {
+                    var appSearchProperties = (StringCollection)appSearches[leafDirectorySearch.Id];
+
+                    var unusedSearchSchemaElement = unusedSearchElement as Wix.ISchemaElement;
+                    if (null != appSearchProperties)
+                    {
+                        var property = this.EnsureProperty(appSearchProperties[0]);
+
+                        property.AddChild(unusedSearchSchemaElement);
+                        used = true;
+                        break;
+                    }
+                    else if (ccpSearches.Contains(leafDirectorySearch.Id))
+                    {
+                        complianceCheck.AddChild(unusedSearchSchemaElement);
+                        used = true;
+                        break;
+                    }
+                    else
+                    {
+                        // TODO: warn
                     }
                 }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
index 5765cdfa..9893a525 100644
--- a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
@@ -66,7 +66,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void CanDecompileNestedDirSearchUnderRegSearch()
         {
             var folder = TestData.Get(@"TestData\AppSearch");
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
index 94ddfe19..6d78b2db 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/DecompiledNestedDirSearchUnderRegSearch.wxs
@@ -18,7 +18,7 @@
     <Media Id="1" />
     <Property Id="ALLUSERS" Value="1" />
     <Property Id="SAMPLEDIRFOUND">
-      <RegistrySearch Id="SubRegSearch" Root="HKLM" Key="SampleReg" Type="raw">
+      <RegistrySearch Id="SubRegSearch" Root="HKLM" Key="SampleReg" Type="raw" Win64="no">
         <DirectorySearch Id="SampleDirSearch" Path="SampleDir">
           <DirectorySearch Id="SubDirSearch" Path="Subdir" />
         </DirectorySearch>