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

Avoid passing NULL buffer elements and status pointers to 

XmbLookupString.
This commit is contained in:
Robert Lunnon 2005-05-07 12:18:24 +00:00 committed by Alexandre Julliard
parent cd40a31073
commit 16a37e1eaf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/x11drv/keyboard.c
View File

@ -1061,11 +1061,13 @@ static const WORD nonchar_key_scan[256] =
static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e)
{
KeySym keysym = 0;
Status status;
char buf[24];
if (xic)
XmbLookupString(xic, e, NULL, 0, &keysym, NULL);
XmbLookupString(xic, e, buf, sizeof(buf), &keysym, &status);
else
XLookupString(e, NULL, 0, &keysym, NULL);
XLookupString(e, buf, sizeof(buf), &keysym, NULL);
if ((keysym >= 0xFFAE) && (keysym <= 0xFFB9) && (keysym != 0xFFAF)
&& (e->state & NumLockMask))
@ -2280,6 +2282,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
char lpChar[10];
HWND focus;
XIC xic;
Status status;
if (scanCode & 0x8000)
{
@ -2366,7 +2369,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
e.type, e.window, e.state, e.keycode);
if (xic)
ret = XmbLookupString(xic, &e, lpChar, sizeof(lpChar), &keysym, NULL);
ret = XmbLookupString(xic, &e, lpChar, sizeof(lpChar), &keysym, &status);
else
ret = XLookupString(&e, lpChar, sizeof(lpChar), &keysym, NULL);
wine_tsx11_unlock();