reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 14:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user32: Remove the CURSORICON parameter in the SetCursor entry point.

Browse Source
This commit is contained in:
Alexandre Julliard 2010-04-20 21:14:31 +02:00
parent eed9c63ac7
commit 8ec6359bbb
6 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/user32/cursoricon.c
View File

@ -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;
}

6
dlls/user32/driver.c
View File

@ -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 )

2
dlls/user32/user_private.h
View File

@ -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);

2
dlls/winex11.drv/mouse.c
View File

@ -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;

4
dlls/winex11.drv/x11drv.h
View File

@ -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,

1
dlls/winex11.drv/x11drv_main.c
View File

@ -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;
}