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".

4 files changed, 17 insertions, 17 deletions

diff --git a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
index a3a3643f..80bfd361 100644
--- a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
+++ b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
@@ -129,7 +129,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnDetectForwardCompatibleBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -179,7 +179,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnDetectRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -276,7 +276,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
         __inout BOOL* pfCancel
@@ -995,7 +995,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanForwardCompatibleBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -1074,7 +1074,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRestoreRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
         __inout BOOL* pfCancel
@@ -1085,7 +1085,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRelatedBundleType(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE /*recommendedType*/,
         __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* /*pRequestedType*/,
         __inout BOOL* pfCancel
@@ -1115,7 +1115,7 @@ public: // IBootstrapperApplication
 
     virtual STDMETHODIMP OnDetectRelatedBundlePackage(
         __in_z LPCWSTR /*wzPackageId*/,
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in BOOL /*fPerMachine*/,
         __in_z LPCWSTR /*wzVersion*/,
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index a08f6863..a3b24bc3 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -56,7 +56,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnDetectForwardCompatibleBundle - called when the engine detects a forward compatible bundle.
     STDMETHOD(OnDetectForwardCompatibleBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -95,7 +95,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnDetectRelatedBundle - called when the engine detects a related bundle.
     STDMETHOD(OnDetectRelatedBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -170,7 +170,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnPlanRelatedBundle - called when the engine begins planning a related bundle.
     STDMETHOD(OnPlanRelatedBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
         __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
         __inout BOOL* pfCancel
@@ -649,7 +649,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         ) = 0;
 
     STDMETHOD(OnPlanForwardCompatibleBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -703,7 +703,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnPlanRestoreRelatedBundle - called when the engine begins planning an upgrade related bundle for restoring in case of failure.
     STDMETHOD(OnPlanRestoreRelatedBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
         __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
         __inout BOOL* pfCancel
@@ -711,7 +711,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnPlanRelatedBundleType - called when the engine begins planning the related bundle relation type.
     STDMETHOD(OnPlanRelatedBundleType)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType,
         __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType,
         __inout BOOL* pfCancel
@@ -736,7 +736,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     // OnDetectRelatedBundlePackage - called when the engine detects a related bundle for a BundlePackage.
     STDMETHOD(OnDetectRelatedBundlePackage)(
         __in_z LPCWSTR wzPackageId,
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in BOOL fPerMachine,
         __in_z LPCWSTR wzVersion,
diff --git a/src/api/burn/balutil/inc/IBootstrapperEngine.h b/src/api/burn/balutil/inc/IBootstrapperEngine.h
index 02094aa5..57fc9be9 100644
--- a/src/api/burn/balutil/inc/IBootstrapperEngine.h
+++ b/src/api/burn/balutil/inc/IBootstrapperEngine.h
@@ -142,7 +142,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
         ) = 0;
 
     STDMETHOD(GetRelatedBundleVariable)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
         __inout SIZE_T* pcchValue
diff --git a/src/api/burn/balutil/inc/balutil.h b/src/api/burn/balutil/inc/balutil.h
index 03575883..4c8550ee 100644
--- a/src/api/burn/balutil/inc/balutil.h
+++ b/src/api/burn/balutil/inc/balutil.h
@@ -141,7 +141,7 @@ BalGetRelatedBundleVariable - gets a string from a shared variable in the engine
 Note: Use StrFree() to release psczValue.
 ********************************************************************/
 DAPI_(HRESULT) BalGetRelatedBundleVariable(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __inout LPWSTR* psczValue
 );
@@ -153,7 +153,7 @@ BalGetRelatedBundleVariableFromEngine - gets a string from a shared variable in
 ********************************************************************/
 DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
     __in IBootstrapperEngine* pEngine,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __inout LPWSTR* psczValue
 );