From 29f7e00586412163a20e298fbf84505f8a917425 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 3 May 2022 15:30:50 -0500
Subject: Only block shutdown during Apply.

---
 .../Bal/wixstdba/WixStandardBootstrapperApplication.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'src/ext')

diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
index e93dbe90..c89d12c4 100644
--- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -1265,9 +1265,6 @@ public: // IBootstrapperApplication
         case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN:
             OnShutdownFallback(reinterpret_cast<BA_ONSHUTDOWN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSHUTDOWN_RESULTS*>(pvResults));
             break;
-        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN:
-            OnSystemShutdownFallback(reinterpret_cast<BA_ONSYSTEMSHUTDOWN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSYSTEMSHUTDOWN_RESULTS*>(pvResults));
-            break;
         case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE:
             OnDetectForwardCompatibleBundleFallback(reinterpret_cast<BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS*>(pvResults));
             break;
@@ -1544,14 +1541,6 @@ private: // privates
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext);
     }
 
-    void OnSystemShutdownFallback(
-        __in BA_ONSYSTEMSHUTDOWN_ARGS* pArgs,
-        __inout BA_ONSYSTEMSHUTDOWN_RESULTS* pResults
-        )
-    {
-        m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext);
-    }
-
     void OnDetectForwardCompatibleBundleFallback(
         __in BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs,
         __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults
@@ -2948,7 +2937,6 @@ private:
     {
 #pragma warning(suppress:4312)
         CWixStandardBootstrapperApplication* pBA = reinterpret_cast<CWixStandardBootstrapperApplication*>(::GetWindowLongPtrW(hWnd, GWLP_USERDATA));
-        BOOL fCancel = FALSE;
 
         switch (uMsg)
         {
@@ -2975,11 +2963,6 @@ private:
         case WM_THMUTIL_LOADED_CONTROL:
             return pBA->OnThemeLoadedControl(reinterpret_cast<THEME_LOADEDCONTROL_ARGS*>(wParam), reinterpret_cast<THEME_LOADEDCONTROL_RESULTS*>(lParam));
 
-        case WM_QUERYENDSESSION:
-            fCancel = true;
-            pBA->OnSystemShutdown(static_cast<DWORD>(lParam), &fCancel);
-            return !fCancel;
-
         case WM_CLOSE:
             // If the user chose not to close, do *not* let the default window proc handle the message.
             if (!pBA->OnClose())
-- 
cgit v1.2.3-55-g6feb