From b652e93a460b4b822a01382e5992f96f1d805ffe Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 3 Jun 2022 17:47:54 -0500 Subject: Replace PathCompare with PathCompareCanonicalized. --- src/libs/dutil/WixToolset.DUtil/inc/pathutil.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/libs/dutil/WixToolset.DUtil/inc/pathutil.h') diff --git a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h index 871e706b..e64c8ef3 100644 --- a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h +++ b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h @@ -258,13 +258,14 @@ DAPI_(HRESULT) PathConcatRelativeToBase( ); /******************************************************************* - PathCompare - compares the fully expanded path of the two paths using - ::CompareStringW(). + PathCompareCanonicalized - canonicalizes the two paths using PathCanonicalizeForComparison + which does not resolve relative paths into fully qualified paths. + The strings are then compared using ::CompareStringW(). *******************************************************************/ -DAPI_(HRESULT) PathCompare( +DAPI_(HRESULT) PathCompareCanonicalized( __in_z LPCWSTR wzPath1, __in_z LPCWSTR wzPath2, - __out int* pnResult + __out BOOL* pfEqual ); /******************************************************************* -- cgit v1.2.3-55-g6feb