Clean up synchronization between the engine and the BA.

1 files changed, 8 insertions, 39 deletions

diff --git a/src/engine/core.cpp b/src/engine/core.cpp
index ae09ea65..a644d377 100644
--- a/src/engine/core.cpp
+++ b/src/engine/core.cpp
@@ -236,16 +236,12 @@ extern "C" HRESULT CoreDetect(
     )
 {
     HRESULT hr = S_OK;
-    BOOL fActivated = FALSE;
     BOOL fDetectBegan = FALSE;
     BURN_PACKAGE* pPackage = NULL;
     HRESULT hrFirstPackageFailure = S_OK;
 
     LogId(REPORT_STANDARD, MSG_DETECT_BEGIN, pEngineState->packages.cPackages);
 
-    hr = UserExperienceActivateEngine(&pEngineState->userExperience, &fActivated);
-    ExitOnFailure(hr, "Engine cannot start detect because it is busy with another action.");
-
     // Detect if bundle installed state has changed since start up. This
     // only happens if Apply() changed the state of bundle (installed or
     // uninstalled). In that case, Detect() can be used here to reset
@@ -369,11 +365,6 @@ LExit:
         hr = hrFirstPackageFailure;
     }
 
-    if (fActivated)
-    {
-        UserExperienceDeactivateEngine(&pEngineState->userExperience);
-    }
-
     if (fDetectBegan)
     {
         UserExperienceOnDetectComplete(&pEngineState->userExperience, hr);
@@ -392,7 +383,6 @@ extern "C" HRESULT CorePlan(
     )
 {
     HRESULT hr = S_OK;
-    BOOL fActivated = FALSE;
     BOOL fPlanBegan = FALSE;
     LPWSTR sczLayoutDirectory = NULL;
     HANDLE hSyncpointEvent = NULL;
@@ -401,9 +391,6 @@ extern "C" HRESULT CorePlan(
 
     LogId(REPORT_STANDARD, MSG_PLAN_BEGIN, pEngineState->packages.cPackages, LoggingBurnActionToString(action));
 
-    hr = UserExperienceActivateEngine(&pEngineState->userExperience, &fActivated);
-    ExitOnFailure(hr, "Engine cannot start plan because it is busy with another action.");
-
     fPlanBegan = TRUE;
     hr = UserExperienceOnPlanBegin(&pEngineState->userExperience, pEngineState->packages.cPackages);
     ExitOnRootFailure(hr, "BA aborted plan begin.");
@@ -496,11 +483,6 @@ extern "C" HRESULT CorePlan(
     PlanDump(&pEngineState->plan);
 
 LExit:
-    if (fActivated)
-    {
-        UserExperienceDeactivateEngine(&pEngineState->userExperience);
-    }
-
     if (fPlanBegan)
     {
         UserExperienceOnPlanComplete(&pEngineState->userExperience, hr);
@@ -551,10 +533,10 @@ extern "C" HRESULT CoreApply(
     )
 {
     HRESULT hr = S_OK;
-    BOOL fActivated = FALSE;
     HANDLE hLock = NULL;
     DWORD cOverallProgressTicks = 0;
     HANDLE hCacheThread = NULL;
+    BOOL fApplyInitialize = FALSE;
     BOOL fElevated = FALSE;
     BOOL fRegistered = FALSE;
     BOOL fKeepRegistration = pEngineState->plan.fKeepRegistrationDefault;
@@ -567,9 +549,6 @@ extern "C" HRESULT CoreApply(
 
     LogId(REPORT_STANDARD, MSG_APPLY_BEGIN);
 
-    hr = UserExperienceActivateEngine(&pEngineState->userExperience, &fActivated);
-    ExitOnFailure(hr, "Engine cannot start apply because it is busy with another action.");
-
     // Ensure any previous attempts to execute are reset.
     ApplyReset(&pEngineState->userExperience, &pEngineState->packages);
 
@@ -599,6 +578,7 @@ extern "C" HRESULT CoreApply(
     ExitOnFailure(hr, "Another per-user setup is already executing.");
 
     // Initialize only after getting a lock.
+    fApplyInitialize = TRUE;
     ApplyInitialize();
 
     pEngineState->userExperience.hwndApply = hwndParent;
@@ -627,7 +607,7 @@ extern "C" HRESULT CoreApply(
         ExitOnFailure(hr, "Failed to elevate.");
 
         hr = ElevationApplyInitialize(pEngineState->companionConnection.hPipe, &pEngineState->userExperience, &pEngineState->variables, pEngineState->plan.action, pEngineState->automaticUpdates, !pEngineState->fDisableSystemRestore);
-        ExitOnFailure(hr, "Another per-machine setup is already executing.");
+        ExitOnFailure(hr, "Failed to initialize apply in elevated process.");
 
         fElevated = TRUE;
     }
@@ -704,7 +684,10 @@ LExit:
 
     pEngineState->userExperience.hwndApply = NULL;
 
-    ApplyUninitialize();
+    if (fApplyInitialize)
+    {
+        ApplyUninitialize();
+    }
 
     if (hLock)
     {
@@ -712,11 +695,6 @@ LExit:
         ::CloseHandle(hLock);
     }
 
-    if (fActivated)
-    {
-        UserExperienceDeactivateEngine(&pEngineState->userExperience);
-    }
-
     ReleaseHandle(hCacheThread);
 
     UserExperienceOnApplyComplete(&pEngineState->userExperience, hr, restart, &applyCompleteAction);
@@ -736,14 +714,10 @@ extern "C" HRESULT CoreLaunchApprovedExe(
     )
 {
     HRESULT hr = S_OK;
-    BOOL fActivated = FALSE;
     DWORD dwProcessId = 0;
 
     LogId(REPORT_STANDARD, MSG_LAUNCH_APPROVED_EXE_BEGIN, pLaunchApprovedExe->sczId);
 
-    hr = UserExperienceActivateEngine(&pEngineState->userExperience, &fActivated);
-    ExitOnFailure(hr, "Engine cannot start LaunchApprovedExe because it is busy with another action.");
-
     hr = UserExperienceOnLaunchApprovedExeBegin(&pEngineState->userExperience);
     ExitOnRootFailure(hr, "BA aborted LaunchApprovedExe begin.");
 
@@ -755,11 +729,6 @@ extern "C" HRESULT CoreLaunchApprovedExe(
     hr = ElevationLaunchApprovedExe(pEngineState->companionConnection.hPipe, pLaunchApprovedExe, &dwProcessId);
 
 LExit:
-    if (fActivated)
-    {
-        UserExperienceDeactivateEngine(&pEngineState->userExperience);
-    }
-
     UserExperienceOnLaunchApprovedExeComplete(&pEngineState->userExperience, hr, dwProcessId);
 
     LogId(REPORT_STANDARD, MSG_LAUNCH_APPROVED_EXE_COMPLETE, hr, dwProcessId);
@@ -782,7 +751,7 @@ extern "C" HRESULT CoreQuit(
         hr = CoreSaveEngineState(pEngineState);
         if (FAILED(hr))
         {
-            LogErrorId(hr, MSG_STATE_NOT_SAVED, NULL, NULL, NULL);
+            LogErrorId(hr, MSG_STATE_NOT_SAVED);
             hr = S_OK;
         }
     }