system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-07 23:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

user32/tests: Recognize undefined characters in OemKeyScan tests.

Browse source 
This reverts commit 72ab2d5b07.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2017-12-28 23:46:57 -07:00 committed by Alexandre Julliard
parent 72ab2d5b07
commit 7a39a7a3ae
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/user32/tests/Makefile.in
View file

@ -1,5 +1,5 @@
TESTDLL = user32.dll
IMPORTS = user32 gdi32 advapi32 imm32
IMPORTS = user32 gdi32 advapi32
C_SRCS = \
broadcast.c \

13
dlls/user32/tests/input.c
View file

@ -54,7 +54,6 @@
#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
#include "imm.h"
#include "wine/test.h"
@ -2516,23 +2515,23 @@ static void test_OemKeyScan(void)
DWORD ret, expect, vkey, scan;
WCHAR oem, wchr;
char oem_char;
BOOL ime = ImmIsIME(GetKeyboardLayout(0));
for (oem = 0; oem < 0x200; oem++)
{
ret = OemKeyScan( oem );
oem_char = LOBYTE( oem );
if (!OemToCharBuffW( &oem_char, &wchr, 1 ))
/* OemKeyScan returns -1 for any character that cannot be mapped,
* whereas OemToCharBuff changes unmappable characters to question
* marks. The ASCII characters 0-127, including the real question mark
* character, are all mappable and are the same in all OEM codepages. */
if (!OemToCharBuffW( &oem_char, &wchr, 1 ) || (wchr == '?' && oem_char < 0))
expect = -1;
else
{
vkey = VkKeyScanW( wchr );
scan = MapVirtualKeyW( LOBYTE( vkey ), MAPVK_VK_TO_VSC );
/* OemKeyScan returns -1 for any character that has to go through
* the IME, whereas VkKeyScan returns the virtual key code for the
* question mark key */
if (!scan || (ime && wchr != '?' && vkey == VkKeyScanW( '?' )))
if (!scan)
expect = -1;
else
{