diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-03-13 23:51:36 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-03-14 14:53:29 -0500 |
| commit | 9453eaa9a38f78e248526ddd996485140a5d4d9a (patch) | |
| tree | 8ef6bda85836fd3f1b9c2c6c16cb4a994519e863 /src/api/burn/WixToolset.BootstrapperCore.Native/inc | |
| parent | 78125b7c4bd59468275d65b63860bdb68b1bc6f1 (diff) | |
| download | wix-9453eaa9a38f78e248526ddd996485140a5d4d9a.tar.gz wix-9453eaa9a38f78e248526ddd996485140a5d4d9a.tar.bz2 wix-9453eaa9a38f78e248526ddd996485140a5d4d9a.zip | |
Make engine skip planning if there are any downgrade related bundles.
Fixes 6677, 6722
Reverts 6537
Diffstat (limited to 'src/api/burn/WixToolset.BootstrapperCore.Native/inc')
| -rw-r--r-- | src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h index b507b167..0b81b35a 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h | |||
| @@ -223,6 +223,7 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE | |||
| 223 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDCOMPATIBLEPACKAGE, | 223 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDCOMPATIBLEPACKAGE, |
| 224 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRESTORERELATEDBUNDLE, | 224 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRESTORERELATEDBUNDLE, |
| 225 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLETYPE, | 225 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLETYPE, |
| 226 | BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYDOWNGRADE, | ||
| 226 | }; | 227 | }; |
| 227 | 228 | ||
| 228 | enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION | 229 | enum BOOTSTRAPPER_APPLYCOMPLETE_ACTION |
| @@ -354,6 +355,18 @@ struct BA_ONAPPLYCOMPLETE_RESULTS | |||
| 354 | BOOTSTRAPPER_APPLYCOMPLETE_ACTION action; | 355 | BOOTSTRAPPER_APPLYCOMPLETE_ACTION action; |
| 355 | }; | 356 | }; |
| 356 | 357 | ||
| 358 | struct BA_ONAPPLYDOWNGRADE_ARGS | ||
| 359 | { | ||
| 360 | DWORD cbSize; | ||
| 361 | HRESULT hrRecommended; | ||
| 362 | }; | ||
| 363 | |||
| 364 | struct BA_ONAPPLYDOWNGRADE_RESULTS | ||
| 365 | { | ||
| 366 | DWORD cbSize; | ||
| 367 | HRESULT hrStatus; | ||
| 368 | }; | ||
| 369 | |||
| 357 | struct BA_ONBEGINMSITRANSACTIONBEGIN_ARGS | 370 | struct BA_ONBEGINMSITRANSACTIONBEGIN_ARGS |
| 358 | { | 371 | { |
| 359 | DWORD cbSize; | 372 | DWORD cbSize; |
