diff options
Diffstat (limited to 'src/engine/core.cpp')
-rw-r--r-- | src/engine/core.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/core.cpp b/src/engine/core.cpp index c153f162..26e74588 100644 --- a/src/engine/core.cpp +++ b/src/engine/core.cpp | |||
@@ -431,7 +431,7 @@ extern "C" HRESULT CorePlan( | |||
431 | ExitOnFailure(hr, "Failed to plan the layout of the bundle."); | 431 | ExitOnFailure(hr, "Failed to plan the layout of the bundle."); |
432 | 432 | ||
433 | // Plan the packages' layout. | 433 | // Plan the packages' layout. |
434 | hr = PlanPackages(&pEngineState->registration, &pEngineState->userExperience, &pEngineState->packages, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, FALSE, pEngineState->command.relationType, sczLayoutDirectory, &hSyncpointEvent); | 434 | hr = PlanPackages(&pEngineState->registration, &pEngineState->userExperience, &pEngineState->packages, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, FALSE, pEngineState->command.display, pEngineState->command.relationType, sczLayoutDirectory, &hSyncpointEvent); |
435 | ExitOnFailure(hr, "Failed to plan packages."); | 435 | ExitOnFailure(hr, "Failed to plan packages."); |
436 | } | 436 | } |
437 | else if (BOOTSTRAPPER_ACTION_UPDATE_REPLACE == action || BOOTSTRAPPER_ACTION_UPDATE_REPLACE_EMBEDDED == action) | 437 | else if (BOOTSTRAPPER_ACTION_UPDATE_REPLACE == action || BOOTSTRAPPER_ACTION_UPDATE_REPLACE_EMBEDDED == action) |
@@ -440,7 +440,7 @@ extern "C" HRESULT CorePlan( | |||
440 | 440 | ||
441 | pUpgradeBundlePackage = &pEngineState->update.package; | 441 | pUpgradeBundlePackage = &pEngineState->update.package; |
442 | 442 | ||
443 | hr = PlanUpdateBundle(&pEngineState->userExperience, pUpgradeBundlePackage, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->command.relationType, &hSyncpointEvent); | 443 | hr = PlanUpdateBundle(&pEngineState->userExperience, pUpgradeBundlePackage, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->command.display, pEngineState->command.relationType, &hSyncpointEvent); |
444 | ExitOnFailure(hr, "Failed to plan update."); | 444 | ExitOnFailure(hr, "Failed to plan update."); |
445 | } | 445 | } |
446 | else if (pEngineState->registration.fEnabledForwardCompatibleBundle) | 446 | else if (pEngineState->registration.fEnabledForwardCompatibleBundle) |
@@ -449,7 +449,7 @@ extern "C" HRESULT CorePlan( | |||
449 | 449 | ||
450 | pForwardCompatibleBundlePackage = &pEngineState->registration.forwardCompatibleBundle; | 450 | pForwardCompatibleBundlePackage = &pEngineState->registration.forwardCompatibleBundle; |
451 | 451 | ||
452 | hr = PlanPassThroughBundle(&pEngineState->userExperience, pForwardCompatibleBundlePackage, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->command.relationType, &hSyncpointEvent); | 452 | hr = PlanPassThroughBundle(&pEngineState->userExperience, pForwardCompatibleBundlePackage, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->command.display, pEngineState->command.relationType, &hSyncpointEvent); |
453 | ExitOnFailure(hr, "Failed to plan passthrough."); | 453 | ExitOnFailure(hr, "Failed to plan passthrough."); |
454 | } | 454 | } |
455 | else // doing an action that modifies the machine state. | 455 | else // doing an action that modifies the machine state. |
@@ -471,7 +471,7 @@ extern "C" HRESULT CorePlan( | |||
471 | hr = PlanRelatedBundlesBegin(&pEngineState->userExperience, &pEngineState->registration, pEngineState->command.relationType, &pEngineState->plan); | 471 | hr = PlanRelatedBundlesBegin(&pEngineState->userExperience, &pEngineState->registration, pEngineState->command.relationType, &pEngineState->plan); |
472 | ExitOnFailure(hr, "Failed to plan related bundles."); | 472 | ExitOnFailure(hr, "Failed to plan related bundles."); |
473 | 473 | ||
474 | hr = PlanPackages(&pEngineState->registration, &pEngineState->userExperience, &pEngineState->packages, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->registration.fInstalled, pEngineState->command.relationType, NULL, &hSyncpointEvent); | 474 | hr = PlanPackages(&pEngineState->registration, &pEngineState->userExperience, &pEngineState->packages, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->registration.fInstalled, pEngineState->command.display, pEngineState->command.relationType, NULL, &hSyncpointEvent); |
475 | ExitOnFailure(hr, "Failed to plan packages."); | 475 | ExitOnFailure(hr, "Failed to plan packages."); |
476 | 476 | ||
477 | // Schedule the update of related bundles last. | 477 | // Schedule the update of related bundles last. |