Integrate OnUnregisterBegin changes in Burn headers.

4 files changed, 28 insertions, 16 deletions

diff --git a/src/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/WixToolset.Mba.Core/BootstrapperApplication.cs
index 43e69e81..1812c80b 100644
--- a/src/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -1529,12 +1529,12 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnUnregisterBegin(ref bool fCancel)
+        int IBootstrapperApplication.OnUnregisterBegin(bool fKeepRegistration, ref bool fForceKeepRegistration)
         {
-            UnregisterBeginEventArgs args = new UnregisterBeginEventArgs(fCancel);
+            UnregisterBeginEventArgs args = new UnregisterBeginEventArgs(fKeepRegistration, fForceKeepRegistration);
             this.OnUnregisterBegin(args);
 
-            fCancel = args.Cancel;
+            fForceKeepRegistration = args.ForceKeepRegistration;
             return args.HResult;
         }
 
diff --git a/src/WixToolset.Mba.Core/EventArgs.cs b/src/WixToolset.Mba.Core/EventArgs.cs
index 953e31ee..56705769 100644
--- a/src/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/WixToolset.Mba.Core/EventArgs.cs
@@ -1187,31 +1187,41 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
-    /// Additional arguments used when the engine has begun removing the registration for the location and visibility of the bundle.
+    /// Event arguments for <see cref="IDefaultBootstrapperApplication.UnregisterBegin"/>
     /// </summary>
     [Serializable]
-    public class UnregisterBeginEventArgs : CancellableHResultEventArgs
+    public class UnregisterBeginEventArgs : HResultEventArgs
     {
         /// <summary>
-        /// Creates a new instance of the <see cref="UnregisterBeginEventArgs"/> class.
+        /// 
         /// </summary>
-        /// <param name="cancelRecommendation">The recommendation from the engine.</param>
-        public UnregisterBeginEventArgs(bool cancelRecommendation)
-            : base(cancelRecommendation)
+        /// <param name="keepRegistration"></param>
+        /// <param name="forceKeepRegistration"></param>
+        public UnregisterBeginEventArgs(bool keepRegistration, bool forceKeepRegistration)
         {
         }
+
+        /// <summary>
+        /// Indicates whether the engine will uninstall the bundle.
+        /// </summary>
+        public bool ForceKeepRegistration { get; set; }
+
+        /// <summary>
+        /// If <see cref="KeepRegistration"/> is FALSE, then this can be set to TRUE to make the engine keep the bundle installed.
+        /// </summary>
+        public bool KeepRegistration { get; private set; }
     }
 
     /// <summary>
-    /// Additional arguments used when the engine has completed removing the registration for the location and visibility of the bundle.
+    /// Event arguments for <see cref="IDefaultBootstrapperApplication.UnregisterComplete"/>
     /// </summary>
     [Serializable]
     public class UnregisterCompleteEventArgs : StatusEventArgs
     {
         /// <summary>
-        /// Creates a new instance of the <see cref="UnregisterCompleteEventArgs"/> class.
+        /// 
         /// </summary>
-        /// <param name="hrStatus">The return code of the operation.</param>
+        /// <param name="hrStatus"></param>
         public UnregisterCompleteEventArgs(int hrStatus)
             : base(hrStatus)
         {
diff --git a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
index 7ff243d2..4812c038 100644
--- a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -822,12 +822,14 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// See <see cref="IDefaultBootstrapperApplication.UnregisterBegin"/>.
         /// </summary>
-        /// <param name="fCancel"></param>
+        /// <param name="fKeepRegistration"></param>
+        /// <param name="fForceKeepRegistration"></param>
         /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnUnregisterBegin(
-            [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
+            [MarshalAs(UnmanagedType.Bool)] bool fKeepRegistration,
+            [MarshalAs(UnmanagedType.Bool)] ref bool fForceKeepRegistration
             );
 
         /// <summary>
diff --git a/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs b/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
index d0518049..5803a26a 100644
--- a/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
+++ b/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
@@ -332,12 +332,12 @@ namespace WixToolset.Mba.Core
         event EventHandler<SystemShutdownEventArgs> SystemShutdown;
 
         /// <summary>
-        /// Fired when the engine has begun removing the registration for the location and visibility of the bundle.
+        /// Fired when the engine unregisters the bundle.
         /// </summary>
         event EventHandler<UnregisterBeginEventArgs> UnregisterBegin;
 
         /// <summary>
-        /// Fired when the engine has completed removing the registration for the location and visibility of the bundle.
+        /// Fired when the engine unregistration is complete.
         /// </summary>
         event EventHandler<UnregisterCompleteEventArgs> UnregisterComplete;
     }