From 4d626c294c4783d454e27ea4e5614037dac8576e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 1 Nov 2025 20:24:25 -0700 Subject: 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 --- src/tools/thmviewer/load.cpp | 2 +- src/tools/thmviewer/thmviewer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools') diff --git a/src/tools/thmviewer/load.cpp b/src/tools/thmviewer/load.cpp index 924f373d..ca1460e3 100644 --- a/src/tools/thmviewer/load.cpp +++ b/src/tools/thmviewer/load.cpp @@ -152,7 +152,7 @@ static DWORD WINAPI LoadThreadProc( // If our file was updated, check to see if the modified time really changed. The notifications // are often trigger happy thinking the file changed two or three times in a row. Maybe it's AV // software creating the problems but actually checking the modified date works well. - if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pNotification->FileName, pNotification->FileNameLength / sizeof(WCHAR), wzFileName, -1)) + if (CSTR_EQUAL == ::CompareStringOrdinal(pNotification->FileName, pNotification->FileNameLength / sizeof(WCHAR), wzFileName, -1, TRUE)) { FILETIME ft = { }; FileGetTime(sczThemePath, NULL, NULL, &ft); diff --git a/src/tools/thmviewer/thmviewer.cpp b/src/tools/thmviewer/thmviewer.cpp index 5d4b88f5..69a9920b 100644 --- a/src/tools/thmviewer/thmviewer.cpp +++ b/src/tools/thmviewer/thmviewer.cpp @@ -241,7 +241,7 @@ static HRESULT ProcessCommandLine( { if (argv[i][0] == L'-' || argv[i][0] == L'/') { - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"lang", -1)) + if (CSTR_EQUAL == ::CompareStringOrdinal(&argv[i][1], -1, L"lang", -1, TRUE)) { if (i + 1 >= argc) { @@ -254,7 +254,7 @@ static HRESULT ProcessCommandLine( else { LPCWSTR wzExtension = PathExtension(argv[i]); - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzExtension, -1, L".wxl", -1)) + if (CSTR_EQUAL == ::CompareStringOrdinal(wzExtension, -1, L".wxl", -1, TRUE)) { hr = StrAllocString(psczWxlFile, argv[i], 0); } -- cgit v1.2.3-55-g6feb