diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-02-04 20:47:04 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2026-02-04 20:47:04 -0500 |
| commit | edccb203c421d2bd820062024088c6698424d9ee (patch) | |
| tree | 6b47c3eb5ca53bd9f79f3d032dc1a596d411bf38 /src/api/burn/balutil/inc/BootstrapperApplicationBase.h | |
| parent | a3d3963f806117ce123d95e8b77e73e1c1545b25 (diff) | |
| download | wix-bob/ConfigurableScopeBundles.tar.gz wix-bob/ConfigurableScopeBundles.tar.bz2 wix-bob/ConfigurableScopeBundles.zip | |
Support dual-purpose packages in Burn.bob/ConfigurableScopeBundles
Fixes https://github.com/wixtoolset/issues/issues/8958
Diffstat (limited to '')
| -rw-r--r-- | src/api/burn/balutil/inc/BootstrapperApplicationBase.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h index 80bfd361..41c151d9 100644 --- a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h +++ b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h | |||
| @@ -16,7 +16,7 @@ class CBootstrapperApplicationBase : public IBootstrapperApplication | |||
| 16 | public: // IUnknown | 16 | public: // IUnknown |
| 17 | virtual STDMETHODIMP QueryInterface( | 17 | virtual STDMETHODIMP QueryInterface( |
| 18 | __in REFIID riid, | 18 | __in REFIID riid, |
| 19 | __out LPVOID *ppvObject | 19 | __out LPVOID* ppvObject |
| 20 | ) | 20 | ) |
| 21 | { | 21 | { |
| 22 | if (!ppvObject) | 22 | if (!ppvObject) |
| @@ -478,12 +478,14 @@ public: // IBootstrapperApplication | |||
| 478 | __in DWORD dwCode, | 478 | __in DWORD dwCode, |
| 479 | __in_z LPCWSTR wzError, | 479 | __in_z LPCWSTR wzError, |
| 480 | __in DWORD dwUIHint, | 480 | __in DWORD dwUIHint, |
| 481 | __in DWORD /*cData*/, | 481 | __in DWORD cData, |
| 482 | __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, | 482 | __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, |
| 483 | __in int /*nRecommendation*/, | 483 | __in int /*nRecommendation*/, |
| 484 | __inout int* pResult | 484 | __inout int* pResult |
| 485 | ) | 485 | ) |
| 486 | { | 486 | { |
| 487 | UNREFERENCED_PARAMETER(cData); | ||
| 488 | |||
| 487 | BalRetryErrorOccurred(wzPackageId, dwCode); | 489 | BalRetryErrorOccurred(wzPackageId, dwCode); |
| 488 | 490 | ||
| 489 | if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_commandDisplay) | 491 | if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_commandDisplay) |
| @@ -781,12 +783,14 @@ public: // IBootstrapperApplication | |||
| 781 | __in INSTALLMESSAGE /*messageType*/, | 783 | __in INSTALLMESSAGE /*messageType*/, |
| 782 | __in DWORD /*dwUIHint*/, | 784 | __in DWORD /*dwUIHint*/, |
| 783 | __in_z LPCWSTR /*wzMessage*/, | 785 | __in_z LPCWSTR /*wzMessage*/, |
| 784 | __in DWORD /*cData*/, | 786 | __in DWORD cData, |
| 785 | __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, | 787 | __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, |
| 786 | __in int /*nRecommendation*/, | 788 | __in int /*nRecommendation*/, |
| 787 | __inout int* pResult | 789 | __inout int* pResult |
| 788 | ) | 790 | ) |
| 789 | { | 791 | { |
| 792 | UNREFERENCED_PARAMETER(cData); | ||
| 793 | |||
| 790 | if (CheckCanceled()) | 794 | if (CheckCanceled()) |
| 791 | { | 795 | { |
| 792 | *pResult = IDCANCEL; | 796 | *pResult = IDCANCEL; |
| @@ -797,13 +801,15 @@ public: // IBootstrapperApplication | |||
| 797 | 801 | ||
| 798 | virtual STDMETHODIMP OnExecuteFilesInUse( | 802 | virtual STDMETHODIMP OnExecuteFilesInUse( |
| 799 | __in_z LPCWSTR /*wzPackageId*/, | 803 | __in_z LPCWSTR /*wzPackageId*/, |
| 800 | __in DWORD /*cFiles*/, | 804 | __in DWORD cFiles, |
| 801 | __in_ecount_z(cFiles) LPCWSTR* /*rgwzFiles*/, | 805 | __in_ecount_z(cFiles) LPCWSTR* /*rgwzFiles*/, |
| 802 | __in int /*nRecommendation*/, | 806 | __in int /*nRecommendation*/, |
| 803 | __in BOOTSTRAPPER_FILES_IN_USE_TYPE /*source*/, | 807 | __in BOOTSTRAPPER_FILES_IN_USE_TYPE /*source*/, |
| 804 | __inout int* pResult | 808 | __inout int* pResult |
| 805 | ) | 809 | ) |
| 806 | { | 810 | { |
| 811 | UNREFERENCED_PARAMETER(cFiles); | ||
| 812 | |||
| 807 | if (CheckCanceled()) | 813 | if (CheckCanceled()) |
| 808 | { | 814 | { |
| 809 | *pResult = IDCANCEL; | 815 | *pResult = IDCANCEL; |
