diff options
| author | Rob Mensching <rob@firegiant.com> | 2025-11-01 21:52:31 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-11-03 14:49:39 -0800 |
| commit | d2ba0da55725f2908b67e1470afc7cfd71cb3d1f (patch) | |
| tree | c2a1db61c5fac031c698976106bba2c453d85ded /src/ext/NetFx/be/netfxsearch.cpp | |
| parent | 4d626c294c4783d454e27ea4e5614037dac8576e (diff) | |
| download | wix-d2ba0da55725f2908b67e1470afc7cfd71cb3d1f.tar.gz wix-d2ba0da55725f2908b67e1470afc7cfd71cb3d1f.tar.bz2 wix-d2ba0da55725f2908b67e1470afc7cfd71cb3d1f.zip | |
Use CompareStringOrdinal() instead of CompareString() case-sensitive
This commit moves to the modern CompareStringOrdinal() for all case-sensitve
uses of CompareString() with the invariant locale.
Resolves 6947
Diffstat (limited to 'src/ext/NetFx/be/netfxsearch.cpp')
| -rw-r--r-- | src/ext/NetFx/be/netfxsearch.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ext/NetFx/be/netfxsearch.cpp b/src/ext/NetFx/be/netfxsearch.cpp index 38c34e3c..6f3373d9 100644 --- a/src/ext/NetFx/be/netfxsearch.cpp +++ b/src/ext/NetFx/be/netfxsearch.cpp | |||
| @@ -46,7 +46,7 @@ STDMETHODIMP NetfxSearchParseFromXml( | |||
| 46 | BextExitOnFailure(hr, "Failed to get @Id."); | 46 | BextExitOnFailure(hr, "Failed to get @Id."); |
| 47 | 47 | ||
| 48 | // Read type specific attributes. | 48 | // Read type specific attributes. |
| 49 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"NetFxNetCoreSearch", -1)) | 49 | if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"NetFxNetCoreSearch", -1, FALSE)) |
| 50 | { | 50 | { |
| 51 | pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SEARCH; | 51 | pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SEARCH; |
| 52 | 52 | ||
| @@ -63,7 +63,7 @@ STDMETHODIMP NetfxSearchParseFromXml( | |||
| 63 | hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &netCoreSearch.sczMajorVersion); | 63 | hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &netCoreSearch.sczMajorVersion); |
| 64 | BextExitOnFailure(hr, "Failed to get @MajorVersion."); | 64 | BextExitOnFailure(hr, "Failed to get @MajorVersion."); |
| 65 | } | 65 | } |
| 66 | else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"NetFxNetCoreSdkSearch", -1)) | 66 | else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"NetFxNetCoreSdkSearch", -1, FALSE)) |
| 67 | { | 67 | { |
| 68 | pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SDK_SEARCH; | 68 | pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SDK_SEARCH; |
| 69 | 69 | ||
| @@ -76,7 +76,7 @@ STDMETHODIMP NetfxSearchParseFromXml( | |||
| 76 | hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &netCoreSdkSearch.sczMajorVersion); | 76 | hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &netCoreSdkSearch.sczMajorVersion); |
| 77 | BextExitOnFailure(hr, "Failed to get @MajorVersion."); | 77 | BextExitOnFailure(hr, "Failed to get @MajorVersion."); |
| 78 | } | 78 | } |
| 79 | else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"NetFxNetCoreSdkFeatureBandSearch", -1)) | 79 | else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"NetFxNetCoreSdkFeatureBandSearch", -1, FALSE)) |
| 80 | { | 80 | { |
| 81 | pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SDK_FEATURE_BAND_SEARCH; | 81 | pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SDK_FEATURE_BAND_SEARCH; |
| 82 | 82 | ||
| @@ -176,7 +176,7 @@ STDMETHODIMP NetfxSearchFindById( | |||
| 176 | { | 176 | { |
| 177 | NETFX_SEARCH* pSearch = &pSearches->rgSearches[i]; | 177 | NETFX_SEARCH* pSearch = &pSearches->rgSearches[i]; |
| 178 | 178 | ||
| 179 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pSearch->sczId, -1, wzId, -1)) | 179 | if (CSTR_EQUAL == ::CompareStringOrdinal(pSearch->sczId, -1, wzId, -1, FALSE)) |
| 180 | { | 180 | { |
| 181 | *ppSearch = pSearch; | 181 | *ppSearch = pSearch; |
| 182 | ExitFunction1(hr = S_OK); | 182 | ExitFunction1(hr = S_OK); |
