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/ext/NetFx | |
| 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/ext/NetFx')
| -rw-r--r-- | src/ext/NetFx/netcoresearch/netcoresearch.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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( | |||
| 86 | 86 | ||
| 87 | wzSearchKind = argv[1]; | 87 | wzSearchKind = argv[1]; |
| 88 | 88 | ||
| 89 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzSearchKind, -1, L"runtime", -1)) | 89 | if (CSTR_EQUAL == ::CompareStringOrdinal(wzSearchKind, -1, L"runtime", -1, TRUE)) |
| 90 | { | 90 | { |
| 91 | if (argc != 4) | 91 | if (argc != 4) |
| 92 | { | 92 | { |
| @@ -103,7 +103,7 @@ HRESULT GetSearchStateFromArguments( | |||
| 103 | 103 | ||
| 104 | pSearchState->Runtime.wzTargetName = wzTargetName; | 104 | pSearchState->Runtime.wzTargetName = wzTargetName; |
| 105 | } | 105 | } |
| 106 | else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzSearchKind, -1, L"sdk", -1)) | 106 | else if (CSTR_EQUAL == ::CompareStringOrdinal(wzSearchKind, -1, L"sdk", -1, TRUE)) |
| 107 | { | 107 | { |
| 108 | if (argc != 3) | 108 | if (argc != 3) |
| 109 | { | 109 | { |
| @@ -117,7 +117,7 @@ HRESULT GetSearchStateFromArguments( | |||
| 117 | hr = StrStringToUInt32(wzMajorVersion, 0, reinterpret_cast<UINT*>(&pSearchState->Sdk.dwMajorVersion)); | 117 | hr = StrStringToUInt32(wzMajorVersion, 0, reinterpret_cast<UINT*>(&pSearchState->Sdk.dwMajorVersion)); |
| 118 | ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get sdk major version from: %ls", wzMajorVersion); | 118 | ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to get sdk major version from: %ls", wzMajorVersion); |
| 119 | } | 119 | } |
| 120 | else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzSearchKind, -1, L"sdkfeatureband", -1)) | 120 | else if (CSTR_EQUAL == ::CompareStringOrdinal(wzSearchKind, -1, L"sdkfeatureband", -1, TRUE)) |
| 121 | { | 121 | { |
| 122 | if (argc != 5) | 122 | if (argc != 5) |
| 123 | { | 123 | { |
| @@ -208,7 +208,7 @@ static HRESULT PerformRuntimeSearch( | |||
| 208 | const hostfxr_dotnet_environment_framework_info* pFrameworkInfo = pInfo->frameworks + i; | 208 | const hostfxr_dotnet_environment_framework_info* pFrameworkInfo = pInfo->frameworks + i; |
| 209 | ReleaseVerutilVersion(pFrameworkVersion); | 209 | ReleaseVerutilVersion(pFrameworkVersion); |
| 210 | 210 | ||
| 211 | if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzTargetName, -1, pFrameworkInfo->name, -1)) | 211 | if (CSTR_EQUAL != ::CompareStringOrdinal(wzTargetName, -1, pFrameworkInfo->name, -1, TRUE)) |
| 212 | { | 212 | { |
| 213 | continue; | 213 | continue; |
| 214 | } | 214 | } |
