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/burn/engine/userexperience.cpp | |
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/burn/engine/userexperience.cpp')
-rw-r--r-- | src/burn/engine/userexperience.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/burn/engine/userexperience.cpp b/src/burn/engine/userexperience.cpp index 8668cf6f..81ce8bb9 100644 --- a/src/burn/engine/userexperience.cpp +++ b/src/burn/engine/userexperience.cpp | |||
@@ -335,6 +335,30 @@ LExit: | |||
335 | return hr; | 335 | return hr; |
336 | } | 336 | } |
337 | 337 | ||
338 | EXTERN_C BAAPI UserExperienceOnApplyDowngrade( | ||
339 | __in BURN_USER_EXPERIENCE* pUserExperience, | ||
340 | __inout HRESULT* phrStatus | ||
341 | ) | ||
342 | { | ||
343 | HRESULT hr = S_OK; | ||
344 | BA_ONAPPLYDOWNGRADE_ARGS args = { }; | ||
345 | BA_ONAPPLYDOWNGRADE_RESULTS results = { }; | ||
346 | |||
347 | args.cbSize = sizeof(args); | ||
348 | args.hrRecommended = *phrStatus; | ||
349 | |||
350 | results.cbSize = sizeof(results); | ||
351 | results.hrStatus = *phrStatus; | ||
352 | |||
353 | hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYDOWNGRADE, &args, &results); | ||
354 | ExitOnFailure(hr, "BA OnApplyDowngrade failed."); | ||
355 | |||
356 | *phrStatus = results.hrStatus; | ||
357 | |||
358 | LExit: | ||
359 | return hr; | ||
360 | } | ||
361 | |||
338 | EXTERN_C BAAPI UserExperienceOnBeginMsiTransactionBegin( | 362 | EXTERN_C BAAPI UserExperienceOnBeginMsiTransactionBegin( |
339 | __in BURN_USER_EXPERIENCE* pUserExperience, | 363 | __in BURN_USER_EXPERIENCE* pUserExperience, |
340 | __in LPCWSTR wzTransactionId | 364 | __in LPCWSTR wzTransactionId |