From dea25ba9bcfd65200b60339c2e4bc060cdf20723 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 7 Mar 2024 01:44:51 -0800 Subject: Move wixstdba functions to Bal.wixext build --- src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp | 3 --- src/ext/Bal/Samples/bafunctions/bafunctions.cpp | 11 +++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/ext/Bal/Samples') diff --git a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp index 14a898e8..a0aa0488 100644 --- a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp +++ b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp @@ -74,9 +74,6 @@ HRESULT WINAPI CreateBAFunctions( HRESULT hr = S_OK; CWixSampleBAFunctions* pBAFunctions = NULL; - // This is required to enable logging functions. - BalInitialize(pArgs->pEngine); - pBAFunctions = new CWixSampleBAFunctions(hModule); ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CWixSampleBAFunctions object."); diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.cpp b/src/ext/Bal/Samples/bafunctions/bafunctions.cpp index d26e7cce..72dc1f54 100644 --- a/src/ext/Bal/Samples/bafunctions/bafunctions.cpp +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.cpp @@ -26,13 +26,16 @@ extern "C" BOOL WINAPI DllMain( } extern "C" HRESULT WINAPI BAFunctionsCreate( - __in const BA_FUNCTIONS_CREATE_ARGS* /*pArgs*/, - __inout BA_FUNCTIONS_CREATE_RESULTS* /*pResults*/ + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, + __inout BA_FUNCTIONS_CREATE_RESULTS* pResults ) { HRESULT hr = S_OK; - - //hr = CreateBAFunctions(vhInstance, pArgs, pResults); + + // This is required to enable logging functions. + BalInitialize(pArgs->pEngine); + + hr = CreateBAFunctions(vhInstance, pArgs, pResults); BalExitOnFailure(hr, "Failed to create BAFunctions interface."); LExit: -- cgit v1.2.3-55-g6feb