From: "Anna (navi) Figueiredo Gomes" <navi@vlhl.dev> Seems like pointerId 1 is always the mouse, regardless of EnableMouseInPointer. --- dlls/win32u/pointer.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/pointer.c b/dlls/win32u/pointer.c index 02a2a992df1..c6e4e71c23a 100644 --- a/dlls/win32u/pointer.c +++ b/dlls/win32u/pointer.c @@ -43,35 +43,47 @@ struct pointer_thread_data { struct list known_pointers; }; +static struct pointer *allocate_pointerid(UINT32 id); + static struct pointer_thread_data *get_pointer_thread_data(void) { struct user_thread_info *thread_info = get_user_thread_info(); if (!thread_info->pointer_data && (thread_info->pointer_data = calloc( 1, sizeof(*thread_info->pointer_data) ))) + { list_init( &thread_info->pointer_data->known_pointers ); + allocate_pointerid( 1 ); + } return thread_info->pointer_data; }; -static struct pointer *find_pointerid(UINT32 id) { +static struct pointer *allocate_pointerid(UINT32 id) +{ struct pointer_thread_data *thread_data = get_pointer_thread_data(); struct pointer *pointer; - TRACE( "looking for pointer id %d\n", id ); - - LIST_FOR_EACH_ENTRY(pointer, &thread_data->known_pointers, struct pointer, entry) - if (pointer->id == id) - return pointer; - TRACE( "allocating pointer id %d\n", id ); if (!thread_data || !(pointer = calloc( 1, sizeof(*pointer) ))) return NULL; - pointer->id = id; list_add_tail(&thread_data->known_pointers, &pointer->entry); return pointer; } +static struct pointer *find_pointerid(UINT32 id) { + struct pointer_thread_data *thread_data = get_pointer_thread_data(); + struct pointer *pointer; + + TRACE( "looking for pointer id %d\n", id ); + + LIST_FOR_EACH_ENTRY(pointer, &thread_data->known_pointers, struct pointer, entry) + if (pointer->id == id) + return pointer; + + return allocate_pointerid(id); +} + static POINT pixel_to_himetric(POINT px) { UINT dpi = HIMETRIC / get_system_dpi(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10649