Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 18:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELLFIND] Use case-insensitive string comparison

Browse source
This commit is contained in:
Brock Mammen 2019-08-20 21:51:37 -05:00 committed by Giannis Adamopoulos
parent 87c1f457eb
commit a905699ac6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dll/win32/browseui/shellfind/CFindFolder.cpp
View file

@ -117,14 +117,14 @@ static UINT StrStrNCount(const TChar *lpFirst, const TString &lpSrch, UINT cchMa
return uCount; return uCount;
} }
static UINT StrStrCountA(const CHAR *lpFirst, const CStringA &lpSrch, UINT cchMax) static UINT StrStrCountNIA(const CHAR *lpFirst, const CStringA &lpSrch, UINT cchMax)
{ {
return StrStrNCount<CHAR, CStringA, strncmp>(lpFirst, lpSrch, cchMax); return StrStrNCount<CHAR, CStringA, _strnicmp>(lpFirst, lpSrch, cchMax);
} }
static UINT StrStrCountW(const WCHAR *lpFirst, const CStringW &lpSrch, UINT cchMax) static UINT StrStrCountNIW(const WCHAR *lpFirst, const CStringW &lpSrch, UINT cchMax)
{ {
return StrStrNCount<WCHAR, CStringW, wcsncmp>(lpFirst, lpSrch, cchMax); return StrStrNCount<WCHAR, CStringW, _wcsnicmp>(lpFirst, lpSrch, cchMax);
} }
static UINT SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData) static UINT SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData)
@ -148,11 +148,11 @@ static UINT SearchFile(LPCWSTR lpFilePath, _SearchData *pSearchData)
// Check for UTF-16 BOM // Check for UTF-16 BOM
if (size >= 2 && lpFileContent[0] == 0xFF && lpFileContent[1] == 0xFE) if (size >= 2 && lpFileContent[0] == 0xFF && lpFileContent[1] == 0xFE)
{ {
uMatches = StrStrCountW((LPCWSTR) lpFileContent, pSearchData->szQueryW, size / sizeof(WCHAR)); uMatches = StrStrCountNIW((LPCWSTR) lpFileContent, pSearchData->szQueryW, size / sizeof(WCHAR));
} }
else else
{ {
uMatches = StrStrCountA((LPCSTR) lpFileContent, pSearchData->szQueryA, size / sizeof(CHAR)); uMatches = StrStrCountNIA((LPCSTR) lpFileContent, pSearchData->szQueryA, size / sizeof(CHAR));
} }
UnmapViewOfFile(lpFileContent); UnmapViewOfFile(lpFileContent);