From dda4a326407eb8a0fb5d094ee1e2b5b85d419042 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 26 Nov 2019 08:24:48 +1000
Subject: Fix decompiling multiple AppSearches with nested searches.

---
 .../DecompiledNestedDirSearchUnderRegSearch.wxs    |  21 ++++++++++++++++++++-
 .../AppSearch/NestedDirSearchUnderRegSearch.msi    | Bin 36864 -> 33045 bytes
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/test')

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
Binary files a/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi and b/src/test/WixToolsetTest.CoreIntegration/TestData/AppSearch/NestedDirSearchUnderRegSearch.msi differ
-- 
cgit v1.2.3-55-g6feb