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

user32/tests: Use the correct codepage for WM_CHAR tests.

This commit is contained in:
Huw Davies 2015-06-12 10:34:32 +01:00 committed by Alexandre Julliard
parent 53dbffd314
commit 30c529c9f7
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/user32/tests/msg.c
View File

@ -11964,6 +11964,18 @@ static void test_SetForegroundWindow(void)
DestroyWindow(hwnd);
}
static DWORD get_input_codepage( void )
{
DWORD cp;
int ret;
HKL hkl = GetKeyboardLayout( 0 );
ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
(WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) );
if (!ret) cp = CP_ACP;
return cp;
}
static void test_dbcs_wm_char(void)
{
BYTE dbch[2];
@ -11977,6 +11989,7 @@ static void test_dbcs_wm_char(void)
UINT i, j, k;
struct message wmCharSeq[2];
BOOL ret;
DWORD cp = get_input_codepage();
if (!pGetCPInfoExA)
{
@ -11984,7 +11997,7 @@ static void test_dbcs_wm_char(void)
return;
}
pGetCPInfoExA( CP_ACP, 0, &cpinfo );
pGetCPInfoExA( cp, 0, &cpinfo );
if (cpinfo.MaxCharSize != 2)
{
skip( "Skipping DBCS WM_CHAR test in SBCS codepage '%s'\n", cpinfo.CodePageName );
@ -12002,8 +12015,8 @@ static void test_dbcs_wm_char(void)
WCHAR wstr[2];
str[0] = j;
str[1] = k;
if (MultiByteToWideChar( CP_ACP, 0, str, 2, wstr, 2 ) == 1 &&
WideCharToMultiByte( CP_ACP, 0, wstr, 1, str, 2, NULL, NULL ) == 2 &&
if (MultiByteToWideChar( cp, 0, str, 2, wstr, 2 ) == 1 &&
WideCharToMultiByte( cp, 0, wstr, 1, str, 2, NULL, NULL ) == 2 &&
(BYTE)str[0] == j && (BYTE)str[1] == k &&
HIBYTE(wstr[0]) && HIBYTE(wstr[0]) != 0xff)
{