From 10ef9d5bfbf81f454113a1c2716009831a916222 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 10 Mar 2021 15:47:59 -0600 Subject: Determine whether to ignore forward compatible bundles during Plan. --- .../inc/BootstrapperApplication.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/WixToolset.BootstrapperCore.Native') diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h index 6cf3477c..c3242167 100644 --- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h +++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h @@ -143,6 +143,7 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN, BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE, + BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, }; enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION @@ -496,7 +497,6 @@ struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS { DWORD cbSize; BOOL fCancel; - BOOL fIgnoreBundle; }; struct BA_ONDETECTMSIFEATURE_ARGS @@ -854,6 +854,24 @@ struct BA_ONPLANCOMPLETE_RESULTS DWORD cbSize; }; +struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS +{ + DWORD cbSize; + LPCWSTR wzBundleId; + BOOTSTRAPPER_RELATION_TYPE relationType; + LPCWSTR wzBundleTag; + BOOL fPerMachine; + LPCWSTR wzVersion; + BOOL fRecommendedIgnoreBundle; +}; + +struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS +{ + DWORD cbSize; + BOOL fCancel; + BOOL fIgnoreBundle; +}; + struct BA_ONPLANMSIFEATURE_ARGS { DWORD cbSize; -- cgit v1.2.3-55-g6feb