Move the responsibility of wrapping the binary interfaces from mbahost to the new mbanative dll of WixToolset.Mba.Core.

7 files changed, 92 insertions, 16 deletions

diff --git a/src/WixToolset.Mba.Core/BalUtil.cs b/src/WixToolset.Mba.Core/BalUtil.cs
new file mode 100644
index 00000000..f478eca4
--- /dev/null
+++ b/src/WixToolset.Mba.Core/BalUtil.cs
@@ -0,0 +1,22 @@
+// 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.Mba.Core
+{
+    using System;
+    using System.Runtime.InteropServices;
+
+    internal static class BalUtil
+    {
+        [DllImport("mbanative.dll", ExactSpelling = true, PreserveSig = false)]
+        internal static extern IBootstrapperEngine InitializeFromCreateArgs(
+            IntPtr pArgs,
+            ref Command pCommand
+            );
+
+        [DllImport("mbanative.dll", ExactSpelling = true)]
+        internal static extern void StoreBAInCreateResults(
+            IntPtr pResults,
+            [MarshalAs(UnmanagedType.Interface)] IBootstrapperApplication pBA
+            );
+    }
+}
diff --git a/src/WixToolset.Mba.Core/BaseBootstrapperApplicationFactory.cs b/src/WixToolset.Mba.Core/BaseBootstrapperApplicationFactory.cs
index 20151b71..264733ac 100644
--- a/src/WixToolset.Mba.Core/BaseBootstrapperApplicationFactory.cs
+++ b/src/WixToolset.Mba.Core/BaseBootstrapperApplicationFactory.cs
@@ -2,15 +2,35 @@
 
 namespace WixToolset.Mba.Core
 {
+    using System;
+    using System.Runtime.InteropServices;
+
     public abstract class BaseBootstrapperApplicationFactory : IBootstrapperApplicationFactory
     {
-        public IBootstrapperApplication Create(IBootstrapperEngine pEngine, ref Command command)
+        public void Create(IntPtr pArgs, IntPtr pResults)
         {
-            IEngine engine = new Engine(pEngine);
-            IBootstrapperCommand bootstrapperCommand = command.GetBootstrapperCommand();
-            return this.Create(engine, bootstrapperCommand);
+            InitializeFromCreateArgs(pArgs, out var engine, out var bootstrapperCommand);
+
+            var ba = this.Create(engine, bootstrapperCommand);
+            StoreBAInCreateResults(pResults, ba);
         }
 
         protected abstract IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand);
+
+        public static void InitializeFromCreateArgs(IntPtr pArgs, out IEngine engine, out IBootstrapperCommand bootstrapperCommand)
+        {
+            Command pCommand = new Command
+            {
+                cbSize = Marshal.SizeOf(typeof(Command))
+            };
+            var pEngine = BalUtil.InitializeFromCreateArgs(pArgs, ref pCommand);
+            engine = new Engine(pEngine);
+            bootstrapperCommand = pCommand.GetBootstrapperCommand();
+        }
+
+        public static void StoreBAInCreateResults(IntPtr pResults, IBootstrapperApplication ba)
+        {
+            BalUtil.StoreBAInCreateResults(pResults, ba);
+        }
     }
 }
diff --git a/src/WixToolset.Mba.Core/BootstrapperApplicationFactory.cs b/src/WixToolset.Mba.Core/BootstrapperApplicationFactory.cs
index 968c6336..55f0e83b 100644
--- a/src/WixToolset.Mba.Core/BootstrapperApplicationFactory.cs
+++ b/src/WixToolset.Mba.Core/BootstrapperApplicationFactory.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Mba.Core
     using System.Runtime.InteropServices;
 
     /// <summary>
-    /// Entry point for the MBA host to create and return the IBootstrapperApplication implementation to the engine.
+    /// Entry point for the MBA host to create and return the BA to the engine.
     /// </summary>
     [ClassInterface(ClassInterfaceType.None)]
     public sealed class BootstrapperApplicationFactory : MarshalByRefObject, IBootstrapperApplicationFactory
@@ -21,14 +21,13 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
-        /// Loads the bootstrapper application assembly and creates an instance of the IBootstrapperApplication.
+        /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method.
         /// </summary>
-        /// <param name="pEngine">IBootstrapperEngine provided for the bootstrapper application.</param>
-        /// <param name="command">Command line for the bootstrapper application.</param>
-        /// <returns>Bootstrapper application via <see cref="IBootstrapperApplication"/> interface.</returns>
+        /// <param name="pArgs">Pointer to BOOTSTRAPPER_CREATE_ARGS struct.</param>
+        /// <param name="pResults">Pointer to BOOTSTRAPPER_CREATE_RESULTS struct.</param>
         /// <exception cref="MissingAttributeException">The bootstrapper application assembly
         /// does not define the <see cref="BootstrapperApplicationFactoryAttribute"/>.</exception>
-        public IBootstrapperApplication Create(IBootstrapperEngine pEngine, ref Command command)
+        public void Create(IntPtr pArgs, IntPtr pResults)
         {
             // Get the wix.boostrapper section group to get the name of the bootstrapper application assembly to host.
             var section = ConfigurationManager.GetSection("wix.bootstrapper/host") as HostSection;
@@ -45,8 +44,7 @@ namespace WixToolset.Mba.Core
                 throw new InvalidBootstrapperApplicationFactoryException();
             }
 
-            var ba = baFactory.Create(pEngine, ref command);
-            return ba;
+            baFactory.Create(pArgs, pResults);
         }
 
         /// <summary>
diff --git a/src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs b/src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs
index f5d4c705..700f0888 100644
--- a/src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs
+++ b/src/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs
@@ -12,9 +12,9 @@ namespace WixToolset.Mba.Core
     [GeneratedCodeAttribute("WixToolset.Bootstrapper.InteropCodeGenerator", "1.0.0.0")]
     public interface IBootstrapperApplicationFactory
     {
-        IBootstrapperApplication Create(
-            [MarshalAs(UnmanagedType.Interface)] IBootstrapperEngine pEngine,
-            ref Command command
+        void Create(
+            IntPtr pArgs,
+            IntPtr pResults
             );
     }
 
@@ -23,6 +23,7 @@ namespace WixToolset.Mba.Core
     [GeneratedCodeAttribute("WixToolset.Bootstrapper.InteropCodeGenerator", "1.0.0.0")]
     public struct Command
     {
+        [MarshalAs(UnmanagedType.I4)] internal int cbSize;
         [MarshalAs(UnmanagedType.U4)] private readonly LaunchAction action;
         [MarshalAs(UnmanagedType.U4)] private readonly Display display;
         [MarshalAs(UnmanagedType.U4)] private readonly Restart restart;
@@ -49,4 +50,25 @@ namespace WixToolset.Mba.Core
                 this.wzLayoutDirectory);
         }
     }
+
+    [Serializable]
+    [StructLayout(LayoutKind.Sequential)]
+    [GeneratedCodeAttribute("WixToolset.Bootstrapper.InteropCodeGenerator", "1.0.0.0")]
+    public struct BootstrapperCreateArgs
+    {
+        [MarshalAs(UnmanagedType.I4)] public readonly int cbSize;
+        [MarshalAs(UnmanagedType.I8)] public readonly long qwEngineAPIVersion;
+        public readonly IntPtr pfnBootstrapperEngineProc;
+        public readonly IntPtr pvBootstrapperEngineProcContext;
+        public readonly IntPtr pCommand;
+
+        public BootstrapperCreateArgs(long version, IntPtr pEngineProc, IntPtr pEngineContext, IntPtr pCommand)
+        {
+            this.cbSize = Marshal.SizeOf(typeof(BootstrapperCreateArgs));
+            this.qwEngineAPIVersion = version;
+            this.pfnBootstrapperEngineProc = pEngineProc;
+            this.pvBootstrapperEngineProcContext = pEngineContext;
+            this.pCommand = pCommand;
+        }
+    }
 }
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
index 05d042c3..4b14a545 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="BalUtil.cs" />
     <Compile Include="BaseBootstrapperApplicationFactory.cs" />
     <Compile Include="BootstrapperApplication.cs" />
     <Compile Include="BootstrapperApplicationData.cs" />
diff --git a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
index 04eee9ec..bbac204f 100644
--- a/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+++ b/src/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
@@ -7,7 +7,7 @@
     <owners>WiX Toolset Team</owners>
     <!-- <license type="expression">MS-RL</license> -->
     <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
-    <projectUrl>https://github.com/wixtoolset/BootstrapperCore</projectUrl>
+    <projectUrl>https://github.com/wixtoolset/balutil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <copyright>$copyright$</copyright>
@@ -15,6 +15,8 @@
 
   <files>
     <file src="..\..\build\$configuration$\$id$.config" target="samples" />
+    <file src="build\net20\$id$.props" target="build\net20" />
+    <file src="..\..\build\$configuration$\v141_xp\x86\mbanative.dll" target="build\net20\x86" />
     <file src="..\..\build\$configuration$\$id$.h" target="build\native\include" />
     <file src="..\..\build\$configuration$\$id$.dll" target="lib\net20" />
   </files>
diff --git a/src/WixToolset.Mba.Core/build/net20/WixToolset.Mba.Core.props b/src/WixToolset.Mba.Core/build/net20/WixToolset.Mba.Core.props
new file mode 100644
index 00000000..c0018e0d
--- /dev/null
+++ b/src/WixToolset.Mba.Core/build/net20/WixToolset.Mba.Core.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WixToolsetMbaNativePath Condition=" '$(WixToolsetMbaNativePath)' == '' ">$(MSBuildThisFileDirectory)x86\mbanative.dll</WixToolsetMbaNativePath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="$(WixToolsetMbaNativePath)" CopyToOutputDirectory="Always" />
+  </ItemGroup>
+</Project>