From da1d1376953ef1c9afb32d5eee02b785e52e372e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 14 Jan 2022 21:37:24 -0600 Subject: Remove orphan compatible MSI packages. Reimplements #3190 --- .../inc/BootstrapperApplication.h | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) (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 4fbfc890..659901be 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h @@ -205,6 +205,10 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANROLLBACKBOUNDARY, BOOTSTRAPPER_APPLICATION_MESSAGE_ONSETUPDATEBEGIN, BOOTSTRAPPER_APPLICATION_MESSAGE_ONSETUPDATECOMPLETE, + BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE, + BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN, + BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE, + BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDCOMPATIBLEPACKAGE, }; enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION @@ -648,6 +652,20 @@ struct BA_ONDETECTBEGIN_RESULTS BOOL fCancel; }; +struct BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS +{ + DWORD cbSize; + LPCWSTR wzPackageId; + LPCWSTR wzCompatiblePackageId; + LPCWSTR wzCompatiblePackageVersion; +}; + +struct BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS +{ + DWORD cbSize; + BOOL fCancel; +}; + struct BA_ONDETECTCOMPLETE_ARGS { DWORD cbSize; @@ -1023,6 +1041,36 @@ struct BA_ONPLANBEGIN_RESULTS BOOL fCancel; }; +struct BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS +{ + DWORD cbSize; + LPCWSTR wzPackageId; + LPCWSTR wzCompatiblePackageId; + LPCWSTR wzCompatiblePackageVersion; + BOOL fRecommendedRemove; +}; + +struct BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS +{ + DWORD cbSize; + BOOL fCancel; + BOOL fRequestRemove; +}; + +struct BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS +{ + DWORD cbSize; + LPCWSTR wzPackageId; + LPCWSTR wzCompatiblePackageId; + HRESULT hrStatus; + BOOL fRequestedRemove; +}; + +struct BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS +{ + DWORD cbSize; +}; + struct BA_ONPLANCOMPLETE_ARGS { DWORD cbSize; @@ -1086,6 +1134,19 @@ struct BA_ONPLANMSIPACKAGE_RESULTS BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning; }; +struct BA_ONPLANNEDCOMPATIBLEPACKAGE_ARGS +{ + DWORD cbSize; + LPCWSTR wzPackageId; + LPCWSTR wzCompatiblePackageId; + BOOL fRemove; +}; + +struct BA_ONPLANNEDCOMPATIBLEPACKAGE_RESULTS +{ + DWORD cbSize; +}; + struct BA_ONPLANNEDPACKAGE_ARGS { DWORD cbSize; -- cgit v1.2.3-55-g6feb