1 files changed, 30 insertions, 1 deletions

diff --git a/src/engine/search.cpp b/src/engine/search.cpp
index c50790fd..763286fd 100644
--- a/src/engine/search.cpp
+++ b/src/engine/search.cpp
@@ -45,12 +45,16 @@ static HRESULT MsiFeatureSearch(
     __in BURN_SEARCH* pSearch,
     __in BURN_VARIABLES* pVariables
     );
+static HRESULT PerformExtensionSearch(
+    __in BURN_SEARCH* pSearch
+    );
 
 
 // function definitions
 
 extern "C" HRESULT SearchesParseFromXml(
     __in BURN_SEARCHES* pSearches,
+    __in BURN_EXTENSIONS* pBurnExtensions,
     __in IXMLDOMNode* pixnBundle
     )
 {
@@ -62,7 +66,7 @@ extern "C" HRESULT SearchesParseFromXml(
     LPWSTR scz = NULL;
 
     // select search nodes
-    hr = XmlSelectNodes(pixnBundle, L"DirectorySearch|FileSearch|RegistrySearch|MsiComponentSearch|MsiProductSearch|MsiFeatureSearch", &pixnNodes);
+    hr = XmlSelectNodes(pixnBundle, L"DirectorySearch|FileSearch|RegistrySearch|MsiComponentSearch|MsiProductSearch|MsiFeatureSearch|ExtensionSearch", &pixnNodes);
     ExitOnFailure(hr, "Failed to select search nodes.");
 
     // get search node count
@@ -373,6 +377,17 @@ extern "C" HRESULT SearchesParseFromXml(
                 ExitOnFailure(hr, "Invalid value for @Type: %ls", scz);
             }
         }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"ExtensionSearch", -1))
+        {
+            pSearch->Type = BURN_SEARCH_TYPE_EXTENSION;
+
+            // @ExtensionId
+            hr = XmlGetAttributeEx(pixnNode, L"ExtensionId", &scz);
+            ExitOnFailure(hr, "Failed to get @ExtensionId.");
+
+            hr = BurnExtensionFindById(pBurnExtensions, scz, &pSearch->ExtensionSearch.pExtension);
+            ExitOnFailure(hr, "Failed to find extension '%ls' for search '%ls'", scz, pSearch->sczKey);
+        }
         else
         {
             hr = E_UNEXPECTED;
@@ -477,6 +492,9 @@ extern "C" HRESULT SearchesExecute(
         case BURN_SEARCH_TYPE_MSI_FEATURE:
             hr = MsiFeatureSearch(pSearch, pVariables);
             break;
+        case BURN_SEARCH_TYPE_EXTENSION:
+            hr = PerformExtensionSearch(pSearch);
+            break;
         default:
             hr = E_UNEXPECTED;
         }
@@ -1193,3 +1211,14 @@ static HRESULT MsiFeatureSearch(
 
     return hr;
 }
+
+static HRESULT PerformExtensionSearch(
+    __in BURN_SEARCH* pSearch
+    )
+{
+    HRESULT hr = S_OK;
+
+    hr = BurnExtensionPerformSearch(pSearch->ExtensionSearch.pExtension, pSearch->sczKey, pSearch->sczVariable);
+
+    return hr;
+}