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
8723d345
Commit
8723d345
authored
Jul 08, 2015
by
Sebastian Lackner
Committed by
Alexandre Julliard
Jul 10, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Add fallback to desktop keystate in get_key_state wineserver call.
parent
6019da23
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
input.c
dlls/user32/tests/input.c
+0
-1
queue.c
server/queue.c
+13
-0
No files found.
dlls/user32/tests/input.c
View file @
8723d345
...
...
@@ -2437,7 +2437,6 @@ static DWORD WINAPI get_key_state_thread(void *arg)
ok
(
result
==
WAIT_OBJECT_0
,
"WaitForSingleObject returned %u
\n
"
,
result
);
result
=
GetKeyState
(
'X'
);
todo_wine
ok
((
result
&
0x8000
)
||
broken
(
!
(
result
&
0x8000
)),
/* > Win 2003 */
"expected that highest bit is set, got %x
\n
"
,
result
);
...
...
server/queue.c
View file @
8723d345
...
...
@@ -2851,13 +2851,26 @@ DECL_HANDLER(get_key_state)
}
else
{
unsigned
char
*
keystate
;
if
(
!
(
thread
=
get_thread_from_id
(
req
->
tid
)))
return
;
if
(
thread
->
queue
)
{
if
(
req
->
key
>=
0
)
reply
->
state
=
thread
->
queue
->
input
->
keystate
[
req
->
key
&
0xff
];
set_reply_data
(
thread
->
queue
->
input
->
keystate
,
size
);
release_object
(
thread
);
return
;
}
release_object
(
thread
);
/* fallback to desktop keystate */
if
(
!
(
desktop
=
get_thread_desktop
(
current
,
0
)))
return
;
if
(
req
->
key
>=
0
)
reply
->
state
=
desktop
->
keystate
[
req
->
key
&
0xff
]
&
~
0x40
;
if
((
keystate
=
set_reply_data_size
(
size
)))
{
unsigned
int
i
;
for
(
i
=
0
;
i
<
size
;
i
++
)
keystate
[
i
]
=
desktop
->
keystate
[
i
]
&
~
0x40
;
}
release_object
(
desktop
);
}
}
...
...
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