FilesInUse messages are too different to unify in the Burn engine.

Fixes #6348

3 files changed, 29 insertions, 9 deletions

diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
index a78bf43f..b1fcaea4 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -1712,9 +1712,9 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnExecuteFilesInUse(string wzPackageId, int cFiles, string[] rgwzFiles, Result nRecommendation, ref Result pResult)
+        int IBootstrapperApplication.OnExecuteFilesInUse(string wzPackageId, int cFiles, string[] rgwzFiles, Result nRecommendation, FilesInUseType source, ref Result pResult)
         {
-            ExecuteFilesInUseEventArgs args = new ExecuteFilesInUseEventArgs(wzPackageId, rgwzFiles, nRecommendation, pResult);
+            ExecuteFilesInUseEventArgs args = new ExecuteFilesInUseEventArgs(wzPackageId, rgwzFiles, nRecommendation, source, pResult);
             this.OnExecuteFilesInUse(args);
 
             pResult = args.Result;
diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
index 55c9e74c..65169b25 100644
--- a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
@@ -1613,11 +1613,12 @@ namespace WixToolset.Mba.Core
     public class ExecuteFilesInUseEventArgs : ResultEventArgs
     {
         /// <summary />
-        public ExecuteFilesInUseEventArgs(string packageId, string[] files, Result recommendation, Result result)
+        public ExecuteFilesInUseEventArgs(string packageId, string[] files, Result recommendation, FilesInUseType source, Result result)
             : base(recommendation, result)
         {
             this.PackageId = packageId;
             this.Files = new ReadOnlyCollection<string>(files ?? new string[] { });
+            this.Source = source;
         }
 
         /// <summary>
@@ -1629,6 +1630,11 @@ namespace WixToolset.Mba.Core
         /// Gets the list of files in use.
         /// </summary>
         public IList<string> Files { get; private set; }
+
+        /// <summary>
+        /// Gets the source of the message.
+        /// </summary>
+        public FilesInUseType Source { get; private set; }
     }
 
     /// <summary>
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
index c6a8fc14..3df54bde 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -777,12 +777,6 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// See <see cref="IDefaultBootstrapperApplication.ExecuteFilesInUse"/>.
         /// </summary>
-        /// <param name="wzPackageId"></param>
-        /// <param name="cFiles"></param>
-        /// <param name="rgwzFiles"></param>
-        /// <param name="nRecommendation"></param>
-        /// <param name="pResult"></param>
-        /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnExecuteFilesInUse(
@@ -790,6 +784,7 @@ namespace WixToolset.Mba.Core
             [MarshalAs(UnmanagedType.U4)] int cFiles,
             [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1, ArraySubType = UnmanagedType.LPWStr), In] string[] rgwzFiles,
             [MarshalAs(UnmanagedType.I4)] Result nRecommendation,
+            [MarshalAs(UnmanagedType.I4)] FilesInUseType source,
             [MarshalAs(UnmanagedType.I4)] ref Result pResult
             );
 
@@ -1446,6 +1441,25 @@ namespace WixToolset.Mba.Core
     };
 
     /// <summary>
+    /// Indicates the source of the FilesInUse message.
+    /// </summary>
+    public enum FilesInUseType
+    {
+        /// <summary>
+        /// Generated from INSTALLMESSAGE_FILESINUSE.
+        /// </summary>
+        Msi,
+        /// <summary>
+        /// Generated from INSTALLMESSAGE_RMFILESINUSE.
+        /// </summary>
+        MsiRm,
+        /// <summary>
+        /// Generated from MMIO_CLOSE_APPS.
+        /// </summary>
+        Netfx,
+    }
+
+    /// <summary>
     /// The calculated operation for the related bundle.
     /// </summary>
     public enum RelatedOperation