diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-10 15:47:59 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-11 20:24:18 -0600 |
| commit | 10ef9d5bfbf81f454113a1c2716009831a916222 (patch) | |
| tree | 9e2fd8c917787ceba5e4c7f873d715eafbda6920 /src/WixToolset.BootstrapperCore.Native | |
| parent | 778b65643f19df94947d390a5a17023043d840b4 (diff) | |
| download | wix-10ef9d5bfbf81f454113a1c2716009831a916222.tar.gz wix-10ef9d5bfbf81f454113a1c2716009831a916222.tar.bz2 wix-10ef9d5bfbf81f454113a1c2716009831a916222.zip | |
Determine whether to ignore forward compatible bundles during Plan.
Diffstat (limited to 'src/WixToolset.BootstrapperCore.Native')
| -rw-r--r-- | src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h | 20 |
1 files changed, 19 insertions, 1 deletions
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 | |||
| 143 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN, | 143 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN, |
| 144 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE, | 144 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE, |
| 145 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE, | 145 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE, |
| 146 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, | ||
| 146 | }; | 147 | }; |
| 147 | 148 | ||
| 148 | enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION | 149 | enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION |
| @@ -496,7 +497,6 @@ struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS | |||
| 496 | { | 497 | { |
| 497 | DWORD cbSize; | 498 | DWORD cbSize; |
| 498 | BOOL fCancel; | 499 | BOOL fCancel; |
| 499 | BOOL fIgnoreBundle; | ||
| 500 | }; | 500 | }; |
| 501 | 501 | ||
| 502 | struct BA_ONDETECTMSIFEATURE_ARGS | 502 | struct BA_ONDETECTMSIFEATURE_ARGS |
| @@ -854,6 +854,24 @@ struct BA_ONPLANCOMPLETE_RESULTS | |||
| 854 | DWORD cbSize; | 854 | DWORD cbSize; |
| 855 | }; | 855 | }; |
| 856 | 856 | ||
| 857 | struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS | ||
| 858 | { | ||
| 859 | DWORD cbSize; | ||
| 860 | LPCWSTR wzBundleId; | ||
| 861 | BOOTSTRAPPER_RELATION_TYPE relationType; | ||
| 862 | LPCWSTR wzBundleTag; | ||
| 863 | BOOL fPerMachine; | ||
| 864 | LPCWSTR wzVersion; | ||
| 865 | BOOL fRecommendedIgnoreBundle; | ||
| 866 | }; | ||
| 867 | |||
| 868 | struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS | ||
| 869 | { | ||
| 870 | DWORD cbSize; | ||
| 871 | BOOL fCancel; | ||
| 872 | BOOL fIgnoreBundle; | ||
| 873 | }; | ||
| 874 | |||
| 857 | struct BA_ONPLANMSIFEATURE_ARGS | 875 | struct BA_ONPLANMSIFEATURE_ARGS |
| 858 | { | 876 | { |
| 859 | DWORD cbSize; | 877 | DWORD cbSize; |
