diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-05-04 19:25:07 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-05-11 19:11:19 -0500 |
commit | 27c6decae94536cae338731b6cb765aa92776486 (patch) | |
tree | cabfb05464fdc64e30597da28a54113fc3a62da1 /src/burn/engine/exeengine.cpp | |
parent | a2f2036c8598efcb434eebeeacd7ede84ab60dfe (diff) | |
download | wix-27c6decae94536cae338731b6cb765aa92776486.tar.gz wix-27c6decae94536cae338731b6cb765aa92776486.tar.bz2 wix-27c6decae94536cae338731b6cb765aa92776486.zip |
Put back the rollback cache package functionality and fix its bugs.
#3719, #4711, #5750
Diffstat (limited to 'src/burn/engine/exeengine.cpp')
-rw-r--r-- | src/burn/engine/exeengine.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/burn/engine/exeengine.cpp b/src/burn/engine/exeengine.cpp index c0ba93e0..13d4f6c6 100644 --- a/src/burn/engine/exeengine.cpp +++ b/src/burn/engine/exeengine.cpp | |||
@@ -268,20 +268,12 @@ extern "C" HRESULT ExeEnginePlanAddPackage( | |||
268 | __in BURN_PACKAGE* pPackage, | 268 | __in BURN_PACKAGE* pPackage, |
269 | __in BURN_PLAN* pPlan, | 269 | __in BURN_PLAN* pPlan, |
270 | __in BURN_LOGGING* pLog, | 270 | __in BURN_LOGGING* pLog, |
271 | __in BURN_VARIABLES* pVariables, | 271 | __in BURN_VARIABLES* pVariables |
272 | __in_opt HANDLE hCacheEvent | ||
273 | ) | 272 | ) |
274 | { | 273 | { |
275 | HRESULT hr = S_OK; | 274 | HRESULT hr = S_OK; |
276 | BURN_EXECUTE_ACTION* pAction = NULL; | 275 | BURN_EXECUTE_ACTION* pAction = NULL; |
277 | 276 | ||
278 | // add wait for cache | ||
279 | if (hCacheEvent) | ||
280 | { | ||
281 | hr = PlanExecuteCacheSyncAndRollback(pPlan, pPackage, hCacheEvent); | ||
282 | ExitOnFailure(hr, "Failed to plan package cache syncpoint"); | ||
283 | } | ||
284 | |||
285 | hr = DependencyPlanPackage(pdwInsertSequence, pPackage, pPlan); | 277 | hr = DependencyPlanPackage(pdwInsertSequence, pPackage, pPlan); |
286 | ExitOnFailure(hr, "Failed to plan package dependency actions."); | 278 | ExitOnFailure(hr, "Failed to plan package dependency actions."); |
287 | 279 | ||