aboutsummaryrefslogtreecommitdiff
path: root/src/burn
diff options
context:
space:
mode:
authorNir Bar <nir.bar@panel-sw.co.il>2021-10-06 14:11:17 +0300
committerSean Hall <r.sean.hall@gmail.com>2021-11-02 17:44:50 -0500
commitce3aea757a01f0eea906fa610501a66735ef3a15 (patch)
tree2864f2edfbd3809e594caa910f410d7f136c00b5 /src/burn
parent956c6bc4011618a05d4cff3992df687530a26e67 (diff)
downloadwix-ce3aea757a01f0eea906fa610501a66735ef3a15.tar.gz
wix-ce3aea757a01f0eea906fa610501a66735ef3a15.tar.bz2
wix-ce3aea757a01f0eea906fa610501a66735ef3a15.zip
Support multiple attached containers
See https://github.com/wixtoolset/issues/issues/6144
Diffstat (limited to 'src/burn')
-rw-r--r--src/burn/engine/section.cpp4
-rw-r--r--src/burn/stub/StubSection.cpp5
2 files changed, 4 insertions, 5 deletions
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 @@
8// If these defaults ever change, be sure to update constants in burn\stub\StubSection.cpp as well. 8// If these defaults ever change, be sure to update constants in burn\stub\StubSection.cpp as well.
9#define BURN_SECTION_NAME ".wixburn" 9#define BURN_SECTION_NAME ".wixburn"
10#define BURN_SECTION_MAGIC 0x00f14300 10#define BURN_SECTION_MAGIC 0x00f14300
11#define BURN_SECTION_VERSION 0x00000002 11#define BURN_SECTION_VERSION 0x00000003
12#define MANIFEST_CABINET_TOKEN L"0" 12#define MANIFEST_CABINET_TOKEN L"0"
13 13
14// structs 14// structs
@@ -26,7 +26,7 @@ typedef struct _BURN_SECTION_HEADER
26 26
27 DWORD dwFormat; 27 DWORD dwFormat;
28 DWORD cContainers; 28 DWORD cContainers;
29 DWORD rgcbContainers[1]; 29 DWORD rgcbContainers[116];
30} BURN_SECTION_HEADER; 30} BURN_SECTION_HEADER;
31 31
32static HRESULT VerifySectionMatchesMemoryPEHeader( 32static 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 @@
7// If these defaults ever change, be sure to update constants in burn\engine\section.cpp as well. 7// If these defaults ever change, be sure to update constants in burn\engine\section.cpp as well.
8#pragma data_seg(push, ".wixburn") 8#pragma data_seg(push, ".wixburn")
9static DWORD dwMagic = 0x00f14300; 9static DWORD dwMagic = 0x00f14300;
10static DWORD dwVersion = 0x00000002; 10static DWORD dwVersion = 0x00000003;
11 11
12static GUID guidBundleId = { }; 12static GUID guidBundleId = { };
13 13
@@ -18,6 +18,5 @@ static DWORD dwOriginalSignatureSize = 0;
18 18
19static DWORD dwContainerFormat = 1; 19static DWORD dwContainerFormat = 1;
20static DWORD dwContainerCount = 0; 20static DWORD dwContainerCount = 0;
21static DWORD qwBootstrapperApplicationContainerSize = 0; 21static DWORD qwAttachedContainerSizes[116]; // Including UX container
22static DWORD qwAttachedContainerSize = 0;
23#pragma data_seg(pop) 22#pragma data_seg(pop)