Only block shutdown during Apply.

11 files changed, 0 insertions, 153 deletions

diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
index f0b5dad4..228cb6ff 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -149,7 +149,6 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATEBEGIN,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATE,
@@ -1463,18 +1462,6 @@ struct BA_ONSYSTEMRESTOREPOINTCOMPLETE_RESULTS
     DWORD cbSize;
 };
 
-struct BA_ONSYSTEMSHUTDOWN_ARGS
-{
-    DWORD cbSize;
-    DWORD dwEndSession;
-};
-
-struct BA_ONSYSTEMSHUTDOWN_RESULTS
-{
-    DWORD cbSize;
-    BOOL fCancel;
-};
-
 struct BA_ONUNREGISTERBEGIN_ARGS
 {
     DWORD cbSize;
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
index 6738a4a6..bb34a33e 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -22,15 +22,12 @@ namespace WixToolset.Mba.Core
         /// </summary>
         protected readonly IEngine engine;
 
-        private bool applying;
-
         /// <summary>
         /// Creates a new instance of the <see cref="BootstrapperApplication"/> class.
         /// </summary>
         protected BootstrapperApplication(IEngine engine)
         {
             this.engine = engine;
-            this.applying = false;
             this.asyncExecution = true;
         }
 
@@ -41,9 +38,6 @@ namespace WixToolset.Mba.Core
         public event EventHandler<ShutdownEventArgs> Shutdown;
 
         /// <inheritdoc/>
-        public event EventHandler<SystemShutdownEventArgs> SystemShutdown;
-
-        /// <inheritdoc/>
         public event EventHandler<DetectBeginEventArgs> DetectBegin;
 
         /// <inheritdoc/>
@@ -332,25 +326,6 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
-        /// Called by the engine, raises the <see cref="SystemShutdown"/> event.
-        /// </summary>
-        /// <param name="args">Additional arguments for this event.</param>
-        protected virtual void OnSystemShutdown(SystemShutdownEventArgs args)
-        {
-            EventHandler<SystemShutdownEventArgs> handler = this.SystemShutdown;
-            if (null != handler)
-            {
-                handler(this, args);
-            }
-            else if (null != args)
-            {
-                // Allow requests to shut down when critical or not applying.
-                bool critical = EndSessionReasons.Critical == (EndSessionReasons.Critical & args.Reasons);
-                args.Cancel = !critical && this.applying;
-            }
-        }
-
-        /// <summary>
         /// Called by the engine, raises the <see cref="DetectBegin"/> event.
         /// </summary>
         /// <param name="args">Additional arguments for this event.</param>
@@ -1433,15 +1408,6 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnSystemShutdown(EndSessionReasons dwEndSession, ref bool fCancel)
-        {
-            SystemShutdownEventArgs args = new SystemShutdownEventArgs(dwEndSession, fCancel);
-            this.OnSystemShutdown(args);
-
-            fCancel = args.Cancel;
-            return args.HResult;
-        }
-
         int IBootstrapperApplication.OnDetectBegin(bool fCached, RegistrationType registrationType, int cPackages, ref bool fCancel)
         {
             DetectBeginEventArgs args = new DetectBeginEventArgs(fCached, registrationType, cPackages, fCancel);
@@ -1693,8 +1659,6 @@ namespace WixToolset.Mba.Core
 
         int IBootstrapperApplication.OnApplyBegin(int dwPhaseCount, ref bool fCancel)
         {
-            this.applying = true;
-
             ApplyBeginEventArgs args = new ApplyBeginEventArgs(dwPhaseCount, fCancel);
             this.OnApplyBegin(args);
 
@@ -1949,8 +1913,6 @@ namespace WixToolset.Mba.Core
             ApplyCompleteEventArgs args = new ApplyCompleteEventArgs(hrStatus, restart, recommendation, pAction);
             this.OnApplyComplete(args);
 
-            this.applying = false;
-
             pAction = args.Action;
             return args.HResult;
         }
diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
index d79ac402..be113700 100644
--- a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
@@ -217,32 +217,6 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
-    /// Event arguments for <see cref="IDefaultBootstrapperApplication.SystemShutdown"/>
-    /// </summary>
-    [Serializable]
-    public class SystemShutdownEventArgs : CancellableHResultEventArgs
-    {
-        /// <summary />
-        public SystemShutdownEventArgs(EndSessionReasons reasons, bool cancelRecommendation)
-            : base(cancelRecommendation)
-        {
-            this.Reasons = reasons;
-        }
-
-        /// <summary>
-        /// Gets the reason the application is requested to close or being closed.
-        /// </summary>
-        /// <remarks>
-        /// <para>To prevent shutting down or logging off, set <see cref="CancellableHResultEventArgs.Cancel"/> to
-        /// true; otherwise, set it to false.</para>
-        /// <para>If <see cref="SystemShutdownEventArgs.Reasons"/> contains <see cref="EndSessionReasons.Critical"/>
-        /// the bootstrapper cannot prevent the shutdown and only has a few seconds to save state or perform any other
-        /// critical operations before being closed by the operating system.</para>
-        /// </remarks>
-        public EndSessionReasons Reasons { get; private set; }
-    }
-
-    /// <summary>
     /// Event arguments for <see cref="IDefaultBootstrapperApplication.DetectBegin"/>
     /// </summary>
     [Serializable]
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
index 2877d4de..8ce99808 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -51,19 +51,6 @@ namespace WixToolset.Mba.Core
         int OnShutdown(ref BOOTSTRAPPER_SHUTDOWN_ACTION action);
 
         /// <summary>
-        /// See <see cref="IDefaultBootstrapperApplication.SystemShutdown"/>.
-        /// </summary>
-        /// <param name="dwEndSession"></param>
-        /// <param name="fCancel"></param>
-        /// <returns></returns>
-        [PreserveSig]
-        [return: MarshalAs(UnmanagedType.I4)]
-        int OnSystemShutdown(
-            [MarshalAs(UnmanagedType.U4)] EndSessionReasons dwEndSession,
-            [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
-            );
-
-        /// <summary>
         /// See <see cref="IDefaultBootstrapperApplication.DetectBegin"/>.
         /// </summary>
         [PreserveSig]
diff --git a/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
index 77089e83..2535f756 100644
--- a/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
@@ -419,22 +419,6 @@ namespace WixToolset.Mba.Core
         event EventHandler<SystemRestorePointCompleteEventArgs> SystemRestorePointComplete;
 
         /// <summary>
-        /// Fired when the system is shutting down or user is logging off.
-        /// </summary>
-        /// <remarks>
-        /// <para>To prevent shutting down or logging off, set <see cref="CancellableHResultEventArgs.Cancel"/> to
-        /// true; otherwise, set it to false.</para>
-        /// <para>By default setup will prevent shutting down or logging off between
-        /// <see cref="IDefaultBootstrapperApplication.ApplyBegin"/> and <see cref="IDefaultBootstrapperApplication.ApplyComplete"/>.
-        /// Derivatives can change this behavior by handling <see cref="IDefaultBootstrapperApplication.SystemShutdown"/>.</para>
-        /// <para>If <see cref="SystemShutdownEventArgs.Reasons"/> contains <see cref="EndSessionReasons.Critical"/>
-        /// the bootstrapper cannot prevent the shutdown and only has a few seconds to save state or perform any other
-        /// critical operations before being closed by the operating system.</para>
-        /// <para>This event may be fired on a different thread.</para>
-        /// </remarks>
-        event EventHandler<SystemShutdownEventArgs> SystemShutdown;
-
-        /// <summary>
         /// Fired when the engine unregisters the bundle.
         /// </summary>
         event EventHandler<UnregisterBeginEventArgs> UnregisterBegin;
diff --git a/src/api/burn/balutil/inc/BAFunctions.h b/src/api/burn/balutil/inc/BAFunctions.h
index 9be3f62f..c1057ab6 100644
--- a/src/api/burn/balutil/inc/BAFunctions.h
+++ b/src/api/burn/balutil/inc/BAFunctions.h
@@ -15,7 +15,6 @@ enum BA_FUNCTIONS_MESSAGE
     BA_FUNCTIONS_MESSAGE_ONPLANCOMPLETE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE,
     BA_FUNCTIONS_MESSAGE_ONSTARTUP = BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP,
     BA_FUNCTIONS_MESSAGE_ONSHUTDOWN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN,
-    BA_FUNCTIONS_MESSAGE_ONSYSTEMSHUTDOWN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN,
     BA_FUNCTIONS_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE,
     BA_FUNCTIONS_MESSAGE_ONDETECTUPDATEBEGIN = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATEBEGIN,
     BA_FUNCTIONS_MESSAGE_ONDETECTUPDATE = BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATE,
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
index 9ff58d2b..ca070553 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h
+++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
@@ -98,14 +98,6 @@ public: // IBootstrapperApplication
         return S_OK;
     }
 
-    virtual STDMETHODIMP OnSystemShutdown(
-        __in DWORD /*dwEndSession*/,
-        __inout BOOL* /*pfCancel*/
-        )
-    {
-        return S_OK;
-    }
-
     virtual STDMETHODIMP OnDetectBegin(
         __in BOOL /*fCached*/,
         __in BOOTSTRAPPER_REGISTRATION_TYPE /*registrationType*/,
diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h
index 4564ad0c..ff92717d 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h
+++ b/src/api/burn/balutil/inc/BalBaseBAFunctionsProc.h
@@ -86,7 +86,6 @@ static HRESULT WINAPI BalBaseBAFunctionsProc(
         case BA_FUNCTIONS_MESSAGE_ONPLANCOMPLETE:
         case BA_FUNCTIONS_MESSAGE_ONSTARTUP:
         case BA_FUNCTIONS_MESSAGE_ONSHUTDOWN:
-        case BA_FUNCTIONS_MESSAGE_ONSYSTEMSHUTDOWN:
         case BA_FUNCTIONS_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE:
         case BA_FUNCTIONS_MESSAGE_ONDETECTUPDATEBEGIN:
         case BA_FUNCTIONS_MESSAGE_ONDETECTUPDATE:
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
index 2e848df7..fc9c4dd7 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
@@ -94,19 +94,6 @@ public: // IBootstrapperApplication
         return S_OK;
     }
 
-    virtual STDMETHODIMP OnSystemShutdown(
-        __in DWORD dwEndSession,
-        __inout BOOL* pfCancel
-        )
-    {
-        HRESULT hr = S_OK;
-
-        // Allow requests to shut down when critical or not applying.
-        *pfCancel = !(ENDSESSION_CRITICAL & dwEndSession || !m_fApplying);
-
-        return hr;
-    }
-
     virtual STDMETHODIMP OnDetectBegin(
         __in BOOL /*fCached*/,
         __in BOOTSTRAPPER_REGISTRATION_TYPE /*registrationType*/,
@@ -406,8 +393,6 @@ public: // IBootstrapperApplication
         __inout BOOL* pfCancel
         )
     {
-        m_fApplying = TRUE;
-
         m_dwProgressPercentage = 0;
         m_dwOverallProgressPercentage = 0;
 
@@ -859,8 +844,6 @@ public: // IBootstrapperApplication
             *pAction = BOOTSTRAPPER_APPLYCOMPLETE_ACTION_RESTART;
         }
 
-        m_fApplying = FALSE;
-
         return hr;
     }
 
@@ -1183,7 +1166,6 @@ protected:
         ::InitializeCriticalSection(&m_csCanceled);
         m_fCanceled = FALSE;
         m_BalInfoCommand = { };
-        m_fApplying = FALSE;
         m_fRollingBack = FALSE;
 
         m_dwProgressPercentage = 0;
@@ -1212,7 +1194,6 @@ private:
     BOOTSTRAPPER_DISPLAY m_display;
     IBootstrapperEngine* m_pEngine;
 
-    BOOL m_fApplying;
     BOOL m_fRollingBack;
 
     DWORD m_dwProgressPercentage;
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
index e35678ad..92243540 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -63,15 +63,6 @@ static HRESULT BalBaseBAProcOnShutdown(
     return pBA->OnShutdown(&pResults->action);
 }
 
-static HRESULT BalBaseBAProcOnSystemShutdown(
-    __in IBootstrapperApplication* pBA,
-    __in BA_ONSYSTEMSHUTDOWN_ARGS* pArgs,
-    __inout BA_ONSYSTEMSHUTDOWN_RESULTS* pResults
-    )
-{
-    return pBA->OnSystemShutdown(pArgs->dwEndSession, &pResults->fCancel);
-}
-
 static HRESULT BalBaseBAProcOnDetectForwardCompatibleBundle(
     __in IBootstrapperApplication* pBA,
     __in BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs,
@@ -803,9 +794,6 @@ static HRESULT WINAPI BalBaseBootstrapperApplicationProc(
         case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN:
             hr = BalBaseBAProcOnShutdown(pBA, reinterpret_cast<BA_ONSHUTDOWN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSHUTDOWN_RESULTS*>(pvResults));
             break;
-        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN:
-            hr = BalBaseBAProcOnSystemShutdown(pBA, reinterpret_cast<BA_ONSYSTEMSHUTDOWN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSYSTEMSHUTDOWN_RESULTS*>(pvResults));
-            break;
         case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE:
             hr = BalBaseBAProcOnDetectForwardCompatibleBundle(pBA, reinterpret_cast<BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS*>(pvResults));
             break;
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index 6eca90fa..382d5aad 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -33,12 +33,6 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         __inout BOOTSTRAPPER_SHUTDOWN_ACTION* pAction
         ) = 0;
 
-    // OnSystemShutdown - called when the operating system is instructed to shutdown the machine.
-    STDMETHOD(OnSystemShutdown)(
-        __in DWORD dwEndSession,
-        __inout BOOL* pfCancel
-        ) = 0;
-
     // OnDetectBegin - called when the engine begins detection.
     STDMETHOD(OnDetectBegin)(
         __in BOOL fCached,