April 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Fix some more misspellings of "device".
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: dc67164d0d965f7259ab27ea2fe0b60c8e01a14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc67164d0d965f7259ab27ea2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 22:38:39 2010 +0200 wined3d: Fix some more misspellings of "device". --- dlls/wined3d/directx.c | 4 +- dlls/wined3d/stateblock.c | 66 ++++++++++++++++++++-------------------- dlls/wined3d/swapchain_base.c | 11 +++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 41 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc67164d0d965f7259ab2…

1 0

Henri Verbeet : wined3d: Move location loading and modification together in IWineD3DDeviceImpl_ClearSurface ().
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 4f004a5565b332a501e84f724d66bcb391cd1c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f004a5565b332a501e84f724… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 21 00:35:05 2010 +0200 wined3d: Move location loading and modification together in IWineD3DDeviceImpl_ClearSurface(). --- dlls/wined3d/device.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c840e2a..00d94fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4431,6 +4431,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) surface_load_ds_location(depth_stencil, context, location); + surface_modify_ds_location(depth_stencil, location); glDepthMask(GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); @@ -4441,6 +4442,8 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (Flags & WINED3DCLEAR_TARGET) { + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, TRUE); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); @@ -4507,16 +4510,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac } } - if (Flags & WINED3DCLEAR_TARGET) - { - IWineD3DSurface_ModifyLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, TRUE); - } - if (Flags & WINED3DCLEAR_ZBUFFER) { - /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */ - DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - surface_modify_ds_location(depth_stencil, location); - } - LEAVE_GL(); if (wined3d_settings.strict_draw_ordering || ((target->Flags & SFLAG_SWAPCHAIN)

1 0

Alexandre Julliard : user32: Add driver entry points for cursor creation and destruction, and pass the cursor handle to SetCursor.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: d676bf246da0c15d46d685598191b1146b764460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d676bf246da0c15d46d685598… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 14:10:46 2010 +0200 user32: Add driver entry points for cursor creation and destruction, and pass the cursor handle to SetCursor. --- dlls/user32/cursoricon.c | 12 +++++++++--- dlls/user32/driver.c | 34 +++++++++++++++++++++++++++++----- dlls/user32/user_private.h | 6 ++++-- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 7 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index fcdb278..60e59c1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -955,6 +955,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, GetBitmapBits( hAndBits, sizeAnd, info + 1 ); GetBitmapBits( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd ); release_icon_ptr( hObj, info ); + USER_Driver->pCreateCursorIcon( hObj, info ); } DeleteObject( hAndBits ); @@ -1566,6 +1567,7 @@ HICON WINAPI CopyIcon( HICON hIcon ) memcpy( ptrNew, ptrOld, size ); release_icon_ptr( hIcon, ptrOld ); release_icon_ptr( hNew, ptrNew ); + USER_Driver->pCreateCursorIcon( hNew, ptrNew ); return hNew; } @@ -1578,7 +1580,10 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) TRACE_(icon)("%p\n", hIcon ); if (CURSORICON_DelSharedIcon( hIcon ) == -1) + { + USER_Driver->pDestroyCursorIcon( hIcon ); free_icon_handle( hIcon ); + } return TRUE; } @@ -1789,7 +1794,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu CURSORICONINFO *info = get_icon_ptr( hCursor ); /* release before calling driver (FIXME) */ if (info) release_icon_ptr( hCursor, info ); - USER_Driver->pSetCursor( info ); + USER_Driver->pSetCursor( hCursor, info ); } return hOldCursor; } @@ -1822,9 +1827,9 @@ INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) CURSORICONINFO *info = get_icon_ptr( cursor ); /* release before calling driver (FIXME) */ if (info) release_icon_ptr( cursor, info ); - USER_Driver->pSetCursor( info ); + USER_Driver->pSetCursor( cursor, info ); } - else USER_Driver->pSetCursor( NULL ); + else USER_Driver->pSetCursor( 0, NULL ); } return prev_count + increment; } @@ -2195,6 +2200,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) } } release_icon_ptr( hObj, info ); + USER_Driver->pCreateCursorIcon( hObj, info ); } return hObj; } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 608c598..ffbfbf8 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -84,6 +84,8 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ToUnicodeEx); GET_USER_FUNC(UnloadKeyboardLayout); GET_USER_FUNC(VkKeyScanEx); + GET_USER_FUNC(CreateCursorIcon); + GET_USER_FUNC(DestroyCursorIcon); GET_USER_FUNC(SetCursor); GET_USER_FUNC(GetCursorPos); GET_USER_FUNC(SetCursorPos); @@ -215,7 +217,15 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -1; } -static void CDECL nulldrv_SetCursor( struct tagCURSORICONINFO *info ) +static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor, struct tagCURSORICONINFO *info ) +{ +} + +static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor ) +{ +} + +static void CDECL nulldrv_SetCursor( HCURSOR cursor, struct tagCURSORICONINFO *info ) { } @@ -442,7 +452,9 @@ static USER_DRIVER null_driver = nulldrv_ToUnicodeEx, nulldrv_UnloadKeyboardLayout, nulldrv_VkKeyScanEx, - /* mouse functions */ + /* cursor/icon functions */ + nulldrv_CreateCursorIcon, + nulldrv_DestroyCursorIcon, nulldrv_SetCursor, nulldrv_GetCursorPos, nulldrv_SetCursorPos, @@ -558,9 +570,19 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_SetCursor( struct tagCURSORICONINFO *info ) +static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor, struct tagCURSORICONINFO *info ) +{ + load_driver()->pCreateCursorIcon( cursor, info ); +} + +static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) +{ + load_driver()->pDestroyCursorIcon( cursor ); +} + +static void CDECL loaderdrv_SetCursor( HCURSOR cursor, struct tagCURSORICONINFO *info ) { - load_driver()->pSetCursor( info ); + load_driver()->pSetCursor( cursor, info ); } static BOOL CDECL loaderdrv_GetCursorPos( LPPOINT pt ) @@ -783,7 +805,9 @@ static USER_DRIVER lazy_load_driver = loaderdrv_ToUnicodeEx, loaderdrv_UnloadKeyboardLayout, loaderdrv_VkKeyScanEx, - /* mouse functions */ + /* cursor/icon functions */ + loaderdrv_CreateCursorIcon, + loaderdrv_DestroyCursorIcon, loaderdrv_SetCursor, loaderdrv_GetCursorPos, loaderdrv_SetCursorPos, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index eb6bdc9..953812b 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -67,8 +67,10 @@ typedef struct tagUSER_DRIVER { INT (CDECL *pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL); BOOL (CDECL *pUnloadKeyboardLayout)(HKL); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); - /* mouse functions */ - void (CDECL *pSetCursor)(struct tagCURSORICONINFO *); + /* cursor/icon functions */ + void (CDECL *pCreateCursorIcon)(HCURSOR,struct tagCURSORICONINFO *); + void (CDECL *pDestroyCursorIcon)(HCURSOR); + void (CDECL *pSetCursor)(HCURSOR,struct tagCURSORICONINFO *); 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 211edfb..6b22877 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -949,7 +949,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) /*********************************************************************** * SetCursor (X11DRV.@) */ -void CDECL X11DRV_SetCursor( CURSORICONINFO *lpCursor ) +void CDECL X11DRV_SetCursor( HCURSOR handle, CURSORICONINFO *lpCursor ) { struct x11drv_thread_data *data = x11drv_init_thread_data(); Cursor cursor; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index edb9a33..4f3dfe6 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -73,7 +73,7 @@ @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx @ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx -@ cdecl SetCursor(ptr) X11DRV_SetCursor +@ cdecl SetCursor(long ptr) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a062e92..12ec286 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -784,7 +784,7 @@ extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern Cursor X11DRV_GetCursor( Display *display, struct tagCURSORICONINFO *ptr ); -extern void CDECL X11DRV_SetCursor( struct tagCURSORICONINFO *lpCursor ); +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 7b4fb58..240e4d9 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -664,7 +664,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) TlsSetValue( thread_data_tls_index, data ); if (use_xim) X11DRV_SetupXIM(); - X11DRV_SetCursor( NULL ); + X11DRV_SetCursor( 0, NULL ); return data; }

1 0

Alexandre Julliard : winex11: Implement the entry points for creating and destroying cursors.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 9485f0b75680fc53a7218077cef417fad8a3aea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9485f0b75680fc53a7218077c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 19:25:14 2010 +0200 winex11: Implement the entry points for creating and destroying cursors. --- dlls/winex11.drv/mouse.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 2 + 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6b22877..e8f96c4 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -88,6 +88,7 @@ static const UINT button_up_flags[NB_BUTTONS] = POINT cursor_pos; static DWORD last_time_modified; static RECT cursor_clip; /* Cursor clipping rect */ +static XContext cursor_context; BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ); @@ -166,6 +167,17 @@ static inline void update_button_state( unsigned int state ) /* X-buttons are not reported from XQueryPointer */ } +/*********************************************************************** + * get_x11_cursor + */ +static Cursor get_x11_cursor( HCURSOR handle ) +{ + Cursor cursor; + + if (cursor_context && !XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) + return cursor; + return 0; +} /*********************************************************************** * update_mouse_state @@ -945,6 +957,45 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) return cursor; } +/*********************************************************************** + * CreateCursorIcon (X11DRV.@) + */ +void CDECL X11DRV_CreateCursorIcon( HCURSOR handle, CURSORICONINFO *info ) +{ + static const WORD ICON_HOTSPOT = 0x4242; + Cursor cursor; + + /* ignore icons (FIXME: shouldn't use magic hotspot value) */ + if (info->ptHotSpot.x == ICON_HOTSPOT && info->ptHotSpot.y == ICON_HOTSPOT) return; + + wine_tsx11_lock(); + cursor = create_cursor( gdi_display, info ); + if (cursor) + { + if (!cursor_context) cursor_context = XUniqueContext(); + XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); + TRACE( "cursor %p %ux%u, planes %u, bpp %u -> xid %lx\n", + handle, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, cursor ); + } + wine_tsx11_unlock(); +} + +/*********************************************************************** + * DestroyCursorIcon (X11DRV.@) + */ +void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) +{ + Cursor cursor; + + wine_tsx11_lock(); + if ((cursor = get_x11_cursor( handle ))) + { + TRACE( "%p xid %lx\n", handle, cursor ); + XFreeCursor( gdi_display, cursor ); + XDeleteContext( gdi_display, (XID)handle, cursor_context ); + } + wine_tsx11_unlock(); +} /*********************************************************************** * SetCursor (X11DRV.@) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 4f3dfe6..0a69581 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -73,6 +73,8 @@ @ cdecl ToUnicodeEx(long long ptr ptr long long long) X11DRV_ToUnicodeEx @ cdecl UnloadKeyboardLayout(long) X11DRV_UnloadKeyboardLayout @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx +@ cdecl CreateCursorIcon(long ptr) X11DRV_CreateCursorIcon +@ cdecl DestroyCursorIcon(long) X11DRV_DestroyCursorIcon @ cdecl SetCursor(long ptr) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos

1 0

Alexandre Julliard : winex11: Move creation of an empty cursor to a separate helper function.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 776527f38f2ff89f354e49aa8df795440677376a URL: http://source.winehq.org/git/wine.git/?a=commit;h=776527f38f2ff89f354e49aa8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 21:23:00 2010 +0200 winex11: Move creation of an empty cursor to a separate helper function. --- dlls/winex11.drv/mouse.c | 55 ++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e8f96c4..c140ca3 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -168,12 +168,38 @@ static inline void update_button_state( unsigned int state ) } /*********************************************************************** + * get_empty_cursor + */ +static Cursor get_empty_cursor(void) +{ + static Cursor cursor; + static const char data[] = { 0 }; + + if (!cursor) + { + XColor bg; + Pixmap pixmap; + + bg.red = bg.green = bg.blue = 0x0000; + pixmap = XCreateBitmapFromData( gdi_display, root_window, data, 1, 1 ); + if (pixmap) + { + cursor = XCreatePixmapCursor( gdi_display, pixmap, pixmap, &bg, &bg, 0, 0 ); + XFreePixmap( gdi_display, pixmap ); + } + } + return cursor; +} + +/*********************************************************************** * get_x11_cursor */ static Cursor get_x11_cursor( HCURSOR handle ) { Cursor cursor; + if (!handle) return get_empty_cursor(); + if (cursor_context && !XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor )) return cursor; return 0; @@ -596,18 +622,6 @@ static Cursor create_xcursor_cursor( Display *display, CURSORICONINFO *ptr ) Cursor cursor; XcursorImage *image; - if (!ptr) /* Create an empty cursor */ - { - image = pXcursorImageCreate( 1, 1 ); - image->xhot = 0; - image->yhot = 0; - *(image->pixels) = 0; - cursor = pXcursorImageLoadCursor( display, image ); - pXcursorImageDestroy( image ); - - return cursor; - } - image = create_cursor_image( ptr ); if (!image) return 0; @@ -646,24 +660,13 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) char *bitMask32 = NULL; BOOL alpha_zero = TRUE; + if (!ptr) return get_empty_cursor(); + #ifdef SONAME_LIBXCURSOR if (pXcursorImageLoadCursor) return create_xcursor_cursor( display, ptr ); #endif - if (!ptr) /* Create an empty cursor */ - { - static const char data[] = { 0 }; - - bg.red = bg.green = bg.blue = 0x0000; - pixmapBits = XCreateBitmapFromData( display, root_window, data, 1, 1 ); - if (pixmapBits) - { - cursor = XCreatePixmapCursor( display, pixmapBits, pixmapBits, - &bg, &bg, 0, 0 ); - XFreePixmap( display, pixmapBits ); - } - } - else /* Create the X cursor from the bits */ + /* Create the X cursor from the bits */ { XImage *image; GC gc;

1 0

Alexandre Julliard : server: Fix structure padding for requests that have a reply.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 3044d734b1cd84746cc57ace8b79a156ea9391b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3044d734b1cd84746cc57ace8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 21:25:38 2010 +0200 server: Fix structure padding for requests that have a reply. --- include/wine/server_protocol.h | 65 +++++++++++++++- server/request.h | 174 ++++++++++++++++++++++++++++++++++++++++ tools/make_requests | 22 ++++-- 3 files changed, 254 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3044d734b1cd84746cc57…

1 0

Alexandre Julliard : server: Return the current cursor when queuing a hardware message.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: cd28e2be7c79644e02babb509247a453e0153390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd28e2be7c79644e02babb509… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 20:51:45 2010 +0200 server: Return the current cursor when queuing a hardware message. --- include/wine/server_protocol.h | 4 +++- server/protocol.def | 3 +++ server/queue.c | 28 ++++++++++++++++------------ server/request.h | 3 +++ server/trace.c | 8 +++++++- 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 83c55db..24790a5 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2751,6 +2751,8 @@ struct send_hardware_message_request struct send_hardware_message_reply { struct reply_header __header; + user_handle_t cursor; + int count; }; @@ -5481,6 +5483,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 399 +#define SERVER_PROTOCOL_VERSION 400 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4aaff10..5015e97 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1992,6 +1992,9 @@ enum message_type int x; /* x position */ int y; /* y position */ unsigned int time; /* message time */ +(a)REPLY + user_handle_t cursor; /* current cursor for the target thread input */ + int count; /* current cursor count */ @END diff --git a/server/queue.c b/server/queue.c index c49c3e1..4a06a73 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1262,12 +1262,11 @@ static user_handle_t find_hardware_message_window( struct thread_input *input, s } /* queue a hardware message into a given thread input */ -static void queue_hardware_message( struct msg_queue *queue, struct message *msg, +static void queue_hardware_message( struct thread_input *input, struct message *msg, struct hardware_msg_data *data ) { user_handle_t win; struct thread *thread; - struct thread_input *input = queue ? queue->input : foreground_input; unsigned int msg_code; last_input_time = get_tick_count(); @@ -1704,20 +1703,20 @@ DECL_HANDLER(send_message) DECL_HANDLER(send_hardware_message) { struct message *msg; - struct msg_queue *recv_queue = NULL; struct thread *thread = NULL; struct hardware_msg_data *data; + struct thread_input *input = foreground_input; if (req->id) { if (!(thread = get_thread_from_id( req->id ))) return; - } - - if (thread && !(recv_queue = thread->queue)) - { - set_error( STATUS_INVALID_PARAMETER ); - release_object( thread ); - return; + if (!thread->queue) + { + set_error( STATUS_INVALID_PARAMETER ); + release_object( thread ); + return; + } + input = thread->queue->input; } if (!(data = mem_alloc( sizeof(*data) ))) @@ -1741,11 +1740,16 @@ DECL_HANDLER(send_hardware_message) msg->result = NULL; msg->data = data; msg->data_size = sizeof(*data); - queue_hardware_message( recv_queue, msg, data ); + queue_hardware_message( input, msg, data ); } else free( data ); - if (thread) release_object( thread ); + if (thread) + { + reply->cursor = input->cursor; + reply->count = input->cursor_count; + release_object( thread ); + } } /* post a quit message to the current queue */ diff --git a/server/request.h b/server/request.h index eb710b9..604d115 100644 --- a/server/request.h +++ b/server/request.h @@ -1381,6 +1381,9 @@ C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, x) == 48 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, y) == 52 ); C_ASSERT( FIELD_OFFSET(struct send_hardware_message_request, time) == 56 ); C_ASSERT( sizeof(struct send_hardware_message_request) == 64 ); +C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, cursor) == 8 ); +C_ASSERT( FIELD_OFFSET(struct send_hardware_message_reply, count) == 12 ); +C_ASSERT( sizeof(struct send_hardware_message_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_message_request, flags) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_message_request, get_win) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_message_request, get_first) == 20 ); diff --git a/server/trace.c b/server/trace.c index 7958781..c97bd70 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2427,6 +2427,12 @@ static void dump_send_hardware_message_request( const struct send_hardware_messa fprintf( stderr, ", time=%08x", req->time ); } +static void dump_send_hardware_message_reply( const struct send_hardware_message_reply *req ) +{ + fprintf( stderr, " cursor=%08x", req->cursor ); + fprintf( stderr, ", count=%d", req->count ); +} + static void dump_get_message_request( const struct get_message_request *req ) { fprintf( stderr, " flags=%08x", req->flags ); @@ -4190,7 +4196,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_process_idle_event_reply, NULL, NULL, - NULL, + (dump_func)dump_send_hardware_message_reply, (dump_func)dump_get_message_reply, NULL, NULL,

1 0

Alexandre Julliard : winex11: Update the cursor from the thread input status instead of caching it per-thread in x11drv .
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: eed9c63ac7650293523da5c8d067c74258568ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed9c63ac7650293523da5c8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 20:52:17 2010 +0200 winex11: Update the cursor from the thread input status instead of caching it per-thread in x11drv. --- dlls/winex11.drv/mouse.c | 51 ++++++++++++++++++---------------------- dlls/winex11.drv/window.c | 16 ++++-------- dlls/winex11.drv/x11drv.h | 5 ++- dlls/winex11.drv/x11drv_main.c | 5 +++- 4 files changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index c140ca3..152763b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -194,7 +194,7 @@ static Cursor get_empty_cursor(void) /*********************************************************************** * get_x11_cursor */ -static Cursor get_x11_cursor( HCURSOR handle ) +Cursor get_x11_cursor( HCURSOR handle ) { Cursor cursor; @@ -216,15 +216,7 @@ static void update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned get_coords( hwnd, window, x, y, pt ); - /* update the cursor */ - - if (data->cursor_window != window) - { - data->cursor_window = window; - wine_tsx11_lock(); - if (data->cursor) XDefineCursor( data->display, window, data->cursor ); - wine_tsx11_unlock(); - } + data->cursor_window = hwnd; /* update the wine server Z-order */ @@ -279,6 +271,7 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, DWORD data, DWORD time, DWORD extra_info, UINT injected_flags ) { MSLLHOOKSTRUCT hook; + HCURSOR cursor; hook.pt.x = x; hook.pt.y = y; @@ -302,9 +295,20 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, req->time = time; req->info = extra_info; wine_server_call( req ); + cursor = (reply->count >= 0) ? wine_server_ptr_handle(reply->cursor) : 0; } SERVER_END_REQ; + if (hwnd) + { + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + if (data && cursor != data->cursor) + { + Cursor xcursor = get_x11_cursor( cursor ); + if (xcursor) XDefineCursor( gdi_display, data->whole_window, xcursor ); + data->cursor = cursor; + } + } } @@ -1005,29 +1009,20 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) */ void CDECL X11DRV_SetCursor( HCURSOR handle, CURSORICONINFO *lpCursor ) { - struct x11drv_thread_data *data = x11drv_init_thread_data(); + struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); + struct x11drv_win_data *data; Cursor cursor; - if (lpCursor) - TRACE("%ux%u, planes %u, bpp %u\n", - lpCursor->nWidth, lpCursor->nHeight, lpCursor->bPlanes, lpCursor->bBitsPerPixel); - else - TRACE("NULL\n"); - - /* set the same cursor for all top-level windows of the current thread */ + if (!(data = X11DRV_get_win_data( thread_data->cursor_window ))) return; wine_tsx11_lock(); - cursor = create_cursor( data->display, lpCursor ); - if (cursor) + if ((cursor = get_x11_cursor( handle ))) { - if (data->cursor) XFreeCursor( data->display, data->cursor ); - data->cursor = cursor; - if (data->cursor_window) - { - XDefineCursor( data->display, data->cursor_window, cursor ); - /* Make the change take effect immediately */ - XFlush( data->display ); - } + TRACE( "%p xid %lx\n", handle, cursor ); + XDefineCursor( gdi_display, data->whole_window, cursor ); + /* Make the change take effect immediately */ + XFlush( gdi_display ); + data->cursor = handle; } wine_tsx11_unlock(); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1621861..bf71cad 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -328,7 +328,6 @@ static int get_window_attributes( Display *display, struct x11drv_win_data *data attr->override_redirect = !data->managed; attr->colormap = X11DRV_PALETTE_PaletteXColormap; attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); - attr->cursor = x11drv_thread_data()->cursor; attr->bit_gravity = NorthWestGravity; attr->win_gravity = StaticGravity; attr->backing_store = NotUseful; @@ -338,7 +337,7 @@ static int get_window_attributes( Display *display, struct x11drv_win_data *data KeymapStateMask | StructureNotifyMask); if (data->managed) attr->event_mask |= PropertyChangeMask; - return (CWOverrideRedirect | CWSaveUnder | CWColormap | CWCursor | + return (CWOverrideRedirect | CWSaveUnder | CWColormap | CWEventMask | CWBitGravity | CWBackingStore); } @@ -388,8 +387,6 @@ static Window create_client_window( Display *display, struct x11drv_win_data *da if (data->client_window) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (thread_data->cursor_window == data->client_window) thread_data->cursor_window = None; XDeleteContext( display, data->client_window, winContext ); XDestroyWindow( display, data->client_window ); } @@ -800,8 +797,6 @@ static Window create_icon_window( Display *display, struct x11drv_win_data *data static void destroy_icon_window( Display *display, struct x11drv_win_data *data ) { if (!data->icon_window) return; - if (x11drv_thread_data()->cursor_window == data->icon_window) - x11drv_thread_data()->cursor_window = None; wine_tsx11_lock(); XDeleteContext( display, data->icon_window, winContext ); XDestroyWindow( display, data->icon_window ); @@ -1057,6 +1052,7 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; char *process_name = get_process_name(); + Cursor cursor; wine_tsx11_lock(); @@ -1089,6 +1085,9 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); + if ((cursor = get_x11_cursor( data->cursor ))) + XDefineCursor( gdi_display, data->whole_window, cursor ); + data->wm_hints = XAllocWMHints(); wine_tsx11_unlock(); @@ -1694,14 +1693,9 @@ done: */ static void destroy_whole_window( Display *display, struct x11drv_win_data *data, BOOL already_destroyed ) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (!data->whole_window) return; TRACE( "win %p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); - if (thread_data->cursor_window == data->whole_window || - thread_data->cursor_window == data->client_window) - thread_data->cursor_window = None; wine_tsx11_lock(); XDeleteContext( display, data->whole_window, winContext ); XDeleteContext( display, data->client_window, winContext ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 12ec286..cffb4ee 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -548,8 +548,7 @@ struct x11drv_thread_data { Display *display; XEvent *current_event; /* event currently being processed */ - Cursor cursor; /* current cursor */ - Window cursor_window; /* current window that contains the cursor */ + HWND cursor_window; /* current window that contains the cursor */ Window grab_window; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ @@ -747,6 +746,7 @@ struct x11drv_win_data RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ XIC xic; /* X input context */ + HCURSOR cursor; /* current cursor */ XWMHints *wm_hints; /* window manager hints */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ @@ -783,6 +783,7 @@ extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow); 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 ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 240e4d9..fbe6184 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -197,7 +197,10 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) /* ignore a number of errors on gdi display caused by creating/destroying windows */ if (display == gdi_display) { - if (event->error_code == BadDrawable || event->error_code == BadGC) return TRUE; + if (event->error_code == BadDrawable || + event->error_code == BadGC || + event->error_code == BadWindow) + return TRUE; #ifdef HAVE_X11_EXTENSIONS_XRENDER_H if (xrender_error_base) /* check for XRender errors */ {

1 0

Alexandre Julliard : user32: Remove the CURSORICON parameter in the SetCursor entry point.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 8ec6359bbbd969960cae828d665459aa3a8add39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec6359bbbd969960cae828d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 21:14:31 2010 +0200 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 60e59c1..52e49bc 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 ffbfbf8..dc17264 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 953812b..43daafd 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 152763b..b776383 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 cffb4ee..4a3f8b7 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 fbe6184..3a1fa3f 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; }

1 0

Alexandre Julliard : user32: Only call the driver when the cursor has actually changed.
by Alexandre Julliard 21 Apr '10

21 Apr '10

Module: wine Branch: master Commit: 33e6f7dca355d98620fa3460d8739bbbc339eab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e6f7dca355d98620fa3460d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 20 21:15:04 2010 +0200 user32: Only call the driver when the cursor has actually changed. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 52e49bc..0fc55ad 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1789,7 +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) USER_Driver->pSetCursor( hCursor ); + if (show_count >= 0 && hOldCursor != hCursor) USER_Driver->pSetCursor( hCursor ); return hOldCursor; }

1 0