diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-03 17:47:54 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-07 19:44:36 -0500 |
commit | b652e93a460b4b822a01382e5992f96f1d805ffe (patch) | |
tree | 0c8ec0f0eba23d65fd404eb3f510944b244de65b /src/libs/dutil/WixToolset.DUtil/pathutil.cpp | |
parent | 8a4d03207633e9fdc364aaed82bd167f844679f9 (diff) | |
download | wix-b652e93a460b4b822a01382e5992f96f1d805ffe.tar.gz wix-b652e93a460b4b822a01382e5992f96f1d805ffe.tar.bz2 wix-b652e93a460b4b822a01382e5992f96f1d805ffe.zip |
Replace PathCompare with PathCompareCanonicalized.
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/pathutil.cpp')
-rw-r--r-- | src/libs/dutil/WixToolset.DUtil/pathutil.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/pathutil.cpp b/src/libs/dutil/WixToolset.DUtil/pathutil.cpp index a9a19b9f..abbf4d4b 100644 --- a/src/libs/dutil/WixToolset.DUtil/pathutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/pathutil.cpp | |||
@@ -1080,32 +1080,6 @@ LExit: | |||
1080 | } | 1080 | } |
1081 | 1081 | ||
1082 | 1082 | ||
1083 | DAPI_(HRESULT) PathCompare( | ||
1084 | __in_z LPCWSTR wzPath1, | ||
1085 | __in_z LPCWSTR wzPath2, | ||
1086 | __out int* pnResult | ||
1087 | ) | ||
1088 | { | ||
1089 | HRESULT hr = S_OK; | ||
1090 | LPWSTR sczPath1 = NULL; | ||
1091 | LPWSTR sczPath2 = NULL; | ||
1092 | |||
1093 | hr = PathExpand(&sczPath1, wzPath1, PATH_EXPAND_ENVIRONMENT | PATH_EXPAND_FULLPATH); | ||
1094 | PathExitOnFailure(hr, "Failed to expand path1."); | ||
1095 | |||
1096 | hr = PathExpand(&sczPath2, wzPath2, PATH_EXPAND_ENVIRONMENT | PATH_EXPAND_FULLPATH); | ||
1097 | PathExitOnFailure(hr, "Failed to expand path2."); | ||
1098 | |||
1099 | *pnResult = ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, sczPath1, -1, sczPath2, -1); | ||
1100 | |||
1101 | LExit: | ||
1102 | ReleaseStr(sczPath2); | ||
1103 | ReleaseStr(sczPath1); | ||
1104 | |||
1105 | return hr; | ||
1106 | } | ||
1107 | |||
1108 | |||
1109 | DAPI_(HRESULT) PathCompress( | 1083 | DAPI_(HRESULT) PathCompress( |
1110 | __in_z LPCWSTR wzPath | 1084 | __in_z LPCWSTR wzPath |
1111 | ) | 1085 | ) |