Move the BootstrapperApplication out of proc

5 files changed, 35 insertions, 19 deletions

diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
index a2b8e041..29a5d7d5 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
@@ -44,6 +44,16 @@ static void CALLBACK BafThmUtilTestingTraceError(
 class CBafThmUtilTesting : public CBalBaseBAFunctions
 {
 public: // IBAFunctions
+    virtual STDMETHODIMP OnCreate(
+        __in IBootstrapperEngine* pEngine,
+        __in BOOTSTRAPPER_COMMAND* pCommand
+        )
+    {
+        m_commandDisplay = pCommand->display;
+
+        return __super::OnCreate(pEngine, pCommand);
+    }
+
     virtual STDMETHODIMP OnThemeControlLoading(
         __in LPCWSTR wzName,
         __inout BOOL* pfProcessed,
@@ -95,7 +105,7 @@ public: //IBootstrapperApplication
         __inout BOOL* pfCancel
         )
     {
-        if (BOOTSTRAPPER_DISPLAY_FULL <= m_command.display)
+        if (BOOTSTRAPPER_DISPLAY_FULL <= m_commandDisplay)
         {
             if (IDCANCEL == ::MessageBoxW(m_hwndParent, L"Shutdown requests should be denied right now.", L"OnExecuteBegin", MB_OKCANCEL))
             {
@@ -184,7 +194,7 @@ private:
         }
 
         hr = ThemeCreateParentWindow(m_pBafTheme, 0, wc.lpszClassName, m_pBafTheme->sczCaption, m_pBafTheme->dwStyle, x, y, m_hwndParent, m_hModule, this, THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES, &m_hWndBaf);
-        ExitOnFailure(hr, "Failed to create window.");
+        ExitOnFailure(hr, "Failed to create baf testing window.");
 
         hr = S_OK;
 
@@ -330,7 +340,7 @@ private:
     {
         HRESULT hr = S_OK;
         BOOL fProcessed = FALSE;
-        
+
         for (DWORD iAssignControl = 0; iAssignControl < countof(vrgInitControls); ++iAssignControl)
         {
             if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pArgs->pThemeControl->sczName, -1, vrgInitControls[iAssignControl].wzName, -1))
@@ -371,7 +381,7 @@ private:
             }
 
             break;
-            
+
         case BAFTHMUTILTESTING_CONTROL_PROGRESSBAR_STANDARD:
             fProcessed = TRUE;
 
@@ -410,11 +420,10 @@ public:
     // Constructor - initialize member variables.
     //
     CBafThmUtilTesting(
-        __in HMODULE hModule,
-        __in IBootstrapperEngine* pEngine,
-        __in const BA_FUNCTIONS_CREATE_ARGS* pArgs
-        ) : CBalBaseBAFunctions(hModule, pEngine, pArgs)
+        __in HMODULE hModule
+        ) : CBalBaseBAFunctions(hModule)
     {
+        m_commandDisplay = BOOTSTRAPPER_DISPLAY_UNKNOWN;
         m_pBafTheme = NULL;
         m_fRegistered = FALSE;
         m_hWndBaf = NULL;
@@ -434,12 +443,12 @@ public:
     }
 
 private:
+    BOOTSTRAPPER_DISPLAY m_commandDisplay;
     THEME* m_pBafTheme;
     BOOL m_fRegistered;
     HWND m_hWndBaf;
 };
 
-
 HRESULT WINAPI CreateBAFunctions(
     __in HMODULE hModule,
     __in const BA_FUNCTIONS_CREATE_ARGS* pArgs,
@@ -448,16 +457,20 @@ HRESULT WINAPI CreateBAFunctions(
 {
     HRESULT hr = S_OK;
     CBafThmUtilTesting* pBAFunctions = NULL;
-    IBootstrapperEngine* pEngine = NULL;
 
     DutilInitialize(&BafThmUtilTestingTraceError);
 
+#if TODO_REWRITE
     hr = BalInitializeFromCreateArgs(pArgs->pBootstrapperCreateArgs, &pEngine);
     ExitOnFailure(hr, "Failed to initialize Bal.");
+#endif
 
-    pBAFunctions = new CBafThmUtilTesting(hModule, pEngine, pArgs);
+    pBAFunctions = new CBafThmUtilTesting(hModule);
     ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CBafThmUtilTesting object.");
 
+    hr = pBAFunctions->OnCreate(pArgs->pEngine, pArgs->pCommand);
+    ExitOnFailure(hr, "Failed to call OnCreate CPrereqBaf.");
+
     pResults->pfnBAFunctionsProc = BalBaseBAFunctionsProc;
     pResults->pvBAFunctionsProcContext = pBAFunctions;
     pBAFunctions = NULL;
@@ -466,7 +479,6 @@ HRESULT WINAPI CreateBAFunctions(
 
 LExit:
     ReleaseObject(pBAFunctions);
-    ReleaseObject(pEngine);
 
     return hr;
 }
diff --git a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
index 615d4b1d..eea96895 100644
--- a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
+++ b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
@@ -30,9 +30,12 @@
     <?elseif $(var.BA) = "hyperlinkLicense"?>
       <BootstrapperApplication>
         <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
+        <PayloadGroupRef Id="BAPayloads" />
       </BootstrapperApplication>
     <?else?>
-      <BootstrapperApplicationRef Id="$(var.BA)" />
+      <BootstrapperApplicationRef Id="$(var.BA)">
+        <PayloadGroupRef Id="BAPayloads" />
+      </BootstrapperApplicationRef>
     <?endif?>
 
     <Chain>
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
index c092f1fd..e7d029a3 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
@@ -6,6 +6,7 @@
     <UpgradeCode>{5DE2F206-3C37-4265-81F7-095284E16B08}</UpgradeCode>
     <HarvestDirectoryAdditionalOptions>-generate payloadgroup</HarvestDirectoryAdditionalOptions>
   </PropertyGroup>
+
   <ItemGroup>
     <HarvestDirectory Include="BAPayloads">
       <ComponentGroupName>BAPayloads</ComponentGroupName>
@@ -18,20 +19,24 @@
       <Transforms>package.xslt</Transforms>
     </HarvestDirectory>
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="WixToolset.Heat" />
     <PackageReference Include="WixToolset.Bal.wixext" />
   </ItemGroup>
+
   <!-- We do this dynamically to avoid committing so many files to source control. -->
   <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild">
     <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
     <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
   </Target>
+
   <Target Name="DeleteThousandsOfFiles" AfterTargets="AfterBuild">
     <RemoveDir Directories="$(MSBuildProjectDirectory)\BAPayloads" />
     <RemoveDir Directories="$(MSBuildProjectDirectory)\PackagePayloads" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
index 3b189b15..54082131 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
@@ -1,11 +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. -->
 
-
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <Fragment>
-    <BootstrapperApplication>
-      <PayloadGroupRef Id="BAPayloads" />
-    </BootstrapperApplication>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)">
         <PayloadGroupRef Id="PackagePayloads" />
diff --git a/src/test/burn/TestData/Manual/PackageA/PackageA.wixproj b/src/test/burn/TestData/Manual/PackageA/PackageA.wixproj
index 61dc27ab..f16c2038 100644
--- a/src/test/burn/TestData/Manual/PackageA/PackageA.wixproj
+++ b/src/test/burn/TestData/Manual/PackageA/PackageA.wixproj
@@ -10,4 +10,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>