summaryrefslogtreecommitdiff
path: root/src/burn/engine/engine.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-08-19 13:47:50 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-08-19 17:02:27 -0500
commit1c4dc6b1cd2aa3ecd05fdb22f9889ed87e61cc68 (patch)
tree1018e1fded2b24a7adf98cdd31ff19a071a1edd0 /src/burn/engine/engine.cpp
parent4a53029a94f706de48c6750481377f808724fe47 (diff)
downloadwix-1c4dc6b1cd2aa3ecd05fdb22f9889ed87e61cc68.tar.gz
wix-1c4dc6b1cd2aa3ecd05fdb22f9889ed87e61cc68.tar.bz2
wix-1c4dc6b1cd2aa3ecd05fdb22f9889ed87e61cc68.zip
Resume automatic updates as part of ApplyUninitialize.
Fixes first half of 6870
Diffstat (limited to 'src/burn/engine/engine.cpp')
-rw-r--r--src/burn/engine/engine.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp
index 334ea23b..2d2da1d5 100644
--- a/src/burn/engine/engine.cpp
+++ b/src/burn/engine/engine.cpp
@@ -638,7 +638,6 @@ static HRESULT RunElevated(
638{ 638{
639 HRESULT hr = S_OK; 639 HRESULT hr = S_OK;
640 HANDLE hLock = NULL; 640 HANDLE hLock = NULL;
641 BOOL fDisabledAutomaticUpdates = FALSE;
642 641
643 // connect to per-user process 642 // connect to per-user process
644 hr = PipeChildConnect(&pEngineState->companionConnection, TRUE); 643 hr = PipeChildConnect(&pEngineState->companionConnection, TRUE);
@@ -666,7 +665,7 @@ static HRESULT RunElevated(
666 SrpInitialize(TRUE); 665 SrpInitialize(TRUE);
667 666
668 // Pump messages from parent process. 667 // Pump messages from parent process.
669 hr = ElevationChildPumpMessages(pEngineState->dwElevatedLoggingTlsId, pEngineState->companionConnection.hPipe, pEngineState->companionConnection.hCachePipe, &pEngineState->approvedExes, &pEngineState->cache, &pEngineState->containers, &pEngineState->packages, &pEngineState->payloads, &pEngineState->variables, &pEngineState->registration, &pEngineState->userExperience, &hLock, &fDisabledAutomaticUpdates, &pEngineState->userExperience.dwExitCode, &pEngineState->fRestart, &pEngineState->plan.fApplying); 668 hr = ElevationChildPumpMessages(pEngineState->dwElevatedLoggingTlsId, pEngineState->companionConnection.hPipe, pEngineState->companionConnection.hCachePipe, &pEngineState->approvedExes, &pEngineState->cache, &pEngineState->containers, &pEngineState->packages, &pEngineState->payloads, &pEngineState->variables, &pEngineState->registration, &pEngineState->userExperience, &hLock, &pEngineState->userExperience.dwExitCode, &pEngineState->fRestart, &pEngineState->plan.fApplying);
670 LogRedirect(NULL, NULL); // reset logging so the next failure gets written to "log buffer" for the failure log. 669 LogRedirect(NULL, NULL); // reset logging so the next failure gets written to "log buffer" for the failure log.
671 ExitOnFailure(hr, "Failed to pump messages from parent process."); 670 ExitOnFailure(hr, "Failed to pump messages from parent process.");
672 671
@@ -676,11 +675,6 @@ LExit:
676 // If the message window is still around, close it. 675 // If the message window is still around, close it.
677 UiCloseMessageWindow(pEngineState); 676 UiCloseMessageWindow(pEngineState);
678 677
679 if (fDisabledAutomaticUpdates)
680 {
681 ElevationChildResumeAutomaticUpdates();
682 }
683
684 if (hLock) 678 if (hLock)
685 { 679 {
686 ::ReleaseMutex(hLock); 680 ::ReleaseMutex(hLock);