mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 03:08:19 +00:00
server: Fixed low-level hardware hooks.
The hook thread field has been reused for win events, so it no longer works for low-level hardward hooks. Use the owner field instead.
This commit is contained in:
parent
ac4de71f85
commit
6d85f3bf21
|
@ -199,6 +199,15 @@ inline static int run_hook_in_current_thread( struct hook *hook )
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* check if a given hook should run in the owner thread instead of the current thread */
|
||||
inline static int run_hook_in_owner_thread( struct hook *hook )
|
||||
{
|
||||
if ((hook->index == WH_MOUSE_LL - WH_MINHOOK ||
|
||||
hook->index == WH_KEYBOARD_LL - WH_MINHOOK))
|
||||
return hook->owner != current;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* find the first non-deleted hook in the chain */
|
||||
inline static struct hook *get_first_valid_hook( struct hook_table *table, int index,
|
||||
int event, user_handle_t win,
|
||||
|
@ -389,7 +398,11 @@ DECL_HANDLER(set_hook)
|
|||
if (req->id == WH_KEYBOARD_LL || req->id == WH_MOUSE_LL)
|
||||
{
|
||||
/* low-level hardware hooks are special: always global, but without a module */
|
||||
thread = (struct thread *)grab_object( current );
|
||||
if (thread)
|
||||
{
|
||||
set_error( STATUS_INVALID_PARAMETER );
|
||||
goto done;
|
||||
}
|
||||
module = NULL;
|
||||
global = 1;
|
||||
}
|
||||
|
@ -488,10 +501,10 @@ DECL_HANDLER(start_hook_chain)
|
|||
return; /* no hook set */
|
||||
}
|
||||
|
||||
if (hook->thread && hook->thread != current) /* must run in other thread */
|
||||
if (run_hook_in_owner_thread( hook ))
|
||||
{
|
||||
reply->pid = get_process_id( hook->thread->process );
|
||||
reply->tid = get_thread_id( hook->thread );
|
||||
reply->pid = get_process_id( hook->owner->process );
|
||||
reply->tid = get_thread_id( hook->owner );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -541,10 +554,10 @@ DECL_HANDLER(get_next_hook)
|
|||
reply->prev_unicode = hook->unicode;
|
||||
reply->next_unicode = next->unicode;
|
||||
if (next->module) set_reply_data( next->module, next->module_size );
|
||||
if (next->thread && next->thread != current)
|
||||
if (run_hook_in_owner_thread( next ))
|
||||
{
|
||||
reply->pid = get_process_id( next->thread->process );
|
||||
reply->tid = get_thread_id( next->thread );
|
||||
reply->pid = get_process_id( next->owner->process );
|
||||
reply->tid = get_thread_id( next->owner );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue