diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-01-17 20:15:48 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-01-17 20:26:04 -0600 |
| commit | 32fce16069d47fbf7e08414e9fd31e2a09968395 (patch) | |
| tree | bdcb69a9b0f1d5d54ca2daf40b80f0a208ddb4cc /src/engine | |
| parent | 5bab3f6ae97b62bb6e79378010c08a13e48fde5a (diff) | |
| download | wix-32fce16069d47fbf7e08414e9fd31e2a09968395.tar.gz wix-32fce16069d47fbf7e08414e9fd31e2a09968395.tar.bz2 wix-32fce16069d47fbf7e08414e9fd31e2a09968395.zip | |
Update PlanTest to use manifests created by latest v4.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/manifest.cpp | 6 | ||||
| -rw-r--r-- | src/engine/manifest.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/manifest.cpp b/src/engine/manifest.cpp index 270b6b74..fe8c6cad 100644 --- a/src/engine/manifest.cpp +++ b/src/engine/manifest.cpp | |||
| @@ -10,8 +10,8 @@ static HRESULT ParseFromXml( | |||
| 10 | 10 | ||
| 11 | // function definitions | 11 | // function definitions |
| 12 | 12 | ||
| 13 | extern "C" HRESULT ManifestLoadXml( | 13 | extern "C" HRESULT ManifestLoadXmlFromFile( |
| 14 | __in LPCWSTR wzDocument, | 14 | __in LPCWSTR wzPath, |
| 15 | __in BURN_ENGINE_STATE* pEngineState | 15 | __in BURN_ENGINE_STATE* pEngineState |
| 16 | ) | 16 | ) |
| 17 | { | 17 | { |
| @@ -19,7 +19,7 @@ extern "C" HRESULT ManifestLoadXml( | |||
| 19 | IXMLDOMDocument* pixdDocument = NULL; | 19 | IXMLDOMDocument* pixdDocument = NULL; |
| 20 | 20 | ||
| 21 | // load xml document | 21 | // load xml document |
| 22 | hr = XmlLoadDocument(wzDocument, &pixdDocument); | 22 | hr = XmlLoadDocumentFromFile(wzPath, &pixdDocument); |
| 23 | ExitOnFailure(hr, "Failed to load manifest as XML document."); | 23 | ExitOnFailure(hr, "Failed to load manifest as XML document."); |
| 24 | 24 | ||
| 25 | hr = ParseFromXml(pixdDocument, pEngineState); | 25 | hr = ParseFromXml(pixdDocument, pEngineState); |
diff --git a/src/engine/manifest.h b/src/engine/manifest.h index 223181d9..8c527279 100644 --- a/src/engine/manifest.h +++ b/src/engine/manifest.h | |||
| @@ -11,8 +11,8 @@ extern "C" { | |||
| 11 | 11 | ||
| 12 | // function declarations | 12 | // function declarations |
| 13 | 13 | ||
| 14 | HRESULT ManifestLoadXml( | 14 | HRESULT ManifestLoadXmlFromFile( |
| 15 | __in LPCWSTR wzDocument, | 15 | __in LPCWSTR wzPath, |
| 16 | __in BURN_ENGINE_STATE* pEngineState | 16 | __in BURN_ENGINE_STATE* pEngineState |
| 17 | ); | 17 | ); |
| 18 | 18 | ||