aboutsummaryrefslogtreecommitdiff
path: root/src/engine/userexperience.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-10-17 19:12:21 -0500
committerSean Hall <r.sean.hall@gmail.com>2020-10-24 20:07:21 -0500
commit273c69f34311f4f4e5f6b5896e71d0788f12d96a (patch)
tree4cf8f42f3ecfa9341a41686b74aa5e48068ede87 /src/engine/userexperience.cpp
parent3f8e35223216ebbe7f6683a5031a5a97bbc66d5a (diff)
downloadwix-273c69f34311f4f4e5f6b5896e71d0788f12d96a.tar.gz
wix-273c69f34311f4f4e5f6b5896e71d0788f12d96a.tar.bz2
wix-273c69f34311f4f4e5f6b5896e71d0788f12d96a.zip
WIXFEAT:6210 Change data type of versions to strings.
Diffstat (limited to 'src/engine/userexperience.cpp')
-rw-r--r--src/engine/userexperience.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/engine/userexperience.cpp b/src/engine/userexperience.cpp
index 6b0e3bf5..6ab28cde 100644
--- a/src/engine/userexperience.cpp
+++ b/src/engine/userexperience.cpp
@@ -646,7 +646,7 @@ EXTERN_C BAAPI UserExperienceOnDetectCompatibleMsiPackage(
646 __in BURN_USER_EXPERIENCE* pUserExperience, 646 __in BURN_USER_EXPERIENCE* pUserExperience,
647 __in_z LPCWSTR wzPackageId, 647 __in_z LPCWSTR wzPackageId,
648 __in_z LPCWSTR wzCompatiblePackageId, 648 __in_z LPCWSTR wzCompatiblePackageId,
649 __in DWORD64 dw64CompatiblePackageVersion 649 __in VERUTIL_VERSION* pCompatiblePackageVersion
650 ) 650 )
651{ 651{
652 HRESULT hr = S_OK; 652 HRESULT hr = S_OK;
@@ -656,7 +656,7 @@ EXTERN_C BAAPI UserExperienceOnDetectCompatibleMsiPackage(
656 args.cbSize = sizeof(args); 656 args.cbSize = sizeof(args);
657 args.wzPackageId = wzPackageId; 657 args.wzPackageId = wzPackageId;
658 args.wzCompatiblePackageId = wzCompatiblePackageId; 658 args.wzCompatiblePackageId = wzCompatiblePackageId;
659 args.dw64CompatiblePackageVersion = dw64CompatiblePackageVersion; 659 args.wzCompatiblePackageVersion = pCompatiblePackageVersion->sczVersion;
660 660
661 results.cbSize = sizeof(results); 661 results.cbSize = sizeof(results);
662 662
@@ -699,7 +699,7 @@ EXTERN_C BAAPI UserExperienceOnDetectForwardCompatibleBundle(
699 __in BOOTSTRAPPER_RELATION_TYPE relationType, 699 __in BOOTSTRAPPER_RELATION_TYPE relationType,
700 __in_z LPCWSTR wzBundleTag, 700 __in_z LPCWSTR wzBundleTag,
701 __in BOOL fPerMachine, 701 __in BOOL fPerMachine,
702 __in DWORD64 dw64Version, 702 __in VERUTIL_VERSION* pVersion,
703 __inout BOOL* pfIgnoreBundle 703 __inout BOOL* pfIgnoreBundle
704 ) 704 )
705{ 705{
@@ -712,7 +712,7 @@ EXTERN_C BAAPI UserExperienceOnDetectForwardCompatibleBundle(
712 args.relationType = relationType; 712 args.relationType = relationType;
713 args.wzBundleTag = wzBundleTag; 713 args.wzBundleTag = wzBundleTag;
714 args.fPerMachine = fPerMachine; 714 args.fPerMachine = fPerMachine;
715 args.dw64Version = dw64Version; 715 args.wzVersion = pVersion->sczVersion;
716 716
717 results.cbSize = sizeof(results); 717 results.cbSize = sizeof(results);
718 results.fIgnoreBundle = *pfIgnoreBundle; 718 results.fIgnoreBundle = *pfIgnoreBundle;
@@ -817,7 +817,7 @@ EXTERN_C BAAPI UserExperienceOnDetectRelatedBundle(
817 __in BOOTSTRAPPER_RELATION_TYPE relationType, 817 __in BOOTSTRAPPER_RELATION_TYPE relationType,
818 __in_z LPCWSTR wzBundleTag, 818 __in_z LPCWSTR wzBundleTag,
819 __in BOOL fPerMachine, 819 __in BOOL fPerMachine,
820 __in DWORD64 dw64Version, 820 __in VERUTIL_VERSION* pVersion,
821 __in BOOTSTRAPPER_RELATED_OPERATION operation 821 __in BOOTSTRAPPER_RELATED_OPERATION operation
822 ) 822 )
823{ 823{
@@ -830,7 +830,7 @@ EXTERN_C BAAPI UserExperienceOnDetectRelatedBundle(
830 args.relationType = relationType; 830 args.relationType = relationType;
831 args.wzBundleTag = wzBundleTag; 831 args.wzBundleTag = wzBundleTag;
832 args.fPerMachine = fPerMachine; 832 args.fPerMachine = fPerMachine;
833 args.dw64Version = dw64Version; 833 args.wzVersion = pVersion->sczVersion;
834 args.operation = operation; 834 args.operation = operation;
835 835
836 results.cbSize = sizeof(results); 836 results.cbSize = sizeof(results);
@@ -853,7 +853,7 @@ EXTERN_C BAAPI UserExperienceOnDetectRelatedMsiPackage(
853 __in_z LPCWSTR wzUpgradeCode, 853 __in_z LPCWSTR wzUpgradeCode,
854 __in_z LPCWSTR wzProductCode, 854 __in_z LPCWSTR wzProductCode,
855 __in BOOL fPerMachine, 855 __in BOOL fPerMachine,
856 __in DWORD64 dw64Version, 856 __in VERUTIL_VERSION* pVersion,
857 __in BOOTSTRAPPER_RELATED_OPERATION operation 857 __in BOOTSTRAPPER_RELATED_OPERATION operation
858 ) 858 )
859{ 859{
@@ -866,7 +866,7 @@ EXTERN_C BAAPI UserExperienceOnDetectRelatedMsiPackage(
866 args.wzUpgradeCode = wzUpgradeCode; 866 args.wzUpgradeCode = wzUpgradeCode;
867 args.wzProductCode = wzProductCode; 867 args.wzProductCode = wzProductCode;
868 args.fPerMachine = fPerMachine; 868 args.fPerMachine = fPerMachine;
869 args.dw64Version = dw64Version; 869 args.wzVersion = pVersion->sczVersion;
870 args.operation = operation; 870 args.operation = operation;
871 871
872 results.cbSize = sizeof(results); 872 results.cbSize = sizeof(results);
@@ -917,7 +917,7 @@ EXTERN_C BAAPI UserExperienceOnDetectUpdate(
917 __in BURN_USER_EXPERIENCE* pUserExperience, 917 __in BURN_USER_EXPERIENCE* pUserExperience,
918 __in_z LPCWSTR wzUpdateLocation, 918 __in_z LPCWSTR wzUpdateLocation,
919 __in DWORD64 dw64Size, 919 __in DWORD64 dw64Size,
920 __in DWORD64 dw64Version, 920 __in VERUTIL_VERSION* pVersion,
921 __in_z_opt LPCWSTR wzTitle, 921 __in_z_opt LPCWSTR wzTitle,
922 __in_z_opt LPCWSTR wzSummary, 922 __in_z_opt LPCWSTR wzSummary,
923 __in_z_opt LPCWSTR wzContentType, 923 __in_z_opt LPCWSTR wzContentType,
@@ -932,7 +932,7 @@ EXTERN_C BAAPI UserExperienceOnDetectUpdate(
932 args.cbSize = sizeof(args); 932 args.cbSize = sizeof(args);
933 args.wzUpdateLocation = wzUpdateLocation; 933 args.wzUpdateLocation = wzUpdateLocation;
934 args.dw64Size = dw64Size; 934 args.dw64Size = dw64Size;
935 args.dw64Version = dw64Version; 935 args.wzVersion = pVersion->sczVersion;
936 args.wzTitle = wzTitle; 936 args.wzTitle = wzTitle;
937 args.wzSummary = wzSummary; 937 args.wzSummary = wzSummary;
938 args.wzContentType = wzContentType; 938 args.wzContentType = wzContentType;
@@ -1414,7 +1414,7 @@ EXTERN_C BAAPI UserExperienceOnPlanCompatibleMsiPackageBegin(
1414 __in BURN_USER_EXPERIENCE* pUserExperience, 1414 __in BURN_USER_EXPERIENCE* pUserExperience,
1415 __in_z LPCWSTR wzPackageId, 1415 __in_z LPCWSTR wzPackageId,
1416 __in_z LPCWSTR wzCompatiblePackageId, 1416 __in_z LPCWSTR wzCompatiblePackageId,
1417 __in DWORD64 dw64CompatiblePackageVersion, 1417 __in VERUTIL_VERSION* pCompatiblePackageVersion,
1418 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState 1418 __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
1419 ) 1419 )
1420{ 1420{
@@ -1425,7 +1425,7 @@ EXTERN_C BAAPI UserExperienceOnPlanCompatibleMsiPackageBegin(
1425 args.cbSize = sizeof(args); 1425 args.cbSize = sizeof(args);
1426 args.wzPackageId = wzPackageId; 1426 args.wzPackageId = wzPackageId;
1427 args.wzCompatiblePackageId = wzCompatiblePackageId; 1427 args.wzCompatiblePackageId = wzCompatiblePackageId;
1428 args.dw64CompatiblePackageVersion = dw64CompatiblePackageVersion; 1428 args.wzCompatiblePackageVersion = pCompatiblePackageVersion->sczVersion;
1429 args.recommendedState = *pRequestedState; 1429 args.recommendedState = *pRequestedState;
1430 1430
1431 results.cbSize = sizeof(results); 1431 results.cbSize = sizeof(results);