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

ntdll: Use ANSI code page in toupper. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Piotr Caban 2019-03-26 10:26:16 +01:00 committed by Alexandre Julliard
parent 4ed7924390
commit 748628e23e
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ntdll/string.c
View File

@ -321,7 +321,17 @@ LPSTR __cdecl _strlwr( LPSTR str )
*/
int __cdecl NTDLL_toupper( int c )
{
return toupper( c );
char str[2], *p = str;
WCHAR wc;
DWORD len;
str[0] = c;
str[1] = c >> 8;
wc = RtlAnsiCharToUnicodeChar( &p );
wc = RtlUpcaseUnicodeChar( wc );
RtlUnicodeToMultiByteN( str, sizeof(str), &len, &wc, sizeof(wc) );
if (len == 2) return ((unsigned char)str[0] << 8) + (unsigned char)str[1];
return (unsigned char)str[0];
}

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

@ -24,6 +24,7 @@
#include <stdlib.h>
#include "ntdll_test.h"
#include "winnls.h"
/* Function ptrs for ntdll calls */
@ -62,6 +63,7 @@ static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *co
static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...);
static int (__cdecl *p_tolower)(int);
static int (__cdecl *p_toupper)(int);
static void InitFunctionPtrs(void)
{
@ -102,6 +104,7 @@ static void InitFunctionPtrs(void)
p__snprintf = (void *)GetProcAddress(hntdll, "_snprintf");
p_tolower = (void *)GetProcAddress(hntdll, "tolower");
p_toupper = (void *)GetProcAddress(hntdll, "toupper");
} /* if */
}
@ -1350,6 +1353,34 @@ static void test_tolower(void)
}
}
static void test_toupper(void)
{
int i, ret, exp_ret;
char str[2], *p;
WCHAR wc;
ok(p_toupper != NULL, "toupper is not available\n");
for (i = -512; i < 0xffff; i++)
{
str[0] = i;
str[1] = i >> 8;
p = str;
wc = RtlAnsiCharToUnicodeChar( &p );
wc = RtlUpcaseUnicodeChar( wc );
ret = WideCharToMultiByte( CP_ACP, 0, &wc, 1, str, 2, NULL, NULL );
ok(ret == 1 || ret == 2, "WideCharToMultiByte returned %d\n", ret);
if (ret == 2)
exp_ret = (unsigned char)str[1] + ((unsigned char)str[0] << 8);
else
exp_ret = (unsigned char)str[0];
ret = p_toupper(i);
ok(ret == exp_ret, "toupper(%x) = %x, expected %x\n", i, ret, exp_ret);
}
}
START_TEST(string)
{
InitFunctionPtrs();
@ -1387,4 +1418,5 @@ START_TEST(string)
if (p__snprintf)
test__snprintf();
test_tolower();
test_toupper();
}