From 237bdc6a97c0dd455da99c16e6b3b7cac4c79e86 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 2 Sep 2022 16:12:42 -0500 Subject: Add WixCanRestart and make wixstdba elevate for restart when required. Fixes 5499 --- src/burn/engine/core.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/burn/engine/core.cpp') diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index c8dce17b..93b9c002 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp @@ -593,6 +593,7 @@ LExit: extern "C" HRESULT CoreElevate( __in BURN_ENGINE_STATE* pEngineState, + __in WM_BURN reason, __in_opt HWND hwndParent ) { @@ -608,7 +609,7 @@ extern "C" HRESULT CoreElevate( ExitOnFailure(hr, "Failed to cache engine to working directory."); } - hr = ElevationElevate(pEngineState, hwndParent); + hr = ElevationElevate(pEngineState, reason, hwndParent); if (E_SUSPECTED_AV_INTERFERENCE == hr && 1 > cAVRetryAttempts) { ++cAVRetryAttempts; @@ -720,7 +721,7 @@ extern "C" HRESULT CoreApply( // Elevate. if (pEngineState->plan.fPerMachine) { - hr = CoreElevate(pEngineState, pEngineState->userExperience.hwndApply); + hr = CoreElevate(pEngineState, WM_BURN_APPLY, pEngineState->userExperience.hwndApply); ExitOnFailure(hr, "Failed to elevate."); hr = ElevationApplyInitialize(pEngineState->companionConnection.hPipe, &pEngineState->userExperience, &pEngineState->variables, &pEngineState->plan); @@ -872,7 +873,7 @@ extern "C" HRESULT CoreLaunchApprovedExe( ExitOnRootFailure(hr, "BA aborted LaunchApprovedExe begin."); // Elevate. - hr = CoreElevate(pEngineState, pLaunchApprovedExe->hwndParent); + hr = CoreElevate(pEngineState, WM_BURN_LAUNCH_APPROVED_EXE, pLaunchApprovedExe->hwndParent); ExitOnFailure(hr, "Failed to elevate."); // Launch. -- cgit v1.2.3-55-g6feb