Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
16a37e1e
Commit
16a37e1e
authored
May 07, 2005
by
Robert Lunnon
Committed by
Alexandre Julliard
May 07, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid passing NULL buffer elements and status pointers to
XmbLookupString.
parent
cd40a310
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
keyboard.c
dlls/x11drv/keyboard.c
+6
-3
No files found.
dlls/x11drv/keyboard.c
View file @
16a37e1e
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment