From 8ec6359bbbd969960cae828d665459aa3a8add39 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 20 Apr 2010 21:14:31 +0200
Subject: [PATCH] user32: Remove the CURSORICON parameter in the SetCursor
 entry point.

---
 dlls/user32/cursoricon.c       | 21 +++------------------
 dlls/user32/driver.c           |  6 +++---
 dlls/user32/user_private.h     |  2 +-
 dlls/winex11.drv/mouse.c       |  2 +-
 dlls/winex11.drv/x11drv.h      |  4 ----
 dlls/winex11.drv/x11drv_main.c |  1 -
 6 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 60e59c1519..52e49bcabe 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -1789,13 +1789,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu
     if (!ret) return 0;
 
     /* Change the cursor shape only if it is visible */
-    if (show_count >= 0)
-    {
-        CURSORICONINFO *info = get_icon_ptr( hCursor );
-        /* release before calling driver (FIXME) */
-        if (info) release_icon_ptr( hCursor, info );
-        USER_Driver->pSetCursor( hCursor, info );
-    }
+    if (show_count >= 0) USER_Driver->pSetCursor( hCursor );
     return hOldCursor;
 }
 
@@ -1820,17 +1814,8 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow )
 
     TRACE("%d, count=%d\n", bShow, prev_count + increment );
 
-    if (!prev_count)
-    {
-        if (bShow)
-        {
-            CURSORICONINFO *info = get_icon_ptr( cursor );
-            /* release before calling driver (FIXME) */
-            if (info) release_icon_ptr( cursor, info );
-            USER_Driver->pSetCursor( cursor, info );
-        }
-        else USER_Driver->pSetCursor( 0, NULL );
-    }
+    if (!prev_count) USER_Driver->pSetCursor( bShow ? cursor : 0 );
+
     return prev_count + increment;
 }
 
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index ffbfbf82f4..dc17264999 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -225,7 +225,7 @@ static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor )
 {
 }
 
-static void CDECL nulldrv_SetCursor( HCURSOR cursor, struct tagCURSORICONINFO *info )
+static void CDECL nulldrv_SetCursor( HCURSOR cursor )
 {
 }
 
@@ -580,9 +580,9 @@ static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor )
     load_driver()->pDestroyCursorIcon( cursor );
 }
 
-static void CDECL loaderdrv_SetCursor( HCURSOR cursor, struct tagCURSORICONINFO *info )
+static void CDECL loaderdrv_SetCursor( HCURSOR cursor )
 {
-    load_driver()->pSetCursor( cursor, info );
+    load_driver()->pSetCursor( cursor );
 }
 
 static BOOL CDECL loaderdrv_GetCursorPos( LPPOINT pt )
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index 953812bab9..43daafd5c1 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -70,7 +70,7 @@ typedef struct tagUSER_DRIVER {
     /* cursor/icon functions */
     void   (CDECL *pCreateCursorIcon)(HCURSOR,struct tagCURSORICONINFO *);
     void   (CDECL *pDestroyCursorIcon)(HCURSOR);
-    void   (CDECL *pSetCursor)(HCURSOR,struct tagCURSORICONINFO *);
+    void   (CDECL *pSetCursor)(HCURSOR);
     BOOL   (CDECL *pGetCursorPos)(LPPOINT);
     BOOL   (CDECL *pSetCursorPos)(INT,INT);
     BOOL   (CDECL *pClipCursor)(LPCRECT);
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index 152763bca0..b776383355 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -1007,7 +1007,7 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle )
 /***********************************************************************
  *		SetCursor (X11DRV.@)
  */
-void CDECL X11DRV_SetCursor( HCURSOR handle, CURSORICONINFO *lpCursor )
+void CDECL X11DRV_SetCursor( HCURSOR handle )
 {
     struct x11drv_thread_data *thread_data = x11drv_init_thread_data();
     struct x11drv_win_data *data;
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index cffb4ee462..4a3f8b7cd4 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -66,8 +66,6 @@ typedef int Status;
 
 #define WINE_XDND_VERSION 4
 
-struct tagCURSORICONINFO;
-
 extern void CDECL wine_tsx11_lock(void);
 extern void CDECL wine_tsx11_unlock(void);
 
@@ -784,8 +782,6 @@ extern void X11DRV_Clipboard_Cleanup(void);
 extern void X11DRV_ResetSelectionOwner(void);
 extern void CDECL X11DRV_SetFocus( HWND hwnd );
 extern Cursor get_x11_cursor( HCURSOR handle );
-extern Cursor X11DRV_GetCursor( Display *display, struct tagCURSORICONINFO *ptr );
-extern void CDECL X11DRV_SetCursor( HCURSOR cursor, struct tagCURSORICONINFO *lpCursor );
 extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip );
 extern void X11DRV_InitKeyboard( Display *display );
 extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time,
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index fbe6184960..3a1fa3fac7 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -667,7 +667,6 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
     TlsSetValue( thread_data_tls_index, data );
 
     if (use_xim) X11DRV_SetupXIM();
-    X11DRV_SetCursor( 0, NULL );
 
     return data;
 }