marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Fix _strnicmp implementation to not depend on locale. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Piotr Caban 2019-03-26 10:26:36 +01:00 committed by Alexandre Julliard
parent 9851785783
commit 9b52a967b7
2 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/ntdll/string.c
View File

@ -257,22 +257,37 @@ INT __cdecl _memicmp( LPCSTR s1, LPCSTR s2, DWORD len )
}
/*********************************************************************
* _strnicmp (NTDLL.@)
*/
int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n )
{
int l1, l2;
while (n--)
{
l1 = (unsigned char)NTDLL_tolower(*str1);
l2 = (unsigned char)NTDLL_tolower(*str2);
if (l1 != l2)
{
if (sizeof(void *) > sizeof(int)) return l1 - l2;
return l1 - l2 > 0 ? 1 : -1;
}
if (!l1) return 0;
str1++;
str2++;
}
return 0;
}
/*********************************************************************
* _stricmp (NTDLL.@)
* _strcmpi (NTDLL.@)
*/
int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 )
{
return strcasecmp( str1, str2 );
}
/*********************************************************************
* _strnicmp (NTDLL.@)
*/
int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n )
{
return strncasecmp( str1, str2, n );
return _strnicmp( str1, str2, -1 );
}

26
dlls/ntdll/tests/string.c
View File

@ -64,6 +64,7 @@ static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...);
static int (__cdecl *p_tolower)(int);
static int (__cdecl *p_toupper)(int);
static int (__cdecl *p__strnicmp)(LPCSTR,LPCSTR,size_t);
static void InitFunctionPtrs(void)
{
@ -105,6 +106,7 @@ static void InitFunctionPtrs(void)
p_tolower = (void *)GetProcAddress(hntdll, "tolower");
p_toupper = (void *)GetProcAddress(hntdll, "toupper");
p__strnicmp = (void *)GetProcAddress(hntdll, "_strnicmp");
} /* if */
}
@ -1381,6 +1383,29 @@ static void test_toupper(void)
}
}
static void test__strnicmp(void)
{
BOOL is_win64 = (sizeof(void *) > sizeof(int));
int ret;
ok(p__strnicmp != NULL, "_strnicmp is not available\n");
ret = p__strnicmp("a", "C", 1);
ok(ret == (is_win64 ? -2 : -1), "_strnicmp returned %d\n", ret);
ret = p__strnicmp("a", "c", 1);
ok(ret == (is_win64 ? -2 : -1), "_strnicmp returned %d\n", ret);
ret = p__strnicmp("C", "a", 1);
ok(ret == (is_win64 ? 2 : 1), "_strnicmp returned %d\n", ret);
ret = p__strnicmp("c", "a", 1);
ok(ret == (is_win64 ? 2 : 1), "_strnicmp returned %d\n", ret);
ret = p__strnicmp("ijk0", "IJK1", 3);
ok(!ret, "_strnicmp returned %d\n", ret);
ret = p__strnicmp("ijk0", "IJK1", 4);
ok(ret == -1, "_strnicmp returned %d\n", ret);
ret = p__strnicmp("ijk\0X", "IJK\0Y", 5);
ok(!ret, "_strnicmp returned %d\n", ret);
}
START_TEST(string)
{
InitFunctionPtrs();
@ -1419,4 +1444,5 @@ START_TEST(string)
test__snprintf();
test_tolower();
test_toupper();
test__strnicmp();
}