From b29af5d005c2cc802aa60a123d435042038ba8ef Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 18 Feb 2021 10:44:49 -0600 Subject: Get all request states up front before building the plan. --- .../inc/BootstrapperApplication.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (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 1ba25cd7..0a89b3f4 100644 --- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h +++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h @@ -142,6 +142,7 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE BOOTSTRAPPER_APPLICATION_MESSAGE_ONPAUSEAUTOMATICUPDATESCOMPLETE, BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN, BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE, + BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE, }; enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION @@ -885,10 +886,25 @@ struct BA_ONPLANMSIPACKAGE_RESULTS BOOL fDisableExternalUiHandler; }; +struct BA_ONPLANNEDPACKAGE_ARGS +{ + DWORD cbSize; + LPCWSTR wzPackageId; + BOOTSTRAPPER_ACTION_STATE execute; + BOOTSTRAPPER_ACTION_STATE rollback; +}; + +struct BA_ONPLANNEDPACKAGE_RESULTS +{ + DWORD cbSize; +}; + struct BA_ONPLANPACKAGEBEGIN_ARGS { DWORD cbSize; LPCWSTR wzPackageId; + BOOTSTRAPPER_PACKAGE_STATE state; + BOOL fInstallCondition; BOOTSTRAPPER_REQUEST_STATE recommendedState; }; @@ -904,10 +920,7 @@ struct BA_ONPLANPACKAGECOMPLETE_ARGS DWORD cbSize; LPCWSTR wzPackageId; HRESULT hrStatus; - BOOTSTRAPPER_PACKAGE_STATE state; BOOTSTRAPPER_REQUEST_STATE requested; - BOOTSTRAPPER_ACTION_STATE execute; - BOOTSTRAPPER_ACTION_STATE rollback; }; struct BA_ONPLANPACKAGECOMPLETE_RESULTS -- cgit v1.2.3-55-g6feb