Skip to content

Commit 523c66a

Browse files
robmenrobmen
committed
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".
1 parent 6edc5d1 commit 523c66a

125 files changed

Lines changed: 2452 additions & 2302 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ref StrUtil.StrHandle psczOut
3838
[DllImport("mbanative.dll", ExactSpelling = true)]
3939
internal static extern int BalGetRelatedBundleVariableFromEngine(
4040
[MarshalAs(UnmanagedType.Interface)] IBootstrapperEngine pEngine,
41-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
41+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
4242
[MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
4343
ref StrUtil.StrHandle psczOut
4444
);

‎src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,9 +1449,9 @@ int IBootstrapperApplication.OnDetectBegin(bool fCached, RegistrationType regist
14491449
return args.HResult;
14501450
}
14511451

1452-
int IBootstrapperApplication.OnDetectForwardCompatibleBundle(string wzBundleId, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
1452+
int IBootstrapperApplication.OnDetectForwardCompatibleBundle(string wzBundleCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
14531453
{
1454-
DetectForwardCompatibleBundleEventArgs args = new DetectForwardCompatibleBundleEventArgs(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
1454+
DetectForwardCompatibleBundleEventArgs args = new DetectForwardCompatibleBundleEventArgs(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
14551455
this.OnDetectForwardCompatibleBundle(args);
14561456

14571457
fCancel = args.Cancel;
@@ -1566,19 +1566,19 @@ int IBootstrapperApplication.OnPlanBegin(int cPackages, ref bool fCancel)
15661566
return args.HResult;
15671567
}
15681568

1569-
int IBootstrapperApplication.OnPlanRelatedBundle(string wzBundleId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
1569+
int IBootstrapperApplication.OnPlanRelatedBundle(string wzBundleCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
15701570
{
1571-
PlanRelatedBundleEventArgs args = new PlanRelatedBundleEventArgs(wzBundleId, recommendedState, pRequestedState, fCancel);
1571+
PlanRelatedBundleEventArgs args = new PlanRelatedBundleEventArgs(wzBundleCode, recommendedState, pRequestedState, fCancel);
15721572
this.OnPlanRelatedBundle(args);
15731573

15741574
pRequestedState = args.State;
15751575
fCancel = args.Cancel;
15761576
return args.HResult;
15771577
}
15781578

1579-
int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleId, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel)
1579+
int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleCode, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel)
15801580
{
1581-
PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleId, recommendedType, pRequestedType, fCancel);
1581+
PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleCode, recommendedType, pRequestedType, fCancel);
15821582
this.OnPlanRelatedBundleType(args);
15831583

15841584
pRequestedType = args.Type;
@@ -2060,9 +2060,9 @@ int IBootstrapperApplication.OnSystemRestorePointComplete(int hrStatus)
20602060
return args.HResult;
20612061
}
20622062

2063-
int IBootstrapperApplication.OnPlanForwardCompatibleBundle(string wzBundleId, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fRecommendedIgnoreBundle, ref bool fCancel, ref bool fIgnoreBundle)
2063+
int IBootstrapperApplication.OnPlanForwardCompatibleBundle(string wzBundleCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fRecommendedIgnoreBundle, ref bool fCancel, ref bool fIgnoreBundle)
20642064
{
2065-
PlanForwardCompatibleBundleEventArgs args = new PlanForwardCompatibleBundleEventArgs(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fRecommendedIgnoreBundle, fCancel, fIgnoreBundle);
2065+
PlanForwardCompatibleBundleEventArgs args = new PlanForwardCompatibleBundleEventArgs(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fRecommendedIgnoreBundle, fCancel, fIgnoreBundle);
20662066
this.OnPlanForwardCompatibleBundle(args);
20672067

20682068
fCancel = args.Cancel;
@@ -2122,9 +2122,9 @@ int IBootstrapperApplication.OnCachePayloadExtractComplete(string wzContainerId,
21222122
return args.HResult;
21232123
}
21242124

2125-
int IBootstrapperApplication.OnPlanRestoreRelatedBundle(string wzBundleId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
2125+
int IBootstrapperApplication.OnPlanRestoreRelatedBundle(string wzBundleCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
21262126
{
2127-
PlanRestoreRelatedBundleEventArgs args = new PlanRestoreRelatedBundleEventArgs(wzBundleId, recommendedState, pRequestedState, fCancel);
2127+
PlanRestoreRelatedBundleEventArgs args = new PlanRestoreRelatedBundleEventArgs(wzBundleCode, recommendedState, pRequestedState, fCancel);
21282128
this.OnPlanRestoreRelatedBundle(args);
21292129

21302130
pRequestedState = args.State;

‎src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ public string GetVariableVersion(string name)
209209
}
210210

211211
/// <inheritdoc/>
212-
public string GetRelatedBundleVariable(string bundleId, string name)
212+
public string GetRelatedBundleVariable(string bundleCode, string name)
213213
{
214214
StrUtil.StrHandle handle = new StrUtil.StrHandle();
215215
try
216216
{
217-
int ret = BalUtil.BalGetRelatedBundleVariableFromEngine(this.engine, bundleId, name, ref handle);
217+
int ret = BalUtil.BalGetRelatedBundleVariableFromEngine(this.engine, bundleCode, name, ref handle);
218218
if (ret != NativeMethods.S_OK)
219219
{
220220
throw new Win32Exception(ret);

‎src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs‎

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,10 @@ public class DetectForwardCompatibleBundleEventArgs : CancellableHResultEventArg
325325
/// This class is for events raised by the engine.
326326
/// It is not intended to be instantiated by user code.
327327
/// </summary>
328-
public DetectForwardCompatibleBundleEventArgs(string bundleId, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
328+
public DetectForwardCompatibleBundleEventArgs(string bundleCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
329329
: base(cancelRecommendation)
330330
{
331-
this.BundleId = bundleId;
331+
this.BundleCode = bundleCode;
332332
this.RelationType = relationType;
333333
this.BundleTag = bundleTag;
334334
this.PerMachine = perMachine;
@@ -339,7 +339,11 @@ public DetectForwardCompatibleBundleEventArgs(string bundleId, RelationType rela
339339
/// <summary>
340340
/// Gets the identity of the forward compatible bundle detected.
341341
/// </summary>
342-
public string BundleId { get; private set; }
342+
public string BundleCode { get; private set; }
343+
344+
/// <inheritdoc cref="BundleCode" />
345+
[Obsolete("Use BundleCode instead.")]
346+
public string BundleId => this.BundleCode;
343347

344348
/// <summary>
345349
/// Gets the relationship type of the forward compatible bundle.
@@ -807,18 +811,22 @@ public class PlanRelatedBundleEventArgs : CancellableHResultEventArgs
807811
/// This class is for events raised by the engine.
808812
/// It is not intended to be instantiated by user code.
809813
/// </summary>
810-
public PlanRelatedBundleEventArgs(string bundleId, RequestState recommendedState, RequestState state, bool cancelRecommendation)
814+
public PlanRelatedBundleEventArgs(string bundleCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
811815
: base(cancelRecommendation)
812816
{
813-
this.BundleId = bundleId;
817+
this.BundleCode = bundleCode;
814818
this.RecommendedState = recommendedState;
815819
this.State = state;
816820
}
817821

818822
/// <summary>
819823
/// Gets the identity of the bundle to plan for.
820824
/// </summary>
821-
public string BundleId { get; private set; }
825+
public string BundleCode { get; private set; }
826+
827+
/// <inheritdoc cref="BundleCode" />
828+
[Obsolete("Use BundleCode instead.")]
829+
public string BundleId => this.BundleCode;
822830

823831
/// <summary>
824832
/// Gets the recommended requested state for the bundle.
@@ -841,18 +849,22 @@ public class PlanRelatedBundleTypeEventArgs : CancellableHResultEventArgs
841849
/// This class is for events raised by the engine.
842850
/// It is not intended to be instantiated by user code.
843851
/// </summary>
844-
public PlanRelatedBundleTypeEventArgs(string bundleId, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation)
852+
public PlanRelatedBundleTypeEventArgs(string bundleCode, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation)
845853
: base(cancelRecommendation)
846854
{
847-
this.BundleId = bundleId;
855+
this.BundleCode = bundleCode;
848856
this.RecommendedType = recommendedType;
849857
this.Type = type;
850858
}
851859

852860
/// <summary>
853861
/// Gets the identity of the bundle to plan for.
854862
/// </summary>
855-
public string BundleId { get; private set; }
863+
public string BundleCode { get; private set; }
864+
865+
/// <inheritdoc cref="BundleCode" />
866+
[Obsolete("Use BundleCode instead.")]
867+
public string BundleId => this.BundleCode;
856868

857869
/// <summary>
858870
/// Gets the recommended plan type for the bundle.
@@ -1327,10 +1339,10 @@ public class PlanForwardCompatibleBundleEventArgs : CancellableHResultEventArgs
13271339
/// This class is for events raised by the engine.
13281340
/// It is not intended to be instantiated by user code.
13291341
/// </summary>
1330-
public PlanForwardCompatibleBundleEventArgs(string bundleId, RelationType relationType, string bundleTag, bool perMachine, string version, bool recommendedIgnoreBundle, bool cancelRecommendation, bool ignoreBundle)
1342+
public PlanForwardCompatibleBundleEventArgs(string bundleCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool recommendedIgnoreBundle, bool cancelRecommendation, bool ignoreBundle)
13311343
: base(cancelRecommendation)
13321344
{
1333-
this.BundleId = bundleId;
1345+
this.BundleCode = bundleCode;
13341346
this.RelationType = relationType;
13351347
this.BundleTag = bundleTag;
13361348
this.PerMachine = perMachine;
@@ -1342,7 +1354,11 @@ public PlanForwardCompatibleBundleEventArgs(string bundleId, RelationType relati
13421354
/// <summary>
13431355
/// Gets the identity of the forward compatible bundle detected.
13441356
/// </summary>
1345-
public string BundleId { get; private set; }
1357+
public string BundleCode { get; private set; }
1358+
1359+
/// <inheritdoc cref="BundleCode" />
1360+
[Obsolete("Use BundleCode instead.")]
1361+
public string BundleId => this.BundleCode;
13461362

13471363
/// <summary>
13481364
/// Gets the relationship type of the forward compatible bundle.
@@ -2624,18 +2640,22 @@ public class PlanRestoreRelatedBundleEventArgs : CancellableHResultEventArgs
26242640
/// This class is for events raised by the engine.
26252641
/// It is not intended to be instantiated by user code.
26262642
/// </summary>
2627-
public PlanRestoreRelatedBundleEventArgs(string bundleId, RequestState recommendedState, RequestState state, bool cancelRecommendation)
2643+
public PlanRestoreRelatedBundleEventArgs(string bundleCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
26282644
: base(cancelRecommendation)
26292645
{
2630-
this.BundleId = bundleId;
2646+
this.BundleCode = bundleCode;
26312647
this.RecommendedState = recommendedState;
26322648
this.State = state;
26332649
}
26342650

26352651
/// <summary>
26362652
/// Gets the identity of the bundle to plan for.
26372653
/// </summary>
2638-
public string BundleId { get; private set; }
2654+
public string BundleCode { get; private set; }
2655+
2656+
/// <inheritdoc cref="BundleCode" />
2657+
[Obsolete("Use BundleCode instead.")]
2658+
public string BundleId => this.BundleCode;
26392659

26402660
/// <summary>
26412661
/// Gets the recommended requested state for the bundle.

‎src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ int OnDetectBegin(
8080
[PreserveSig]
8181
[return: MarshalAs(UnmanagedType.I4)]
8282
int OnDetectForwardCompatibleBundle(
83-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
83+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
8484
[MarshalAs(UnmanagedType.U4)] RelationType relationType,
8585
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
8686
[MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -135,7 +135,7 @@ int OnDetectUpdateComplete(
135135
[PreserveSig]
136136
[return: MarshalAs(UnmanagedType.I4)]
137137
int OnDetectRelatedBundle(
138-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
138+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
139139
[MarshalAs(UnmanagedType.U4)] RelationType relationType,
140140
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
141141
[MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -243,7 +243,7 @@ int OnPlanBegin(
243243
[PreserveSig]
244244
[return: MarshalAs(UnmanagedType.I4)]
245245
int OnPlanRelatedBundle(
246-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
246+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
247247
[MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
248248
[MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
249249
[MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -869,7 +869,7 @@ int hrStatus
869869
[PreserveSig]
870870
[return: MarshalAs(UnmanagedType.I4)]
871871
int OnPlanForwardCompatibleBundle(
872-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
872+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
873873
[MarshalAs(UnmanagedType.U4)] RelationType relationType,
874874
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
875875
[MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -957,7 +957,7 @@ int hrStatus
957957
[PreserveSig]
958958
[return: MarshalAs(UnmanagedType.I4)]
959959
int OnPlanRestoreRelatedBundle(
960-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
960+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
961961
[MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
962962
[MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
963963
[MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -969,7 +969,7 @@ int OnPlanRestoreRelatedBundle(
969969
[PreserveSig]
970970
[return: MarshalAs(UnmanagedType.I4)]
971971
int OnPlanRelatedBundleType(
972-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
972+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
973973
[MarshalAs(UnmanagedType.U4)] RelatedBundlePlanType recommendedType,
974974
[MarshalAs(UnmanagedType.U4)] ref RelatedBundlePlanType pRequestedType,
975975
[MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -1004,7 +1004,7 @@ int OnExecuteProcessCancel(
10041004
[return: MarshalAs(UnmanagedType.I4)]
10051005
int OnDetectRelatedBundlePackage(
10061006
[MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
1007-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
1007+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
10081008
[MarshalAs(UnmanagedType.U4)] RelationType relationType,
10091009
[MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
10101010
[MarshalAs(UnmanagedType.LPWStr)] string wzVersion,

‎src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ void CompareVersions(
236236
/// </summary>
237237
[PreserveSig]
238238
int GetRelatedBundleVariable(
239-
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
239+
[MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
240240
[MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
241241
IntPtr wzValue,
242242
ref IntPtr pcchValue

‎src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ public interface IEngine
107107
/// <summary>
108108
/// Gets persisted variables from a related bundle.
109109
/// </summary>
110-
/// <param name="bundleId">The BundleId of the related bundle.</param>
110+
/// <param name="bundleCode">The bundle code of the related bundle.</param>
111111
/// <param name="name">The name of the variable.</param>
112-
string GetRelatedBundleVariable(string bundleId, string name);
112+
string GetRelatedBundleVariable(string bundleCode, string name);
113113

114114
/// <summary>
115115
/// Launches a preapproved executable elevated. As long as the engine already elevated, there will be no UAC prompt.

‎src/api/burn/balutil/BalBootstrapperEngine.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class CBalBootstrapperEngine : public IBootstrapperEngine
319319
}
320320

321321
virtual STDMETHODIMP GetRelatedBundleVariable(
322-
__in_z LPCWSTR wzBundleId,
322+
__in_z LPCWSTR wzBundleCode,
323323
__in_z LPCWSTR wzVariable,
324324
__out_ecount_opt(*pcchValue) LPWSTR wzValue,
325325
__inout SIZE_T* pcchValue
@@ -338,7 +338,7 @@ class CBalBootstrapperEngine : public IBootstrapperEngine
338338

339339
// Init send structs.
340340
args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
341-
args.wzBundleId = wzBundleId;
341+
args.wzBundleCode = wzBundleCode;
342342
args.wzVariable = wzVariable;
343343

344344
results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -349,8 +349,8 @@ class CBalBootstrapperEngine : public IBootstrapperEngine
349349
hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
350350
ExitOnFailure(hr, "Failed to write API version of GetRelatedBundleVariable args.");
351351

352-
hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
353-
ExitOnFailure(hr, "Failed to write bundle id of GetRelatedBundleVariable args.");
352+
hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
353+
ExitOnFailure(hr, "Failed to write bundle code of GetRelatedBundleVariable args.");
354354

355355
hr = BuffWriteStringToBuffer(&bufferArgs, args.wzVariable);
356356
ExitOnFailure(hr, "Failed to write variable name of GetRelatedBundleVariable args.");

‎src/api/burn/balutil/balutil.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ DAPI_(HRESULT) BalGetVersionVariableFromEngine(
551551
}
552552

553553
DAPI_(HRESULT) BalGetRelatedBundleVariable(
554-
__in_z LPCWSTR wzBundleId,
554+
__in_z LPCWSTR wzBundleCode,
555555
__in_z LPCWSTR wzVariable,
556556
__inout LPWSTR* psczValue
557557
)
@@ -564,15 +564,15 @@ DAPI_(HRESULT) BalGetRelatedBundleVariable(
564564
ExitOnRootFailure(hr, "BalInitialize() must be called first.");
565565
}
566566

567-
hr = BalGetRelatedBundleVariableFromEngine(vpEngine, wzBundleId, wzVariable, psczValue);
567+
hr = BalGetRelatedBundleVariableFromEngine(vpEngine, wzBundleCode, wzVariable, psczValue);
568568

569569
LExit:
570570
return hr;
571571
}
572572

573573
DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
574574
__in IBootstrapperEngine* pEngine,
575-
__in_z LPCWSTR wzBundleId,
575+
__in_z LPCWSTR wzBundleCode,
576576
__in_z LPCWSTR wzVariable,
577577
__inout LPWSTR* psczValue
578578
)
@@ -586,15 +586,15 @@ DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
586586
ExitOnFailure(hr, "Failed to determine length of value.");
587587
}
588588

589-
hr = pEngine->GetRelatedBundleVariable(wzBundleId, wzVariable, *psczValue, &cch);
589+
hr = pEngine->GetRelatedBundleVariable(wzBundleCode, wzVariable, *psczValue, &cch);
590590
if (E_MOREDATA == hr)
591591
{
592592
++cch;
593593

594594
hr = StrAllocSecure(psczValue, cch);
595595
ExitOnFailure(hr, "Failed to allocate value.");
596596

597-
hr = pEngine->GetRelatedBundleVariable(wzBundleId, wzVariable, *psczValue, &cch);
597+
hr = pEngine->GetRelatedBundleVariable(wzBundleCode, wzVariable, *psczValue, &cch);
598598
}
599599

600600
LExit:

0 commit comments

Comments
 (0)