From 0d3d54992104288e9ee0c834d0b96e8502fd2d42 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 11 Jan 2024 18:26:20 -0800 Subject: Move the BootstrapperApplication out of proc --- src/api/burn/balutil/balinfo.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/api/burn/balutil/balinfo.cpp') diff --git a/src/api/burn/balutil/balinfo.cpp b/src/api/burn/balutil/balinfo.cpp index 751ba4f1..6f609a40 100644 --- a/src/api/burn/balutil/balinfo.cpp +++ b/src/api/burn/balutil/balinfo.cpp @@ -223,7 +223,6 @@ LExit: DAPI_(HRESULT) BalInfoAddUpdateBundleAsPackage( __in BAL_INFO_PACKAGES* pPackages, __in_z LPCWSTR wzId, - __in_z LPCWSTR /*wzPreviousId*/, __out_opt BAL_INFO_PACKAGE** ppPackage ) { @@ -356,7 +355,7 @@ DAPI_(HRESULT) BalSetOverridableVariablesFromEngine( LPCWSTR wzVariableValue = pCommand->rgVariableValues[i]; hr = DictGetValue(pOverridableVariables->sdVariables, wzVariableName, reinterpret_cast(&pOverridableVariable)); - if (E_NOTFOUND == hr) + if (E_NOTFOUND == hr || E_INVALIDARG == hr) { BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to set non-overridable variable: '%ls'.", wzVariableName); hr = S_OK; @@ -549,16 +548,16 @@ static HRESULT ParseBalPackageInfoFromXml( } ExitOnFailure(hr, "Failed to parse all WixBalPackageInfo elements."); - hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixMbaPrereqInformation", &pNodeList); + hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixPrereqInformation", &pNodeList); ExitOnFailure(hr, "Failed to select all packages."); while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL))) { hr = XmlGetAttributeEx(pNode, L"PackageId", &scz); - ExitOnRequiredXmlQueryFailure(hr, "Failed to get package identifier for WixMbaPrereqInformation."); + ExitOnRequiredXmlQueryFailure(hr, "Failed to get package identifier for WixPrereqInformation."); hr = BalInfoFindPackageById(pPackages, scz, &pPackage); - ExitOnFailure(hr, "Failed to find package specified in WixMbaPrereqInformation: %ls", scz); + ExitOnFailure(hr, "Failed to find package specified in WixPrereqInformation: %ls", scz); pPackage->fPrereqPackage = TRUE; @@ -570,7 +569,7 @@ static HRESULT ParseBalPackageInfoFromXml( ReleaseNullObject(pNode); } - ExitOnFailure(hr, "Failed to parse all WixMbaPrereqInformation elements."); + ExitOnFailure(hr, "Failed to parse all WixPrereqInformation elements."); if (S_FALSE == hr) { -- cgit v1.2.3-55-g6feb