From 4cd1c4e06145434ca940ac828772dc47b9d9738e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 13 Mar 2022 23:45:32 -0500 Subject: Allow the BA to override the bundle relation type during plan. --- src/libs/dutil/WixToolset.DUtil/butil.cpp | 12 ++++++------ src/libs/dutil/WixToolset.DUtil/inc/butil.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/libs') diff --git a/src/libs/dutil/WixToolset.DUtil/butil.cpp b/src/libs/dutil/WixToolset.DUtil/butil.cpp index ac322ae7..175903ad 100644 --- a/src/libs/dutil/WixToolset.DUtil/butil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/butil.cpp @@ -559,7 +559,7 @@ static HRESULT DetermineRelationType( { ExitOnFailure(hr, "Failed to do array search for addon code match."); - *pRelationType = BUNDLE_RELATION_DEPENDENT; + *pRelationType = BUNDLE_RELATION_DEPENDENT_ADDON; ExitFunction(); } @@ -571,9 +571,9 @@ static HRESULT DetermineRelationType( } else { - ExitOnFailure(hr, "Failed to do array search for addon code match."); + ExitOnFailure(hr, "Failed to do array search for patch code match."); - *pRelationType = BUNDLE_RELATION_DEPENDENT; + *pRelationType = BUNDLE_RELATION_DEPENDENT_PATCH; ExitFunction(); } @@ -690,7 +690,7 @@ static HRESULT DetermineRelationType( { ExitOnFailure(hr, "Failed to do array search for addon code match."); - *pRelationType = BUNDLE_RELATION_DEPENDENT; + *pRelationType = BUNDLE_RELATION_DEPENDENT_ADDON; ExitFunction(); } @@ -702,9 +702,9 @@ static HRESULT DetermineRelationType( } else { - ExitOnFailure(hr, "Failed to do array search for addon code match."); + ExitOnFailure(hr, "Failed to do array search for patch code match."); - *pRelationType = BUNDLE_RELATION_DEPENDENT; + *pRelationType = BUNDLE_RELATION_DEPENDENT_PATCH; ExitFunction(); } diff --git a/src/libs/dutil/WixToolset.DUtil/inc/butil.h b/src/libs/dutil/WixToolset.DUtil/inc/butil.h index 0d3eefe3..5d390344 100644 --- a/src/libs/dutil/WixToolset.DUtil/inc/butil.h +++ b/src/libs/dutil/WixToolset.DUtil/inc/butil.h @@ -25,8 +25,8 @@ typedef enum _BUNDLE_RELATION_TYPE BUNDLE_RELATION_UPGRADE, BUNDLE_RELATION_ADDON, BUNDLE_RELATION_PATCH, - BUNDLE_RELATION_DEPENDENT, - BUNDLE_RELATION_UPDATE, + BUNDLE_RELATION_DEPENDENT_ADDON, + BUNDLE_RELATION_DEPENDENT_PATCH, } BUNDLE_RELATION_TYPE; typedef struct _BUNDLE_QUERY_RELATED_BUNDLE_RESULT -- cgit v1.2.3-55-g6feb