diff options
author | Rob Mensching <rob@firegiant.com> | 2024-12-29 18:01:20 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2024-12-30 06:45:49 -0800 |
commit | 523c66a62a619e6aa9f30070173ea33edfb5e328 (patch) | |
tree | 04fa3146250b7eeaa6864b0f71e37905a2d77be1 /src/burn/engine/apply.cpp | |
parent | 6edc5d1e2a289eac50c6d59a29e195353bb023cb (diff) | |
download | wix-523c66a62a619e6aa9f30070173ea33edfb5e328.tar.gz wix-523c66a62a619e6aa9f30070173ea33edfb5e328.tar.bz2 wix-523c66a62a619e6aa9f30070173ea33edfb5e328.zip |
Rename "bundle id" concept to "bundle code"
The "bundle id" always had more in common with the PackageCode from the Windows
Installer. With the introduction of an actual Id attribute on the Bundle
element, there is potential for confusion, so there is finally real motivation
to rename "bundle id" to "bundle code".
Diffstat (limited to 'src/burn/engine/apply.cpp')
-rw-r--r-- | src/burn/engine/apply.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp index 0f65b0ad..e4e76a6c 100644 --- a/src/burn/engine/apply.cpp +++ b/src/burn/engine/apply.cpp | |||
@@ -452,7 +452,7 @@ extern "C" HRESULT ApplyRegister( | |||
452 | 452 | ||
453 | if (pEngineState->registration.fPerMachine) | 453 | if (pEngineState->registration.fPerMachine) |
454 | { | 454 | { |
455 | hr = ElevationSessionBegin(pEngineState->companionConnection.hPipe, sczEngineWorkingPath, pEngineState->registration.sczResumeCommandLine, pEngineState->registration.fDisableResume, &pEngineState->variables, pEngineState->plan.dwRegistrationOperations, pEngineState->registration.fDetectedForeignProviderKeyBundleId, qwEstimatedSize, registrationType); | 455 | hr = ElevationSessionBegin(pEngineState->companionConnection.hPipe, sczEngineWorkingPath, pEngineState->registration.sczResumeCommandLine, pEngineState->registration.fDisableResume, &pEngineState->variables, pEngineState->plan.dwRegistrationOperations, pEngineState->registration.fDetectedForeignProviderKeyBundleCode, qwEstimatedSize, registrationType); |
456 | ExitOnFailure(hr, "Failed to begin registration session in per-machine process."); | 456 | ExitOnFailure(hr, "Failed to begin registration session in per-machine process."); |
457 | } | 457 | } |
458 | else | 458 | else |
@@ -548,7 +548,7 @@ extern "C" HRESULT ApplyUnregister( | |||
548 | 548 | ||
549 | if (pEngineState->registration.fPerMachine) | 549 | if (pEngineState->registration.fPerMachine) |
550 | { | 550 | { |
551 | hr = ElevationSessionEnd(pEngineState->companionConnection.hPipe, resumeMode, restart, pEngineState->registration.fDetectedForeignProviderKeyBundleId, qwEstimatedSize, registrationType); | 551 | hr = ElevationSessionEnd(pEngineState->companionConnection.hPipe, resumeMode, restart, pEngineState->registration.fDetectedForeignProviderKeyBundleCode, qwEstimatedSize, registrationType); |
552 | ExitOnFailure(hr, "Failed to end session in per-machine process."); | 552 | ExitOnFailure(hr, "Failed to end session in per-machine process."); |
553 | } | 553 | } |
554 | else | 554 | else |