aboutsummaryrefslogtreecommitdiff
path: root/src/api/burn/balutil/inc
diff options
context:
space:
mode:
Diffstat (limited to 'src/api/burn/balutil/inc')
-rw-r--r--src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h14
-rw-r--r--src/api/burn/balutil/inc/balinfo.h10
2 files changed, 21 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 }
diff --git a/src/api/burn/balutil/inc/balinfo.h b/src/api/burn/balutil/inc/balinfo.h
index cd61f34d..818ff5ef 100644
--- a/src/api/burn/balutil/inc/balinfo.h
+++ b/src/api/burn/balutil/inc/balinfo.h
@@ -20,6 +20,15 @@ typedef enum BAL_INFO_PACKAGE_TYPE
20 BAL_INFO_PACKAGE_TYPE_BUNDLE_CHAIN, 20 BAL_INFO_PACKAGE_TYPE_BUNDLE_CHAIN,
21} BAL_INFO_PACKAGE_TYPE; 21} BAL_INFO_PACKAGE_TYPE;
22 22
23typedef enum _BAL_INFO_PRIMARY_PACKAGE_TYPE
24{
25 BAL_INFO_PRIMARY_PACKAGE_TYPE_NONE,
26 BAL_INFO_PRIMARY_PACKAGE_TYPE_DEFAULT,
27 BAL_INFO_PRIMARY_PACKAGE_TYPE_X86,
28 BAL_INFO_PRIMARY_PACKAGE_TYPE_X64,
29 BAL_INFO_PRIMARY_PACKAGE_TYPE_ARM64,
30} BAL_INFO_PRIMARY_PACKAGE_TYPE;
31
23typedef enum _BAL_INFO_RESTART 32typedef enum _BAL_INFO_RESTART
24{ 33{
25 BAL_INFO_RESTART_UNKNOWN, 34 BAL_INFO_RESTART_UNKNOWN,
@@ -54,6 +63,7 @@ typedef struct _BAL_INFO_PACKAGE
54 BOOL fPrereqPackage; 63 BOOL fPrereqPackage;
55 LPWSTR sczPrereqLicenseFile; 64 LPWSTR sczPrereqLicenseFile;
56 LPWSTR sczPrereqLicenseUrl; 65 LPWSTR sczPrereqLicenseUrl;
66 BAL_INFO_PRIMARY_PACKAGE_TYPE primaryPackageType;
57 LPVOID pvCustomData; 67 LPVOID pvCustomData;
58} BAL_INFO_PACKAGE; 68} BAL_INFO_PACKAGE;
59 69