wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to allow NULL pointer as keystate argument in ToUnicodeEx.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-04-04 22:32:25 +02:00
parent 9f091b033c
commit 4ad22c8418
5 changed files with 111 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
patches/winex11-ToUnicodeEx/0001-winex11-Allow-NULL-pointer-as-keystate-in-X11DRV_ToU.patch Normal file
View File

@ -0,0 +1,88 @@
From e9507c2b46cd5ca8de228abffcbb3d1505a4d331 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 4 Apr 2015 22:29:58 +0200
Subject: winex11: Allow NULL pointer as keystate in X11DRV_ToUnicodeEx.
---
dlls/winex11.drv/keyboard.c | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 1323e19..5737f40 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -2463,7 +2463,7 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
if (!match_x11_keyboard_layout(hkl))
FIXME_(key)("keyboard layout %p is not supported\n", hkl);
- if ((lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80))
+ if (lpKeyState && (lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80))
{
TRACE_(key)("Ctrl+Alt+[key] won't generate a character\n");
return 0;
@@ -2486,25 +2486,28 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
EnterCriticalSection( &kbd_section );
- if (lpKeyState[VK_SHIFT] & 0x80)
+ if (lpKeyState)
{
- TRACE_(key)("ShiftMask = %04x\n", ShiftMask);
- e.state |= ShiftMask;
- }
- if (lpKeyState[VK_CAPITAL] & 0x01)
- {
- TRACE_(key)("LockMask = %04x\n", LockMask);
- e.state |= LockMask;
- }
- if (lpKeyState[VK_CONTROL] & 0x80)
- {
- TRACE_(key)("ControlMask = %04x\n", ControlMask);
- e.state |= ControlMask;
- }
- if (lpKeyState[VK_NUMLOCK] & 0x01)
- {
- TRACE_(key)("NumLockMask = %04x\n", NumLockMask);
- e.state |= NumLockMask;
+ if (lpKeyState[VK_SHIFT] & 0x80)
+ {
+ TRACE_(key)("ShiftMask = %04x\n", ShiftMask);
+ e.state |= ShiftMask;
+ }
+ if (lpKeyState[VK_CAPITAL] & 0x01)
+ {
+ TRACE_(key)("LockMask = %04x\n", LockMask);
+ e.state |= LockMask;
+ }
+ if (lpKeyState[VK_CONTROL] & 0x80)
+ {
+ TRACE_(key)("ControlMask = %04x\n", ControlMask);
+ e.state |= ControlMask;
+ }
+ if (lpKeyState[VK_NUMLOCK] & 0x01)
+ {
+ TRACE_(key)("NumLockMask = %04x\n", NumLockMask);
+ e.state |= NumLockMask;
+ }
}
/* Restore saved AltGr state */
@@ -2680,13 +2683,13 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
lpChar[0] = 0;
ret = 0;
}
- else if((lpKeyState[VK_SHIFT] & 0x80) /* Shift is pressed */
+ else if (lpKeyState && (lpKeyState[VK_SHIFT] & 0x80) /* Shift is pressed */
&& (keysym == XK_KP_Decimal))
{
lpChar[0] = 0;
ret = 0;
}
- else if((lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */
+ else if (lpKeyState && (lpKeyState[VK_CONTROL] & 0x80) /* Control is pressed */
&& (keysym == XK_Return || keysym == XK_KP_Enter))
{
lpChar[0] = '\n';
--
2.3.3

1
patches/winex11-ToUnicodeEx/definition Normal file
View File

@ -0,0 +1 @@
Fixes: [38353] Allow NULL pointer as keystate argument in ToUnicodeEx