From 523c66a62a619e6aa9f30070173ea33edfb5e328 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 29 Dec 2024 18:01:20 -0800 Subject: Rename "bundle id" concept to "bundle code" The "bundle id" always had more in common with the PackageCode from the Windows Installer. With the introduction of an actual Id attribute on the Bundle element, there is potential for confusion, so there is finally real motivation to rename "bundle id" to "bundle code". --- src/burn/engine/section.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/burn/engine/section.cpp') diff --git a/src/burn/engine/section.cpp b/src/burn/engine/section.cpp index fd3ce92c..f7c508f3 100644 --- a/src/burn/engine/section.cpp +++ b/src/burn/engine/section.cpp @@ -9,7 +9,7 @@ typedef struct _BURN_SECTION_HEADER DWORD dwMagic; DWORD dwVersion; - GUID guidBundleId; + GUID guidBundleCode; DWORD dwStubSize; DWORD dwOriginalChecksum; @@ -235,7 +235,7 @@ extern "C" HRESULT SectionInitialize( memcpy(pSection->rgcbContainers, pBurnSectionHeader->rgcbContainers, sizeof(DWORD) * pSection->cContainers); // TODO: verify more than just the GUID. - hr = VerifySectionMatchesMemoryPEHeader(pBurnSectionHeader->guidBundleId); + hr = VerifySectionMatchesMemoryPEHeader(pBurnSectionHeader->guidBundleCode); ExitOnRootFailure(hr, "PE Header from file didn't match PE Header in memory."); LExit: @@ -299,7 +299,7 @@ LExit: } HRESULT VerifySectionMatchesMemoryPEHeader( - __in REFGUID pBundleId + __in REFGUID pBundleCode ) { HRESULT hr = S_OK; @@ -382,7 +382,7 @@ HRESULT VerifySectionMatchesMemoryPEHeader( ExitOnRootFailure(hr, "Failed to read section info, unsupported version: %08x", pBurnSectionHeader->dwVersion); } - if (!::IsEqualGUID(pBundleId, pBurnSectionHeader->guidBundleId)) + if (!::IsEqualGUID(pBundleCode, pBurnSectionHeader->guidBundleCode)) { hr = E_INVALIDDATA; ExitOnRootFailure(hr, "Bundle guid didn't match the guid in the PE Header in memory."); -- cgit v1.2.3-55-g6feb