aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/plan.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-08-03 18:06:54 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-08-04 10:03:57 -0500
commitcdba28de1ee229369b254c62bc58cf2f001899a3 (patch)
tree4ae9a7aafd83ff311c5440df2c6d4a8693f8f23b /src/burn/engine/plan.cpp
parent75d645c6aec0df0e02bd3aaf2fe2571d83316d4c (diff)
downloadwix-cdba28de1ee229369b254c62bc58cf2f001899a3.tar.gz
wix-cdba28de1ee229369b254c62bc58cf2f001899a3.tar.bz2
wix-cdba28de1ee229369b254c62bc58cf2f001899a3.zip
Add argument and policy setting to set Burn's base working directory.
Fixes #5856
Diffstat (limited to 'src/burn/engine/plan.cpp')
-rw-r--r--src/burn/engine/plan.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index f77e8e2a..04da2a9d 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -266,6 +266,7 @@ extern "C" void PlanUninitializeExecuteAction(
266 case BURN_EXECUTE_ACTION_TYPE_EXE_PACKAGE: 266 case BURN_EXECUTE_ACTION_TYPE_EXE_PACKAGE:
267 ReleaseStr(pExecuteAction->exePackage.sczIgnoreDependencies); 267 ReleaseStr(pExecuteAction->exePackage.sczIgnoreDependencies);
268 ReleaseStr(pExecuteAction->exePackage.sczAncestors); 268 ReleaseStr(pExecuteAction->exePackage.sczAncestors);
269 ReleaseStr(pExecuteAction->exePackage.sczEngineWorkingDirectory);
269 break; 270 break;
270 271
271 case BURN_EXECUTE_ACTION_TYPE_MSI_PACKAGE: 272 case BURN_EXECUTE_ACTION_TYPE_MSI_PACKAGE:
@@ -1282,6 +1283,7 @@ extern "C" HRESULT PlanRelatedBundlesBegin(
1282 1283
1283 // Pass along any ancestors and ourself to prevent infinite loops. 1284 // Pass along any ancestors and ourself to prevent infinite loops.
1284 pRelatedBundle->package.Exe.wzAncestors = pRegistration->sczBundlePackageAncestors; 1285 pRelatedBundle->package.Exe.wzAncestors = pRegistration->sczBundlePackageAncestors;
1286 pRelatedBundle->package.Exe.wzEngineWorkingDirectory = pPlan->pInternalCommand->sczWorkingDirectory;
1285 1287
1286 hr = PlanDefaultRelatedBundleRequestState(relationType, pRelatedBundle->relationType, pPlan->action, pRegistration->pVersion, pRelatedBundle->pVersion, &pRelatedBundle->package.requested); 1288 hr = PlanDefaultRelatedBundleRequestState(relationType, pRelatedBundle->relationType, pPlan->action, pRegistration->pVersion, pRelatedBundle->pVersion, &pRelatedBundle->package.requested);
1287 ExitOnFailure(hr, "Failed to get default request state for related bundle."); 1289 ExitOnFailure(hr, "Failed to get default request state for related bundle.");