From ce3aea757a01f0eea906fa610501a66735ef3a15 Mon Sep 17 00:00:00 2001 From: Nir Bar Date: Wed, 6 Oct 2021 14:11:17 +0300 Subject: Support multiple attached containers See https://github.com/wixtoolset/issues/issues/6144 --- src/burn/engine/section.cpp | 4 ++-- src/burn/stub/StubSection.cpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/burn') diff --git a/src/burn/engine/section.cpp b/src/burn/engine/section.cpp index 3720155c..1fd6cce4 100644 --- a/src/burn/engine/section.cpp +++ b/src/burn/engine/section.cpp @@ -8,7 +8,7 @@ // If these defaults ever change, be sure to update constants in burn\stub\StubSection.cpp as well. #define BURN_SECTION_NAME ".wixburn" #define BURN_SECTION_MAGIC 0x00f14300 -#define BURN_SECTION_VERSION 0x00000002 +#define BURN_SECTION_VERSION 0x00000003 #define MANIFEST_CABINET_TOKEN L"0" // structs @@ -26,7 +26,7 @@ typedef struct _BURN_SECTION_HEADER DWORD dwFormat; DWORD cContainers; - DWORD rgcbContainers[1]; + DWORD rgcbContainers[116]; } BURN_SECTION_HEADER; static HRESULT VerifySectionMatchesMemoryPEHeader( diff --git a/src/burn/stub/StubSection.cpp b/src/burn/stub/StubSection.cpp index 962bb3cf..01b4b576 100644 --- a/src/burn/stub/StubSection.cpp +++ b/src/burn/stub/StubSection.cpp @@ -7,7 +7,7 @@ // If these defaults ever change, be sure to update constants in burn\engine\section.cpp as well. #pragma data_seg(push, ".wixburn") static DWORD dwMagic = 0x00f14300; -static DWORD dwVersion = 0x00000002; +static DWORD dwVersion = 0x00000003; static GUID guidBundleId = { }; @@ -18,6 +18,5 @@ static DWORD dwOriginalSignatureSize = 0; static DWORD dwContainerFormat = 1; static DWORD dwContainerCount = 0; -static DWORD qwBootstrapperApplicationContainerSize = 0; -static DWORD qwAttachedContainerSize = 0; +static DWORD qwAttachedContainerSizes[116]; // Including UX container #pragma data_seg(pop) -- cgit v1.2.3-55-g6feb