From 92714e7949c41db4c17e6bd87c919ef4b3dc34f7 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Fri, 20 Feb 2026 19:18:23 -0500 Subject: Configurable-scope bundles for WixStdBA. Fixes https://github.com/wixtoolset/issues/issues/9234 Fixes https://github.com/wixtoolset/issues/issues/9235 --- src/burn/engine/plan.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/burn/engine/plan.cpp') diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp index 2257b28c..302c1857 100644 --- a/src/burn/engine/plan.cpp +++ b/src/burn/engine/plan.cpp @@ -284,7 +284,7 @@ extern "C" void PlanReset( } } - PlanSetVariables(BOOTSTRAPPER_ACTION_UNKNOWN, BOOTSTRAPPER_PACKAGE_SCOPE_INVALID, BOOTSTRAPPER_SCOPE_DEFAULT, pVariables); + PlanSetVariables(BOOTSTRAPPER_ACTION_UNKNOWN, BOOTSTRAPPER_SCOPE_DEFAULT, pVariables); } extern "C" void PlanUninitializeExecuteAction( @@ -338,7 +338,6 @@ extern "C" void PlanUninitializeExecuteAction( extern "C" HRESULT PlanSetVariables( __in BOOTSTRAPPER_ACTION action, - __in BOOTSTRAPPER_PACKAGE_SCOPE authoredScope, __in BOOTSTRAPPER_SCOPE plannedScope, __in BURN_VARIABLES* pVariables ) @@ -348,9 +347,6 @@ extern "C" HRESULT PlanSetVariables( hr = VariableSetNumeric(pVariables, BURN_BUNDLE_ACTION, action, TRUE); ExitOnFailure(hr, "Failed to set the bundle action built-in variable."); - hr = VariableSetNumeric(pVariables, BURN_BUNDLE_AUTHORED_SCOPE, authoredScope, TRUE); - ExitOnFailure(hr, "Failed to set the bundle authored scope built-in variable."); - hr = VariableSetNumeric(pVariables, BURN_BUNDLE_PLANNED_SCOPE, plannedScope, TRUE); ExitOnFailure(hr, "Failed to set the bundle planned scope built-in variable."); @@ -922,7 +918,6 @@ static HRESULT GetUpgradedBundleScope( // Is the related bundle's upgrade code the same as ours? // If so, lock our scope to the "original" bundle's scope. - if (CSTR_EQUAL == ::CompareStringOrdinal(wzRelatedUpgradeCode, -1, wzUpgradeCode, -1, FALSE)) if (CSTR_EQUAL == ::CompareStringOrdinal(wzRelatedUpgradeCode, -1, wzUpgradeCode, -1, TRUE)) { *pScope = pRelatedBundle->detectedScope; -- cgit v1.2.3-55-g6feb