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/BalBootstrapperEngine.cpp | |
| parent | a3d3963f806117ce123d95e8b77e73e1c1545b25 (diff) | |
| download | wix-edccb203c421d2bd820062024088c6698424d9ee.tar.gz wix-edccb203c421d2bd820062024088c6698424d9ee.tar.bz2 wix-edccb203c421d2bd820062024088c6698424d9ee.zip | |
Support dual-purpose packages in Burn.bob/ConfigurableScopeBundles
Fixes https://github.com/wixtoolset/issues/issues/8958
Diffstat (limited to 'src/api/burn/balutil/BalBootstrapperEngine.cpp')
| -rw-r--r-- | src/api/burn/balutil/BalBootstrapperEngine.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/api/burn/balutil/BalBootstrapperEngine.cpp b/src/api/burn/balutil/BalBootstrapperEngine.cpp index 61e7e31b..14aa5c25 100644 --- a/src/api/burn/balutil/BalBootstrapperEngine.cpp +++ b/src/api/burn/balutil/BalBootstrapperEngine.cpp | |||
| @@ -1188,7 +1188,8 @@ public: // IBootstrapperEngine | |||
| 1188 | } | 1188 | } |
| 1189 | 1189 | ||
| 1190 | virtual STDMETHODIMP Plan( | 1190 | virtual STDMETHODIMP Plan( |
| 1191 | __in BOOTSTRAPPER_ACTION action | 1191 | __in BOOTSTRAPPER_ACTION action, |
| 1192 | __in BOOTSTRAPPER_SCOPE plannedScope | ||
| 1192 | ) | 1193 | ) |
| 1193 | { | 1194 | { |
| 1194 | HRESULT hr = S_OK; | 1195 | HRESULT hr = S_OK; |
| @@ -1199,17 +1200,21 @@ public: // IBootstrapperEngine | |||
| 1199 | PIPE_RPC_RESULT rpc = { }; | 1200 | PIPE_RPC_RESULT rpc = { }; |
| 1200 | 1201 | ||
| 1201 | // Init send structs. | 1202 | // Init send structs. |
| 1202 | args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; | 1203 | args.dwApiVersion = WIX_7_BOOTSTRAPPER_APPLICATION_API_VERSION; |
| 1203 | args.action = action; | 1204 | args.action = action; |
| 1205 | args.plannedScope = plannedScope; | ||
| 1204 | 1206 | ||
| 1205 | results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; | 1207 | results.dwApiVersion = WIX_7_BOOTSTRAPPER_APPLICATION_API_VERSION; |
| 1206 | 1208 | ||
| 1207 | // Send args. | 1209 | // Send args. |
| 1208 | hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); | 1210 | hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); |
| 1209 | ExitOnFailure(hr, "Failed to write API version of Plan args."); | 1211 | ExitOnFailure(hr, "Failed to write API version of Plan args."); |
| 1210 | 1212 | ||
| 1211 | hr = BuffWriteNumberToBuffer(&bufferArgs, static_cast<DWORD>(args.action)); | 1213 | hr = BuffWriteNumberToBuffer(&bufferArgs, static_cast<DWORD>(args.action)); |
| 1212 | ExitOnFailure(hr, "Failed to write parent window of Plan args."); | 1214 | ExitOnFailure(hr, "Failed to write action of Plan args."); |
| 1215 | |||
| 1216 | hr = BuffWriteNumberToBuffer(&bufferArgs, static_cast<DWORD>(args.plannedScope)); | ||
| 1217 | ExitOnFailure(hr, "Failed to write planned scope of Plan args."); | ||
| 1213 | 1218 | ||
| 1214 | // Send results. | 1219 | // Send results. |
| 1215 | hr = BuffWriteNumberToBuffer(&bufferResults, results.dwApiVersion); | 1220 | hr = BuffWriteNumberToBuffer(&bufferResults, results.dwApiVersion); |
