Add ability to disable file system redirection for File/DirectorySearch

Fixes 5476

3 files changed, 126 insertions, 1 deletions

diff --git a/src/burn/engine/search.cpp b/src/burn/engine/search.cpp
index a57e703e..f521cdbd 100644
--- a/src/burn/engine/search.cpp
+++ b/src/burn/engine/search.cpp
@@ -139,6 +139,10 @@ extern "C" HRESULT SearchesParseFromXml(
             hr = XmlGetAttributeEx(pixnNode, L"Path", &pSearch->FileSearch.sczPath);
             ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Path.");
 
+            // @DisableFileRedirection
+            hr = XmlGetYesNoAttribute(pixnNode, L"DisableFileRedirection", &pSearch->FileSearch.fDisableFileRedirection);
+            ExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get DisableFileRedirection attribute.");
+
             // @Type
             hr = XmlGetAttributeEx(pixnNode, L"Type", &scz);
             ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Type.");
@@ -557,6 +561,49 @@ extern "C" void SearchesUninitialize(
 
 // internal function definitions
 
+#if !defined(_WIN64)
+
+typedef struct _BURN_FILE_SEARCH
+{
+    BURN_SEARCH* pSearch;
+    PROC_FILESYSTEMREDIRECTION pfsr;
+} BURN_FILE_SEARCH;
+
+static HRESULT FileSystemSearchStart(
+    __in BURN_FILE_SEARCH* pFileSearch
+    )
+{
+    HRESULT hr = S_OK;
+
+    if (pFileSearch->pSearch->FileSearch.fDisableFileRedirection)
+    {
+        hr = ProcDisableWowFileSystemRedirection(&pFileSearch->pfsr);
+        if (hr == E_NOTIMPL)
+        {
+            hr = S_FALSE;
+        }
+        ExitOnFailure(hr, "Failed to disable file system redirection.");
+    }
+
+LExit:
+    return hr;
+}
+
+static void FileSystemSearchEnd(
+    __in BURN_FILE_SEARCH* pFileSearch
+    )
+{
+    HRESULT hr = S_OK;
+
+    hr = ProcRevertWowFileSystemRedirection(&pFileSearch->pfsr);
+    ExitOnFailure(hr, "Failed to revert file system redirection.");
+
+LExit:
+    return;
+}
+
+#endif
+
 static HRESULT DirectorySearchExists(
     __in BURN_SEARCH* pSearch,
     __in BURN_VARIABLES* pVariables
@@ -566,6 +613,15 @@ static HRESULT DirectorySearchExists(
     LPWSTR sczPath = NULL;
     BOOL fExists = FALSE;
 
+#if !defined(_WIN64)
+    BURN_FILE_SEARCH bfs = { };
+
+    bfs.pSearch = pSearch;
+
+    hr = FileSystemSearchStart(&bfs);
+    ExitOnFailure(hr, "Failed to initialize file search.");
+#endif
+
     // format path
     hr = VariableFormatString(pVariables, pSearch->DirectorySearch.sczPath, &sczPath, NULL);
     ExitOnFailure(hr, "Failed to format variable string.");
@@ -593,6 +649,10 @@ static HRESULT DirectorySearchExists(
     ExitOnFailure(hr, "Failed to set variable.");
 
 LExit:
+#if !defined(_WIN64)
+    FileSystemSearchEnd(&bfs);
+#endif
+
     StrSecureZeroFreeString(sczPath);
 
     return hr;
@@ -606,6 +666,15 @@ static HRESULT DirectorySearchPath(
     HRESULT hr = S_OK;
     LPWSTR sczPath = NULL;
 
+#if !defined(_WIN64)
+    BURN_FILE_SEARCH bfs = { };
+
+    bfs.pSearch = pSearch;
+
+    hr = FileSystemSearchStart(&bfs);
+    ExitOnFailure(hr, "Failed to initialize file search.");
+#endif
+
     // format path
     hr = VariableFormatString(pVariables, pSearch->DirectorySearch.sczPath, &sczPath, NULL);
     ExitOnFailure(hr, "Failed to format variable string.");
@@ -634,6 +703,10 @@ static HRESULT DirectorySearchPath(
     ExitOnFailure(hr, "Failed while searching directory search: %ls, for path: %ls", pSearch->sczKey, sczPath);
 
 LExit:
+#if !defined(_WIN64)
+    FileSystemSearchEnd(&bfs);
+#endif
+
     StrSecureZeroFreeString(sczPath);
 
     return hr;
@@ -649,6 +722,15 @@ static HRESULT FileSearchExists(
     LPWSTR sczPath = NULL;
     BOOL fExists = FALSE;
 
+#if !defined(_WIN64)
+    BURN_FILE_SEARCH bfs = { };
+
+    bfs.pSearch = pSearch;
+
+    hr = FileSystemSearchStart(&bfs);
+    ExitOnFailure(hr, "Failed to initialize file search.");
+#endif
+
     // format path
     hr = VariableFormatString(pVariables, pSearch->FileSearch.sczPath, &sczPath, NULL);
     ExitOnFailure(hr, "Failed to format variable string.");
@@ -665,7 +747,7 @@ static HRESULT FileSearchExists(
         }
         else
         {
-            ExitOnWin32Error(er, hr, "Failed get to file attributes. '%ls'", pSearch->DirectorySearch.sczPath);
+            ExitOnWin32Error(er, hr, "Failed get to file attributes. '%ls'", pSearch->FileSearch.sczPath);
         }
     }
     else if (FILE_ATTRIBUTE_DIRECTORY != (dwAttributes & FILE_ATTRIBUTE_DIRECTORY))
@@ -678,6 +760,10 @@ static HRESULT FileSearchExists(
     ExitOnFailure(hr, "Failed to set variable.");
 
 LExit:
+#if !defined(_WIN64)
+    FileSystemSearchEnd(&bfs);
+#endif
+
     StrSecureZeroFreeString(sczPath);
     return hr;
 }
@@ -692,6 +778,15 @@ static HRESULT FileSearchVersion(
     LPWSTR sczPath = NULL;
     VERUTIL_VERSION* pVersion = NULL;
 
+#if !defined(_WIN64)
+    BURN_FILE_SEARCH bfs = { };
+
+    bfs.pSearch = pSearch;
+
+    hr = FileSystemSearchStart(&bfs);
+    ExitOnFailure(hr, "Failed to initialize file search.");
+#endif
+
     // format path
     hr = VariableFormatString(pVariables, pSearch->FileSearch.sczPath, &sczPath, NULL);
     ExitOnFailure(hr, "Failed to format path string.");
@@ -714,6 +809,10 @@ static HRESULT FileSearchVersion(
     ExitOnFailure(hr, "Failed to set variable.");
 
 LExit:
+#if !defined(_WIN64)
+    FileSystemSearchEnd(&bfs);
+#endif
+
     StrSecureZeroFreeString(sczPath);
     ReleaseVerutilVersion(pVersion);
     return hr;
@@ -727,6 +826,15 @@ static HRESULT FileSearchPath(
     HRESULT hr = S_OK;
     LPWSTR sczPath = NULL;
 
+#if !defined(_WIN64)
+    BURN_FILE_SEARCH bfs = { };
+
+    bfs.pSearch = pSearch;
+
+    hr = FileSystemSearchStart(&bfs);
+    ExitOnFailure(hr, "Failed to initialize file search.");
+#endif
+
     // format path
     hr = VariableFormatString(pVariables, pSearch->FileSearch.sczPath, &sczPath, NULL);
     ExitOnFailure(hr, "Failed to format variable string.");
@@ -755,6 +863,10 @@ static HRESULT FileSearchPath(
     ExitOnFailure(hr, "Failed while searching file search: %ls, for path: %ls", pSearch->sczKey, sczPath);
 
 LExit:
+#if !defined(_WIN64)
+    FileSystemSearchEnd(&bfs);
+#endif
+
     StrSecureZeroFreeString(sczPath);
 
     return hr;
diff --git a/src/burn/engine/search.h b/src/burn/engine/search.h
index bc53f197..341fe1aa 100644
--- a/src/burn/engine/search.h
+++ b/src/burn/engine/search.h
@@ -88,6 +88,7 @@ typedef struct _BURN_SEARCH
         {
             BURN_FILE_SEARCH_TYPE Type;
             LPWSTR sczPath;
+            BOOL fDisableFileRedirection;
         } FileSearch;
         struct
         {
diff --git a/src/burn/test/BurnUnitTest/SearchTest.cpp b/src/burn/test/BurnUnitTest/SearchTest.cpp
index 7efbca2d..a8e397c2 100644
--- a/src/burn/test/BurnUnitTest/SearchTest.cpp
+++ b/src/burn/test/BurnUnitTest/SearchTest.cpp
@@ -129,6 +129,9 @@ namespace Bootstrapper
                     L"    <FileSearch Id='Search1' Type='exists' Path='[File1]' Variable='Variable1' />"
                     L"    <FileSearch Id='Search2' Type='exists' Path='[File2]' Variable='Variable2' />"
                     L"    <FileSearch Id='Search3' Type='version' Path='[File2]' Variable='Variable3' />"
+                    L"    <FileSearch Id='Search4' Type='exists' Path='[SystemFolder]\\consent.exe' Variable='Variable4' />"
+                    L"    <FileSearch Id='Search5' Type='exists' Path='[System64Folder]\\consent.exe' Variable='Variable5' DisableFileRedirection='no' />"
+                    L"    <FileSearch Id='Search6' Type='exists' Path='[System64Folder]\\consent.exe' Variable='Variable6' DisableFileRedirection='yes' />"
                     L"</Bundle>";
 
                 // load XML document
@@ -145,6 +148,15 @@ namespace Bootstrapper
                 Assert::Equal(0ll, VariableGetNumericHelper(&variables, L"Variable1"));
                 Assert::Equal(1ll, VariableGetNumericHelper(&variables, L"Variable2"));
                 Assert::Equal<String^>(gcnew String(pVersion->sczVersion), VariableGetVersionHelper(&variables, L"Variable3"));
+
+                // Assume that consent.exe continues to only exist in 64-bit system folder.
+                Assert::Equal(0ll, VariableGetNumericHelper(&variables, L"Variable4"));
+#if !defined(_WIN64)
+                Assert::Equal(0ll, VariableGetNumericHelper(&variables, L"Variable5"));
+#else
+                Assert::Equal(1ll, VariableGetNumericHelper(&variables, L"Variable5"));
+#endif
+                Assert::Equal(1ll, VariableGetNumericHelper(&variables, L"Variable6"));
             }
             finally
             {