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/ext/NetFx/netcoresearch/netcoresearch.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ext/NetFx') diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.cpp b/src/ext/NetFx/netcoresearch/netcoresearch.cpp index 8c788461..1b151d8f 100644 --- a/src/ext/NetFx/netcoresearch/netcoresearch.cpp +++ b/src/ext/NetFx/netcoresearch/netcoresearch.cpp @@ -86,7 +86,7 @@ HRESULT GetSearchStateFromArguments( wzSearchKind = argv[1]; - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzSearchKind, -1, L"runtime", -1)) + if (CSTR_EQUAL == ::CompareStringOrdinal(wzSearchKind, -1, L"runtime", -1, TRUE)) { if (argc != 4) { @@ -103,7 +103,7 @@ HRESULT GetSearchStateFromArguments( pSearchState->Runtime.wzTargetName = wzTargetName; } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzSearchKind, -1, L"sdk", -1)) + else if (CSTR_EQUAL == ::CompareStringOrdinal(wzSearchKind, -1, L"sdk", -1, TRUE)) { if (argc != 3) { @@ -117,7 +117,7 @@ HRESULT GetSearchStateFromArguments( hr = StrStringToUInt32(wzMajorVersion, 0, reinterpret_cast(&pSearchState->Sdk.dwMajorVersion)); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get sdk major version from: %ls", wzMajorVersion); } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzSearchKind, -1, L"sdkfeatureband", -1)) + else if (CSTR_EQUAL == ::CompareStringOrdinal(wzSearchKind, -1, L"sdkfeatureband", -1, TRUE)) { if (argc != 5) { @@ -208,7 +208,7 @@ static HRESULT PerformRuntimeSearch( const hostfxr_dotnet_environment_framework_info* pFrameworkInfo = pInfo->frameworks + i; ReleaseVerutilVersion(pFrameworkVersion); - if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzTargetName, -1, pFrameworkInfo->name, -1)) + if (CSTR_EQUAL != ::CompareStringOrdinal(wzTargetName, -1, pFrameworkInfo->name, -1, TRUE)) { continue; } -- cgit v1.2.3-55-g6feb