diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-07-19 15:17:10 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-07-20 08:53:56 -0500 |
commit | 913b6238417dceeb8440315e4669990756d17655 (patch) | |
tree | a9e3552ea124d2025e30436afc8629f071c01ed4 /src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h | |
parent | 93bb820eff547f8de304f05249f572da861256fb (diff) | |
download | wix-913b6238417dceeb8440315e4669990756d17655.tar.gz wix-913b6238417dceeb8440315e4669990756d17655.tar.bz2 wix-913b6238417dceeb8440315e4669990756d17655.zip |
Add WixInternalUIBootstrapperApplication as a new built-in BA.
Implements 6835
Diffstat (limited to 'src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h')
-rw-r--r-- | src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h index aa1ca56f..c3223bee 100644 --- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h +++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h | |||
@@ -451,8 +451,8 @@ public: // IBootstrapperApplication | |||
451 | __in BOOTSTRAPPER_ERROR_TYPE errorType, | 451 | __in BOOTSTRAPPER_ERROR_TYPE errorType, |
452 | __in_z LPCWSTR wzPackageId, | 452 | __in_z LPCWSTR wzPackageId, |
453 | __in DWORD dwCode, | 453 | __in DWORD dwCode, |
454 | __in_z LPCWSTR /*wzError*/, | 454 | __in_z LPCWSTR wzError, |
455 | __in DWORD /*dwUIHint*/, | 455 | __in DWORD dwUIHint, |
456 | __in DWORD /*cData*/, | 456 | __in DWORD /*cData*/, |
457 | __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, | 457 | __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, |
458 | __in int /*nRecommendation*/, | 458 | __in int /*nRecommendation*/, |
@@ -461,7 +461,15 @@ public: // IBootstrapperApplication | |||
461 | { | 461 | { |
462 | BalRetryErrorOccurred(wzPackageId, dwCode); | 462 | BalRetryErrorOccurred(wzPackageId, dwCode); |
463 | 463 | ||
464 | if (CheckCanceled()) | 464 | if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_display) |
465 | { | ||
466 | HRESULT hr = m_pEngine->SendEmbeddedError(dwCode, wzError, dwUIHint, pResult); | ||
467 | if (FAILED(hr)) | ||
468 | { | ||
469 | *pResult = IDERROR; | ||
470 | } | ||
471 | } | ||
472 | else if (CheckCanceled()) | ||
465 | { | 473 | { |
466 | *pResult = IDCANCEL; | 474 | *pResult = IDCANCEL; |
467 | } | 475 | } |