Move the BootstrapperApplication out of proc

2 files changed, 312 insertions, 285 deletions

diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/baenginetypes.h
index 96302bd1..7af41d97 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/baenginetypes.h
@@ -86,6 +86,7 @@ enum BOOTSTRAPPER_UPDATE_HASH_TYPE
 
 enum BOOTSTRAPPER_ENGINE_MESSAGE
 {
+    BOOTSTRAPPER_ENGINE_MESSAGE_UNKNOWN,
     BOOTSTRAPPER_ENGINE_MESSAGE_GETPACKAGECOUNT,
     BOOTSTRAPPER_ENGINE_MESSAGE_GETVARIABLENUMERIC,
     BOOTSTRAPPER_ENGINE_MESSAGE_GETVARIABLESTRING,
@@ -112,159 +113,161 @@ enum BOOTSTRAPPER_ENGINE_MESSAGE
     BOOTSTRAPPER_ENGINE_MESSAGE_SETUPDATESOURCE,
     BOOTSTRAPPER_ENGINE_MESSAGE_COMPAREVERSIONS,
     BOOTSTRAPPER_ENGINE_MESSAGE_GETRELATEDBUNDLEVARIABLE,
+
+    BOOTSTRAPPER_APPLICATION_MESSAGE_LAST = 65535
 };
 
 typedef struct _BAENGINE_APPLY_ARGS
 {
-    DWORD cbSize;
-    HWND hwndParent;
+    DWORD dwApiVersion;
+    DWORD64 hwndParent;
 } BAENGINE_APPLY_ARGS;
 
 typedef struct _BAENGINE_APPLY_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_APPLY_RESULTS;
 
 typedef struct _BAENGINE_CLOSESPLASHSCREEN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_CLOSESPLASHSCREEN_ARGS;
 
 typedef struct _BAENGINE_CLOSESPLASHSCREEN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_CLOSESPLASHSCREEN_RESULTS;
 
 typedef struct _BAENGINE_COMPAREVERSIONS_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzVersion1;
     LPCWSTR wzVersion2;
 } BAENGINE_COMPAREVERSIONS_ARGS;
 
 typedef struct _BAENGINE_COMPAREVERSIONS_RESULTS
 {
-    DWORD cbSize;
-    int nResult;
+    DWORD dwApiVersion;
+    INT32 nResult;
 } BAENGINE_COMPAREVERSIONS_RESULTS;
 
 typedef struct _BAENGINE_DETECT_ARGS
 {
-    DWORD cbSize;
-    HWND hwndParent;
+    DWORD dwApiVersion;
+    DWORD64 hwndParent;
 } BAENGINE_DETECT_ARGS;
 
 typedef struct _BAENGINE_DETECT_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_DETECT_RESULTS;
 
 typedef struct _BAENGINE_ELEVATE_ARGS
 {
-    DWORD cbSize;
-    HWND hwndParent;
+    DWORD dwApiVersion;
+    DWORD64 hwndParent;
 } BAENGINE_ELEVATE_ARGS;
 
 typedef struct _BAENGINE_ELEVATE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_ELEVATE_RESULTS;
 
 typedef struct _BAENGINE_ESCAPESTRING_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzIn;
 } BAENGINE_ESCAPESTRING_ARGS;
 
 typedef struct _BAENGINE_ESCAPESTRING_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPWSTR wzOut;
     // Should be initialized to the size of wzOut.
-    SIZE_T cchOut;
+    DWORD cchOut;
 } BAENGINE_ESCAPESTRING_RESULTS;
 
 typedef struct _BAENGINE_EVALUATECONDITION_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzCondition;
 } BAENGINE_EVALUATECONDITION_ARGS;
 
 typedef struct _BAENGINE_EVALUATECONDITION_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL f;
 } BAENGINE_EVALUATECONDITION_RESULTS;
 
 typedef struct _BAENGINE_FORMATSTRING_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzIn;
 } BAENGINE_FORMATSTRING_ARGS;
 
 typedef struct _BAENGINE_FORMATSTRING_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPWSTR wzOut;
     // Should be initialized to the size of wzOut.
-    SIZE_T cchOut;
+    DWORD cchOut;
 } BAENGINE_FORMATSTRING_RESULTS;
 
 typedef struct _BAENGINE_GETPACKAGECOUNT_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_GETPACKAGECOUNT_ARGS;
 
 typedef struct _BAENGINE_GETPACKAGECOUNT_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD cPackages;
 } BAENGINE_GETPACKAGECOUNT_RESULTS;
 
 typedef struct _BAENGINE_GETVARIABLENUMERIC_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzVariable;
 } BAENGINE_GETVARIABLENUMERIC_ARGS;
 
 typedef struct _BAENGINE_GETVARIABLENUMERIC_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LONGLONG llValue;
 } BAENGINE_GETVARIABLENUMERIC_RESULTS;
 
 typedef struct _BAENGINE_GETVARIABLESTRING_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzVariable;
 } BAENGINE_GETVARIABLESTRING_ARGS;
 
 typedef struct _BAENGINE_GETVARIABLESTRING_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPWSTR wzValue;
     // Should be initialized to the size of wzValue.
-    SIZE_T cchValue;
+    DWORD cchValue;
 } BAENGINE_GETVARIABLESTRING_RESULTS;
 
 typedef struct _BAENGINE_GETVARIABLEVERSION_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzVariable;
 } BAENGINE_GETVARIABLEVERSION_ARGS;
 
 typedef struct _BAENGINE_GETVARIABLEVERSION_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPWSTR wzValue;
     // Should be initialized to the size of wzValue.
-    SIZE_T cchValue;
+    DWORD cchValue;
 } BAENGINE_GETVARIABLEVERSION_RESULTS;
 
 typedef struct _BAENGINE_LAUNCHAPPROVEDEXE_ARGS
 {
-    DWORD cbSize;
-    HWND hwndParent;
+    DWORD dwApiVersion;
+    DWORD64 hwndParent;
     LPCWSTR wzApprovedExeForElevationId;
     LPCWSTR wzArguments;
     DWORD dwWaitForInputIdleTimeout;
@@ -272,57 +275,58 @@ typedef struct _BAENGINE_LAUNCHAPPROVEDEXE_ARGS
 
 typedef struct _BAENGINE_LAUNCHAPPROVEDEXE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_LAUNCHAPPROVEDEXE_RESULTS;
 
 typedef struct _BAENGINE_SETUPDATESOURCE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzUrl;
+    LPCWSTR wzAuthorizationHeader;
 } BAENGINE_SETUPDATESOURCE_ARGS;
 
 typedef struct _BAENGINE_SETUPDATESOURCE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_SETUPDATESOURCE_RESULTS;
 
 typedef struct _BAENGINE_LOG_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_LOG_LEVEL level;
     LPCWSTR wzMessage;
 } BAENGINE_LOG_ARGS;
 
 typedef struct _BAENGINE_LOG_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_LOG_RESULTS;
 
 typedef struct _BAENGINE_PLAN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_ACTION action;
 } BAENGINE_PLAN_ARGS;
 
 typedef struct _BAENGINE_PLAN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_PLAN_RESULTS;
 
 typedef struct _BAENGINE_QUIT_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD dwExitCode;
 } BAENGINE_QUIT_ARGS;
 
 typedef struct _BAENGINE_QUIT_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_QUIT_RESULTS;
 
 typedef struct _BAENGINE_SENDEMBEDDEDERROR_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD dwErrorCode;
     LPCWSTR wzMessage;
     DWORD dwUIHint;
@@ -330,41 +334,42 @@ typedef struct _BAENGINE_SENDEMBEDDEDERROR_ARGS
 
 typedef struct _BAENGINE_SENDEMBEDDEDERROR_RESULTS
 {
-    DWORD cbSize;
-    int nResult;
+    DWORD dwApiVersion;
+    INT32 nResult;
 } BAENGINE_SENDEMBEDDEDERROR_RESULTS;
 
 typedef struct _BAENGINE_SENDEMBEDDEDPROGRESS_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD dwProgressPercentage;
     DWORD dwOverallProgressPercentage;
 } BAENGINE_SENDEMBEDDEDPROGRESS_ARGS;
 
 typedef struct _BAENGINE_SENDEMBEDDEDPROGRESS_RESULTS
 {
-    DWORD cbSize;
-    int nResult;
+    DWORD dwApiVersion;
+    INT32 nResult;
 } BAENGINE_SENDEMBEDDEDPROGRESS_RESULTS;
 
 typedef struct _BAENGINE_SETDOWNLOADSOURCE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     LPCWSTR wzUrl;
     LPCWSTR wzUser;
     LPCWSTR wzPassword;
+    LPCWSTR wzAuthorizationHeader;
 } BAENGINE_SETDOWNLOADSOURCE_ARGS;
 
 typedef struct _BAENGINE_SETDOWNLOADSOURCE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_SETDOWNLOADSOURCE_RESULTS;
 
 typedef struct _BAENGINE_SETLOCALSOURCE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     LPCWSTR wzPath;
@@ -372,39 +377,40 @@ typedef struct _BAENGINE_SETLOCALSOURCE_ARGS
 
 typedef struct _BAENGINE_SETLOCALSOURCE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_SETLOCALSOURCE_RESULTS;
 
 typedef struct _BAENGINE_SETUPDATE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzLocalSource;
     LPCWSTR wzDownloadSource;
     DWORD64 qwSize;
     BOOTSTRAPPER_UPDATE_HASH_TYPE hashType;
     LPCWSTR wzHash;
+    LPCWSTR wzUpdatePackageId;
 } BAENGINE_SETUPDATE_ARGS;
 
 typedef struct _BAENGINE_SETUPDATE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_SETUPDATE_RESULTS;
 
 typedef struct _BAENGINE_SETVARIABLENUMERIC_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzVariable;
     LONGLONG llValue;
 } BAENGINE_SETVARIABLENUMERIC_ARGS;
 
 typedef struct _BAENGINE_SETVARIABLENUMERIC_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_SETVARIABLENUMERIC_RESULTS;
 
 typedef struct _BAENGINE_SETVARIABLESTRING_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzVariable;
     LPCWSTR wzValue;
     BOOL fFormatted;
@@ -412,42 +418,42 @@ typedef struct _BAENGINE_SETVARIABLESTRING_ARGS
 
 typedef struct _BAENGINE_SETVARIABLESTRING_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_SETVARIABLESTRING_RESULTS;
 
 typedef struct _BAENGINE_SETVARIABLEVERSION_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzVariable;
     LPCWSTR wzValue;
 } BAENGINE_SETVARIABLEVERSION_ARGS;
 
 typedef struct _BAENGINE_SETVARIABLEVERSION_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 } BAENGINE_SETVARIABLEVERSION_RESULTS;
 
 typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzBundleId;
     LPCWSTR wzVariable;
 } BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS;
 
 typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPWSTR wzValue;
     // Should be initialized to the size of wzValue.
-    SIZE_T cchValue;
+    DWORD cchValue;
 } BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS;
 
-extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_ENGINE_PROC)(
-    __in BOOTSTRAPPER_ENGINE_MESSAGE message,
-    __in const LPVOID pvArgs,
-    __inout LPVOID pvResults,
-    __in_opt LPVOID pvContext
-    );
+// extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_ENGINE_PROC)(
+//     __in BOOTSTRAPPER_ENGINE_MESSAGE message,
+//     __in const LPVOID pvArgs,
+//     __inout LPVOID pvResults,
+//     __in_opt LPVOID pvContext
+//     );
 
 #if defined(__cplusplus)
 }
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/batypes.h
index 2633a9c2..0116364c 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/batypes.h
@@ -2,6 +2,10 @@
 // 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.
 
 
+const LPCWSTR BOOTSTRAPPER_APPLICATION_COMMANDLINE_SWITCH_API_VERSION = L"burn.ba.apiver";
+const LPCWSTR BOOTSTRAPPER_APPLICATION_COMMANDLINE_SWITCH_PIPE_NAME = L"burn.ba.pipe";
+const DWORD WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION = 5;
+
 enum BOOTSTRAPPER_DISPLAY
 {
     BOOTSTRAPPER_DISPLAY_UNKNOWN,
@@ -143,27 +147,30 @@ enum BOOTSTRAPPER_MSI_FILE_VERSIONING
 
 enum BOOTSTRAPPER_APPLICATION_MESSAGE
 {
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTBEGIN,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPLETE,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANBEGIN,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_UNKNOWN = 65536,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONCREATE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDESTROY,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTBEGIN,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPLETE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATEBEGIN,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATECOMPLETE,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANBEGIN,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGECOMPLETE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYBEGIN,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONELEVATEBEGIN,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONELEVATECOMPLETE,
@@ -215,8 +222,6 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTCOMPLETE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTPROGRESS,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANROLLBACKBOUNDARY,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONSETUPDATEBEGIN,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONSETUPDATECOMPLETE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE,
@@ -345,7 +350,7 @@ struct BOOTSTRAPPER_COMMAND
     BOOTSTRAPPER_DISPLAY display;
 
     LPWSTR wzCommandLine;
-    int nCmdShow;
+    INT32 nCmdShow;
 
     BOOTSTRAPPER_RESUME_TYPE resumeType;
     HWND hwndSplashScreen;
@@ -361,19 +366,19 @@ struct BOOTSTRAPPER_COMMAND
 
 struct BA_ONAPPLYBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD dwPhaseCount;
 };
 
 struct BA_ONAPPLYBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONAPPLYCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
     // Indicates whether any package required a reboot or initiated the reboot already.
     BOOTSTRAPPER_APPLY_RESTART restart;
@@ -382,49 +387,49 @@ struct BA_ONAPPLYCOMPLETE_ARGS
 
 struct BA_ONAPPLYCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_APPLYCOMPLETE_ACTION action;
 };
 
 struct BA_ONAPPLYDOWNGRADE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrRecommended;
 };
 
 struct BA_ONAPPLYDOWNGRADE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONBEGINMSITRANSACTIONBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzTransactionId;
 };
 
 struct BA_ONBEGINMSITRANSACTIONBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONBEGINMSITRANSACTIONCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzTransactionId;
     HRESULT hrStatus;
 };
 
 struct BA_ONBEGINMSITRANSACTIONCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONCACHEACQUIREBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     LPCWSTR wzSource;
@@ -435,14 +440,14 @@ struct BA_ONCACHEACQUIREBEGIN_ARGS
 
 struct BA_ONCACHEACQUIREBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOTSTRAPPER_CACHE_OPERATION action;
 };
 
 struct BA_ONCACHEACQUIRECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     HRESULT hrStatus;
@@ -451,13 +456,13 @@ struct BA_ONCACHEACQUIRECOMPLETE_ARGS
 
 struct BA_ONCACHEACQUIRECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_CACHEACQUIRECOMPLETE_ACTION action;
 };
 
 struct BA_ONCACHEACQUIREPROGRESS_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     DWORD64 dw64Progress;
@@ -467,13 +472,13 @@ struct BA_ONCACHEACQUIREPROGRESS_ARGS
 
 struct BA_ONCACHEACQUIREPROGRESS_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCACHEACQUIRERESOLVING_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     LPCWSTR* rgSearchPaths;
@@ -487,7 +492,7 @@ struct BA_ONCACHEACQUIRERESOLVING_ARGS
 
 struct BA_ONCACHEACQUIRERESOLVING_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD dwChosenSearchPath;
     BOOTSTRAPPER_CACHE_RESOLVE_OPERATION action;
     BOOL fCancel;
@@ -495,42 +500,42 @@ struct BA_ONCACHEACQUIRERESOLVING_RESULTS
 
 struct BA_ONCACHEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONCACHEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCACHECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONCACHECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONCACHECONTAINERORPAYLOADVERIFYBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
 };
 
 struct BA_ONCACHECONTAINERORPAYLOADVERIFYBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     HRESULT hrStatus;
@@ -538,12 +543,12 @@ struct BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_ARGS
 
 struct BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     DWORD64 dw64Progress;
@@ -553,13 +558,13 @@ struct BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_ARGS
 
 struct BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCACHEPACKAGEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     DWORD cCachePayloads;
     DWORD64 dw64PackageCacheSize;
@@ -569,13 +574,13 @@ struct BA_ONCACHEPACKAGEBEGIN_ARGS
 
 struct BA_ONCACHEPACKAGEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCACHEPACKAGECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     HRESULT hrStatus;
     BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION recommendation;
@@ -583,13 +588,13 @@ struct BA_ONCACHEPACKAGECOMPLETE_ARGS
 
 struct BA_ONCACHEPACKAGECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION action;
 };
 
 struct BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     HRESULT hrStatus;
     BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION recommendation;
@@ -597,26 +602,26 @@ struct BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_ARGS
 
 struct BA_ONCACHEPACKAGENONVITALVALIDATIONFAILURE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_CACHEPACKAGENONVITALVALIDATIONFAILURE_ACTION action;
 };
 
 struct BA_ONCACHEPAYLOADEXTRACTBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzContainerId;
     LPCWSTR wzPayloadId;
 };
 
 struct BA_ONCACHEPAYLOADEXTRACTBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCACHEPAYLOADEXTRACTCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzContainerId;
     LPCWSTR wzPayloadId;
     HRESULT hrStatus;
@@ -624,12 +629,12 @@ struct BA_ONCACHEPAYLOADEXTRACTCOMPLETE_ARGS
 
 struct BA_ONCACHEPAYLOADEXTRACTCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONCACHEPAYLOADEXTRACTPROGRESS_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzContainerId;
     LPCWSTR wzPayloadId;
     DWORD64 dw64Progress;
@@ -639,26 +644,26 @@ struct BA_ONCACHEPAYLOADEXTRACTPROGRESS_ARGS
 
 struct BA_ONCACHEPAYLOADEXTRACTPROGRESS_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCACHEVERIFYBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
 };
 
 struct BA_ONCACHEVERIFYBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCACHEVERIFYCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     HRESULT hrStatus;
@@ -667,13 +672,13 @@ struct BA_ONCACHEVERIFYCOMPLETE_ARGS
 
 struct BA_ONCACHEVERIFYCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION action;
 };
 
 struct BA_ONCACHEVERIFYPROGRESS_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageOrContainerId;
     LPCWSTR wzPayloadId;
     DWORD64 dw64Progress;
@@ -684,25 +689,25 @@ struct BA_ONCACHEVERIFYPROGRESS_ARGS
 
 struct BA_ONCACHEVERIFYPROGRESS_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCOMMITMSITRANSACTIONBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzTransactionId;
 };
 
 struct BA_ONCOMMITMSITRANSACTIONBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONCOMMITMSITRANSACTIONCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzTransactionId;
     HRESULT hrStatus;
     BOOTSTRAPPER_APPLY_RESTART restart;
@@ -711,13 +716,50 @@ struct BA_ONCOMMITMSITRANSACTIONCOMPLETE_ARGS
 
 struct BA_ONCOMMITMSITRANSACTIONCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_EXECUTEMSITRANSACTIONCOMPLETE_ACTION action;
 };
 
+struct BA_ONCREATE_ARGS
+{
+    DWORD dwApiVersion;
+    BOOTSTRAPPER_COMMAND command;
+    // BOOTSTRAPPER_ACTION action;
+    // BOOTSTRAPPER_DISPLAY display;
+
+    // LPWSTR wzCommandLine;
+    // INT32 nCmdShow;
+
+    // BOOTSTRAPPER_RESUME_TYPE resumeType;
+    // HWND hwndSplashScreen;
+
+    // BOOTSTRAPPER_RELATION_TYPE relationType;
+    // BOOL fPassthrough;
+
+    // LPWSTR wzLayoutDirectory;
+    // LPWSTR wzBootstrapperWorkingFolder;
+    // LPWSTR wzBootstrapperApplicationDataPath;
+};
+
+struct BA_ONCREATE_RESULTS
+{
+    DWORD dwApiVersion;
+};
+
+struct BA_ONDESTROY_ARGS
+{
+    DWORD dwApiVersion;
+    BOOL fReload;
+};
+
+struct BA_ONDESTROY_RESULTS
+{
+    DWORD dwApiVersion;
+};
+
 struct BA_ONDETECTBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_REGISTRATION_TYPE registrationType;
     DWORD cPackages;
     BOOL fCached;
@@ -725,13 +767,13 @@ struct BA_ONDETECTBEGIN_ARGS
 
 struct BA_ONDETECTBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzCompatiblePackageId;
     LPCWSTR wzCompatiblePackageVersion;
@@ -739,25 +781,25 @@ struct BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS
 
 struct BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
     BOOL fEligibleForCleanup;
 };
 
 struct BA_ONDETECTCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzBundleId;
     BOOTSTRAPPER_RELATION_TYPE relationType;
     LPCWSTR wzBundleTag;
@@ -768,13 +810,13 @@ struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS
 
 struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTMSIFEATURE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzFeatureId;
     BOOTSTRAPPER_FEATURE_STATE state;
@@ -782,25 +824,25 @@ struct BA_ONDETECTMSIFEATURE_ARGS
 
 struct BA_ONDETECTMSIFEATURE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTPACKAGEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
 };
 
 struct BA_ONDETECTPACKAGEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTPACKAGECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     HRESULT hrStatus;
     BOOTSTRAPPER_PACKAGE_STATE state;
@@ -809,12 +851,12 @@ struct BA_ONDETECTPACKAGECOMPLETE_ARGS
 
 struct BA_ONDETECTPACKAGECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONDETECTRELATEDBUNDLE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzBundleId;
     BOOTSTRAPPER_RELATION_TYPE relationType;
     LPCWSTR wzBundleTag;
@@ -825,13 +867,13 @@ struct BA_ONDETECTRELATEDBUNDLE_ARGS
 
 struct BA_ONDETECTRELATEDBUNDLE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzBundleId;
     BOOTSTRAPPER_RELATION_TYPE relationType;
@@ -841,13 +883,13 @@ struct BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS
 
 struct BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTRELATEDMSIPACKAGE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzUpgradeCode;
     LPCWSTR wzProductCode;
@@ -858,13 +900,13 @@ struct BA_ONDETECTRELATEDMSIPACKAGE_ARGS
 
 struct BA_ONDETECTRELATEDMSIPACKAGE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTPATCHTARGET_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzProductCode;
     BOOTSTRAPPER_PACKAGE_STATE patchState;
@@ -872,13 +914,13 @@ struct BA_ONDETECTPATCHTARGET_ARGS
 
 struct BA_ONDETECTPATCHTARGET_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONDETECTUPDATE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzUpdateLocation;
     DWORD64 dw64Size;
     LPCWSTR wzHash;
@@ -892,61 +934,61 @@ struct BA_ONDETECTUPDATE_ARGS
 
 struct BA_ONDETECTUPDATE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOL fStopProcessingUpdates;
 };
 
 struct BA_ONDETECTUPDATEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzUpdateLocation;
 };
 
 struct BA_ONDETECTUPDATEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOL fSkip;
 };
 
 struct BA_ONDETECTUPDATECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONDETECTUPDATECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fIgnoreError;
 };
 
 struct BA_ONELEVATEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONELEVATEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONELEVATECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONELEVATECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONERROR_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_ERROR_TYPE errorType;
     LPCWSTR wzPackageId;
     DWORD dwCode;
@@ -954,75 +996,75 @@ struct BA_ONERROR_ARGS
     DWORD dwUIHint;
     DWORD cData;
     LPCWSTR* rgwzData;
-    int nRecommendation;
+    INT32 nRecommendation;
 };
 
 struct BA_ONERROR_RESULTS
 {
-    DWORD cbSize;
-    int nResult;
+    DWORD dwApiVersion;
+    INT32 nResult;
 };
 
 struct BA_ONEXECUTEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD cExecutingPackages;
 };
 
 struct BA_ONEXECUTEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONEXECUTECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONEXECUTECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONEXECUTEFILESINUSE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     DWORD cFiles;
     LPCWSTR* rgwzFiles;
-    int nRecommendation;
+    INT32 nRecommendation;
     BOOTSTRAPPER_FILES_IN_USE_TYPE source;
 };
 
 struct BA_ONEXECUTEFILESINUSE_RESULTS
 {
-    DWORD cbSize;
-    int nResult;
+    DWORD dwApiVersion;
+    INT32 nResult;
 };
 
 struct BA_ONEXECUTEMSIMESSAGE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     INSTALLMESSAGE messageType;
     DWORD dwUIHint;
     LPCWSTR wzMessage;
     DWORD cData;
     LPCWSTR* rgwzData;
-    int nRecommendation;
+    INT32 nRecommendation;
 };
 
 struct BA_ONEXECUTEMSIMESSAGE_RESULTS
 {
-    DWORD cbSize;
-    int nResult;
+    DWORD dwApiVersion;
+    INT32 nResult;
 };
 
 struct BA_ONEXECUTEPACKAGEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     BOOL fExecute; // false means rollback.
     BOOTSTRAPPER_ACTION_STATE action;
@@ -1032,13 +1074,13 @@ struct BA_ONEXECUTEPACKAGEBEGIN_ARGS
 
 struct BA_ONEXECUTEPACKAGEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONEXECUTEPACKAGECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     HRESULT hrStatus;
     // Indicates whether this package requires a reboot or initiated the reboot already.
@@ -1048,26 +1090,26 @@ struct BA_ONEXECUTEPACKAGECOMPLETE_ARGS
 
 struct BA_ONEXECUTEPACKAGECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION action;
 };
 
 struct BA_ONEXECUTEPATCHTARGET_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzTargetProductCode;
 };
 
 struct BA_ONEXECUTEPATCHTARGET_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONEXECUTEPROCESSCANCEL_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     DWORD dwProcessId;
     BOOTSTRAPPER_EXECUTEPROCESSCANCEL_ACTION recommendation;
@@ -1075,13 +1117,13 @@ struct BA_ONEXECUTEPROCESSCANCEL_ARGS
 
 struct BA_ONEXECUTEPROCESSCANCEL_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_EXECUTEPROCESSCANCEL_ACTION action;
 };
 
 struct BA_ONEXECUTEPROGRESS_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     DWORD dwProgressPercentage;
     DWORD dwOverallPercentage;
@@ -1089,24 +1131,24 @@ struct BA_ONEXECUTEPROGRESS_ARGS
 
 struct BA_ONEXECUTEPROGRESS_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONLAUNCHAPPROVEDEXEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONLAUNCHAPPROVEDEXEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONLAUNCHAPPROVEDEXECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
     // Only valid if the operation succeeded.
     DWORD dwProcessId;
@@ -1114,45 +1156,45 @@ struct BA_ONLAUNCHAPPROVEDEXECOMPLETE_ARGS
 
 struct BA_ONLAUNCHAPPROVEDEXECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPAUSEAUTOMATICUPDATESBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPAUSEAUTOMATICUPDATESBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPAUSEAUTOMATICUPDATESCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONPAUSEAUTOMATICUPDATESCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPLANBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD cPackages;
 };
 
 struct BA_ONPLANBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzCompatiblePackageId;
     LPCWSTR wzCompatiblePackageVersion;
@@ -1161,14 +1203,14 @@ struct BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS
 
 struct BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOL fRequestRemove;
 };
 
 struct BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzCompatiblePackageId;
     HRESULT hrStatus;
@@ -1177,23 +1219,23 @@ struct BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS
 
 struct BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPLANCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONPLANCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzBundleId;
     BOOTSTRAPPER_RELATION_TYPE relationType;
     LPCWSTR wzBundleTag;
@@ -1204,14 +1246,14 @@ struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS
 
 struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOL fIgnoreBundle;
 };
 
 struct BA_ONPLANMSIFEATURE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzFeatureId;
     BOOTSTRAPPER_FEATURE_STATE recommendedState;
@@ -1219,14 +1261,14 @@ struct BA_ONPLANMSIFEATURE_ARGS
 
 struct BA_ONPLANMSIFEATURE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_FEATURE_STATE requestedState;
     BOOL fCancel;
 };
 
 struct BA_ONPLANMSIPACKAGE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     BOOL fExecute; // false means rollback.
     BOOTSTRAPPER_ACTION_STATE action;
@@ -1235,7 +1277,7 @@ struct BA_ONPLANMSIPACKAGE_ARGS
 
 struct BA_ONPLANMSIPACKAGE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BURN_MSI_PROPERTY actionMsiProperty;
     INSTALLUILEVEL uiLevel;
@@ -1245,7 +1287,7 @@ struct BA_ONPLANMSIPACKAGE_RESULTS
 
 struct BA_ONPLANNEDCOMPATIBLEPACKAGE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzCompatiblePackageId;
     BOOL fRemove;
@@ -1253,12 +1295,12 @@ struct BA_ONPLANNEDCOMPATIBLEPACKAGE_ARGS
 
 struct BA_ONPLANNEDCOMPATIBLEPACKAGE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPLANNEDPACKAGE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     BOOTSTRAPPER_ACTION_STATE execute;
     BOOTSTRAPPER_ACTION_STATE rollback;
@@ -1268,12 +1310,12 @@ struct BA_ONPLANNEDPACKAGE_ARGS
 
 struct BA_ONPLANNEDPACKAGE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPLANPACKAGEBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     BOOTSTRAPPER_PACKAGE_STATE state;
     BOOL fCached;
@@ -1285,7 +1327,7 @@ struct BA_ONPLANPACKAGEBEGIN_ARGS
 
 struct BA_ONPLANPACKAGEBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOTSTRAPPER_REQUEST_STATE requestedState;
     BOOTSTRAPPER_CACHE_TYPE requestedCacheType;
@@ -1293,7 +1335,7 @@ struct BA_ONPLANPACKAGEBEGIN_RESULTS
 
 struct BA_ONPLANPACKAGECOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     HRESULT hrStatus;
     BOOTSTRAPPER_REQUEST_STATE requested;
@@ -1301,68 +1343,68 @@ struct BA_ONPLANPACKAGECOMPLETE_ARGS
 
 struct BA_ONPLANPACKAGECOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONPLANRELATEDBUNDLE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzBundleId;
     BOOTSTRAPPER_REQUEST_STATE recommendedState;
 };
 
 struct BA_ONPLANRELATEDBUNDLE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOTSTRAPPER_REQUEST_STATE requestedState;
 };
 
 struct BA_ONPLANRELATEDBUNDLETYPE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzBundleId;
     BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType;
 };
 
 struct BA_ONPLANRELATEDBUNDLETYPE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE requestedType;
 };
 
 struct BA_ONPLANRESTORERELATEDBUNDLE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzBundleId;
     BOOTSTRAPPER_REQUEST_STATE recommendedState;
 };
 
 struct BA_ONPLANRESTORERELATEDBUNDLE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOTSTRAPPER_REQUEST_STATE requestedState;
 };
 
 struct BA_ONPLANROLLBACKBOUNDARY_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzRollbackBoundaryId;
     BOOL fRecommendedTransaction;
 };
 
 struct BA_ONPLANROLLBACKBOUNDARY_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fTransaction;
     BOOL fCancel;
 };
 
 struct BA_ONPLANPATCHTARGET_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzPackageId;
     LPCWSTR wzProductCode;
     BOOTSTRAPPER_REQUEST_STATE recommendedState;
@@ -1370,62 +1412,62 @@ struct BA_ONPLANPATCHTARGET_ARGS
 
 struct BA_ONPLANPATCHTARGET_RESULTS
 {
-    DWORD cbSize;
-    BOOTSTRAPPER_REQUEST_STATE requestedState;
+    DWORD dwApiVersion;
     BOOL fCancel;
+    BOOTSTRAPPER_REQUEST_STATE requestedState;
 };
 
 struct BA_ONPROGRESS_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD dwProgressPercentage;
     DWORD dwOverallPercentage;
 };
 
 struct BA_ONPROGRESS_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
 };
 
 struct BA_ONREGISTERBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_REGISTRATION_TYPE recommendedRegistrationType;
 };
 
 struct BA_ONREGISTERBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fCancel;
     BOOTSTRAPPER_REGISTRATION_TYPE registrationType;
 };
 
 struct BA_ONREGISTERCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONREGISTERCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONROLLBACKMSITRANSACTIONBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzTransactionId;
 };
 
 struct BA_ONROLLBACKMSITRANSACTIONBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONROLLBACKMSITRANSACTIONCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     LPCWSTR wzTransactionId;
     HRESULT hrStatus;
     BOOTSTRAPPER_APPLY_RESTART restart;
@@ -1434,99 +1476,76 @@ struct BA_ONROLLBACKMSITRANSACTIONCOMPLETE_ARGS
 
 struct BA_ONROLLBACKMSITRANSACTIONCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_EXECUTEMSITRANSACTIONCOMPLETE_ACTION action;
 };
 
-struct BA_ONSETUPDATEBEGIN_ARGS
-{
-    DWORD cbSize;
-};
-
-struct BA_ONSETUPDATEBEGIN_RESULTS
-{
-    DWORD cbSize;
-};
-
-struct BA_ONSETUPDATECOMPLETE_ARGS
-{
-    DWORD cbSize;
-    HRESULT hrStatus;
-    LPCWSTR wzPreviousPackageId;
-    LPCWSTR wzNewPackageId;
-};
-
-struct BA_ONSETUPDATECOMPLETE_RESULTS
-{
-    DWORD cbSize;
-};
-
 struct BA_ONSHUTDOWN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONSHUTDOWN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_SHUTDOWN_ACTION action;
 };
 
 struct BA_ONSTARTUP_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONSTARTUP_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONSYSTEMRESTOREPOINTBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONSYSTEMRESTOREPOINTBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONSYSTEMRESTOREPOINTCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONSYSTEMRESTOREPOINTCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
 struct BA_ONUNREGISTERBEGIN_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_REGISTRATION_TYPE recommendedRegistrationType;
 };
 
 struct BA_ONUNREGISTERBEGIN_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOTSTRAPPER_REGISTRATION_TYPE registrationType;
 };
 
 struct BA_ONUNREGISTERCOMPLETE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     HRESULT hrStatus;
 };
 
 struct BA_ONUNREGISTERCOMPLETE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
 };
 
-
+#ifdef TODO_DELETE
 
 extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_PROC)(
     __in BOOTSTRAPPER_APPLICATION_MESSAGE message,
@@ -1537,13 +1556,13 @@ extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_PROC)(
 
 struct BOOTSTRAPPER_DESTROY_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fReload;
 };
 
 struct BOOTSTRAPPER_DESTROY_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     BOOL fDisableUnloading; // indicates the BA dll must not be unloaded after BootstrapperApplicationDestroy.
 };
 
@@ -1556,7 +1575,7 @@ extern "C" typedef void (WINAPI *PFN_BOOTSTRAPPER_APPLICATION_DESTROY)(
 
 struct BOOTSTRAPPER_CREATE_ARGS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     DWORD64 qwEngineAPIVersion;
     PFN_BOOTSTRAPPER_ENGINE_PROC pfnBootstrapperEngineProc;
     LPVOID pvBootstrapperEngineProcContext;
@@ -1565,7 +1584,7 @@ struct BOOTSTRAPPER_CREATE_ARGS
 
 struct BOOTSTRAPPER_CREATE_RESULTS
 {
-    DWORD cbSize;
+    DWORD dwApiVersion;
     PFN_BOOTSTRAPPER_APPLICATION_PROC pfnBootstrapperApplicationProc;
     LPVOID pvBootstrapperApplicationProcContext;
 };
@@ -1574,3 +1593,5 @@ extern "C" typedef HRESULT(WINAPI *PFN_BOOTSTRAPPER_APPLICATION_CREATE)(
     __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
     __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
     );
+
+#endif