diff options
| author | Rob Mensching <rob@firegiant.com> | 2025-11-01 20:24:25 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-11-03 14:49:39 -0800 |
| commit | 4d626c294c4783d454e27ea4e5614037dac8576e (patch) | |
| tree | 51d822f48716e4c5ef2a51ca28925896f221b521 /src/libs/dutil/WixToolset.DUtil/iis7util.cpp | |
| parent | 33c12fa386aa7ace7a6bd06a45bc3ecf17e9c8f5 (diff) | |
| download | wix-4d626c294c4783d454e27ea4e5614037dac8576e.tar.gz wix-4d626c294c4783d454e27ea4e5614037dac8576e.tar.bz2 wix-4d626c294c4783d454e27ea4e5614037dac8576e.zip | |
Use CompareStringOrdinal() instead of CompareString() case-insensitive
This commit moves to the modern CompareStringOrdinal() for all case-insensitve
uses of CompareString() with the invariant locale.
Partially resolves 6947
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/iis7util.cpp')
| -rw-r--r-- | src/libs/dutil/WixToolset.DUtil/iis7util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/iis7util.cpp b/src/libs/dutil/WixToolset.DUtil/iis7util.cpp index d0a0b000..b0dc1444 100644 --- a/src/libs/dutil/WixToolset.DUtil/iis7util.cpp +++ b/src/libs/dutil/WixToolset.DUtil/iis7util.cpp | |||
| @@ -222,7 +222,7 @@ BOOL DAPI CompareVariantPath( | |||
| 222 | IisExitOnFailure(hr, "Failed to expand path %ls", pVariant2->bstrVal); | 222 | IisExitOnFailure(hr, "Failed to expand path %ls", pVariant2->bstrVal); |
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | fEqual = CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzValue1, -1, wzValue2, -1); | 225 | fEqual = CSTR_EQUAL == ::CompareStringOrdinal(wzValue1, -1, wzValue2, -1, TRUE); |
| 226 | 226 | ||
| 227 | LExit: | 227 | LExit: |
| 228 | ReleaseNullStr(wzValue1); | 228 | ReleaseNullStr(wzValue1); |
| @@ -258,7 +258,7 @@ extern "C" BOOL DAPI Iis7IsMatchingAppHostElement( | |||
| 258 | 258 | ||
| 259 | hr = pElement->get_Name(&bstrElementName); | 259 | hr = pElement->get_Name(&bstrElementName); |
| 260 | IisExitOnFailure(hr, "Failed to get name of element"); | 260 | IisExitOnFailure(hr, "Failed to get name of element"); |
| 261 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pComparison->sczElementName, -1, bstrElementName, -1)) | 261 | if (CSTR_EQUAL != ::CompareStringOrdinal(pComparison->sczElementName, -1, bstrElementName, -1, TRUE)) |
| 262 | { | 262 | { |
| 263 | ExitFunction(); | 263 | ExitFunction(); |
| 264 | } | 264 | } |
| @@ -293,7 +293,7 @@ BOOL DAPI IsMatchingAppHostMethod( | |||
| 293 | 293 | ||
| 294 | Assert(bstrName); | 294 | Assert(bstrName); |
| 295 | 295 | ||
| 296 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzMethodName, -1, bstrName, -1)) | 296 | if (CSTR_EQUAL == ::CompareStringOrdinal(wzMethodName, -1, bstrName, -1, TRUE)) |
| 297 | { | 297 | { |
| 298 | fResult = TRUE; | 298 | fResult = TRUE; |
| 299 | } | 299 | } |
