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

3 files changed, 23 insertions, 23 deletions

diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
index c86a4a1d..59b2d8de 100644
--- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
@@ -355,7 +355,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnDetectRelatedBundle(
-        __in LPCWSTR wzBundleId,
+        __in LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -368,7 +368,7 @@ public: // IBootstrapperApplication
 
         if (!fMissingFromCache)
         {
-            BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage);
+            BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleCode, relationType, fPerMachine, &pPackage);
             // Best effort
         }
 
@@ -387,7 +387,7 @@ public: // IBootstrapperApplication
         }
 
     LExit:
-        return CBootstrapperApplicationBase::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
+        return CBootstrapperApplicationBase::OnDetectRelatedBundle(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
     }
 
 
@@ -550,7 +550,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
@@ -562,7 +562,7 @@ public: // IBootstrapperApplication
             *pRequestedType = BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_NONE;
         }
 
-        return CBootstrapperApplicationBase::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel);
+        return CBootstrapperApplicationBase::OnPlanRelatedBundleType(wzBundleCode, recommendedType, pRequestedType, pfCancel);
     }
 
 
@@ -1853,7 +1853,7 @@ private: // privates
     {
         BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState;
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext);
-        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE, m_hModule, pArgs->wzBundleId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
+        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE, m_hModule, pArgs->wzBundleCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
     }
 
     void OnPlanRelatedBundleTypeFallback(
@@ -1863,7 +1863,7 @@ private: // privates
     {
         BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE requestedType = pResults->requestedType;
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLETYPE, pArgs, pResults, m_pvBAFunctionsProcContext);
-        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE_TYPE, m_hModule, pArgs->wzBundleId, LoggingPlanRelationTypeToString(requestedType), LoggingPlanRelationTypeToString(pResults->requestedType));
+        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE_TYPE, m_hModule, pArgs->wzBundleCode, LoggingPlanRelationTypeToString(requestedType), LoggingPlanRelationTypeToString(pResults->requestedType));
     }
 
     void OnPlanPackageBeginFallback(
@@ -2259,7 +2259,7 @@ private: // privates
     {
         BOOL fIgnoreBundle = pResults->fIgnoreBundle;
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext);
-        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleId, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable");
+        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleCode, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable");
     }
 
     void OnCacheVerifyProgressFallback(
@@ -2361,7 +2361,7 @@ private: // privates
     {
         BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState;
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRESTORERELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext);
-        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RESTORE_RELATED_BUNDLE, m_hModule, pArgs->wzBundleId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
+        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RESTORE_RELATED_BUNDLE, m_hModule, pArgs->wzBundleCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
     }
 
     void OnApplyDowngradeFallback(
diff --git a/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp b/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp
index 38ebf65c..f8a94853 100644
--- a/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp
+++ b/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp
@@ -71,7 +71,7 @@ static HRESULT BalBaseBAFunctionsProcOnDetectForwardCompatibleBundle(
     __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnDetectForwardCompatibleBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
+    return pBAFunctions->OnDetectForwardCompatibleBundle(pArgs->wzBundleCode, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnDetectUpdateBegin(
@@ -107,7 +107,7 @@ static HRESULT BalBaseBAFunctionsProcOnDetectRelatedBundle(
     __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnDetectRelatedBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
+    return pBAFunctions->OnDetectRelatedBundle(pArgs->wzBundleCode, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnDetectPackageBegin(
@@ -170,7 +170,7 @@ static HRESULT BalBaseBAFunctionsProcOnPlanRelatedBundle(
     __inout BA_ONPLANRELATEDBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnPlanRelatedBundle(pArgs->wzBundleId, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
+    return pBAFunctions->OnPlanRelatedBundle(pArgs->wzBundleCode, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnPlanRollbackBoundary(
@@ -647,7 +647,7 @@ static HRESULT BalBaseBAFunctionsProcOnPlanForwardCompatibleBundle(
     __inout BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnPlanForwardCompatibleBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fRecommendedIgnoreBundle, &pResults->fCancel, &pResults->fIgnoreBundle);
+    return pBAFunctions->OnPlanForwardCompatibleBundle(pArgs->wzBundleCode, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fRecommendedIgnoreBundle, &pResults->fCancel, &pResults->fIgnoreBundle);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnCacheContainerOrPayloadVerifyBegin(
@@ -710,7 +710,7 @@ static HRESULT BalBaseBAFunctionsProcOnPlanRestoreRelatedBundle(
     __inout BA_ONPLANRESTORERELATEDBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnPlanRestoreRelatedBundle(pArgs->wzBundleId, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
+    return pBAFunctions->OnPlanRestoreRelatedBundle(pArgs->wzBundleCode, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnPlanRelatedBundleType(
@@ -719,7 +719,7 @@ static HRESULT BalBaseBAFunctionsProcOnPlanRelatedBundleType(
     __inout BA_ONPLANRELATEDBUNDLETYPE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnPlanRelatedBundleType(pArgs->wzBundleId, pArgs->recommendedType, &pResults->requestedType, &pResults->fCancel);
+    return pBAFunctions->OnPlanRelatedBundleType(pArgs->wzBundleCode, pArgs->recommendedType, &pResults->requestedType, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnApplyDowngrade(
@@ -737,7 +737,7 @@ static HRESULT BalBaseBAFunctionsProcOnDetectRelatedBundlePackage(
     __inout BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnDetectRelatedBundlePackage(pArgs->wzPackageId, pArgs->wzBundleId, pArgs->relationType, pArgs->fPerMachine, pArgs->wzVersion, &pResults->fCancel);
+    return pBAFunctions->OnDetectRelatedBundlePackage(pArgs->wzPackageId, pArgs->wzBundleCode, pArgs->relationType, pArgs->fPerMachine, pArgs->wzVersion, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnCachePackageNonVitalValidationFailure(
diff --git a/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h b/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h
index fd284d9c..d057f625 100644
--- a/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h
+++ b/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h
@@ -121,7 +121,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*/,
@@ -168,7 +168,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*/,
@@ -258,7 +258,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*/
@@ -776,7 +776,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*/,
@@ -850,7 +850,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*/
@@ -860,7 +860,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*/
@@ -889,7 +889,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 LPCWSTR /*wzVersion*/,