Rename *TargetMsiPackage BA events to *PatchTarget.
Sean Hall committed
Feb 15, 2021 at 13:25 UTC
b6862716cd27cefa541b85c63dd30dc3f0749d87
4 files changed
+22
-22
src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+6
-6
@@ -93,12 +93,12 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE
93
BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE,
94
BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN,
95
BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE,
96
- BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE,
96
+ BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET,
97
BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE,
98
BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE,
99
BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE,
100
BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN,
101
- BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE,
101
+ BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET,
102
BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE,
103
BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGECOMPLETE,
104
BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYBEGIN,
@@ -571,7 +571,7 @@ struct BA_ONDETECTRELATEDMSIPACKAGE_RESULTS
571
BOOL fCancel;
572
};
573
574
-struct BA_ONDETECTTARGETMSIPACKAGE_ARGS
574
+struct BA_ONDETECTPATCHTARGET_ARGS
575
{
576
DWORD cbSize;
577
LPCWSTR wzPackageId;
@@ -579,7 +579,7 @@ struct BA_ONDETECTTARGETMSIPACKAGE_ARGS
579
BOOTSTRAPPER_PACKAGE_STATE patchState;
580
};
581
582
-struct BA_ONDETECTTARGETMSIPACKAGE_RESULTS
582
+struct BA_ONDETECTPATCHTARGET_RESULTS
583
{
584
DWORD cbSize;
585
BOOL fCancel;
@@ -929,7 +929,7 @@ struct BA_ONPLANRELATEDBUNDLE_RESULTS
929
BOOTSTRAPPER_REQUEST_STATE requestedState;
930
};
931
932
-struct BA_ONPLANTARGETMSIPACKAGE_ARGS
932
+struct BA_ONPLANPATCHTARGET_ARGS
933
{
934
DWORD cbSize;
935
LPCWSTR wzPackageId;
@@ -937,7 +937,7 @@ struct BA_ONPLANTARGETMSIPACKAGE_ARGS
937
BOOTSTRAPPER_REQUEST_STATE recommendedState;
938
};
939
940
-struct BA_ONPLANTARGETMSIPACKAGE_RESULTS
940
+struct BA_ONPLANPATCHTARGET_RESULTS
941
{
942
DWORD cbSize;
943
BOOTSTRAPPER_REQUEST_STATE requestedState;
src/engine/mspengine.cpp
+4
-4
@@ -268,8 +268,8 @@ extern "C" HRESULT MspEngineDetectPackage(
268
}
269
}
270
271
- hr = UserExperienceOnDetectTargetMsiPackage(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, pTargetProduct->patchPackageState);
272
- ExitOnRootFailure(hr, "BA aborted detect target MSI package.");
271
+ hr = UserExperienceOnDetectPatchTarget(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, pTargetProduct->patchPackageState);
272
+ ExitOnRootFailure(hr, "BA aborted detect patch target.");
273
}
274
}
275
@@ -300,8 +300,8 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
300
BOOTSTRAPPER_ACTION_STATE execute = BOOTSTRAPPER_ACTION_STATE_NONE;
301
BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE;
302
303
- hr = UserExperienceOnPlanTargetMsiPackage(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, &requested);
304
- ExitOnRootFailure(hr, "BA aborted plan target MSI package.");
303
+ hr = UserExperienceOnPlanPatchTarget(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, &requested);
304
+ ExitOnRootFailure(hr, "BA aborted plan patch target.");
305
306
// Calculate the execute action.
307
switch (pTargetProduct->patchPackageState)
src/engine/userexperience.cpp
+10
-10
@@ -947,7 +947,7 @@ LExit:
947
return hr;
948
}
949
950
-EXTERN_C BAAPI UserExperienceOnDetectTargetMsiPackage(
950
+EXTERN_C BAAPI UserExperienceOnDetectPatchTarget(
951
__in BURN_USER_EXPERIENCE* pUserExperience,
952
__in_z LPCWSTR wzPackageId,
953
__in_z LPCWSTR wzProductCode,
@@ -955,8 +955,8 @@ EXTERN_C BAAPI UserExperienceOnDetectTargetMsiPackage(
955
)
956
{
957
HRESULT hr = S_OK;
958
- BA_ONDETECTTARGETMSIPACKAGE_ARGS args = { };
959
- BA_ONDETECTTARGETMSIPACKAGE_RESULTS results = { };
958
+ BA_ONDETECTPATCHTARGET_ARGS args = { };
959
+ BA_ONDETECTPATCHTARGET_RESULTS results = { };
960
961
args.cbSize = sizeof(args);
962
args.wzPackageId = wzPackageId;
@@ -965,8 +965,8 @@ EXTERN_C BAAPI UserExperienceOnDetectTargetMsiPackage(
965
966
results.cbSize = sizeof(results);
967
968
- hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE, &args, &results);
969
- ExitOnFailure(hr, "BA OnDetectTargetMsiPackage failed.");
968
+ hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET, &args, &results);
969
+ ExitOnFailure(hr, "BA OnDetectPatchTarget failed.");
970
971
if (results.fCancel)
972
{
@@ -1697,7 +1697,7 @@ LExit:
1697
return hr;
1698
}
1699
1700
-EXTERN_C BAAPI UserExperienceOnPlanTargetMsiPackage(
1700
+EXTERN_C BAAPI UserExperienceOnPlanPatchTarget(
1701
__in BURN_USER_EXPERIENCE* pUserExperience,
1702
__in_z LPCWSTR wzPackageId,
1703
__in_z LPCWSTR wzProductCode,
@@ -1705,8 +1705,8 @@ EXTERN_C BAAPI UserExperienceOnPlanTargetMsiPackage(
1705
)
1706
{
1707
HRESULT hr = S_OK;
1708
- BA_ONPLANTARGETMSIPACKAGE_ARGS args = { };
1709
- BA_ONPLANTARGETMSIPACKAGE_RESULTS results = { };
1708
+ BA_ONPLANPATCHTARGET_ARGS args = { };
1709
+ BA_ONPLANPATCHTARGET_RESULTS results = { };
1710
1711
args.cbSize = sizeof(args);
1712
args.wzPackageId = wzPackageId;
@@ -1716,8 +1716,8 @@ EXTERN_C BAAPI UserExperienceOnPlanTargetMsiPackage(
1716
results.cbSize = sizeof(results);
1717
results.requestedState = *pRequestedState;
1718
1719
- hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE, &args, &results);
1720
- ExitOnFailure(hr, "BA OnPlanTargetMsiPackage failed.");
1719
+ hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET, &args, &results);
1720
+ ExitOnFailure(hr, "BA OnPlanPatchTarget failed.");
1721
1722
if (results.fCancel)
1723
{
src/engine/userexperience.h
+2
-2
@@ -237,7 +237,7 @@ BAAPI UserExperienceOnDetectRelatedMsiPackage(
237
__in VERUTIL_VERSION* pVersion,
238
__in BOOTSTRAPPER_RELATED_OPERATION operation
239
);
240
-BAAPI UserExperienceOnDetectTargetMsiPackage(
240
+BAAPI UserExperienceOnDetectPatchTarget(
241
__in BURN_USER_EXPERIENCE* pUserExperience,
242
__in_z LPCWSTR wzPackageId,
243
__in_z LPCWSTR wzProductCode,
@@ -391,7 +391,7 @@ BAAPI UserExperienceOnPlanRelatedBundle(
391
__in_z LPCWSTR wzBundleId,
392
__inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
393
);
394
-BAAPI UserExperienceOnPlanTargetMsiPackage(
394
+BAAPI UserExperienceOnPlanPatchTarget(
395
__in BURN_USER_EXPERIENCE* pUserExperience,
396
__in_z LPCWSTR wzPackageId,
397
__in_z LPCWSTR wzProductCode,