aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/bacallback.cpp
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-12-29 18:01:20 -0800
committerRob Mensching <rob@firegiant.com>2024-12-30 06:45:49 -0800
commit523c66a62a619e6aa9f30070173ea33edfb5e328 (patch)
tree04fa3146250b7eeaa6864b0f71e37905a2d77be1 /src/burn/engine/bacallback.cpp
parent6edc5d1e2a289eac50c6d59a29e195353bb023cb (diff)
downloadwix-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/bacallback.cpp')
-rw-r--r--src/burn/engine/bacallback.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/burn/engine/bacallback.cpp b/src/burn/engine/bacallback.cpp
index f4e6894d..72ca27ea 100644
--- a/src/burn/engine/bacallback.cpp
+++ b/src/burn/engine/bacallback.cpp
@@ -2120,7 +2120,7 @@ LExit:
2120 2120
2121EXTERN_C HRESULT BACallbackOnDetectForwardCompatibleBundle( 2121EXTERN_C HRESULT BACallbackOnDetectForwardCompatibleBundle(
2122 __in BURN_USER_EXPERIENCE* pUserExperience, 2122 __in BURN_USER_EXPERIENCE* pUserExperience,
2123 __in_z LPCWSTR wzBundleId, 2123 __in_z LPCWSTR wzBundleCode,
2124 __in BOOTSTRAPPER_RELATION_TYPE relationType, 2124 __in BOOTSTRAPPER_RELATION_TYPE relationType,
2125 __in_z LPCWSTR wzBundleTag, 2125 __in_z LPCWSTR wzBundleTag,
2126 __in BOOL fPerMachine, 2126 __in BOOL fPerMachine,
@@ -2138,7 +2138,7 @@ EXTERN_C HRESULT BACallbackOnDetectForwardCompatibleBundle(
2138 2138
2139 // Init structs. 2139 // Init structs.
2140 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 2140 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
2141 args.wzBundleId = wzBundleId; 2141 args.wzBundleCode = wzBundleCode;
2142 args.relationType = relationType; 2142 args.relationType = relationType;
2143 args.wzBundleTag = wzBundleTag; 2143 args.wzBundleTag = wzBundleTag;
2144 args.fPerMachine = fPerMachine; 2144 args.fPerMachine = fPerMachine;
@@ -2151,8 +2151,8 @@ EXTERN_C HRESULT BACallbackOnDetectForwardCompatibleBundle(
2151 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); 2151 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
2152 ExitOnFailure(hr, "Failed to write API version of OnDetectForwardCompatibleBundle args."); 2152 ExitOnFailure(hr, "Failed to write API version of OnDetectForwardCompatibleBundle args.");
2153 2153
2154 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId); 2154 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
2155 ExitOnFailure(hr, "Failed to write bundle id of OnDetectForwardCompatibleBundle args."); 2155 ExitOnFailure(hr, "Failed to write bundle code of OnDetectForwardCompatibleBundle args.");
2156 2156
2157 hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType); 2157 hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType);
2158 ExitOnFailure(hr, "Failed to write relation type of OnDetectForwardCompatibleBundle args."); 2158 ExitOnFailure(hr, "Failed to write relation type of OnDetectForwardCompatibleBundle args.");
@@ -2393,7 +2393,7 @@ LExit:
2393 2393
2394EXTERN_C HRESULT BACallbackOnDetectRelatedBundle( 2394EXTERN_C HRESULT BACallbackOnDetectRelatedBundle(
2395 __in BURN_USER_EXPERIENCE* pUserExperience, 2395 __in BURN_USER_EXPERIENCE* pUserExperience,
2396 __in_z LPCWSTR wzBundleId, 2396 __in_z LPCWSTR wzBundleCode,
2397 __in BOOTSTRAPPER_RELATION_TYPE relationType, 2397 __in BOOTSTRAPPER_RELATION_TYPE relationType,
2398 __in_z LPCWSTR wzBundleTag, 2398 __in_z LPCWSTR wzBundleTag,
2399 __in BOOL fPerMachine, 2399 __in BOOL fPerMachine,
@@ -2411,7 +2411,7 @@ EXTERN_C HRESULT BACallbackOnDetectRelatedBundle(
2411 2411
2412 // Init structs. 2412 // Init structs.
2413 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 2413 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
2414 args.wzBundleId = wzBundleId; 2414 args.wzBundleCode = wzBundleCode;
2415 args.relationType = relationType; 2415 args.relationType = relationType;
2416 args.wzBundleTag = wzBundleTag; 2416 args.wzBundleTag = wzBundleTag;
2417 args.fPerMachine = fPerMachine; 2417 args.fPerMachine = fPerMachine;
@@ -2424,8 +2424,8 @@ EXTERN_C HRESULT BACallbackOnDetectRelatedBundle(
2424 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); 2424 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
2425 ExitOnFailure(hr, "Failed to write API version of OnDetectRelatedBundle args."); 2425 ExitOnFailure(hr, "Failed to write API version of OnDetectRelatedBundle args.");
2426 2426
2427 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId); 2427 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
2428 ExitOnFailure(hr, "Failed to write bundle id of OnDetectRelatedBundle args."); 2428 ExitOnFailure(hr, "Failed to write bundle code of OnDetectRelatedBundle args.");
2429 2429
2430 hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType); 2430 hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType);
2431 ExitOnFailure(hr, "Failed to write relation type of OnDetectRelatedBundle args."); 2431 ExitOnFailure(hr, "Failed to write relation type of OnDetectRelatedBundle args.");
@@ -2478,7 +2478,7 @@ LExit:
2478EXTERN_C HRESULT BACallbackOnDetectRelatedBundlePackage( 2478EXTERN_C HRESULT BACallbackOnDetectRelatedBundlePackage(
2479 __in BURN_USER_EXPERIENCE* pUserExperience, 2479 __in BURN_USER_EXPERIENCE* pUserExperience,
2480 __in_z LPCWSTR wzPackageId, 2480 __in_z LPCWSTR wzPackageId,
2481 __in_z LPCWSTR wzBundleId, 2481 __in_z LPCWSTR wzBundleCode,
2482 __in BOOTSTRAPPER_RELATION_TYPE relationType, 2482 __in BOOTSTRAPPER_RELATION_TYPE relationType,
2483 __in BOOL fPerMachine, 2483 __in BOOL fPerMachine,
2484 __in VERUTIL_VERSION* pVersion 2484 __in VERUTIL_VERSION* pVersion
@@ -2495,7 +2495,7 @@ EXTERN_C HRESULT BACallbackOnDetectRelatedBundlePackage(
2495 // Init structs. 2495 // Init structs.
2496 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 2496 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
2497 args.wzPackageId = wzPackageId; 2497 args.wzPackageId = wzPackageId;
2498 args.wzBundleId = wzBundleId; 2498 args.wzBundleCode = wzBundleCode;
2499 args.relationType = relationType; 2499 args.relationType = relationType;
2500 args.fPerMachine = fPerMachine; 2500 args.fPerMachine = fPerMachine;
2501 args.wzVersion = pVersion->sczVersion; 2501 args.wzVersion = pVersion->sczVersion;
@@ -2509,8 +2509,8 @@ EXTERN_C HRESULT BACallbackOnDetectRelatedBundlePackage(
2509 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzPackageId); 2509 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzPackageId);
2510 ExitOnFailure(hr, "Failed to write package id of OnDetectRelatedBundlePackage args."); 2510 ExitOnFailure(hr, "Failed to write package id of OnDetectRelatedBundlePackage args.");
2511 2511
2512 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId); 2512 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
2513 ExitOnFailure(hr, "Failed to write bundle id of OnDetectRelatedBundlePackage args."); 2513 ExitOnFailure(hr, "Failed to write bundle code of OnDetectRelatedBundlePackage args.");
2514 2514
2515 hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType); 2515 hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType);
2516 ExitOnFailure(hr, "Failed to write relation type of OnDetectRelatedBundlePackage args."); 2516 ExitOnFailure(hr, "Failed to write relation type of OnDetectRelatedBundlePackage args.");
@@ -4315,7 +4315,7 @@ LExit:
4315 4315
4316EXTERN_C HRESULT BACallbackOnPlanForwardCompatibleBundle( 4316EXTERN_C HRESULT BACallbackOnPlanForwardCompatibleBundle(
4317 __in BURN_USER_EXPERIENCE* pUserExperience, 4317 __in BURN_USER_EXPERIENCE* pUserExperience,
4318 __in_z LPCWSTR wzBundleId, 4318 __in_z LPCWSTR wzBundleCode,
4319 __in BOOTSTRAPPER_RELATION_TYPE relationType, 4319 __in BOOTSTRAPPER_RELATION_TYPE relationType,
4320 __in_z LPCWSTR wzBundleTag, 4320 __in_z LPCWSTR wzBundleTag,
4321 __in BOOL fPerMachine, 4321 __in BOOL fPerMachine,
@@ -4333,7 +4333,7 @@ EXTERN_C HRESULT BACallbackOnPlanForwardCompatibleBundle(
4333 4333
4334 // Init structs. 4334 // Init structs.
4335 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 4335 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
4336 args.wzBundleId = wzBundleId; 4336 args.wzBundleCode = wzBundleCode;
4337 args.relationType = relationType; 4337 args.relationType = relationType;
4338 args.wzBundleTag = wzBundleTag; 4338 args.wzBundleTag = wzBundleTag;
4339 args.fPerMachine = fPerMachine; 4339 args.fPerMachine = fPerMachine;
@@ -4347,8 +4347,8 @@ EXTERN_C HRESULT BACallbackOnPlanForwardCompatibleBundle(
4347 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); 4347 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
4348 ExitOnFailure(hr, "Failed to write API version of OnPlanForwardCompatibleBundle args."); 4348 ExitOnFailure(hr, "Failed to write API version of OnPlanForwardCompatibleBundle args.");
4349 4349
4350 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId); 4350 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
4351 ExitOnFailure(hr, "Failed to write bundle id of OnPlanForwardCompatibleBundle args."); 4351 ExitOnFailure(hr, "Failed to write bundle code of OnPlanForwardCompatibleBundle args.");
4352 4352
4353 hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType); 4353 hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType);
4354 ExitOnFailure(hr, "Failed to write relation type of OnPlanForwardCompatibleBundle args."); 4354 ExitOnFailure(hr, "Failed to write relation type of OnPlanForwardCompatibleBundle args.");
@@ -4806,7 +4806,7 @@ LExit:
4806 4806
4807EXTERN_C HRESULT BACallbackOnPlanRelatedBundle( 4807EXTERN_C HRESULT BACallbackOnPlanRelatedBundle(
4808 __in BURN_USER_EXPERIENCE* pUserExperience, 4808 __in BURN_USER_EXPERIENCE* pUserExperience,
4809 __in_z LPCWSTR wzBundleId, 4809 __in_z LPCWSTR wzBundleCode,
4810 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState 4810 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
4811 ) 4811 )
4812{ 4812{
@@ -4820,7 +4820,7 @@ EXTERN_C HRESULT BACallbackOnPlanRelatedBundle(
4820 4820
4821 // Init structs. 4821 // Init structs.
4822 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 4822 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
4823 args.wzBundleId = wzBundleId; 4823 args.wzBundleCode = wzBundleCode;
4824 args.recommendedState = *pRequestedState; 4824 args.recommendedState = *pRequestedState;
4825 4825
4826 results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 4826 results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -4830,8 +4830,8 @@ EXTERN_C HRESULT BACallbackOnPlanRelatedBundle(
4830 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); 4830 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
4831 ExitOnFailure(hr, "Failed to write API version of OnPlanRelatedBundle args."); 4831 ExitOnFailure(hr, "Failed to write API version of OnPlanRelatedBundle args.");
4832 4832
4833 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId); 4833 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
4834 ExitOnFailure(hr, "Failed to write bundle id of OnPlanRelatedBundle args."); 4834 ExitOnFailure(hr, "Failed to write bundle code of OnPlanRelatedBundle args.");
4835 4835
4836 hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedState); 4836 hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedState);
4837 ExitOnFailure(hr, "Failed to write recommended state of OnPlanRelatedBundle args."); 4837 ExitOnFailure(hr, "Failed to write recommended state of OnPlanRelatedBundle args.");
@@ -4879,7 +4879,7 @@ LExit:
4879 4879
4880EXTERN_C HRESULT BACallbackOnPlanRelatedBundleType( 4880EXTERN_C HRESULT BACallbackOnPlanRelatedBundleType(
4881 __in BURN_USER_EXPERIENCE* pUserExperience, 4881 __in BURN_USER_EXPERIENCE* pUserExperience,
4882 __in_z LPCWSTR wzBundleId, 4882 __in_z LPCWSTR wzBundleCode,
4883 __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType 4883 __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType
4884 ) 4884 )
4885{ 4885{
@@ -4893,7 +4893,7 @@ EXTERN_C HRESULT BACallbackOnPlanRelatedBundleType(
4893 4893
4894 // Init structs. 4894 // Init structs.
4895 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 4895 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
4896 args.wzBundleId = wzBundleId; 4896 args.wzBundleCode = wzBundleCode;
4897 args.recommendedType = *pRequestedType; 4897 args.recommendedType = *pRequestedType;
4898 4898
4899 results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 4899 results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -4903,8 +4903,8 @@ EXTERN_C HRESULT BACallbackOnPlanRelatedBundleType(
4903 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); 4903 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
4904 ExitOnFailure(hr, "Failed to write API version of OnPlanRelatedBundleType args."); 4904 ExitOnFailure(hr, "Failed to write API version of OnPlanRelatedBundleType args.");
4905 4905
4906 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId); 4906 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
4907 ExitOnFailure(hr, "Failed to write bundle id of OnPlanRelatedBundleType args."); 4907 ExitOnFailure(hr, "Failed to write bundle code of OnPlanRelatedBundleType args.");
4908 4908
4909 hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedType); 4909 hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedType);
4910 ExitOnFailure(hr, "Failed to write recommended type of OnPlanRelatedBundleType args."); 4910 ExitOnFailure(hr, "Failed to write recommended type of OnPlanRelatedBundleType args.");
@@ -4952,7 +4952,7 @@ LExit:
4952 4952
4953EXTERN_C HRESULT BACallbackOnPlanRestoreRelatedBundle( 4953EXTERN_C HRESULT BACallbackOnPlanRestoreRelatedBundle(
4954 __in BURN_USER_EXPERIENCE* pUserExperience, 4954 __in BURN_USER_EXPERIENCE* pUserExperience,
4955 __in_z LPCWSTR wzBundleId, 4955 __in_z LPCWSTR wzBundleCode,
4956 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState 4956 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
4957 ) 4957 )
4958{ 4958{
@@ -4966,7 +4966,7 @@ EXTERN_C HRESULT BACallbackOnPlanRestoreRelatedBundle(
4966 4966
4967 // Init structs. 4967 // Init structs.
4968 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 4968 args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
4969 args.wzBundleId = wzBundleId; 4969 args.wzBundleCode = wzBundleCode;
4970 args.recommendedState = *pRequestedState; 4970 args.recommendedState = *pRequestedState;
4971 4971
4972 results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION; 4972 results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -4976,8 +4976,8 @@ EXTERN_C HRESULT BACallbackOnPlanRestoreRelatedBundle(
4976 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion); 4976 hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
4977 ExitOnFailure(hr, "Failed to write API version of OnPlanRestoreRelatedBundle args."); 4977 ExitOnFailure(hr, "Failed to write API version of OnPlanRestoreRelatedBundle args.");
4978 4978
4979 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId); 4979 hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
4980 ExitOnFailure(hr, "Failed to write bundle id of OnPlanRestoreRelatedBundle args."); 4980 ExitOnFailure(hr, "Failed to write bundle code of OnPlanRestoreRelatedBundle args.");
4981 4981
4982 hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedState); 4982 hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedState);
4983 ExitOnFailure(hr, "Failed to write recommended state of OnPlanRestoreRelatedBundle args."); 4983 ExitOnFailure(hr, "Failed to write recommended state of OnPlanRestoreRelatedBundle args.");