Rémi Bernon : server: Use the capture window as cursor window if it is set.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c3dcf1e2697b2cdf88dffdeb57feb0d5c7ff06cb
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c3dcf1e2697b2cdf88dffdeb57feb0d...

Author: Rémi Bernon 
Date:   Tue Jul 25 15:36:47 2023 +0200

server: Use the capture window as cursor window if it is set.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55306

---

server/queue.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/queue.c b/server/queue.c
index df5d96486fb..15a63f880f1 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -455,6 +455,7 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t
 static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win, int x, int y )
 {
     struct thread_input *input;
+    user_handle_t capture;
     int updated;

x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left );
@@ -464,7 +465,7 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win
     desktop->cursor.y = y;
     desktop->cursor.last_change = get_tick_count();

-    if (!win && (input = desktop->foreground_input)) win = input->capture;
+    if ((input = desktop->foreground_input) && (capture = input->capture)) win = capture;
     if (!win || !is_window_visible( win ) || is_window_transparent( win ))
         win = shallow_window_from_point( desktop, x, y );
     if (update_desktop_cursor_window( desktop, win )) updated = 1;