Rémi Bernon : win32u: Notify drivers of cursor changes on WM_WINE_SETCURSOR.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4b968267c1169c5437e9fc5d8ec5d4fd24491436
URL:    https://gitlab.winehq.org/wine/wine/-/commit/4b968267c1169c5437e9fc5d8ec5d4f...

Author: Rémi Bernon 
Date:   Thu Jan 26 11:52:44 2023 +0100

win32u: Notify drivers of cursor changes on WM_WINE_SETCURSOR.

---

dlls/win32u/cursoricon.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c
index 23bb4354c2a..51226ed81a5 100644
--- a/dlls/win32u/cursoricon.c
+++ b/dlls/win32u/cursoricon.c
@@ -77,6 +77,7 @@ static struct cursoricon_object *get_icon_ptr( HICON handle )
 BOOL process_wine_setcursor( HWND hwnd, HWND window, HCURSOR handle )
 {
     TRACE( "hwnd %p, window %p, hcursor %p\n", hwnd, window, handle );
+    user_driver->pSetCursor( window, handle );
     return TRUE;
 }

@@ -85,7 +86,6 @@ BOOL process_wine_setcursor( HWND hwnd, HWND window, HCURSOR handle )
  */
 INT WINAPI NtUserShowCursor( BOOL show )
 {
-    HCURSOR cursor;
     int increment = show ? 1 : -1;
     int count;

@@ -94,16 +94,11 @@ INT WINAPI NtUserShowCursor( BOOL show )
         req->flags = SET_CURSOR_COUNT;
         req->show_count = increment;
         wine_server_call( req );
-        cursor = wine_server_ptr_handle( reply->prev_handle );
         count = reply->prev_count + increment;
     }
     SERVER_END_REQ;

TRACE("%d, count=%d\n", show, count );
-
-    if (show && !count) user_driver->pSetCursor( 0, cursor );
-    else if (!show && count == -1) user_driver->pSetCursor( 0, 0 );
-
     return count;
 }

@@ -114,7 +109,6 @@ HCURSOR WINAPI NtUserSetCursor( HCURSOR cursor )
 {
     struct cursoricon_object *obj;
     HCURSOR old_cursor;
-    int show_count;
     BOOL ret;

TRACE( "%p\n", cursor );
@@ -124,16 +118,11 @@ HCURSOR WINAPI NtUserSetCursor( HCURSOR cursor )
         req->flags = SET_CURSOR_HANDLE;
         req->handle = wine_server_user_handle( cursor );
         if ((ret = !wine_server_call_err( req )))
-        {
             old_cursor = wine_server_ptr_handle( reply->prev_handle );
-            show_count = reply->prev_count;
-        }
     }
     SERVER_END_REQ;
     if (!ret) return 0;

-    user_driver->pSetCursor( 0, show_count >= 0 ? cursor : 0 );
-
     if (!(obj = get_icon_ptr( old_cursor ))) return 0;
     release_user_handle_ptr( obj );
     return old_cursor;