Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
9bd1dbd0
Commit
9bd1dbd0
authored
Oct 14, 2003
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Oct 14, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some cases when 'keysym' might be left uninitialized.
parent
5202364a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
keyboard.c
dlls/x11drv/keyboard.c
+6
-6
No files found.
dlls/x11drv/keyboard.c
View file @
9bd1dbd0
...
...
@@ -850,7 +850,7 @@ static const WORD nonchar_key_scan[256] =
/* x11 lock must be held */
static
WORD
EVENT_event_to_vkey
(
XIC
xic
,
XKeyEvent
*
e
)
{
KeySym
keysym
;
KeySym
keysym
=
0
;
if
(
xic
)
XmbLookupString
(
xic
,
e
,
NULL
,
0
,
&
keysym
,
NULL
);
...
...
@@ -995,7 +995,7 @@ void X11DRV_KeymapNotify( HWND hwnd, XKeymapEvent *event )
void
X11DRV_KeyEvent
(
HWND
hwnd
,
XKeyEvent
*
event
)
{
char
Str
[
24
];
KeySym
keysym
;
KeySym
keysym
=
0
;
WORD
vkey
=
0
,
bScan
;
DWORD
dwFlags
;
int
ascii_chars
;
...
...
@@ -1010,9 +1010,8 @@ void X11DRV_KeyEvent( HWND hwnd, XKeyEvent *event )
wine_tsx11_unlock
();
/* Ignore some unwanted events */
if
(
ascii_chars
&&
((
keysym
>=
XK_ISO_Lock
&&
keysym
<=
XK_ISO_Last_Group_Lock
)
||
keysym
==
XK_Mode_switch
))
if
((
keysym
>=
XK_ISO_Lock
&&
keysym
<=
XK_ISO_Last_Group_Lock
)
||
keysym
==
XK_Mode_switch
)
{
TRACE
(
"Ignoring %s keyboard event
\n
"
,
TSXKeysymToString
(
keysym
));
return
;
...
...
@@ -1271,6 +1270,7 @@ void X11DRV_InitKeyboard( BYTE *key_state_table )
OEMvkey
=
VK_OEM_7
;
/* next is available. */
for
(
keyc
=
min_keycode
;
keyc
<=
max_keycode
;
keyc
++
)
{
keysym
=
0
;
e2
.
keycode
=
(
KeyCode
)
keyc
;
XLookupString
(
&
e2
,
NULL
,
0
,
&
keysym
,
NULL
);
vkey
=
0
;
scan
=
0
;
...
...
@@ -1771,7 +1771,7 @@ INT X11DRV_ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState,
{
Display
*
display
=
thread_display
();
XKeyEvent
e
;
KeySym
keysym
;
KeySym
keysym
=
0
;
INT
ret
;
int
keyc
;
char
lpChar
[
10
];
...
...
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