diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-01-03 15:35:14 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-01-04 19:19:43 -0600 |
| commit | 1f5314302b3c8bc1977aed79df1d05c52608f382 (patch) | |
| tree | f0fef3a4462352c914a4cc9413515d07f2244703 /src/burn/engine/core.cpp | |
| parent | db44f6cf3b1eb476e47384f2eccba5712808def5 (diff) | |
| download | wix-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/core.cpp')
| -rw-r--r-- | src/burn/engine/core.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index 30c64b01..8a181e7c 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
| @@ -228,11 +228,11 @@ extern "C" HRESULT CoreInitializeConstants( | |||
| 228 | { | 228 | { |
| 229 | BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i; | 229 | BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i; |
| 230 | 230 | ||
| 231 | if (BURN_PACKAGE_TYPE_EXE == pPackage->type && BURN_EXE_PROTOCOL_TYPE_BURN == pPackage->Exe.protocol) // TODO: Don't assume exePackages with burn protocol are bundles. | 231 | if (BURN_PACKAGE_TYPE_BUNDLE == pPackage->type) |
| 232 | { | 232 | { |
| 233 | // Pass along any ancestors and ourself to prevent infinite loops. | 233 | // Pass along any ancestors and ourself to prevent infinite loops. |
| 234 | pPackage->Exe.wzAncestors = pRegistration->sczBundlePackageAncestors; | 234 | pPackage->Bundle.wzAncestors = pRegistration->sczBundlePackageAncestors; |
| 235 | pPackage->Exe.wzEngineWorkingDirectory = pInternalCommand->sczEngineWorkingDirectory; | 235 | pPackage->Bundle.wzEngineWorkingDirectory = pInternalCommand->sczEngineWorkingDirectory; |
| 236 | } | 236 | } |
| 237 | } | 237 | } |
| 238 | 238 | ||
| @@ -518,7 +518,7 @@ extern "C" HRESULT CorePlan( | |||
| 518 | ExitOnFailure(hr, "Failed to plan the layout of the bundle."); | 518 | ExitOnFailure(hr, "Failed to plan the layout of the bundle."); |
| 519 | 519 | ||
| 520 | // Plan the packages' layout. | 520 | // Plan the packages' layout. |
| 521 | hr = PlanPackages(&pEngineState->userExperience, &pEngineState->packages, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->command.display, pEngineState->command.relationType); | 521 | hr = PlanPackages(&pEngineState->userExperience, &pEngineState->packages, &pEngineState->plan, &pEngineState->log, &pEngineState->variables); |
| 522 | ExitOnFailure(hr, "Failed to plan packages."); | 522 | ExitOnFailure(hr, "Failed to plan packages."); |
| 523 | } | 523 | } |
| 524 | else if (BOOTSTRAPPER_ACTION_UPDATE_REPLACE == action || BOOTSTRAPPER_ACTION_UPDATE_REPLACE_EMBEDDED == action) | 524 | else if (BOOTSTRAPPER_ACTION_UPDATE_REPLACE == action || BOOTSTRAPPER_ACTION_UPDATE_REPLACE_EMBEDDED == action) |
| @@ -527,7 +527,7 @@ extern "C" HRESULT CorePlan( | |||
| 527 | 527 | ||
| 528 | pUpgradeBundlePackage = &pEngineState->update.package; | 528 | pUpgradeBundlePackage = &pEngineState->update.package; |
| 529 | 529 | ||
| 530 | hr = PlanUpdateBundle(&pEngineState->userExperience, pUpgradeBundlePackage, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->command.display, pEngineState->command.relationType); | 530 | hr = PlanUpdateBundle(&pEngineState->userExperience, pUpgradeBundlePackage, &pEngineState->plan, &pEngineState->log, &pEngineState->variables); |
| 531 | ExitOnFailure(hr, "Failed to plan update."); | 531 | ExitOnFailure(hr, "Failed to plan update."); |
| 532 | } | 532 | } |
| 533 | else | 533 | else |
| @@ -541,7 +541,7 @@ extern "C" HRESULT CorePlan( | |||
| 541 | 541 | ||
| 542 | pForwardCompatibleBundlePackage = &pEngineState->plan.forwardCompatibleBundle; | 542 | pForwardCompatibleBundlePackage = &pEngineState->plan.forwardCompatibleBundle; |
| 543 | 543 | ||
| 544 | hr = PlanPassThroughBundle(&pEngineState->userExperience, pForwardCompatibleBundlePackage, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->command.display, pEngineState->command.relationType); | 544 | hr = PlanPassThroughBundle(&pEngineState->userExperience, pForwardCompatibleBundlePackage, &pEngineState->plan, &pEngineState->log, &pEngineState->variables); |
| 545 | ExitOnFailure(hr, "Failed to plan passthrough."); | 545 | ExitOnFailure(hr, "Failed to plan passthrough."); |
| 546 | } | 546 | } |
| 547 | else // doing an action that modifies the machine state. | 547 | else // doing an action that modifies the machine state. |
| @@ -562,7 +562,7 @@ extern "C" HRESULT CorePlan( | |||
| 562 | hr = PlanRelatedBundlesBegin(&pEngineState->userExperience, &pEngineState->registration, pEngineState->command.relationType, &pEngineState->plan); | 562 | hr = PlanRelatedBundlesBegin(&pEngineState->userExperience, &pEngineState->registration, pEngineState->command.relationType, &pEngineState->plan); |
| 563 | ExitOnFailure(hr, "Failed to plan related bundles."); | 563 | ExitOnFailure(hr, "Failed to plan related bundles."); |
| 564 | 564 | ||
| 565 | hr = PlanPackages(&pEngineState->userExperience, &pEngineState->packages, &pEngineState->plan, &pEngineState->log, &pEngineState->variables, pEngineState->command.display, pEngineState->command.relationType); | 565 | hr = PlanPackages(&pEngineState->userExperience, &pEngineState->packages, &pEngineState->plan, &pEngineState->log, &pEngineState->variables); |
| 566 | ExitOnFailure(hr, "Failed to plan packages."); | 566 | ExitOnFailure(hr, "Failed to plan packages."); |
| 567 | 567 | ||
| 568 | // Schedule the update of related bundles last. | 568 | // Schedule the update of related bundles last. |