ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Optimize _strlwr implementation in C locale. 

Tests by Ambrož Bizjak.

Signed-off-by: Gijs Vermeulen <gijsvrm@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gijs Vermeulen 2019-12-04 10:04:46 +01:00 committed by Alexandre Julliard
parent aa82739331
commit e44d935cc6
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/msvcrt/string.c
View File

@ -56,6 +56,7 @@ char* CDECL MSVCRT__strdup(const char* str)
*/ */
int CDECL MSVCRT__strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) int CDECL MSVCRT__strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale)
{ {
MSVCRT_pthreadlocinfo locinfo;
char *ptr = str; char *ptr = str;
if (!str || !len) if (!str || !len)
@ -77,10 +78,27 @@ int CDECL MSVCRT__strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t loca
return MSVCRT_EINVAL; return MSVCRT_EINVAL;
} }
while (*str) if(!locale)
locinfo = get_locinfo();
else
locinfo = locale->locinfo;
if(!locinfo->lc_handle[MSVCRT_LC_CTYPE])
{ {
*str = MSVCRT__tolower_l((unsigned char)*str, locale); while (*str)
str++; {
if (*str >= 'A' && *str <= 'Z')
*str -= 'A' - 'a';
str++;
}
}
else
{
while (*str)
{
*str = MSVCRT__tolower_l((unsigned char)*str, locale);
str++;
}
} }
return 0; return 0;

8
dlls/msvcrt/tests/string.c
View File

@ -2411,6 +2411,9 @@ static void test__strlwr_s(void)
ok(!memcmp(buffer, "gorrister\0ELLEN", sizeof("gorrister\0ELLEN")), ok(!memcmp(buffer, "gorrister\0ELLEN", sizeof("gorrister\0ELLEN")),
"Expected the output buffer to be \"gorrister\\0ELLEN\", got \"%s\"\n", "Expected the output buffer to be \"gorrister\\0ELLEN\", got \"%s\"\n",
buffer); buffer);
ret = p_strlwr_s((char *)"already_lowercase", sizeof("already_lowercase"));
ok(ret == 0, "Expected _strlwr_s to return 0, got %d\n", ret);
} }
static void test_wcsncat_s(void) static void test_wcsncat_s(void)
@ -3596,6 +3599,7 @@ static void test__memicmp_l(void)
static void test__strupr(void) static void test__strupr(void)
{ {
const char str[] = "123"; const char str[] = "123";
const char *const_p;
char str2[4]; char str2[4];
char *mem, *p; char *mem, *p;
DWORD prot; DWORD prot;
@ -3614,6 +3618,10 @@ static void test__strupr(void)
ok(p == mem, "_strupr returned %p\n", p); ok(p == mem, "_strupr returned %p\n", p);
ok(!strcmp(mem, "123"), "mem = %s\n", mem); ok(!strcmp(mem, "123"), "mem = %s\n", mem);
const_p = "ALREADY_UPPERCASE";
p = _strupr((char *)const_p);
ok(p == const_p, "_strupr returned %p\n", p);
if(!setlocale(LC_ALL, "english")) { if(!setlocale(LC_ALL, "english")) {
VirtualFree(mem, sizeof(str), MEM_RELEASE); VirtualFree(mem, sizeof(str), MEM_RELEASE);
win_skip("English locale _strupr tests\n"); win_skip("English locale _strupr tests\n");