wixtoolset · rseanhall · Dec 31, 2021 · Dec 30, 2021 · Dec 30, 2021 · Dec 30, 2021
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -725,7 +725,6 @@ struct BA_ONDETECTRELATEDBUNDLE_ARGS
     LPCWSTR wzBundleTag;
     BOOL fPerMachine;
     LPCWSTR wzVersion;
-    BOOTSTRAPPER_RELATED_OPERATION operation;
     BOOL fMissingFromCache;
 };
 

diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -1345,9 +1345,9 @@ int IBootstrapperApplication.OnDetectUpdateComplete(int hrStatus, ref bool fIgno
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnDetectRelatedBundle(string wzProductCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, RelatedOperation operation, bool fMissingFromCache, ref bool fCancel)
+        int IBootstrapperApplication.OnDetectRelatedBundle(string wzProductCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
         {
-            DetectRelatedBundleEventArgs args = new DetectRelatedBundleEventArgs(wzProductCode, relationType, wzBundleTag, fPerMachine, wzVersion, operation, fMissingFromCache, fCancel);
+            DetectRelatedBundleEventArgs args = new DetectRelatedBundleEventArgs(wzProductCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
             this.OnDetectRelatedBundle(args);
 
             fCancel = args.Cancel;

diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
@@ -434,15 +434,14 @@ public DetectUpdateCompleteEventArgs(int hrStatus, bool ignoreRecommendation)
     public class DetectRelatedBundleEventArgs : CancellableHResultEventArgs
     {
         /// <summary />
-        public DetectRelatedBundleEventArgs(string productCode, RelationType relationType, string bundleTag, bool perMachine, string version, RelatedOperation operation, bool missingFromCache, bool cancelRecommendation)
+        public DetectRelatedBundleEventArgs(string productCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
             this.ProductCode = productCode;
             this.RelationType = relationType;
             this.BundleTag = bundleTag;
             this.PerMachine = perMachine;
             this.Version = version;
-            this.Operation = operation;
             this.MissingFromCache = missingFromCache;
         }
 
@@ -471,11 +470,6 @@ public DetectRelatedBundleEventArgs(string productCode, RelationType relationTyp
         /// </summary>
         public string Version { get; private set; }
 
-        /// <summary>
-        /// Gets the operation that will be taken on the detected bundle.
-        /// </summary>
-        public RelatedOperation Operation { get; private set; }
-
         /// <summary>
         /// Whether the related bundle is missing from the package cache.
         /// </summary>

diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -156,15 +156,6 @@ IntPtr pvContext
         /// <summary>
         /// See <see cref="IDefaultBootstrapperApplication.DetectRelatedBundle"/>.
         /// </summary>
-        /// <param name="wzBundleId"></param>
-        /// <param name="relationType"></param>
-        /// <param name="wzBundleTag"></param>
-        /// <param name="fPerMachine"></param>
-        /// <param name="wzVersion"></param>
-        /// <param name="operation"></param>
-        /// <param name="fMissingFromCache"></param>
-        /// <param name="fCancel"></param>
-        /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnDetectRelatedBundle(
@@ -173,7 +164,6 @@ IntPtr pvContext
             [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
             [MarshalAs(UnmanagedType.LPWStr)] string wzVersion,
-            [MarshalAs(UnmanagedType.U4)] RelatedOperation operation,
             [MarshalAs(UnmanagedType.Bool)] bool fMissingFromCache,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
             );
@@ -289,11 +279,6 @@ IntPtr pvContext
         /// <summary>
         /// See <see cref="IDefaultBootstrapperApplication.PlanRelatedBundle"/>.
         /// </summary>
-        /// <param name="wzBundleId"></param>
-        /// <param name="recommendedState"></param>
-        /// <param name="pRequestedState"></param>
-        /// <param name="fCancel"></param>
-        /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanRelatedBundle(

diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
@@ -167,7 +167,6 @@ class CBalBaseBAFunctions : public IBAFunctions
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
         __in LPCWSTR /*wzVersion*/,
-        __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/,
         __in BOOL /*fMissingFromCache*/,
         __inout BOOL* /*pfCancel*/
         )

diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
@@ -172,7 +172,6 @@ class CBalBaseBootstrapperApplication : public IBootstrapperApplication
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
         __in LPCWSTR /*wzVersion*/,
-        __in BOOTSTRAPPER_RELATED_OPERATION /*operation*/,
         __in BOOL /*fMissingFromCache*/,
         __inout BOOL* pfCancel
         )

diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -114,7 +114,7 @@ static HRESULT BalBaseBAProcOnDetectRelatedBundle(
     __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults
     )
 {
-    return pBA->OnDetectRelatedBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->operation, pArgs->fMissingFromCache, &pResults->fCancel);
+    return pBA->OnDetectRelatedBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAProcOnDetectPackageBegin(

diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -91,7 +91,6 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
         __in_z LPCWSTR wzVersion,
-        __in BOOTSTRAPPER_RELATED_OPERATION operation,
         __in BOOL fMissingFromCache,
         __inout BOOL* pfCancel
         ) = 0;

diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
@@ -359,7 +359,7 @@ extern "C" HRESULT CoreDetect(
     ExitOnFailure(hr, "Failed to detect provider key bundle id.");
 
     // Report the related bundles.
-    hr = DetectReportRelatedBundles(&pEngineState->userExperience, &pEngineState->registration, pEngineState->command.relationType, pEngineState->command.action, &pEngineState->registration.fEligibleForCleanup);
+    hr = DetectReportRelatedBundles(&pEngineState->userExperience, &pEngineState->registration, pEngineState->command.relationType, &pEngineState->registration.fEligibleForCleanup);
     ExitOnFailure(hr, "Failed to report detected related bundles.");
 
     // Do update detection.

diff --git a/src/burn/engine/detect.cpp b/src/burn/engine/detect.cpp
@@ -154,68 +154,20 @@ extern "C" HRESULT DetectReportRelatedBundles(
     __in BURN_USER_EXPERIENCE* pUX,
     __in BURN_REGISTRATION* pRegistration,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
-    __in BOOTSTRAPPER_ACTION action,
     __out BOOL* pfEligibleForCleanup
     )
 {
     HRESULT hr = S_OK;
-    int nCompareResult = 0;
     BOOTSTRAPPER_REQUEST_STATE uninstallRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE;
     *pfEligibleForCleanup = pRegistration->fInstalled || pRegistration->fCached;
 
     for (DWORD iRelatedBundle = 0; iRelatedBundle < pRegistration->relatedBundles.cRelatedBundles; ++iRelatedBundle)
     {
         const BURN_RELATED_BUNDLE* pRelatedBundle = pRegistration->relatedBundles.rgRelatedBundles + iRelatedBundle;
-        BOOTSTRAPPER_RELATED_OPERATION operation = BOOTSTRAPPER_RELATED_OPERATION_NONE;
-
-        switch (pRelatedBundle->relationType)
-        {
-        case BOOTSTRAPPER_RELATION_UPGRADE:
-            if (BOOTSTRAPPER_RELATION_UPGRADE != relationType && BOOTSTRAPPER_ACTION_UNINSTALL < action)
-            {
-                hr = VerCompareParsedVersions(pRegistration->pVersion, pRelatedBundle->pVersion, &nCompareResult);
-                ExitOnFailure(hr, "Failed to compare bundle version '%ls' to related bundle version '%ls'", pRegistration->pVersion->sczVersion, pRelatedBundle->pVersion->sczVersion);
-
-                if (nCompareResult < 0)
-                {
-                    operation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE;
-                }
-                else
-                {
-                    operation = BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE;
-                }
-            }
-            break;
-
-        case BOOTSTRAPPER_RELATION_PATCH: __fallthrough;
-        case BOOTSTRAPPER_RELATION_ADDON:
-            if (BOOTSTRAPPER_ACTION_UNINSTALL == action)
-            {
-                operation = BOOTSTRAPPER_RELATED_OPERATION_REMOVE;
-            }
-            else if (BOOTSTRAPPER_ACTION_INSTALL == action || BOOTSTRAPPER_ACTION_MODIFY == action)
-            {
-                operation = BOOTSTRAPPER_RELATED_OPERATION_INSTALL;
-            }
-            else if (BOOTSTRAPPER_ACTION_REPAIR == action)
-            {
-                operation = BOOTSTRAPPER_RELATED_OPERATION_REPAIR;
-            }
-            break;
-
-        case BOOTSTRAPPER_RELATION_DETECT: __fallthrough;
-        case BOOTSTRAPPER_RELATION_DEPENDENT:
-            break;
-
-        default:
-            hr = E_FAIL;
-            ExitOnRootFailure(hr, "Unexpected relation type encountered: %d", pRelatedBundle->relationType);
-            break;
-        }
 
-        LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_BUNDLE, pRelatedBundle->package.sczId, LoggingRelationTypeToString(pRelatedBundle->relationType), LoggingPerMachineToString(pRelatedBundle->package.fPerMachine), pRelatedBundle->pVersion->sczVersion, LoggingRelatedOperationToString(operation), LoggingBoolToString(pRelatedBundle->package.fCached));
+        LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_BUNDLE, pRelatedBundle->package.sczId, LoggingRelationTypeToString(pRelatedBundle->relationType), LoggingPerMachineToString(pRelatedBundle->package.fPerMachine), pRelatedBundle->pVersion->sczVersion, LoggingBoolToString(pRelatedBundle->package.fCached));
 
-        hr = UserExperienceOnDetectRelatedBundle(pUX, pRelatedBundle->package.sczId, pRelatedBundle->relationType, pRelatedBundle->sczTag, pRelatedBundle->package.fPerMachine, pRelatedBundle->pVersion, operation, !pRelatedBundle->package.fCached);
+        hr = UserExperienceOnDetectRelatedBundle(pUX, pRelatedBundle->package.sczId, pRelatedBundle->relationType, pRelatedBundle->sczTag, pRelatedBundle->package.fPerMachine, pRelatedBundle->pVersion, !pRelatedBundle->package.fCached);
         ExitOnRootFailure(hr, "BA aborted detect related bundle.");
 
         // For now, if any related bundles will be executed during uninstall by default then never automatically clean up the bundle.

diff --git a/src/burn/engine/detect.h b/src/burn/engine/detect.h
@@ -29,7 +29,6 @@ HRESULT DetectReportRelatedBundles(
     __in BURN_USER_EXPERIENCE* pUX,
     __in BURN_REGISTRATION* pRegistration,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
-    __in BOOTSTRAPPER_ACTION action,
     __out BOOL* pfEligibleForCleanup
     );
 

diff --git a/src/burn/engine/engine.mc b/src/burn/engine/engine.mc
@@ -223,7 +223,7 @@ MessageId=102
 Severity=Success
 SymbolicName=MSG_DETECTED_RELATED_BUNDLE
 Language=English
-Detected related bundle: %1!ls!, type: %2!hs!, scope: %3!hs!, version: %4!ls!, operation: %5!hs!, cached: %6!hs!
+Detected related bundle: %1!ls!, type: %2!hs!, scope: %3!hs!, version: %4!ls!, cached: %5!hs!
 .
 
 MessageId=103

diff --git a/src/burn/engine/inc/engine.h b/src/burn/engine/inc/engine.h
@@ -2,6 +2,16 @@
 // 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.
 
 
+// constants
+
+// If these defaults ever change, be sure to update constants in wix\WixToolset.Core.Burn\Bundles\BurnCommon.cs as well.
+#define BURN_SECTION_NAME ".wixburn"
+#define BURN_SECTION_MAGIC 0x00f14300
+#define BURN_SECTION_VERSION 0x00000002
+
+// This needs to be incremented whenever a breaking change is made to the Burn protocol.
+#define BURN_PROTOCOL_VERSION 1
+
 #if defined(__cplusplus)
 extern "C" {
 #endif

diff --git a/src/burn/engine/pipe.cpp b/src/burn/engine/pipe.cpp
@@ -710,6 +710,7 @@ static HRESULT ChildPipeConnected(
     }
 
     // All is well, tell the parent process.
+    // TODO: consider sending BURN_PROTOCOL_VERSION as a way to verify compatibility.
     hr = FileWriteHandle(hPipe, reinterpret_cast<LPCBYTE>(&dwAck), sizeof(dwAck));
     ExitOnFailure(hr, "Failed to inform parent process that child is running.");
 

diff --git a/src/burn/engine/precomp.h b/src/burn/engine/precomp.h
@@ -101,3 +101,4 @@
 #include "EngineForApplication.h"
 #include "EngineForExtension.h"
 #include "engine.messages.h"
+#include "engine.h"
diff --git a/src/burn/engine/pseudobundle.cpp b/src/burn/engine/pseudobundle.cpp
@@ -4,8 +4,8 @@
 
 
 extern "C" HRESULT PseudoBundleInitialize(
-    __in DWORD64 qwEngineVersion,
     __in BURN_PACKAGE* pPackage,
+    __in BOOL fSupportsBurnProtocol,
     __in BOOL fPerMachine,
     __in_z LPCWSTR wzId,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
@@ -84,6 +84,9 @@ extern "C" HRESULT PseudoBundleInitialize(
     pPackage->qwSize = qwSize;
     pPackage->fVital = fVital;
 
+    pPackage->Exe.protocol = fSupportsBurnProtocol ? BURN_EXE_PROTOCOL_TYPE_BURN : BURN_EXE_PROTOCOL_TYPE_NONE;
+    pPackage->Exe.fSupportsAncestors = TRUE;
+
     hr = StrAllocString(&pPackage->sczId, wzId, 0);
     ExitOnFailure(hr, "Failed to copy key for pseudo bundle.");
 
@@ -131,12 +134,6 @@ extern "C" HRESULT PseudoBundleInitialize(
         pPackage->fUninstallable = TRUE;
     }
 
-    // Only support progress from engines that are compatible (aka: version greater than or equal to last protocol breaking change *and* versions that are older or the same as this engine).
-    pPackage->Exe.protocol = (FILEMAKEVERSION(3, 6, 2221, 0) <= qwEngineVersion && qwEngineVersion <= FILEMAKEVERSION(rmj, rmm, rup, rpr)) ? BURN_EXE_PROTOCOL_TYPE_BURN : BURN_EXE_PROTOCOL_TYPE_NONE;
-
-    // All versions of Burn past v3.9 RTM support suppressing ancestors.
-    pPackage->Exe.fSupportsAncestors = FILEMAKEVERSION(3, 9, 1006, 0) <= qwEngineVersion;
-
     if (pDependencyProvider)
     {
         pPackage->rgDependencyProviders = (BURN_DEPENDENCY_PROVIDER*)MemAlloc(sizeof(BURN_DEPENDENCY_PROVIDER), TRUE);
@@ -310,7 +307,7 @@ extern "C" HRESULT PseudoBundleInitializeUpdateBundle(
     hr = StrAllocString(&pPackage->Exe.sczInstallArguments, wzInstallArguments, 0);
     ExitOnFailure(hr, "Failed to copy install arguments for update bundle package");
 
-    // Assume the update bundle has the same engine version as this one.
+    // Trust the BA to only use UPDATE_REPLACE_EMBEDDED when appropriate.
     pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_BURN;
     pPackage->Exe.fSupportsAncestors = TRUE;
 

diff --git a/src/burn/engine/pseudobundle.h b/src/burn/engine/pseudobundle.h
@@ -7,8 +7,8 @@ extern "C" {
 #endif
 
 HRESULT PseudoBundleInitialize(
-    __in DWORD64 qwEngineVersion,
     __in BURN_PACKAGE* pPackage,
+    __in BOOL fSupportsBurnProtocol,
     __in BOOL fPerMachine,
     __in_z LPCWSTR wzId,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,

diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp
@@ -671,6 +671,9 @@ extern "C" HRESULT RegistrationSessionBegin(
         hr = RegWriteStringFormatted(hkRegistration, BURN_REGISTRATION_REGISTRY_ENGINE_VERSION, L"%hs", szVerMajorMinorBuild);
         ExitOnFailure(hr, "Failed to write %ls value.", BURN_REGISTRATION_REGISTRY_ENGINE_VERSION);
 
+        hr = RegWriteNumber(hkRegistration, BURN_REGISTRATION_REGISTRY_ENGINE_PROTOCOL_VERSION, BURN_PROTOCOL_VERSION);
+        ExitOnFailure(hr, "Failed to write %ls value.", BURN_REGISTRATION_REGISTRY_ENGINE_PROTOCOL_VERSION);
+
         // DisplayIcon: [path to exe] and ",0" to refer to the first icon in the executable.
         hr = RegWriteStringFormatted(hkRegistration, REGISTRY_BUNDLE_DISPLAY_ICON, L"%s,0", pRegistration->sczCacheExecutablePath);
         ExitOnFailure(hr, "Failed to write %ls value.", REGISTRY_BUNDLE_DISPLAY_ICON);

diff --git a/src/burn/engine/registration.h b/src/burn/engine/registration.h
@@ -23,6 +23,7 @@ const LPCWSTR BURN_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE = L"BundleUpgradeCo
 const LPCWSTR BURN_REGISTRATION_REGISTRY_BUNDLE_DISPLAY_NAME = L"DisplayName";
 const LPCWSTR BURN_REGISTRATION_REGISTRY_BUNDLE_VERSION = L"BundleVersion";
 const LPCWSTR BURN_REGISTRATION_REGISTRY_ENGINE_VERSION = L"EngineVersion";
+const LPCWSTR BURN_REGISTRATION_REGISTRY_ENGINE_PROTOCOL_VERSION = L"EngineProtocolVersion";
 const LPCWSTR BURN_REGISTRATION_REGISTRY_BUNDLE_PROVIDER_KEY = L"BundleProviderKey";
 const LPCWSTR BURN_REGISTRATION_REGISTRY_BUNDLE_TAG = L"BundleTag";
 

diff --git a/src/burn/engine/relatedbundle.cpp b/src/burn/engine/relatedbundle.cpp
@@ -21,7 +21,7 @@ static HRESULT LoadRelatedBundleFromKey(
     __in HKEY hkBundleId,
     __in BOOL fPerMachine,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
-    __inout BURN_RELATED_BUNDLE *pRelatedBundle
+    __in BURN_RELATED_BUNDLE *pRelatedBundle
     );
 
 
@@ -398,21 +398,34 @@ static HRESULT LoadRelatedBundleFromKey(
     __in HKEY hkBundleId,
     __in BOOL fPerMachine,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
-    __inout BURN_RELATED_BUNDLE* pRelatedBundle
+    __in BURN_RELATED_BUNDLE* pRelatedBundle
     )
 {
     HRESULT hr = S_OK;
     DWORD64 qwEngineVersion = 0;
+    DWORD dwEngineProtocolVersion = 0;
+    BOOL fSupportsBurnProtocol = FALSE;
     LPWSTR sczBundleVersion = NULL;
     LPWSTR sczCachePath = NULL;
     BOOL fCached = FALSE;
     DWORD64 qwFileSize = 0;
     BURN_DEPENDENCY_PROVIDER dependencyProvider = { };
 
-    hr = RegReadVersion(hkBundleId, BURN_REGISTRATION_REGISTRY_ENGINE_VERSION, &qwEngineVersion);
-    if (FAILED(hr))
+    // Only support progress from engines that are compatible.
+    hr = RegReadNumber(hkBundleId, BURN_REGISTRATION_REGISTRY_ENGINE_PROTOCOL_VERSION, &dwEngineProtocolVersion);
+    if (SUCCEEDED(hr))
+    {
+        fSupportsBurnProtocol = BURN_PROTOCOL_VERSION == dwEngineProtocolVersion;
+    }
+    else
     {
-        qwEngineVersion = 0;
+        // Rely on version checking (aka: version greater than or equal to last protocol breaking change *and* versions that are older or the same as this engine)
+        hr = RegReadVersion(hkBundleId, BURN_REGISTRATION_REGISTRY_ENGINE_VERSION, &qwEngineVersion);
+        if (SUCCEEDED(hr))
+        {
+            fSupportsBurnProtocol = (FILEMAKEVERSION(3, 6, 2221, 0) <= qwEngineVersion && qwEngineVersion <= FILEMAKEVERSION(rmj, rmm, rup, rpr));
+        }
+
         hr = S_OK;
     }
 
@@ -467,7 +480,7 @@ static HRESULT LoadRelatedBundleFromKey(
 
     pRelatedBundle->relationType = relationType;
 
-    hr = PseudoBundleInitialize(qwEngineVersion, &pRelatedBundle->package, fPerMachine, wzRelatedBundleId, pRelatedBundle->relationType,
+    hr = PseudoBundleInitialize(&pRelatedBundle->package, fSupportsBurnProtocol, fPerMachine, wzRelatedBundleId, pRelatedBundle->relationType,
                                 BOOTSTRAPPER_PACKAGE_STATE_PRESENT, fCached, sczCachePath, sczCachePath, NULL, qwFileSize, FALSE,
                                 L"-quiet", L"-repair -quiet", L"-uninstall -quiet",
                                 (dependencyProvider.sczKey && *dependencyProvider.sczKey) ? &dependencyProvider : NULL,

diff --git a/src/burn/engine/section.cpp b/src/burn/engine/section.cpp
@@ -3,14 +3,6 @@
 #include "precomp.h"
 
 
-// constants
-
-// 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 0x00000003
-#define MANIFEST_CABINET_TOKEN L"0"
-
 // structs
 typedef struct _BURN_SECTION_HEADER
 {