Only block shutdown during Apply.

4 files changed, 0 insertions, 93 deletions

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;