1 files changed, 9 insertions, 2 deletions

diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp
index c5d27277..8e5099d9 100644
--- a/src/engine/apply.cpp
+++ b/src/engine/apply.cpp
@@ -291,10 +291,12 @@ extern "C" void ApplyReset(
 
 extern "C" HRESULT ApplyLock(
     __in BOOL /*fPerMachine*/,
-    __out HANDLE* /*phLock*/
+    __out HANDLE* phLock
     )
 {
     HRESULT hr = S_OK;
+    *phLock = NULL;
+
 #if 0 // eventually figure out the correct way to support this. In its current form, embedded bundles (including related bundles) are hosed.
     DWORD er = ERROR_SUCCESS;
     HANDLE hLock = NULL;
@@ -459,6 +461,8 @@ extern "C" HRESULT ApplyCache(
     DWORD iPackageStartAction = BURN_PLAN_INVALID_ACTION_INDEX;
     DWORD iPackageCompleteAction = BURN_PLAN_INVALID_ACTION_INDEX;
 
+    *pfRollback = FALSE;
+
     hr = UserExperienceOnCacheBegin(pUX);
     ExitOnRootFailure(hr, "BA aborted cache.");
 
@@ -732,7 +736,7 @@ extern "C" HRESULT ApplyExecute(
     __in BURN_ENGINE_STATE* pEngineState,
     __in_opt HANDLE hCacheThread,
     __inout DWORD* pcOverallProgressTicks,
-    __out BOOL* pfKeepRegistration,
+    __inout BOOL* pfKeepRegistration,
     __out BOOL* pfRollback,
     __out BOOL* pfSuspend,
     __out BOOTSTRAPPER_APPLY_RESTART* pRestart
@@ -749,6 +753,9 @@ extern "C" HRESULT ApplyExecute(
     context.cExecutePackagesTotal = pEngineState->plan.cExecutePackagesTotal;
     context.pcOverallProgressTicks = pcOverallProgressTicks;
 
+    *pfRollback = FALSE;
+    *pfSuspend = FALSE;
+
     // Send execute begin to BA.
     hr = UserExperienceOnExecuteBegin(&pEngineState->userExperience, pEngineState->plan.cExecutePackagesTotal);
     ExitOnRootFailure(hr, "BA aborted execute begin.");