Revert .wixburn version since the format didn't change.
Sean Hall committed
Dec 30, 2021 at 15:11 UTC
c86f75bcc104d5dc457fa2900a3ebb9c38f6ff65
5 files changed
+15
-16
src/burn/engine/inc/engine.h
+8
@@ -2,6 +2,14 @@
2
// 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.
3
4
5
+// constants
6
+
7
+// If these defaults ever change, be sure to update constants in wix\WixToolset.Core.Burn\Bundles\BurnCommon.cs as well.
8
+#define BURN_SECTION_NAME ".wixburn"
9
+#define BURN_SECTION_MAGIC 0x00f14300
10
+#define BURN_SECTION_VERSION 0x00000002
11
+
12
+
13
#if defined(__cplusplus)
14
extern "C" {
15
#endif
src/burn/engine/precomp.h
+1
@@ -101,3 +101,4 @@
101
#include "EngineForApplication.h"
102
#include "EngineForExtension.h"
103
#include "engine.messages.h"
104
+#include "engine.h"
src/burn/engine/section.cpp
-8
@@ -3,14 +3,6 @@
3
#include "precomp.h"
4
5
6
-// constants
7
-
8
-// If these defaults ever change, be sure to update constants in burn\stub\StubSection.cpp as well.
9
-#define BURN_SECTION_NAME ".wixburn"
10
-#define BURN_SECTION_MAGIC 0x00f14300
11
-#define BURN_SECTION_VERSION 0x00000003
12
-#define MANIFEST_CABINET_TOKEN L"0"
13
-
6
// structs
7
typedef struct _BURN_SECTION_HEADER
8
{
src/burn/stub/StubSection.cpp
+4
-5
@@ -2,12 +2,11 @@
2
3
#include "precomp.h"
4
5
-#pragma section(".wixburn",read)
5
+#pragma section(BURN_SECTION_NAME,read)
6
7
-// If these defaults ever change, be sure to update constants in burn\engine\section.cpp as well.
8
-#pragma data_seg(push, ".wixburn")
9
-static DWORD dwMagic = 0x00f14300;
10
-static DWORD dwVersion = 0x00000003;
7
+#pragma data_seg(push, BURN_SECTION_NAME)
8
+static DWORD dwMagic = BURN_SECTION_MAGIC;
9
+static DWORD dwVersion = BURN_SECTION_VERSION;
10
11
static GUID guidBundleId = { };
12
src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs
+2
-3
@@ -83,8 +83,7 @@ namespace WixToolset.Core.Burn.Bundles
83
protected const UInt32 BURN_SECTION_MIN_SIZE = BURN_SECTION_OFFSET_ATTACHEDCONTAINERSIZE0;
84
85
protected const UInt32 BURN_SECTION_MAGIC = 0x00f14300;
86
- protected const UInt32 BURN_SECTION_VERSION = 0x00000003;
87
- protected const UInt32 BURN_SECTION_COMPATIBLE_VERSION = 0x00000002;
86
+ protected const UInt32 BURN_SECTION_VERSION = 0x00000002;
87
88
protected string fileExe;
89
protected UInt32 peOffset = UInt32.MaxValue;
@@ -191,7 +190,7 @@ namespace WixToolset.Core.Burn.Bundles
190
}
191
192
this.Version = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_VERSION);
194
- if ((BURN_SECTION_VERSION != this.Version) && (BURN_SECTION_COMPATIBLE_VERSION != this.Version))
193
+ if (BURN_SECTION_VERSION != this.Version)
194
{
195
this.Messaging.Write(BurnBackendErrors.IncompatibleWixBurnSection(this.fileExe, this.Version));
196
return false;