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/api/burn/balutil/balutil.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/api/burn/balutil/balutil.cpp')
-rw-r--r-- | src/api/burn/balutil/balutil.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/api/burn/balutil/balutil.cpp b/src/api/burn/balutil/balutil.cpp index 716f82d3..3cca38a4 100644 --- a/src/api/burn/balutil/balutil.cpp +++ b/src/api/burn/balutil/balutil.cpp | |||
@@ -551,7 +551,7 @@ LExit: | |||
551 | } | 551 | } |
552 | 552 | ||
553 | DAPI_(HRESULT) BalGetRelatedBundleVariable( | 553 | DAPI_(HRESULT) BalGetRelatedBundleVariable( |
554 | __in_z LPCWSTR wzBundleId, | 554 | __in_z LPCWSTR wzBundleCode, |
555 | __in_z LPCWSTR wzVariable, | 555 | __in_z LPCWSTR wzVariable, |
556 | __inout LPWSTR* psczValue | 556 | __inout LPWSTR* psczValue |
557 | ) | 557 | ) |
@@ -564,7 +564,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariable( | |||
564 | ExitOnRootFailure(hr, "BalInitialize() must be called first."); | 564 | ExitOnRootFailure(hr, "BalInitialize() must be called first."); |
565 | } | 565 | } |
566 | 566 | ||
567 | hr = BalGetRelatedBundleVariableFromEngine(vpEngine, wzBundleId, wzVariable, psczValue); | 567 | hr = BalGetRelatedBundleVariableFromEngine(vpEngine, wzBundleCode, wzVariable, psczValue); |
568 | 568 | ||
569 | LExit: | 569 | LExit: |
570 | return hr; | 570 | return hr; |
@@ -572,7 +572,7 @@ LExit: | |||
572 | 572 | ||
573 | DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine( | 573 | DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine( |
574 | __in IBootstrapperEngine* pEngine, | 574 | __in IBootstrapperEngine* pEngine, |
575 | __in_z LPCWSTR wzBundleId, | 575 | __in_z LPCWSTR wzBundleCode, |
576 | __in_z LPCWSTR wzVariable, | 576 | __in_z LPCWSTR wzVariable, |
577 | __inout LPWSTR* psczValue | 577 | __inout LPWSTR* psczValue |
578 | ) | 578 | ) |
@@ -586,7 +586,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine( | |||
586 | ExitOnFailure(hr, "Failed to determine length of value."); | 586 | ExitOnFailure(hr, "Failed to determine length of value."); |
587 | } | 587 | } |
588 | 588 | ||
589 | hr = pEngine->GetRelatedBundleVariable(wzBundleId, wzVariable, *psczValue, &cch); | 589 | hr = pEngine->GetRelatedBundleVariable(wzBundleCode, wzVariable, *psczValue, &cch); |
590 | if (E_MOREDATA == hr) | 590 | if (E_MOREDATA == hr) |
591 | { | 591 | { |
592 | ++cch; | 592 | ++cch; |
@@ -594,7 +594,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine( | |||
594 | hr = StrAllocSecure(psczValue, cch); | 594 | hr = StrAllocSecure(psczValue, cch); |
595 | ExitOnFailure(hr, "Failed to allocate value."); | 595 | ExitOnFailure(hr, "Failed to allocate value."); |
596 | 596 | ||
597 | hr = pEngine->GetRelatedBundleVariable(wzBundleId, wzVariable, *psczValue, &cch); | 597 | hr = pEngine->GetRelatedBundleVariable(wzBundleCode, wzVariable, *psczValue, &cch); |
598 | } | 598 | } |
599 | 599 | ||
600 | LExit: | 600 | LExit: |