André Hentschel : winex11: Fix Ctrl+Tab translation.
Alexandre Julliard
julliard at winehq.org
Thu May 28 09:39:44 CDT 2009
Module: wine
Branch: master
Commit: cc688148acef8d636bdaaa4e6ede264657364c36
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc688148acef8d636bdaaa4e6ede264657364c36
Author: André Hentschel <nerv at dawncrow.de>
Date: Wed May 27 19:55:23 2009 +0200
winex11: Fix Ctrl+Tab translation.
---
dlls/user32/tests/input.c | 2 +-
dlls/winex11.drv/keyboard.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 2ad3eae..00d344b 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -1276,7 +1276,7 @@ static void test_ToUnicode(void)
state[VK_LCONTROL] |= HIGHEST_BIT;
ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0);
- todo_wine ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret);
+ ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret);
ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0);
ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)\n", ret);
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 80f8445..ad41c84 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -2679,7 +2679,8 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
if (e.state & ControlMask)
{
if (((keysym>=33) && (keysym < 'A')) ||
- ((keysym > 'Z') && (keysym < 'a')))
+ ((keysym > 'Z') && (keysym < 'a')) ||
+ (keysym == XK_Tab))
{
lpChar[0] = 0;
ret = 0;
More information about the wine-cvs
mailing list