From 8ec8f5b0091fce08be88acee1f49dbf2edf040a9 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 2 Mar 2021 17:26:47 -0600 Subject: Update dependencies and integrate changes. --- src/dnchost/dnchost.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'src/dnchost/dnchost.cpp') diff --git a/src/dnchost/dnchost.cpp b/src/dnchost/dnchost.cpp index 503537c0..8ca326fc 100644 --- a/src/dnchost/dnchost.cpp +++ b/src/dnchost/dnchost.cpp @@ -169,9 +169,6 @@ static HRESULT LoadDncConfiguration( HRESULT hr = S_OK; IXMLDOMDocument* pixdManifest = NULL; IXMLDOMNode* pixnHost = NULL; - IXMLDOMNode* pixnPayload = NULL; - LPWSTR sczPayloadId = NULL; - LPWSTR sczPayloadXPath = NULL; LPWSTR sczPayloadName = NULL; DWORD dwBool = 0; @@ -187,21 +184,8 @@ static HRESULT LoadDncConfiguration( BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config."); } - hr = XmlGetAttributeEx(pixnHost, L"PayloadId", &sczPayloadId); - BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@PayloadId."); - - hr = StrAllocFormatted(&sczPayloadXPath, L"/BootstrapperApplicationData/WixPayloadProperties[@Payload='%ls']", sczPayloadId); - BalExitOnFailure(hr, "Failed to format BAFactoryAssembly payload XPath."); - - hr = XmlSelectSingleNode(pixdManifest, sczPayloadXPath, &pixnPayload); - if (S_FALSE == hr) - { - hr = E_NOTFOUND; - } - BalExitOnFailure(hr, "Failed to find WixPayloadProperties node for BAFactoryAssembly PayloadId: %ls.", sczPayloadId); - - hr = XmlGetAttributeEx(pixnPayload, L"Name", &sczPayloadName); - BalExitOnFailure(hr, "Failed to get BAFactoryAssembly payload Name."); + hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName); + BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath."); hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); @@ -250,9 +234,6 @@ static HRESULT LoadDncConfiguration( LExit: ReleaseStr(sczPayloadName); - ReleaseObject(pixnPayload); - ReleaseStr(sczPayloadXPath); - ReleaseStr(sczPayloadId); ReleaseObject(pixnHost); ReleaseObject(pixdManifest); -- cgit v1.2.3-55-g6feb