6 files changed, 121 insertions, 35 deletions

diff --git a/src/WixToolset.Extensibility/Data/DecompileResult.cs b/src/WixToolset.Extensibility/Data/DecompileResult.cs
new file mode 100644
index 00000000..29da4887
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/DecompileResult.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility.Data
+{
+    using System.Collections.Generic;
+
+    public class DecompileResult
+    {
+        public string SourceDocumentPath { get; set; }
+
+        public IEnumerable<string> ExtractedFilePaths { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/IDecompileContext.cs b/src/WixToolset.Extensibility/Data/IDecompileContext.cs
new file mode 100644
index 00000000..fb846878
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IDecompileContext.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility.Data
+{
+    using System;
+    using System.Collections.Generic;
+    using WixToolset.Data;
+
+    public interface IDecompileContext
+    {
+        IServiceProvider ServiceProvider { get; }
+
+        string DecompilePath { get; set; }
+
+        OutputType DecompileType { get; set; }
+
+        IEnumerable<IDecompilerExtension> Extensions { get; set; }
+
+        string ExtractFolder { get; set; }
+
+        /// <summary>
+        /// Optional gets or sets the base path for the File/@Source.
+        /// </summary>
+        /// <remarks>Default value is "SourceDir" to enable use of BindPaths.</remarks>
+        string BaseSourcePath { get; set; }
+
+        string IntermediateFolder { get; set; }
+
+        bool IsAdminImage { get; set; }
+
+        string OutputPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the option to suppress custom tables.
+        /// </summary>
+        bool SuppressCustomTables { get; set; }
+
+        /// <summary>
+        /// Gets or sets the option to suppress dropping empty tables.
+        /// </summary>
+        bool SuppressDroppingEmptyTables { get; set; }
+
+        bool SuppressExtractCabinets { get; set; }
+
+        /// <summary>
+        /// Gets or sets the option to suppress decompiling UI-related tables.
+        /// </summary>
+        bool SuppressUI { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether the decompiler should use module logic on a product output.
+        /// </summary>
+        bool TreatProductAsModule { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/DecompilerConstants.cs b/src/WixToolset.Extensibility/DecompilerConstants.cs
index 58742182..8cd6b19c 100644
--- a/src/WixToolset.Extensibility/DecompilerConstants.cs
+++ b/src/WixToolset.Extensibility/DecompilerConstants.cs
@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset
+namespace WixToolset.Extensibility
 {
-    using System;
-
     /// <summary>
     /// Constants used by decompiler.
     /// </summary>
diff --git a/src/WixToolset.Extensibility/IBackend.cs b/src/WixToolset.Extensibility/IBackend.cs
index 80f885c3..df693561 100644
--- a/src/WixToolset.Extensibility/IBackend.cs
+++ b/src/WixToolset.Extensibility/IBackend.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 namespace WixToolset.Extensibility
 {
@@ -9,6 +9,8 @@ namespace WixToolset.Extensibility
     {
         BindResult Bind(IBindContext context);
 
+        DecompileResult Decompile(IDecompileContext context);
+
         Intermediate Unbind(IUnbindContext context);
 
         bool Inscribe(IInscribeContext context);
diff --git a/src/WixToolset.Extensibility/IDecompilerExtension.cs b/src/WixToolset.Extensibility/IDecompilerExtension.cs
index e2b80089..9ea4290b 100644
--- a/src/WixToolset.Extensibility/IDecompilerExtension.cs
+++ b/src/WixToolset.Extensibility/IDecompilerExtension.cs
@@ -2,46 +2,21 @@
 
 namespace WixToolset.Extensibility
 {
+    using WixToolset.Extensibility.Data;
+
     /// <summary>
     /// Base class for creating a decompiler extension.
     /// </summary>
     public interface IDecompilerExtension
     {
         /// <summary>
-        /// Gets or sets the decompiler core for the extension.
-        /// </summary>
-        /// <value>The decompiler core for the extension.</value>
-        IDecompilerCore Core { get; set; }
-
-        /// <summary>
-        /// Gets the table definitions this extension decompiles.
-        /// </summary>
-        /// <value>Table definitions this extension decompiles.</value>
-        //TableDefinitionCollection TableDefinitions { get; }
-
-        /// <summary>
-        /// Gets the library that this decompiler wants removed from the decomipiled output.
-        /// </summary>
-        /// <param name="tableDefinitions">The table definitions to use while loading the library.</param>
-        /// <returns>The library for this extension or null if there is no library to be removed.</returns>
-        //Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions);
-
-        /// <summary>
-        /// Called at the beginning of the decompilation of a database.
-        /// </summary>
-        /// <param name="tables">The collection of all tables.</param>
-        //void Initialize(TableIndexedCollection tables);
-
-        /// <summary>
-        /// Decompiles an extension table.
+        /// Called before decompiling occurs.
         /// </summary>
-        /// <param name="table">The table to decompile.</param>
-        //void DecompileTable(Table table);
+        void PreDecompile(IDecompileContext context);
 
         /// <summary>
-        /// Finalize decompilation.
+        /// Called after all decompiling occurs.
         /// </summary>
-        /// <param name="tables">The collection of all tables.</param>
-        //void Finish(TableIndexedCollection tables);
+        void PostDecompile(DecompileResult result);
     }
 }
diff --git a/src/WixToolset.Extensibility/IWindowsInstallerBackendDecompilerExtension.cs b/src/WixToolset.Extensibility/IWindowsInstallerBackendDecompilerExtension.cs
new file mode 100644
index 00000000..05899c1f
--- /dev/null
+++ b/src/WixToolset.Extensibility/IWindowsInstallerBackendDecompilerExtension.cs
@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility
+{
+    using WixToolset.Data;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility.Data;
+
+    /// <summary>
+    /// Interface all binder extensions implement.
+    /// </summary>
+    public interface IWindowsInstallerBackendDecompilerExtension
+    {
+        /// <summary>
+        /// Called before decompiling occurs.
+        /// </summary>
+        void PreBackendDecompile(IDecompileContext context);
+
+        /// <summary>
+        /// Gets the table definitions this extension decompiles.
+        /// </summary>
+        /// <value>Table definitions this extension decompiles.</value>
+        TableDefinitionCollection TableDefinitions { get; }
+
+        /// <summary>
+        /// Gets the library that this decompiler wants removed from the decomipiled output.
+        /// </summary>
+        /// <param name="tableDefinitions">The table definitions to use while loading the library.</param>
+        /// <returns>The library for this extension or null if there is no library to be removed.</returns>
+        Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions);
+
+        /// <summary>
+        /// Decompiles an extension table.
+        /// </summary>
+        /// <param name="table">The table to decompile.</param>
+        void DecompileTable(Table table);
+
+        /// <summary>
+        /// Called after all output changes occur and right before the output is bound into its final format.
+        /// </summary>
+        void PostBackendDecompile(DecompileResult result);
+    }
+}