summaryrefslogtreecommitdiff
path: root/src/burn/engine/msuengine.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-05-04 19:25:07 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-05-11 19:11:19 -0500
commit27c6decae94536cae338731b6cb765aa92776486 (patch)
treecabfb05464fdc64e30597da28a54113fc3a62da1 /src/burn/engine/msuengine.cpp
parenta2f2036c8598efcb434eebeeacd7ede84ab60dfe (diff)
downloadwix-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/msuengine.cpp')
-rw-r--r--src/burn/engine/msuengine.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/burn/engine/msuengine.cpp b/src/burn/engine/msuengine.cpp
index 6003123b..d6722bbf 100644
--- a/src/burn/engine/msuengine.cpp
+++ b/src/burn/engine/msuengine.cpp
@@ -192,20 +192,12 @@ extern "C" HRESULT MsuEnginePlanAddPackage(
192 __in BURN_PACKAGE* pPackage, 192 __in BURN_PACKAGE* pPackage,
193 __in BURN_PLAN* pPlan, 193 __in BURN_PLAN* pPlan,
194 __in BURN_LOGGING* pLog, 194 __in BURN_LOGGING* pLog,
195 __in BURN_VARIABLES* pVariables, 195 __in BURN_VARIABLES* pVariables
196 __in HANDLE hCacheEvent
197 ) 196 )
198{ 197{
199 HRESULT hr = S_OK; 198 HRESULT hr = S_OK;
200 BURN_EXECUTE_ACTION* pAction = NULL; 199 BURN_EXECUTE_ACTION* pAction = NULL;
201 200
202 // add wait for cache
203 if (hCacheEvent)
204 {
205 hr = PlanExecuteCacheSyncAndRollback(pPlan, pPackage, hCacheEvent);
206 ExitOnFailure(hr, "Failed to plan package cache syncpoint");
207 }
208
209 hr = DependencyPlanPackage(NULL, pPackage, pPlan); 201 hr = DependencyPlanPackage(NULL, pPackage, pPlan);
210 ExitOnFailure(hr, "Failed to plan package dependency actions."); 202 ExitOnFailure(hr, "Failed to plan package dependency actions.");
211 203