From 5baa1dfe8ba2a3bd4728bca118fe1de225f848d4 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 7 Mar 2024 09:41:29 -0800 Subject: Rename "bundle extension" to "bootstrapper extension" for more consistency Also renames WixToolet.BextUtil nupkg to WixToolset.BootstrapperExtensionApi. --- src/burn/engine/EngineForExtension.cpp | 82 ++++++++++---------- src/burn/engine/EngineForExtension.h | 2 +- src/burn/engine/burnextension.cpp | 88 +++++++++++----------- src/burn/engine/burnextension.h | 2 +- src/burn/engine/engine.cpp | 2 +- src/burn/engine/engine.vcxproj | 4 +- src/burn/engine/precomp.h | 2 +- .../BasicFunctionality_BundleA_manifest.xml | 4 +- .../PlanTest/BundlePackage_Multiple_manifest.xml | 4 +- .../ExePackage_PerUserArpEntry_manifest.xml | 4 +- .../TestData/PlanTest/Failure_BundleD_manifest.xml | 4 +- .../PlanTest/MsiTransaction_BundleAv1_manifest.xml | 4 +- .../PlanTest/MsuPackageFixture_manifest.xml | 4 +- .../PlanTest/Slipstream_BundleA_manifest.xml | 4 +- .../Slipstream_BundleA_modified_manifest.xml | 4 +- src/burn/test/BurnUnitTest/precomp.h | 2 +- 16 files changed, 108 insertions(+), 108 deletions(-) (limited to 'src/burn') diff --git a/src/burn/engine/EngineForExtension.cpp b/src/burn/engine/EngineForExtension.cpp index bb134a61..e19cb802 100644 --- a/src/burn/engine/EngineForExtension.cpp +++ b/src/burn/engine/EngineForExtension.cpp @@ -10,8 +10,8 @@ static HRESULT BEEngineEscapeString( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_ESCAPESTRING_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_ESCAPESTRING_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_ESCAPESTRING_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_ESCAPESTRING_RESULTS, pResults); hr = ExternalEngineEscapeString(pArgs->wzIn, pResults->wzOut, &pResults->cchOut); @@ -26,8 +26,8 @@ static HRESULT BEEngineEvaluateCondition( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_EVALUATECONDITION_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_EVALUATECONDITION_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_EVALUATECONDITION_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_EVALUATECONDITION_RESULTS, pResults); hr = ExternalEngineEvaluateCondition(pContext->pEngineState, pArgs->wzCondition, &pResults->f); @@ -42,8 +42,8 @@ static HRESULT BEEngineFormatString( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_FORMATSTRING_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_FORMATSTRING_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_FORMATSTRING_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_FORMATSTRING_RESULTS, pResults); hr = ExternalEngineFormatString(pContext->pEngineState, pArgs->wzIn, pResults->wzOut, &pResults->cchOut); @@ -58,8 +58,8 @@ static HRESULT BEEngineGetVariableNumeric( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_GETVARIABLENUMERIC_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_GETVARIABLENUMERIC_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLENUMERIC_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLENUMERIC_RESULTS, pResults); hr = ExternalEngineGetVariableNumeric(pContext->pEngineState, pArgs->wzVariable, &pResults->llValue); @@ -74,8 +74,8 @@ static HRESULT BEEngineGetVariableString( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_GETVARIABLESTRING_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_GETVARIABLESTRING_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLESTRING_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLESTRING_RESULTS, pResults); hr = ExternalEngineGetVariableString(pContext->pEngineState, pArgs->wzVariable, pResults->wzValue, &pResults->cchValue); @@ -90,8 +90,8 @@ static HRESULT BEEngineGetVariableVersion( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_GETVARIABLEVERSION_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_GETVARIABLEVERSION_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLEVERSION_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_GETVARIABLEVERSION_RESULTS, pResults); hr = ExternalEngineGetVariableVersion(pContext->pEngineState, pArgs->wzVariable, pResults->wzValue, &pResults->cchValue); @@ -107,24 +107,24 @@ static HRESULT BEEngineLog( { HRESULT hr = S_OK; REPORT_LEVEL rl = REPORT_NONE; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_LOG_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_LOG_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_LOG_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_LOG_RESULTS, pResults); switch (pArgs->level) { - case BUNDLE_EXTENSION_LOG_LEVEL_STANDARD: + case BOOTSTRAPPER_EXTENSION_LOG_LEVEL_STANDARD: rl = REPORT_STANDARD; break; - case BUNDLE_EXTENSION_LOG_LEVEL_VERBOSE: + case BOOTSTRAPPER_EXTENSION_LOG_LEVEL_VERBOSE: rl = REPORT_VERBOSE; break; - case BUNDLE_EXTENSION_LOG_LEVEL_DEBUG: + case BOOTSTRAPPER_EXTENSION_LOG_LEVEL_DEBUG: rl = REPORT_DEBUG; break; - case BUNDLE_EXTENSION_LOG_LEVEL_ERROR: + case BOOTSTRAPPER_EXTENSION_LOG_LEVEL_ERROR: rl = REPORT_ERROR; break; @@ -146,8 +146,8 @@ static HRESULT BEEngineSetVariableNumeric( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_SETVARIABLENUMERIC_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_SETVARIABLENUMERIC_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLENUMERIC_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLENUMERIC_RESULTS, pResults); hr = ExternalEngineSetVariableNumeric(pContext->pEngineState, pArgs->wzVariable, pArgs->llValue); @@ -162,8 +162,8 @@ static HRESULT BEEngineSetVariableString( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_SETVARIABLESTRING_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_SETVARIABLESTRING_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLESTRING_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLESTRING_RESULTS, pResults); hr = ExternalEngineSetVariableString(pContext->pEngineState, pArgs->wzVariable, pArgs->wzValue, pArgs->fFormatted); @@ -178,8 +178,8 @@ static HRESULT BEEngineSetVariableVersion( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_SETVARIABLEVERSION_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_SETVARIABLEVERSION_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLEVERSION_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLEVERSION_RESULTS, pResults); hr = ExternalEngineSetVariableVersion(pContext->pEngineState, pArgs->wzVariable, pArgs->wzValue); @@ -194,8 +194,8 @@ static HRESULT BEEngineCompareVersions( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_COMPAREVERSIONS_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_COMPAREVERSIONS_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_COMPAREVERSIONS_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_COMPAREVERSIONS_RESULTS, pResults); hr = ExternalEngineCompareVersions(pArgs->wzVersion1, pArgs->wzVersion2, &pResults->nResult); @@ -210,8 +210,8 @@ static HRESULT BEEngineGetRelatedBundleVariable( ) { HRESULT hr = S_OK; - ValidateMessageArgs(hr, pvArgs, BUNDLE_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS, pArgs); - ValidateMessageResults(hr, pvResults, BUNDLE_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS, pResults); + ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS, pArgs); + ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS, pResults); hr = ExternalEngineGetRelatedBundleVariable(pContext->pEngineState, pArgs->wzBundleId, pArgs->wzVariable, pResults->wzValue, &pResults->cchValue); @@ -220,7 +220,7 @@ LExit: } HRESULT WINAPI EngineForExtensionProc( - __in BUNDLE_EXTENSION_ENGINE_MESSAGE message, + __in BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE message, __in const LPVOID pvArgs, __inout LPVOID pvResults, __in_opt LPVOID pvContext @@ -236,40 +236,40 @@ HRESULT WINAPI EngineForExtensionProc( switch (message) { - case BUNDLE_EXTENSION_ENGINE_MESSAGE_ESCAPESTRING: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_ESCAPESTRING: hr = BEEngineEscapeString(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_EVALUATECONDITION: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_EVALUATECONDITION: hr = BEEngineEvaluateCondition(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_FORMATSTRING: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_FORMATSTRING: hr = BEEngineFormatString(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLENUMERIC: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_GETVARIABLENUMERIC: hr = BEEngineGetVariableNumeric(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLESTRING: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_GETVARIABLESTRING: hr = BEEngineGetVariableString(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_GETVARIABLEVERSION: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_GETVARIABLEVERSION: hr = BEEngineGetVariableVersion(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_LOG: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_LOG: hr = BEEngineLog(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLENUMERIC: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_SETVARIABLENUMERIC: hr = BEEngineSetVariableNumeric(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLESTRING: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_SETVARIABLESTRING: hr = BEEngineSetVariableString(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_SETVARIABLEVERSION: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_SETVARIABLEVERSION: hr = BEEngineSetVariableVersion(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_COMPAREVERSIONS: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_COMPAREVERSIONS: hr = BEEngineCompareVersions(pContext, pvArgs, pvResults); break; - case BUNDLE_EXTENSION_ENGINE_MESSAGE_GETRELATEDBUNDLEVARIABLE: + case BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE_GETRELATEDBUNDLEVARIABLE: hr = BEEngineGetRelatedBundleVariable(pContext, pvArgs, pvResults); break; default: diff --git a/src/burn/engine/EngineForExtension.h b/src/burn/engine/EngineForExtension.h index bad5f08a..b52d4f0a 100644 --- a/src/burn/engine/EngineForExtension.h +++ b/src/burn/engine/EngineForExtension.h @@ -16,7 +16,7 @@ typedef struct _BURN_EXTENSION_ENGINE_CONTEXT // function declarations HRESULT WINAPI EngineForExtensionProc( - __in BUNDLE_EXTENSION_ENGINE_MESSAGE message, + __in BOOTSTRAPPER_EXTENSION_ENGINE_MESSAGE message, __in const LPVOID pvArgs, __inout LPVOID pvResults, __in_opt LPVOID pvContext diff --git a/src/burn/engine/burnextension.cpp b/src/burn/engine/burnextension.cpp index ee4b1542..536dbcc9 100644 --- a/src/burn/engine/burnextension.cpp +++ b/src/burn/engine/burnextension.cpp @@ -5,7 +5,7 @@ static HRESULT SendRequiredBextMessage( __in BURN_EXTENSION* pExtension, - __in BUNDLE_EXTENSION_MESSAGE message, + __in BOOTSTRAPPER_EXTENSION_MESSAGE message, __in const LPVOID pvArgs, __inout LPVOID pvResults ); @@ -13,7 +13,7 @@ static HRESULT SendRequiredBextMessage( // function definitions /******************************************************************* - BurnExtensionParseFromXml - + BurnExtensionParseFromXml - *******************************************************************/ EXTERN_C HRESULT BurnExtensionParseFromXml( @@ -28,22 +28,22 @@ EXTERN_C HRESULT BurnExtensionParseFromXml( DWORD cNodes = 0; LPWSTR scz = NULL; - // Select BundleExtension nodes. - hr = XmlSelectNodes(pixnBundle, L"BundleExtension", &pixnNodes); - ExitOnFailure(hr, "Failed to select BundleExtension nodes."); + // Select BootstrapperExtension nodes. + hr = XmlSelectNodes(pixnBundle, L"BootstrapperExtension", &pixnNodes); + ExitOnFailure(hr, "Failed to select BootstrapperExtension nodes."); - // Get BundleExtension node count. + // Get BootstrapperExtension node count. hr = pixnNodes->get_length((long*)&cNodes); - ExitOnFailure(hr, "Failed to get BundleExtension node count."); + ExitOnFailure(hr, "Failed to get BootstrapperExtension node count."); if (!cNodes) { ExitFunction(); } - // Allocate memory for BundleExtensions. + // Allocate memory for BootstrapperExtensions. pBurnExtensions->rgExtensions = (BURN_EXTENSION*)MemAlloc(sizeof(BURN_EXTENSION) * cNodes, TRUE); - ExitOnNull(pBurnExtensions->rgExtensions, hr, E_OUTOFMEMORY, "Failed to allocate memory for BundleExtension structs."); + ExitOnNull(pBurnExtensions->rgExtensions, hr, E_OUTOFMEMORY, "Failed to allocate memory for BootstrapperExtension structs."); pBurnExtensions->cExtensions = cNodes; @@ -64,7 +64,7 @@ EXTERN_C HRESULT BurnExtensionParseFromXml( ExitOnFailure(hr, "Failed to get @EntryPayloadSourcePath."); hr = PayloadFindEmbeddedBySourcePath(pBaPayloads->sdhPayloads, scz, &pExtension->pEntryPayload); - ExitOnFailure(hr, "Failed to find BundleExtension EntryPayload '%ls'.", pExtension->sczId); + ExitOnFailure(hr, "Failed to find BootstrapperExtension EntryPayload '%ls'.", pExtension->sczId); // prepare next iteration ReleaseNullObject(pixnNode); @@ -81,7 +81,7 @@ LExit: } /******************************************************************* - BurnExtensionUninitialize - + BurnExtensionUninitialize - *******************************************************************/ EXTERN_C void BurnExtensionUninitialize( @@ -104,7 +104,7 @@ EXTERN_C void BurnExtensionUninitialize( } /******************************************************************* - BurnExtensionLoad - + BurnExtensionLoad - *******************************************************************/ EXTERN_C HRESULT BurnExtensionLoad( @@ -113,59 +113,59 @@ EXTERN_C HRESULT BurnExtensionLoad( ) { HRESULT hr = S_OK; - LPWSTR sczBundleExtensionDataPath = NULL; - BUNDLE_EXTENSION_CREATE_ARGS args = { }; - BUNDLE_EXTENSION_CREATE_RESULTS results = { }; + LPWSTR sczBootstrapperExtensionDataPath = NULL; + BOOTSTRAPPER_EXTENSION_CREATE_ARGS args = { }; + BOOTSTRAPPER_EXTENSION_CREATE_RESULTS results = { }; if (!pBurnExtensions->rgExtensions || !pBurnExtensions->cExtensions) { ExitFunction(); } - hr = PathConcat(pEngineContext->pEngineState->userExperience.sczTempDirectory, L"BundleExtensionData.xml", &sczBundleExtensionDataPath); - ExitOnFailure(hr, "Failed to get BundleExtensionDataPath."); + hr = PathConcat(pEngineContext->pEngineState->userExperience.sczTempDirectory, L"BootstrapperExtensionData.xml", &sczBootstrapperExtensionDataPath); + ExitOnFailure(hr, "Failed to get BootstrapperExtensionDataPath."); for (DWORD i = 0; i < pBurnExtensions->cExtensions; ++i) { BURN_EXTENSION* pExtension = &pBurnExtensions->rgExtensions[i]; - memset(&args, 0, sizeof(BUNDLE_EXTENSION_CREATE_ARGS)); - memset(&results, 0, sizeof(BUNDLE_EXTENSION_CREATE_RESULTS)); + memset(&args, 0, sizeof(BOOTSTRAPPER_EXTENSION_CREATE_ARGS)); + memset(&results, 0, sizeof(BOOTSTRAPPER_EXTENSION_CREATE_RESULTS)); - args.cbSize = sizeof(BUNDLE_EXTENSION_CREATE_ARGS); - args.pfnBundleExtensionEngineProc = EngineForExtensionProc; - args.pvBundleExtensionEngineProcContext = pEngineContext; + args.cbSize = sizeof(BOOTSTRAPPER_EXTENSION_CREATE_ARGS); + args.pfnBootstrapperExtensionEngineProc = EngineForExtensionProc; + args.pvBootstrapperExtensionEngineProcContext = pEngineContext; args.qwEngineAPIVersion = MAKEQWORDVERSION(2021, 4, 27, 0); args.wzBootstrapperWorkingFolder = pEngineContext->pEngineState->userExperience.sczTempDirectory; - args.wzBundleExtensionDataPath = sczBundleExtensionDataPath; + args.wzBootstrapperExtensionDataPath = sczBootstrapperExtensionDataPath; args.wzExtensionId = pExtension->sczId; - results.cbSize = sizeof(BUNDLE_EXTENSION_CREATE_RESULTS); + results.cbSize = sizeof(BOOTSTRAPPER_EXTENSION_CREATE_RESULTS); - // Load BundleExtension DLL. + // Load BootstrapperExtension DLL. pExtension->hBextModule = ::LoadLibraryExW(pExtension->pEntryPayload->sczLocalFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - ExitOnNullWithLastError(pExtension->hBextModule, hr, "Failed to load BundleExtension DLL '%ls': '%ls'.", pExtension->sczId, pExtension->pEntryPayload->sczLocalFilePath); + ExitOnNullWithLastError(pExtension->hBextModule, hr, "Failed to load BootstrapperExtension DLL '%ls': '%ls'.", pExtension->sczId, pExtension->pEntryPayload->sczLocalFilePath); - // Get BundleExtensionCreate entry-point. - PFN_BUNDLE_EXTENSION_CREATE pfnCreate = (PFN_BUNDLE_EXTENSION_CREATE)::GetProcAddress(pExtension->hBextModule, "BundleExtensionCreate"); - ExitOnNullWithLastError(pfnCreate, hr, "Failed to get BundleExtensionCreate entry-point '%ls'.", pExtension->sczId); + // Get BootstrapperExtensionCreate entry-point. + PFN_BOOTSTRAPPER_EXTENSION_CREATE pfnCreate = (PFN_BOOTSTRAPPER_EXTENSION_CREATE)::GetProcAddress(pExtension->hBextModule, "BootstrapperExtensionCreate"); + ExitOnNullWithLastError(pfnCreate, hr, "Failed to get BootstrapperExtensionCreate entry-point '%ls'.", pExtension->sczId); - // Create BundleExtension. + // Create BootstrapperExtension. hr = pfnCreate(&args, &results); - ExitOnFailure(hr, "Failed to create BundleExtension '%ls'.", pExtension->sczId); + ExitOnFailure(hr, "Failed to create BootstrapperExtension '%ls'.", pExtension->sczId); - pExtension->pfnBurnExtensionProc = results.pfnBundleExtensionProc; - pExtension->pvBurnExtensionProcContext = results.pvBundleExtensionProcContext; + pExtension->pfnBurnExtensionProc = results.pfnBootstrapperExtensionProc; + pExtension->pvBurnExtensionProcContext = results.pvBootstrapperExtensionProcContext; } LExit: - ReleaseStr(sczBundleExtensionDataPath); + ReleaseStr(sczBootstrapperExtensionDataPath); return hr; } /******************************************************************* - BurnExtensionUnload - + BurnExtensionUnload - *******************************************************************/ EXTERN_C void BurnExtensionUnload( @@ -182,18 +182,18 @@ EXTERN_C void BurnExtensionUnload( if (pExtension->hBextModule) { - // Get BundleExtensionDestroy entry-point and call it if it exists. - PFN_BUNDLE_EXTENSION_DESTROY pfnDestroy = (PFN_BUNDLE_EXTENSION_DESTROY)::GetProcAddress(pExtension->hBextModule, "BundleExtensionDestroy"); + // Get BootstrapperExtensionDestroy entry-point and call it if it exists. + PFN_BOOTSTRAPPER_EXTENSION_DESTROY pfnDestroy = (PFN_BOOTSTRAPPER_EXTENSION_DESTROY)::GetProcAddress(pExtension->hBextModule, "BootstrapperExtensionDestroy"); if (pfnDestroy) { pfnDestroy(); } - // Free BundleExtension DLL. + // Free BootstrapperExtension DLL. if (!::FreeLibrary(pExtension->hBextModule)) { hr = HRESULT_FROM_WIN32(::GetLastError()); - TraceError(hr, "Failed to unload BundleExtension DLL."); + TraceError(hr, "Failed to unload BootstrapperExtension DLL."); } pExtension->hBextModule = NULL; } @@ -234,8 +234,8 @@ EXTERN_C BEEAPI BurnExtensionPerformSearch( ) { HRESULT hr = S_OK; - BUNDLE_EXTENSION_SEARCH_ARGS args = { }; - BUNDLE_EXTENSION_SEARCH_RESULTS results = { }; + BOOTSTRAPPER_EXTENSION_SEARCH_ARGS args = { }; + BOOTSTRAPPER_EXTENSION_SEARCH_RESULTS results = { }; args.cbSize = sizeof(args); args.wzId = wzSearchId; @@ -243,8 +243,8 @@ EXTERN_C BEEAPI BurnExtensionPerformSearch( results.cbSize = sizeof(results); - hr = SendRequiredBextMessage(pExtension, BUNDLE_EXTENSION_MESSAGE_SEARCH, &args, &results); - ExitOnFailure(hr, "BundleExtension '%ls' Search '%ls' failed.", pExtension->sczId, wzSearchId); + hr = SendRequiredBextMessage(pExtension, BOOTSTRAPPER_EXTENSION_MESSAGE_SEARCH, &args, &results); + ExitOnFailure(hr, "BootstrapperExtension '%ls' Search '%ls' failed.", pExtension->sczId, wzSearchId); LExit: return hr; @@ -252,7 +252,7 @@ LExit: static HRESULT SendRequiredBextMessage( __in BURN_EXTENSION* pExtension, - __in BUNDLE_EXTENSION_MESSAGE message, + __in BOOTSTRAPPER_EXTENSION_MESSAGE message, __in const LPVOID pvArgs, __inout LPVOID pvResults ) diff --git a/src/burn/engine/burnextension.h b/src/burn/engine/burnextension.h index 3529ef38..d6926647 100644 --- a/src/burn/engine/burnextension.h +++ b/src/burn/engine/burnextension.h @@ -18,7 +18,7 @@ typedef struct _BURN_EXTENSION BURN_PAYLOAD* pEntryPayload; HMODULE hBextModule; - PFN_BUNDLE_EXTENSION_PROC pfnBurnExtensionProc; + PFN_BOOTSTRAPPER_EXTENSION_PROC pfnBurnExtensionProc; LPVOID pvBurnExtensionProcContext; } BURN_EXTENSION; diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp index 9daa18a1..619ff0d1 100644 --- a/src/burn/engine/engine.cpp +++ b/src/burn/engine/engine.cpp @@ -535,7 +535,7 @@ static HRESULT RunNormal( // Load the extensions. hr = BurnExtensionLoad(&pEngineState->extensions, &extensionEngineContext); - ExitOnFailure(hr, "Failed to load BundleExtensions."); + ExitOnFailure(hr, "Failed to load BootstrapperExtensions."); // The secondary bootstrapper application only gets one chance to execute. That means // first time through we run the primary bootstrapper application and on reload we run diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj index 73985d51..62e03941 100644 --- a/src/burn/engine/engine.vcxproj +++ b/src/burn/engine/engine.vcxproj @@ -104,8 +104,8 @@ - - + + diff --git a/src/burn/engine/precomp.h b/src/burn/engine/precomp.h index 3b9693ff..348c78ce 100644 --- a/src/burn/engine/precomp.h +++ b/src/burn/engine/precomp.h @@ -62,7 +62,7 @@ #include #include "BootstrapperApplication.h" -#include "BundleExtension.h" +#include "BootstrapperExtension.h" #include "platform.h" #include "variant.h" diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml index f4cc2820..975a3805 100644 --- a/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml +++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml @@ -8,8 +8,8 @@ - - + + diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml index b75899cc..a8696537 100644 --- a/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml +++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml @@ -38,8 +38,8 @@ - - + + diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml index 680f6c5f..167bfbbb 100644 --- a/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml +++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml @@ -38,8 +38,8 @@ - - + + diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml index bfe1dfee..4e15fddb 100644 --- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml +++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml @@ -39,8 +39,8 @@ - - + + diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml index 73c6078d..c9294707 100644 --- a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml +++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml @@ -8,8 +8,8 @@ - - + + diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml index 675183b1..824cf489 100644 --- a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml +++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml @@ -4,8 +4,8 @@ - - + + diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml index c5ca03b6..d1fd96bb 100644 --- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml +++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml @@ -38,8 +38,8 @@ - - + + diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml index 52091ebd..2f829586 100644 --- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml +++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml @@ -38,8 +38,8 @@ - - + + diff --git a/src/burn/test/BurnUnitTest/precomp.h b/src/burn/test/BurnUnitTest/precomp.h index 0f98480a..7a84dd41 100644 --- a/src/burn/test/BurnUnitTest/precomp.h +++ b/src/burn/test/BurnUnitTest/precomp.h @@ -38,7 +38,7 @@ #include #include "BootstrapperApplication.h" -#include "BundleExtension.h" +#include "BootstrapperExtension.h" #include "platform.h" #include "variant.h" -- cgit v1.2.3-55-g6feb