aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-03-07 01:44:51 -0800
committerRob Mensching <rob@firegiant.com>2024-03-07 10:55:57 -0800
commitdea25ba9bcfd65200b60339c2e4bc060cdf20723 (patch)
tree91dae5127a7eeb4f0e59252194fc7ec7153a2781 /src/test
parent3d2d46f62fc01e2653d0251ad9703090574e7c41 (diff)
downloadwix-dea25ba9bcfd65200b60339c2e4bc060cdf20723.tar.gz
wix-dea25ba9bcfd65200b60339c2e4bc060cdf20723.tar.bz2
wix-dea25ba9bcfd65200b60339c2e4bc060cdf20723.zip
Move wixstdba functions to Bal.wixext build
Diffstat (limited to 'src/test')
-rw-r--r--src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj2
-rw-r--r--src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/precomp.cpp4
-rw-r--r--src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj2
-rw-r--r--src/test/burn/TestData/Manual/BafThmutilTesting/precomp.cpp4
-rw-r--r--src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp2
-rw-r--r--src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj2
-rw-r--r--src/test/burn/TestData/PrereqBaTests/PrereqBaf/precomp.cpp4
7 files changed, 12 insertions, 8 deletions
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 @@
59 </ItemGroup> 59 </ItemGroup>
60 60
61 <ItemGroup> 61 <ItemGroup>
62 <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> 62 <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
63 </ItemGroup> 63 </ItemGroup>
64 64
65 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 65 <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(
31 ) 31 )
32{ 32{
33 HRESULT hr = S_OK; 33 HRESULT hr = S_OK;
34 34
35 BalInitialize(pArgs->pEngine);
36
35 hr = CreateBAFunctions(vhInstance, pArgs, pResults); 37 hr = CreateBAFunctions(vhInstance, pArgs, pResults);
36 BalExitOnFailure(hr, "Failed to create BAFunctions interface."); 38 BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
37 39
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 @@
62 </ItemGroup> 62 </ItemGroup>
63 63
64 <ItemGroup> 64 <ItemGroup>
65 <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> 65 <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
66 </ItemGroup> 66 </ItemGroup>
67 67
68 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 68 <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(
31 ) 31 )
32{ 32{
33 HRESULT hr = S_OK; 33 HRESULT hr = S_OK;
34 34
35 BalInitialize(pArgs->pEngine);
36
35 hr = CreateBAFunctions(vhInstance, pArgs, pResults); 37 hr = CreateBAFunctions(vhInstance, pArgs, pResults);
36 BalExitOnFailure(hr, "Failed to create BAFunctions interface."); 38 BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
37 39
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(
77 HRESULT hr = S_OK; 77 HRESULT hr = S_OK;
78 CPrereqBaf* pBAFunctions = NULL; 78 CPrereqBaf* pBAFunctions = NULL;
79 79
80 BalInitialize(pArgs->pEngine);
81
82 pBAFunctions = new CPrereqBaf(hModule); 80 pBAFunctions = new CPrereqBaf(hModule);
83 ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CPrereqBaf object."); 81 ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CPrereqBaf object.");
84 82
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 @@
59 </ItemGroup> 59 </ItemGroup>
60 60
61 <ItemGroup> 61 <ItemGroup>
62 <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> 62 <PackageReference Include="WixToolset.WixStandardBootstrapperApplicationFunctionApi" />
63 </ItemGroup> 63 </ItemGroup>
64 64
65 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 65 <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(
31 ) 31 )
32{ 32{
33 HRESULT hr = S_OK; 33 HRESULT hr = S_OK;
34 34
35 BalInitialize(pArgs->pEngine);
36
35 hr = CreateBAFunctions(vhInstance, pArgs, pResults); 37 hr = CreateBAFunctions(vhInstance, pArgs, pResults);
36 BalExitOnFailure(hr, "Failed to create BAFunctions interface."); 38 BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
37 39