From cef14c6055f85e470ff9ce7a33b53e80d1160ba6 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 15 Jun 2023 15:40:37 -0400
Subject: Ensure extensions get the same decompiler helper.

Fixes https://github.com/wixtoolset/issues/issues/7548.

THIS IS A BREAKING INTERFACE/EXTENSIBILITY CHANGE.
---
 .../BaseWindowsInstallerDecompilerExtension.cs                      | 6 +++---
 .../IWindowsInstallerDecompilerExtension.cs                         | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/api')

diff --git a/src/api/wix/WixToolset.Extensibility/BaseWindowsInstallerDecompilerExtension.cs b/src/api/wix/WixToolset.Extensibility/BaseWindowsInstallerDecompilerExtension.cs
index 8072cd88..69124490 100644
--- a/src/api/wix/WixToolset.Extensibility/BaseWindowsInstallerDecompilerExtension.cs
+++ b/src/api/wix/WixToolset.Extensibility/BaseWindowsInstallerDecompilerExtension.cs
@@ -36,13 +36,13 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// See <see cref="IWindowsInstallerDecompilerExtension.PostDecompile(IWindowsInstallerDecompileResult)"/>
         /// </summary>
-        public virtual void PreDecompile(IWindowsInstallerDecompileContext context)
+        public virtual void PreDecompile(IWindowsInstallerDecompileContext context, IWindowsInstallerDecompilerHelper helper)
         {
             this.Context = context;
 
-            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
+            this.DecompilerHelper = helper;
 
-            this.DecompilerHelper = context.ServiceProvider.GetService<IWindowsInstallerDecompilerHelper>();
+            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
         }
 
         /// <summary>
diff --git a/src/api/wix/WixToolset.Extensibility/IWindowsInstallerDecompilerExtension.cs b/src/api/wix/WixToolset.Extensibility/IWindowsInstallerDecompilerExtension.cs
index f7d54799..cbeda116 100644
--- a/src/api/wix/WixToolset.Extensibility/IWindowsInstallerDecompilerExtension.cs
+++ b/src/api/wix/WixToolset.Extensibility/IWindowsInstallerDecompilerExtension.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Extensibility
     using System.Collections.Generic;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Interface all windows installer decompiler extensions implement.
@@ -21,7 +22,8 @@ namespace WixToolset.Extensibility
         /// Called before decompiling occurs.
         /// </summary>
         /// <param name="context">Decompile context.</param>
-        void PreDecompile(IWindowsInstallerDecompileContext context);
+        /// <param name="helper">Decompile helper.</param>
+        void PreDecompile(IWindowsInstallerDecompileContext context, IWindowsInstallerDecompilerHelper helper);
 
         /// <summary>
         /// Called before decompiling occurs.
-- 
cgit v1.2.3-55-g6feb