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 --- .../burn/test/BalUtilUnitTest/BAFunctionsTests.cpp | 47 ---------------------- .../test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | 3 -- .../burn/test/BalUtilUnitTest/TestBAFunctions.cpp | 39 ------------------ .../burn/test/BalUtilUnitTest/TestBAFunctions.h | 8 ---- src/api/burn/test/BalUtilUnitTest/precomp.h | 2 - 5 files changed, 99 deletions(-) delete mode 100644 src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp delete mode 100644 src/api/burn/test/BalUtilUnitTest/TestBAFunctions.cpp delete mode 100644 src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h (limited to 'src/api/burn/test') diff --git a/src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp b/src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp deleted file mode 100644 index ba04c1bb..00000000 --- a/src/api/burn/test/BalUtilUnitTest/BAFunctionsTests.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -#include "precomp.h" - -using namespace System; -using namespace Xunit; -using namespace WixInternal::TestSupport; -using namespace WixInternal::TestSupport::XunitExtensions; - -namespace BalUtilTests -{ - public ref class BAFunctions - { - public: - [Fact(Skip = "Need a mock implementation of IBootstrapperEngine to test BAFunctions.")] - void CanCreateTestBAFunctions() - { - HRESULT hr = S_OK; - BA_FUNCTIONS_CREATE_ARGS args = { }; - BA_FUNCTIONS_CREATE_RESULTS results = { }; - IBootstrapperEngine* pEngine = NULL; - BOOTSTRAPPER_COMMAND command = { }; - IBAFunctions* pBAFunctions = NULL; - - args.cbSize = sizeof(args); - args.pEngine = pEngine; - args.pCommand = &command; - - results.cbSize = sizeof(results); - - try - { - BalInitialize(pEngine); - - hr = CreateBAFunctions(NULL, &args, &results); - NativeAssert::Succeeded(hr, "Failed to create BAFunctions."); - - pBAFunctions = reinterpret_cast(results.pvBAFunctionsProcContext); - } - finally - { - ReleaseObject(pEngine); - ReleaseObject(pBAFunctions); - } - } - }; -} diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj index de79fe33..114ab26d 100644 --- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj +++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj @@ -37,20 +37,17 @@ - Create 4564;4691 - - diff --git a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.cpp b/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.cpp deleted file mode 100644 index 3e850442..00000000 --- a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// 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. - -#include "precomp.h" -#include "BalBaseBAFunctions.h" -#include "BalBaseBAFunctionsProc.h" - -class CTestBAFunctions : public CBalBaseBAFunctions -{ -public: - CTestBAFunctions( - __in HMODULE hModule - ) : CBalBaseBAFunctions(hModule) - { - } -}; - -HRESULT CreateBAFunctions( - __in HMODULE hModule, - __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, - __inout BA_FUNCTIONS_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - CTestBAFunctions* pFunction = NULL; - - pFunction = new CTestBAFunctions(hModule); - ExitOnNull(pFunction, hr, E_OUTOFMEMORY, "Failed to create new test bafunctions object."); - - hr = pFunction->OnCreate(pArgs->pEngine, pArgs->pCommand); - ExitOnFailure(hr, "Failed to initialize new test bafunctions."); - - pResults->pfnBAFunctionsProc = BalBaseBAFunctionsProc; - pResults->pvBAFunctionsProcContext = pFunction; - pFunction = NULL; - -LExit: - ReleaseObject(pFunction); - return hr; -} diff --git a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h b/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h deleted file mode 100644 index e25e40c3..00000000 --- a/src/api/burn/test/BalUtilUnitTest/TestBAFunctions.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -// 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. - -HRESULT CreateBAFunctions( - __in HMODULE hModule, - __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, - __inout BA_FUNCTIONS_CREATE_RESULTS* pResults - ); diff --git a/src/api/burn/test/BalUtilUnitTest/precomp.h b/src/api/burn/test/BalUtilUnitTest/precomp.h index 4cdd262c..78add593 100644 --- a/src/api/burn/test/BalUtilUnitTest/precomp.h +++ b/src/api/burn/test/BalUtilUnitTest/precomp.h @@ -16,11 +16,9 @@ #include #include -#include #include #include -#include "TestBAFunctions.h" #include "TestBootstrapperApplication.h" #pragma managed -- cgit v1.2.3-55-g6feb