Integrate simplified message handling

4 files changed, 24 insertions, 19 deletions

diff --git a/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs b/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs
index 0baa6094..df328eb6 100644
--- a/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs
+++ b/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Diagnostics;
     using System.IO;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Common functionality for Burn PE Writer & Reader for the WiX toolset.
@@ -77,7 +78,6 @@ namespace WixToolset.Core.Burn.Bundles
 
         protected const UInt32 BURN_SECTION_MAGIC = 0x00f14300;
         protected const UInt32 BURN_SECTION_VERSION = 0x00000002;
-
         protected string fileExe;
         protected UInt32 peOffset = UInt32.MaxValue;
         protected UInt16 sections = UInt16.MaxValue;
@@ -103,8 +103,9 @@ namespace WixToolset.Core.Burn.Bundles
         /// </summary>
         /// <param name="fileExe">File to modify in-place.</param>
         /// <param name="bundleGuid">GUID for the bundle.</param>
-        public BurnCommon(string fileExe)
+        public BurnCommon(IMessaging messaging, string fileExe)
         {
+            this.messaging = messaging;
             this.fileExe = fileExe;
         }
 
@@ -123,6 +124,8 @@ namespace WixToolset.Core.Burn.Bundles
         public UInt32 AttachedContainerAddress { get; protected set; }
         public UInt32 AttachedContainerSize { get; protected set; }
 
+        protected IMessaging messaging { get; }
+
         public void Dispose()
         {
             Dispose(true);
@@ -176,21 +179,21 @@ namespace WixToolset.Core.Burn.Bundles
             uint32 = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_MAGIC);
             if (BURN_SECTION_MAGIC != uint32)
             {
-                Messaging.Instance.OnMessage(WixErrors.InvalidBundle(this.fileExe));
+                this.messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
                 return false;
             }
 
             this.Version = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_VERSION);
             if (BURN_SECTION_VERSION != this.Version)
             {
-                Messaging.Instance.OnMessage(WixErrors.BundleTooNew(this.fileExe, this.Version));
+                this.messaging.Write(ErrorMessages.BundleTooNew(this.fileExe, this.Version));
                 return false;
             }
 
             uint32 = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_FORMAT); // We only know how to deal with CABs right now
             if (1 != uint32)
             {
-                Messaging.Instance.OnMessage(WixErrors.InvalidBundle(this.fileExe));
+                this.messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
                 return false;
             }
 
@@ -257,7 +260,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                 if (UInt32.MaxValue == wixburnSectionOffset)
                 {
-                    Messaging.Instance.OnMessage(WixErrors.StubMissingWixburnSection(this.fileExe));
+                    this.messaging.Write(ErrorMessages.StubMissingWixburnSection(this.fileExe));
                     return false;
                 }
 
@@ -265,7 +268,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // the smallest alignment (512 bytes), but just to be paranoid...
                 if (BURN_SECTION_SIZE > BurnCommon.ReadUInt32(bytes, IMAGE_SECTION_HEADER_OFFSET_SIZEOFRAWDATA))
                 {
-                    Messaging.Instance.OnMessage(WixErrors.StubWixburnSectionTooSmall(this.fileExe));
+                    this.messaging.Write(ErrorMessages.StubWixburnSectionTooSmall(this.fileExe));
                     return false;
                 }
 
@@ -294,7 +297,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // Verify the NT signature...
                 if (IMAGE_NT_SIGNATURE != BurnCommon.ReadUInt32(bytes, IMAGE_NT_HEADER_OFFSET_SIGNATURE))
                 {
-                    Messaging.Instance.OnMessage(WixErrors.InvalidStubExe(this.fileExe));
+                    this.messaging.Write(ErrorMessages.InvalidStubExe(this.fileExe));
                     return false;
                 }
 
@@ -329,7 +332,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // Verify the DOS 'MZ' signature.
                 if (IMAGE_DOS_SIGNATURE != BurnCommon.ReadUInt16(bytes, IMAGE_DOS_HEADER_OFFSET_MAGIC))
                 {
-                    Messaging.Instance.OnMessage(WixErrors.InvalidStubExe(this.fileExe));
+                    this.messaging.Write(ErrorMessages.InvalidStubExe(this.fileExe));
                     return false;
                 }
 
diff --git a/src/WixToolset.Core.Burn/Bundles/BurnReader.cs b/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
index 3b3076c4..b4e23623 100644
--- a/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
+++ b/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.IO;
     using System.Xml;
     using WixToolset.Core.Native;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Burn PE reader for the WiX toolset.
@@ -32,8 +33,8 @@ namespace WixToolset.Core.Burn.Bundles
         /// Creates a BurnReader for reading a PE file.
         /// </summary>
         /// <param name="fileExe">File to read.</param>
-        private BurnReader(string fileExe)
-            : base(fileExe)
+        private BurnReader(IMessaging messaging, string fileExe)
+            : base(messaging, fileExe)
         {
             this.attachedContainerPayloadNames = new List<DictionaryEntry>();
         }
@@ -59,9 +60,9 @@ namespace WixToolset.Core.Burn.Bundles
         /// </summary>
         /// <param name="fileExe">Path to file.</param>
         /// <returns>Burn reader.</returns>
-        public static BurnReader Open(string fileExe)
+        public static BurnReader Open(IMessaging messaging, string fileExe)
         {
-            BurnReader reader = new BurnReader(fileExe);
+            BurnReader reader = new BurnReader(messaging, fileExe);
 
             reader.binaryReader = new BinaryReader(File.Open(fileExe, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Delete));
             if (!reader.Initialize(reader.binaryReader))
diff --git a/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs b/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs
index e7365212..08eeaa15 100644
--- a/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs
+++ b/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Diagnostics;
     using System.IO;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Burn PE writer for the WiX toolset.
@@ -30,8 +31,8 @@ namespace WixToolset.Core.Burn.Bundles
         /// </summary>
         /// <param name="fileExe">File to modify in-place.</param>
         /// <param name="bundleGuid">GUID for the bundle.</param>
-        private BurnWriter(string fileExe)
-            : base(fileExe)
+        private BurnWriter(IMessaging messaging, string fileExe)
+            : base(messaging, fileExe)
         {
         }
 
@@ -40,9 +41,9 @@ namespace WixToolset.Core.Burn.Bundles
         /// </summary>
         /// <param name="fileExe">Path to file.</param>
         /// <returns>Burn writer.</returns>
-        public static BurnWriter Open(string fileExe)
+        public static BurnWriter Open(IMessaging messaging, string fileExe)
         {
-            BurnWriter writer = new BurnWriter(fileExe);
+            BurnWriter writer = new BurnWriter(messaging, fileExe);
 
             using (BinaryReader binaryReader = new BinaryReader(File.Open(fileExe, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Delete)))
             {
@@ -76,7 +77,7 @@ namespace WixToolset.Core.Burn.Bundles
             this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_MAGIC, BURN_SECTION_MAGIC);
             this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_VERSION, BURN_SECTION_VERSION);
 
-            Messaging.Instance.OnMessage(WixVerboses.BundleGuid(bundleId.ToString("B")));
+            this.messaging.Write(VerboseMessages.BundleGuid(bundleId.ToString("B")));
             this.binaryWriter.BaseStream.Seek(this.wixburnDataOffset + BURN_SECTION_OFFSET_BUNDLEGUID, SeekOrigin.Begin);
             this.binaryWriter.Write(bundleId.ToByteArray());
 
diff --git a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
index 5eb76479..0dea8b1d 100644
--- a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
@@ -29,7 +29,7 @@ namespace WixToolset.Core.Burn.Inscribe
                 {
                     reader.Stream.Seek(reader.AttachedContainerAddress, SeekOrigin.Begin);
 
-                    using (BurnWriter writer = BurnWriter.Open(tempFile))
+                    using (BurnWriter writer = BurnWriter.Open(this.Context.Messaging, tempFile))
                     {
                         writer.RememberThenResetSignature();
                         writer.AppendContainer(reader.Stream, reader.AttachedContainerSize, BurnCommon.Container.Attached);