Add support for ExtensionSearches.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/engine/manifest.cpp b/src/engine/manifest.cpp
index a20f1980..8783b15e 100644
--- a/src/engine/manifest.cpp
+++ b/src/engine/manifest.cpp
@@ -80,14 +80,18 @@ extern "C" HRESULT ManifestLoadXmlFromBuffer(
     hr = VariablesParseFromXml(&pEngineState->variables, pixeBundle);
     ExitOnFailure(hr, "Failed to parse variables.");
 
-    // parse searches
-    hr = SearchesParseFromXml(&pEngineState->searches, pixeBundle); // TODO: Modularization
-    ExitOnFailure(hr, "Failed to parse searches.");
-
     // parse user experience
     hr = UserExperienceParseFromXml(&pEngineState->userExperience, pixeBundle);
     ExitOnFailure(hr, "Failed to parse user experience.");
 
+    // parse extensions
+    hr = BurnExtensionParseFromXml(&pEngineState->extensions, &pEngineState->userExperience.payloads, pixeBundle);
+    ExitOnFailure(hr, "Failed to parse extensions.");
+
+    // parse searches
+    hr = SearchesParseFromXml(&pEngineState->searches, &pEngineState->extensions, pixeBundle);
+    ExitOnFailure(hr, "Failed to parse searches.");
+
     // parse catalog files
     hr = CatalogsParseFromXml(&pEngineState->catalogs, pixeBundle);
     ExitOnFailure(hr, "Failed to parse catalog files.");
@@ -116,10 +120,6 @@ extern "C" HRESULT ManifestLoadXmlFromBuffer(
     hr = ApprovedExesParseFromXml(&pEngineState->approvedExes, pixeBundle);
     ExitOnFailure(hr, "Failed to parse approved exes.");
 
-    // parse extensions
-    hr = BurnExtensionParseFromXml(&pEngineState->extensions, &pEngineState->userExperience.payloads, pixeBundle);
-    ExitOnFailure(hr, "Failed to parse extensions.");
-
 LExit:
     ReleaseObject(pixnChain);
     ReleaseObject(pixnLog);