diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-21 14:13:16 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-21 14:18:40 +1000 |
commit | 513286d4798572cc82a78554ef15ef2fe79f407e (patch) | |
tree | 3960b579a914c843f56c9045c59d194162d0a9d2 /src/engine/plan.h | |
parent | c903a96bd8d61a375448e1a6ad7b40bab8cb24c4 (diff) | |
download | wix-513286d4798572cc82a78554ef15ef2fe79f407e.tar.gz wix-513286d4798572cc82a78554ef15ef2fe79f407e.tar.bz2 wix-513286d4798572cc82a78554ef15ef2fe79f407e.zip |
WIXBUG:5980 Fix bugs around INSTALLUILEVEL_SOURCERESONLY.
Apply requires a valid hWnd since otherwise a source resolution prompt could hang the bundle.
Burn now defaults to INSTALLUILEVEL_NONE by itself if the bundle is not showing UI.
Diffstat (limited to '')
-rw-r--r-- | src/engine/plan.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/engine/plan.h b/src/engine/plan.h index 89f4b4bf..db9745e9 100644 --- a/src/engine/plan.h +++ b/src/engine/plan.h | |||
@@ -408,6 +408,7 @@ HRESULT PlanPackages( | |||
408 | __in BURN_LOGGING* pLog, | 408 | __in BURN_LOGGING* pLog, |
409 | __in BURN_VARIABLES* pVariables, | 409 | __in BURN_VARIABLES* pVariables, |
410 | __in BOOL fBundleInstalled, | 410 | __in BOOL fBundleInstalled, |
411 | __in BOOTSTRAPPER_DISPLAY display, | ||
411 | __in BOOTSTRAPPER_RELATION_TYPE relationType, | 412 | __in BOOTSTRAPPER_RELATION_TYPE relationType, |
412 | __in_z_opt LPCWSTR wzLayoutDirectory, | 413 | __in_z_opt LPCWSTR wzLayoutDirectory, |
413 | __inout HANDLE* phSyncpointEvent | 414 | __inout HANDLE* phSyncpointEvent |
@@ -426,6 +427,7 @@ HRESULT PlanPassThroughBundle( | |||
426 | __in BURN_PLAN* pPlan, | 427 | __in BURN_PLAN* pPlan, |
427 | __in BURN_LOGGING* pLog, | 428 | __in BURN_LOGGING* pLog, |
428 | __in BURN_VARIABLES* pVariables, | 429 | __in BURN_VARIABLES* pVariables, |
430 | __in BOOTSTRAPPER_DISPLAY display, | ||
429 | __in BOOTSTRAPPER_RELATION_TYPE relationType, | 431 | __in BOOTSTRAPPER_RELATION_TYPE relationType, |
430 | __inout HANDLE* phSyncpointEvent | 432 | __inout HANDLE* phSyncpointEvent |
431 | ); | 433 | ); |
@@ -435,6 +437,7 @@ HRESULT PlanUpdateBundle( | |||
435 | __in BURN_PLAN* pPlan, | 437 | __in BURN_PLAN* pPlan, |
436 | __in BURN_LOGGING* pLog, | 438 | __in BURN_LOGGING* pLog, |
437 | __in BURN_VARIABLES* pVariables, | 439 | __in BURN_VARIABLES* pVariables, |
440 | __in BOOTSTRAPPER_DISPLAY display, | ||
438 | __in BOOTSTRAPPER_RELATION_TYPE relationType, | 441 | __in BOOTSTRAPPER_RELATION_TYPE relationType, |
439 | __inout HANDLE* phSyncpointEvent | 442 | __inout HANDLE* phSyncpointEvent |
440 | ); | 443 | ); |
@@ -453,6 +456,7 @@ HRESULT PlanCachePackage( | |||
453 | ); | 456 | ); |
454 | HRESULT PlanExecutePackage( | 457 | HRESULT PlanExecutePackage( |
455 | __in BOOL fPerMachine, | 458 | __in BOOL fPerMachine, |
459 | __in BOOTSTRAPPER_DISPLAY display, | ||
456 | __in BURN_USER_EXPERIENCE* pUserExperience, | 460 | __in BURN_USER_EXPERIENCE* pUserExperience, |
457 | __in BURN_PLAN* pPlan, | 461 | __in BURN_PLAN* pPlan, |
458 | __in BURN_PACKAGE* pPackage, | 462 | __in BURN_PACKAGE* pPackage, |