Store list of persisted well-known variables in Burn.

This allows it to reject Variables declared in the manifest that start with the reserved prefix 'Wix'.

1 files changed, 2 insertions, 20 deletions

diff --git a/src/burn/engine/manifest.cpp b/src/burn/engine/manifest.cpp
index 0cd10dbb..c0d67c19 100644
--- a/src/burn/engine/manifest.cpp
+++ b/src/burn/engine/manifest.cpp
@@ -67,31 +67,14 @@ static HRESULT ParseFromXml(
 {
     HRESULT hr = S_OK;
     IXMLDOMElement* pixeBundle = NULL;
-    IXMLDOMNode* pixnLog = NULL;
     IXMLDOMNode* pixnChain = NULL;
 
     // get bundle element
     hr = pixdDocument->get_documentElement(&pixeBundle);
     ExitOnFailure(hr, "Failed to get bundle element.");
 
-    // parse the log element, if present.
-    hr = XmlSelectSingleNode(pixeBundle, L"Log", &pixnLog);
-    ExitOnFailure(hr, "Failed to get Log element.");
-
-    if (S_OK == hr)
-    {
-        hr = XmlGetAttributeEx(pixnLog, L"PathVariable", &pEngineState->log.sczPathVariable);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed to get Log/@PathVariable.");
-        }
-
-        hr = XmlGetAttributeEx(pixnLog, L"Prefix", &pEngineState->log.sczPrefix);
-        ExitOnFailure(hr, "Failed to get Log/@Prefix attribute.");
-
-        hr = XmlGetAttributeEx(pixnLog, L"Extension", &pEngineState->log.sczExtension);
-        ExitOnFailure(hr, "Failed to get Log/@Extension attribute.");
-    }
+    hr = LoggingParseFromXml(&pEngineState->log, pixeBundle);
+    ExitOnFailure(hr, "Failed to parse logging.");
 
     // get the chain element
     hr = XmlSelectSingleNode(pixeBundle, L"Chain", &pixnChain);
@@ -167,7 +150,6 @@ static HRESULT ParseFromXml(
 
 LExit:
     ReleaseObject(pixnChain);
-    ReleaseObject(pixnLog);
     ReleaseObject(pixeBundle);
     return hr;
 }