aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/package.h
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-01-03 15:35:14 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-01-04 19:19:43 -0600
commit1f5314302b3c8bc1977aed79df1d05c52608f382 (patch)
treef0fef3a4462352c914a4cc9413515d07f2244703 /src/burn/engine/package.h
parentdb44f6cf3b1eb476e47384f2eccba5712808def5 (diff)
downloadwix-1f5314302b3c8bc1977aed79df1d05c52608f382.tar.gz
wix-1f5314302b3c8bc1977aed79df1d05c52608f382.tar.bz2
wix-1f5314302b3c8bc1977aed79df1d05c52608f382.zip
Don't assume Exe packages with Burn protocol are bundles.
Related to #3693
Diffstat (limited to 'src/burn/engine/package.h')
-rw-r--r--src/burn/engine/package.h22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/burn/engine/package.h b/src/burn/engine/package.h
index f2a1c304..10b5f33c 100644
--- a/src/burn/engine/package.h
+++ b/src/burn/engine/package.h
@@ -35,6 +35,7 @@ enum BURN_EXE_PROTOCOL_TYPE
35enum BURN_PACKAGE_TYPE 35enum BURN_PACKAGE_TYPE
36{ 36{
37 BURN_PACKAGE_TYPE_NONE, 37 BURN_PACKAGE_TYPE_NONE,
38 BURN_PACKAGE_TYPE_BUNDLE,
38 BURN_PACKAGE_TYPE_EXE, 39 BURN_PACKAGE_TYPE_EXE,
39 BURN_PACKAGE_TYPE_MSI, 40 BURN_PACKAGE_TYPE_MSI,
40 BURN_PACKAGE_TYPE_MSP, 41 BURN_PACKAGE_TYPE_MSP,
@@ -263,21 +264,36 @@ typedef struct _BURN_PACKAGE
263 { 264 {
264 struct 265 struct
265 { 266 {
266 LPWSTR sczDetectCondition;
267 LPWSTR sczInstallArguments; 267 LPWSTR sczInstallArguments;
268 LPWSTR sczRepairArguments; 268 LPWSTR sczRepairArguments;
269 LPWSTR sczUninstallArguments; 269 LPWSTR sczUninstallArguments;
270
270 LPWSTR sczIgnoreDependencies; 271 LPWSTR sczIgnoreDependencies;
271 LPCWSTR wzAncestors; // points directly into engine state. 272 LPCWSTR wzAncestors; // points directly into engine state.
272 LPCWSTR wzEngineWorkingDirectory; // points directly into engine state. 273 LPCWSTR wzEngineWorkingDirectory; // points directly into engine state.
273 274
274 BOOL fPseudoBundle; 275 BOOL fPseudoBundle;
276 BOOL fRepairable;
277 BOOL fSupportsBurnProtocol;
275 278
279 BURN_EXE_EXIT_CODE* rgExitCodes;
280 DWORD cExitCodes;
281
282 BURN_EXE_COMMAND_LINE_ARGUMENT* rgCommandLineArguments;
283 DWORD cCommandLineArguments;
284 } Bundle;
285 struct
286 {
287 LPWSTR sczDetectCondition;
288 LPWSTR sczInstallArguments;
289 LPWSTR sczRepairArguments;
290 LPWSTR sczUninstallArguments;
291
292 BOOL fPseudoBundle;
293 BOOL fFireAndForget;
276 BOOL fRepairable; 294 BOOL fRepairable;
277 BURN_EXE_PROTOCOL_TYPE protocol; 295 BURN_EXE_PROTOCOL_TYPE protocol;
278 296
279 BOOL fSupportsAncestors;
280
281 BURN_EXE_EXIT_CODE* rgExitCodes; 297 BURN_EXE_EXIT_CODE* rgExitCodes;
282 DWORD cExitCodes; 298 DWORD cExitCodes;
283 299