reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user32: Make MapVirtualKeyEx(MAPVK_VK_TO_CHAR) behave more like in Windows.

Browse Source
This commit is contained in:
Dmitry Timoshkov 2008-01-23 20:26:57 +08:00 committed by Alexandre Julliard
parent e929e3b603
commit e5e261f104
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/user32/input.c
View File

@ -622,7 +622,18 @@ UINT WINAPI MapVirtualKeyW(UINT code, UINT maptype)
*/
UINT WINAPI MapVirtualKeyExA(UINT code, UINT maptype, HKL hkl)
{
return MapVirtualKeyExW(code, maptype, hkl);
UINT ret;
ret = MapVirtualKeyExW( code, maptype, hkl );
if (maptype == MAPVK_VK_TO_CHAR)
{
BYTE ch = 0;
WCHAR wch = ret;
WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL );
ret = ch;
}
return ret;
}
/******************************************************************************

28
dlls/winex11.drv/keyboard.c
View File

@ -2121,17 +2121,15 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl)
/* let's do vkey -> keycode -> (XLookupString) ansi char */
XKeyEvent e;
KeySym keysym;
int keyc;
char s[2];
e.display = display;
int keyc, len;
char s[10];
e.state = LockMask;
/* LockMask should behave exactly like caps lock - upercase
* the letter keys and that's about it. */
e.display = display;
e.state = 0;
e.keycode = 0;
wine_tsx11_lock();
e.keycode = 0;
/* We exit on the first keycode found, to speed up the thing. */
for (keyc=min_keycode; (keyc<=max_keycode) && (!e.keycode) ; keyc++)
{ /* Find a keycode that could have generated this virtual key */
@ -2159,14 +2157,16 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl)
}
TRACE("Found keycode %d (0x%2X)\n",e.keycode,e.keycode);
if (XLookupString(&e, s, 2, &keysym, NULL))
{
wine_tsx11_unlock();
returnMVK (*s);
}
TRACE("returning no ANSI.\n");
len = XLookupString(&e, s, sizeof(s), &keysym, NULL);
wine_tsx11_unlock();
if (len)
{
WCHAR wch;
if (MultiByteToWideChar(CP_UNIXCP, 0, s, len, &wch, 1))
returnMVK(toupperW(wch));
}
TRACE("returning no ANSI.\n");
return 0;
}
default: /* reserved */