diff options
Diffstat (limited to 'src/burn/engine/core.cpp')
| -rw-r--r-- | src/burn/engine/core.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index a85e6f18..3fe9b586 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
| @@ -202,12 +202,12 @@ extern "C" HRESULT CoreInitializeConstants( | |||
| 202 | // Support passing Ancestors to embedded burn bundles. | 202 | // Support passing Ancestors to embedded burn bundles. |
| 203 | if (pInternalCommand->sczAncestors && *pInternalCommand->sczAncestors) | 203 | if (pInternalCommand->sczAncestors && *pInternalCommand->sczAncestors) |
| 204 | { | 204 | { |
| 205 | hr = StrAllocFormatted(&pRegistration->sczBundlePackageAncestors, L"%ls;%ls", pInternalCommand->sczAncestors, pRegistration->sczId); | 205 | hr = StrAllocFormatted(&pRegistration->sczBundlePackageAncestors, L"%ls;%ls", pInternalCommand->sczAncestors, pRegistration->sczCode); |
| 206 | ExitOnFailure(hr, "Failed to copy ancestors and self to bundle package ancestors."); | 206 | ExitOnFailure(hr, "Failed to copy ancestors and self to bundle package ancestors."); |
| 207 | } | 207 | } |
| 208 | else | 208 | else |
| 209 | { | 209 | { |
| 210 | hr = StrAllocString(&pRegistration->sczBundlePackageAncestors, pRegistration->sczId, 0); | 210 | hr = StrAllocString(&pRegistration->sczBundlePackageAncestors, pRegistration->sczCode, 0); |
| 211 | ExitOnFailure(hr, "Failed to copy self to bundle package ancestors."); | 211 | ExitOnFailure(hr, "Failed to copy self to bundle package ancestors."); |
| 212 | } | 212 | } |
| 213 | 213 | ||
| @@ -330,7 +330,7 @@ extern "C" HRESULT CoreDetect( | |||
| 330 | ExitOnFailure(hr, "Failed to report detected related bundles."); | 330 | ExitOnFailure(hr, "Failed to report detected related bundles."); |
| 331 | 331 | ||
| 332 | // Do update detection. | 332 | // Do update detection. |
| 333 | hr = DetectUpdate(pEngineState->registration.sczId, &pEngineState->userExperience, &pEngineState->update); | 333 | hr = DetectUpdate(pEngineState->registration.sczCode, &pEngineState->userExperience, &pEngineState->update); |
| 334 | ExitOnFailure(hr, "Failed to detect update."); | 334 | ExitOnFailure(hr, "Failed to detect update."); |
| 335 | 335 | ||
| 336 | // Detecting MSPs requires special initialization before processing each package but | 336 | // Detecting MSPs requires special initialization before processing each package but |
| @@ -462,8 +462,8 @@ extern "C" HRESULT CorePlan( | |||
| 462 | pEngineState->plan.pCommand = &pEngineState->command; | 462 | pEngineState->plan.pCommand = &pEngineState->command; |
| 463 | pEngineState->plan.pInternalCommand = &pEngineState->internalCommand; | 463 | pEngineState->plan.pInternalCommand = &pEngineState->internalCommand; |
| 464 | pEngineState->plan.pPayloads = &pEngineState->payloads; | 464 | pEngineState->plan.pPayloads = &pEngineState->payloads; |
| 465 | pEngineState->plan.wzBundleId = pEngineState->registration.sczId; | 465 | pEngineState->plan.wzBundleCode = pEngineState->registration.sczCode; |
| 466 | pEngineState->plan.wzBundleProviderKey = pEngineState->registration.sczId; | 466 | pEngineState->plan.wzBundleProviderKey = pEngineState->registration.sczCode; |
| 467 | pEngineState->plan.fDisableRollback = pEngineState->fDisableRollback || BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == pEngineState->plan.action; | 467 | pEngineState->plan.fDisableRollback = pEngineState->fDisableRollback || BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == pEngineState->plan.action; |
| 468 | pEngineState->plan.fPlanPackageCacheRollback = BOOTSTRAPPER_REGISTRATION_TYPE_NONE == pEngineState->registration.detectedRegistrationType; | 468 | pEngineState->plan.fPlanPackageCacheRollback = BOOTSTRAPPER_REGISTRATION_TYPE_NONE == pEngineState->registration.detectedRegistrationType; |
| 469 | 469 | ||
