From 4cd1c4e06145434ca940ac828772dc47b9d9738e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 13 Mar 2022 23:45:32 -0500 Subject: Allow the BA to override the bundle relation type during plan. --- .../inc/BootstrapperApplication.h | 29 +++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'src/api/burn/WixToolset.BootstrapperCore.Native/inc') diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h index 9a5fb8f8..b507b167 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h @@ -103,10 +103,22 @@ enum BOOTSTRAPPER_RELATION_TYPE BOOTSTRAPPER_RELATION_UPGRADE, BOOTSTRAPPER_RELATION_ADDON, BOOTSTRAPPER_RELATION_PATCH, - BOOTSTRAPPER_RELATION_DEPENDENT, + BOOTSTRAPPER_RELATION_DEPENDENT_ADDON, + BOOTSTRAPPER_RELATION_DEPENDENT_PATCH, BOOTSTRAPPER_RELATION_UPDATE, }; +enum BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE +{ + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_NONE, + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_DOWNGRADE, + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_UPGRADE, + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_ADDON, + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_PATCH, + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_DEPENDENT_ADDON, + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_DEPENDENT_PATCH, +}; + enum BOOTSTRAPPER_CACHE_TYPE { BOOTSTRAPPER_CACHE_TYPE_REMOVE, @@ -210,6 +222,7 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDCOMPATIBLEPACKAGE, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRESTORERELATEDBUNDLE, + BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLETYPE, }; enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION @@ -1209,6 +1222,20 @@ struct BA_ONPLANRELATEDBUNDLE_RESULTS BOOTSTRAPPER_REQUEST_STATE requestedState; }; +struct BA_ONPLANRELATEDBUNDLETYPE_ARGS +{ + DWORD cbSize; + LPCWSTR wzBundleId; + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType; +}; + +struct BA_ONPLANRELATEDBUNDLETYPE_RESULTS +{ + DWORD cbSize; + BOOL fCancel; + BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE requestedType; +}; + struct BA_ONPLANRESTORERELATEDBUNDLE_ARGS { DWORD cbSize; -- cgit v1.2.3-55-g6feb