Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Implement lstr[i]cmp[AW] using CompareString[AW] and properly handle NULL parameters.

Browse source 
svn path=/trunk/; revision=11922
This commit is contained in:
Filip Navara 2004-12-04 19:52:55 +00:00
parent 7b11cf526c
commit 495274f192
1 changed files with 53 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

57
reactos/lib/kernel32/string/lstring.c
View file

@ -21,7 +21,19 @@ lstrcmpA(
LPCSTR lpString2 LPCSTR lpString2
) )
{ {
return strcmp(lpString1,lpString2); int Result;
if (lpString1 == lpString2)
return 0;
if (lpString1 == NULL)
return -1;
if (lpString2 == NULL)
return 1;
Result = CompareStringA(GetThreadLocale(), 0, lpString1, -1, lpString2, -1);
if (Result) Result -= 2;
return Result;
} }
@ -35,7 +47,20 @@ lstrcmpiA(
LPCSTR lpString2 LPCSTR lpString2
) )
{ {
return _stricmp(lpString1,lpString2); int Result;
if (lpString1 == lpString2)
return 0;
if (lpString1 == NULL)
return -1;
if (lpString2 == NULL)
return 1;
Result = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1,
lpString2, -1);
if (Result) Result -= 2;
return Result;
} }
@ -145,7 +170,19 @@ lstrcmpW(
LPCWSTR lpString2 LPCWSTR lpString2
) )
{ {
return wcscmp(lpString1,lpString2); int Result;
if (lpString1 == lpString2)
return 0;
if (lpString1 == NULL)
return -1;
if (lpString2 == NULL)
return 1;
Result = CompareStringW(GetThreadLocale(), 0, lpString1, -1, lpString2, -1);
if (Result) Result -= 2;
return Result;
} }
@ -159,7 +196,19 @@ lstrcmpiW(
LPCWSTR lpString2 LPCWSTR lpString2
) )
{ {
return _wcsicmp(lpString1,lpString2); int Result;
if (lpString1 == lpString2)
return 0;
if (lpString1 == NULL)
return -1;
if (lpString2 == NULL)
return 1;
Result = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpString1, -1, lpString2, -1);
if (Result) Result -= 2;
return Result;
} }