Rémi Bernon : server: Send WM_WINE_SETCURSOR with the thread input cursor handle.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2581e0b3eab4638b8aa00be9e66543b7e39f3dc6
URL:    https://gitlab.winehq.org/wine/wine/-/commit/2581e0b3eab4638b8aa00be9e66543b...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue Oct 10 18:11:43 2023 +0200

server: Send WM_WINE_SETCURSOR with the thread input cursor handle.

Which may be different from the last desktop cursor handle.

This makes the behavior better match the old winex11 behavior, which queried
the current thread input cursor handle on every mouse move to sync it with X11,
although it contradicts MSDN documentation which states that the cursor handle
is global.

This fixes the X11 cursor being visible in "Deus Ex: GOTY Edition".

---

 server/queue.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server/queue.c b/server/queue.c
index fcc946ff0cb..0558bd111f9 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -436,6 +436,15 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t
     desktop->cursor.win = win;
     if (updated)
     {
+        struct thread *thread;
+
+        if ((thread = get_window_thread( win )))
+        {
+            struct thread_input *input = thread->queue->input;
+            if (input) handle = input->cursor_count < 0 ? 0 : input->cursor;
+            release_object( thread );
+        }
+
         /* when clipping send the message to the foreground window as well, as some driver have an artificial overlay window */
         if (is_cursor_clipped( desktop )) queue_cursor_message( desktop, 0, WM_WINE_SETCURSOR, win, handle );
         queue_cursor_message( desktop, win, WM_WINE_SETCURSOR, win, handle );