From dea25ba9bcfd65200b60339c2e4bc060cdf20723 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 7 Mar 2024 01:44:51 -0800
Subject: Move wixstdba functions to Bal.wixext build

---
 .../BafRelatedBundleVariableTesting.vcxproj                           | 2 +-
 .../BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp      | 4 +++-
 .../burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj  | 2 +-
 src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp           | 4 +++-
 src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp          | 2 --
 src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj      | 2 +-
 src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp            | 4 +++-
 7 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/test')

diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
index 58db7048..815b20a9 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
+    <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp
index fc9d1177..6396fa08 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp
@@ -31,7 +31,9 @@ extern "C" HRESULT WINAPI BAFunctionsCreate(
     )
 {
     HRESULT hr = S_OK;
-    
+
+    BalInitialize(pArgs->pEngine);
+
     hr = CreateBAFunctions(vhInstance, pArgs, pResults);
     BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
 
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
index b6de5844..aa6a03f7 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
@@ -62,7 +62,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
+    <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp b/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp
index fc9d1177..6396fa08 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp
@@ -31,7 +31,9 @@ extern "C" HRESULT WINAPI BAFunctionsCreate(
     )
 {
     HRESULT hr = S_OK;
-    
+
+    BalInitialize(pArgs->pEngine);
+
     hr = CreateBAFunctions(vhInstance, pArgs, pResults);
     BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
 
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
index c93f9d3f..5e26faac 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
@@ -77,8 +77,6 @@ HRESULT WINAPI CreateBAFunctions(
     HRESULT hr = S_OK;
     CPrereqBaf* pBAFunctions = NULL;
 
-    BalInitialize(pArgs->pEngine);
-
     pBAFunctions = new CPrereqBaf(hModule);
     ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CPrereqBaf object.");
 
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
index 4156a8f5..d0bce9d8 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
+    <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp
index fc9d1177..6396fa08 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp
@@ -31,7 +31,9 @@ extern "C" HRESULT WINAPI BAFunctionsCreate(
     )
 {
     HRESULT hr = S_OK;
-    
+
+    BalInitialize(pArgs->pEngine);
+
     hr = CreateBAFunctions(vhInstance, pArgs, pResults);
     BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
 
-- 
cgit v1.2.3-55-g6feb