April 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Add a more general way of posting messages to the desktop window.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 85358b10f35e829ba42da8f46a40a8fd7eee6f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=85358b10f35e829ba42da8f46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 20:25:45 2011 +0200 server: Add a more general way of posting messages to the desktop window. --- server/user.h | 3 ++- server/window.c | 7 ++++--- server/winstation.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/user.h b/server/user.h index cc603cf..2a3f369 100644 --- a/server/user.h +++ b/server/user.h @@ -143,7 +143,8 @@ extern int rect_in_region( struct region *region, const rectangle_t *rect ); extern struct process *get_top_window_owner( struct desktop *desktop ); extern void get_top_window_rectangle( struct desktop *desktop, rectangle_t *rect ); -extern void close_desktop_window( struct desktop *desktop ); +extern void post_desktop_message( struct desktop *desktop, unsigned int message, + lparam_t wparam, lparam_t lparam ); extern void destroy_window( struct window *win ); extern void destroy_thread_windows( struct thread *thread ); extern int is_child_window( user_handle_t parent, user_handle_t child ); diff --git a/server/window.c b/server/window.c index 0fbce24..3465eba 100644 --- a/server/window.c +++ b/server/window.c @@ -402,11 +402,12 @@ void get_top_window_rectangle( struct desktop *desktop, rectangle_t *rect ) else *rect = win->window_rect; } -/* attempt to close the desktop window when the last process using it is gone */ -void close_desktop_window( struct desktop *desktop ) +/* post a message to the desktop window */ +void post_desktop_message( struct desktop *desktop, unsigned int message, + lparam_t wparam, lparam_t lparam ) { struct window *win = desktop->top_window; - if (win && win->thread) post_message( win->handle, WM_CLOSE, 0, 0 ); + if (win && win->thread) post_message( win->handle, message, wparam, lparam ); } /* create a new window structure (note: the window is not linked in the window tree) */ diff --git a/server/winstation.c b/server/winstation.c index 7b01919..20656aa 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -376,7 +376,7 @@ static void close_desktop_timeout( void *private ) desktop->close_timeout = NULL; unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ - close_desktop_window( desktop ); /* and signal the owner to quit */ + post_desktop_message( desktop, WM_CLOSE, 0, 0 ); /* and signal the owner to quit */ } /* close the desktop of a given process */

1 0

Alexandre Julliard : winex11: Add an option to disable pointer grabs.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 4d358bfee3ac087405a7609ecde0fd6e2d0c9353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d358bfee3ac087405a7609ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 11:00:09 2011 +0200 winex11: Add an option to disable pointer grabs. --- dlls/winex11.drv/mouse.c | 29 ++++++++++++++++------------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 ++++ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2b793e1..fe9f716 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -938,22 +938,25 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; /* don't clip in the desktop process */ - TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); - wine_tsx11_lock(); - XUnmapWindow( display, clip_window ); - XMoveResizeWindow( display, clip_window, - clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, - clip->right - clip->left, clip->bottom - clip->top ); - XMapWindow( display, clip_window ); - if (!XGrabPointer( display, clip_window, False, - PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + if (grab_pointer) { + TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); + wine_tsx11_lock(); + XUnmapWindow( display, clip_window ); + XMoveResizeWindow( display, clip_window, + clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, + clip->right - clip->left, clip->bottom - clip->top ); + XMapWindow( display, clip_window ); + if (!XGrabPointer( display, clip_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + { + wine_tsx11_unlock(); + clip_rect = *clip; + return TRUE; + } wine_tsx11_unlock(); - clip_rect = *clip; - return TRUE; } - wine_tsx11_unlock(); } /* release the grab if any */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a746d08..0a1e3d9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -598,6 +598,7 @@ extern int use_take_focus; extern int use_primary_selection; extern int use_system_cursors; extern int show_systray; +extern int grab_pointer; extern int usexcomposite; extern int managed_mode; extern int decorated_mode; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 606bc28..cc38be2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -84,6 +84,7 @@ int use_take_focus = 1; int use_primary_selection = 0; int use_system_cursors = 1; int show_systray = 1; +int grab_pointer = 1; int managed_mode = 1; int decorated_mode = 1; int private_color_map = 0; @@ -426,6 +427,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "ShowSystray", buffer, sizeof(buffer) )) show_systray = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "GrabPointer", buffer, sizeof(buffer) )) + grab_pointer = IS_OPTION_TRUE( buffer[0] ); + screen_depth = 0; if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) )) screen_depth = atoi(buffer);

1 0

Alexandre Julliard : winex11: Implement cursor clipping using a pointer grab.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: ae2b356361be4d9d25d82bc62d0fbb130aea4f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2b356361be4d9d25d82bc62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 11:50:45 2011 +0200 winex11: Implement cursor clipping using a pointer grab. --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/mouse.c | 56 +++++++++++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 34 +++++++++++++++++++-- dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/x11drv.h | 1 + 5 files changed, 87 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 4a36e46..eefc74c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -258,6 +258,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); + X11DRV_ClipCursor( NULL ); SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1a2d618..2b793e1 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -95,6 +95,7 @@ static const UINT button_up_flags[NB_BUTTONS] = static HWND cursor_window; static DWORD last_time_modified; static XContext cursor_context; +static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -216,11 +217,18 @@ void sync_window_cursor( struct x11drv_win_data *data ) static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y, unsigned int state, DWORD mouse_data, Time time ) { - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + struct x11drv_win_data *data; POINT pt; INPUT input; - if (!data) return; + if (!hwnd && window == clip_window) + { + pt.x = x + clip_rect.left; + pt.y = y + clip_rect.top; + goto done; + } + + if (!(data = X11DRV_get_win_data( hwnd ))) return; if (window == data->whole_window) { @@ -270,6 +278,7 @@ static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y SERVER_END_REQ; } +done: input.type = INPUT_MOUSE; input.u.mi.dx = pt.x; input.u.mi.dy = pt.y; @@ -911,6 +920,49 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) return ret; } +/*********************************************************************** + * ClipCursor (X11DRV.@) + */ +BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) +{ + Display *display = thread_init_display(); + + if (!clip_window) return TRUE; + + /* we are clipping if the clip rectangle is smaller than the screen */ + if (clip && (clip->left > virtual_screen_rect.left || + clip->right < virtual_screen_rect.right || + clip->top > virtual_screen_rect.top || + clip->bottom < virtual_screen_rect.bottom)) + { + if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) + return TRUE; /* don't clip in the desktop process */ + + TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); + wine_tsx11_lock(); + XUnmapWindow( display, clip_window ); + XMoveResizeWindow( display, clip_window, + clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, + clip->right - clip->left, clip->bottom - clip->top ); + XMapWindow( display, clip_window ); + if (!XGrabPointer( display, clip_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + { + wine_tsx11_unlock(); + clip_rect = *clip; + return TRUE; + } + wine_tsx11_unlock(); + } + + /* release the grab if any */ + TRACE( "no longer clipping\n" ); + wine_tsx11_lock(); + XUnmapWindow( display, clip_window ); + wine_tsx11_unlock(); + return TRUE; +} /*********************************************************************** * X11DRV_ButtonPress diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e2ffccc..1fcadb5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -68,6 +68,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) +/* cursor clipping window */ +Window clip_window = 0; + /* X context to associate a hwnd to an X window */ XContext winContext = 0; @@ -82,6 +85,7 @@ static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char client_window_prop[]= "__wine_x11_client_window"; static const char icon_window_prop[] = "__wine_x11_icon_window"; +static const char clip_window_prop[] = "__wine_x11_clip_window"; static const char fbconfig_id_prop[] = "__wine_x11_fbconfig_id"; static const char gl_drawable_prop[] = "__wine_x11_gl_drawable"; static const char pixmap_prop[] = "__wine_x11_pixmap"; @@ -1962,13 +1966,35 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) */ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) { - if (hwnd == GetDesktopWindow() && root_window != DefaultRootWindow( gdi_display )) + Display *display = thread_init_display(); + + if (hwnd == GetDesktopWindow()) { - Display *display = thread_init_display(); + XSetWindowAttributes attr; + + if (root_window != DefaultRootWindow( gdi_display )) + { + /* the desktop win data can't be created lazily */ + if (!create_desktop_win_data( display, hwnd )) return FALSE; + } - /* the desktop win data can't be created lazily */ - if (!create_desktop_win_data( display, hwnd )) return FALSE; + /* create the cursor clipping window */ + attr.override_redirect = TRUE; + attr.event_mask = StructureNotifyMask; + wine_tsx11_lock(); + clip_window = XCreateWindow( display, root_window, 0, 0, 1, 1, 0, 0, + InputOnly, visual, CWOverrideRedirect | CWEventMask, &attr ); + wine_tsx11_unlock(); + SetPropA( hwnd, clip_window_prop, (HANDLE)clip_window ); } + else if (!clip_window) + { + clip_window = (Window)GetPropA( GetDesktopWindow(), clip_window_prop ); + wine_tsx11_lock(); + XSelectInput( display, clip_window, StructureNotifyMask ); + wine_tsx11_unlock(); + } + return TRUE; } diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 85177c5..f5c45d1 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -77,6 +77,7 @@ @ cdecl SetCursor(long) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos +@ cdecl ClipCursor(ptr) X11DRV_ClipCursor @ cdecl GetScreenSaveActive() X11DRV_GetScreenSaveActive @ cdecl SetScreenSaveActive(long) X11DRV_SetScreenSaveActive @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e51a614..a746d08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -585,6 +585,7 @@ static inline size_t get_property_size( int format, unsigned long count ) extern Visual *visual; extern Window root_window; +extern Window clip_window; extern unsigned int screen_width; extern unsigned int screen_height; extern unsigned int screen_bpp;

1 0

Alexandre Julliard : server: Post a message to the desktop window when the cursor clip rectangle changes .
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 21e86f60ec44bbb61c87b97abb6fa7a9843e42b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e86f60ec44bbb61c87b97ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 20:27:29 2011 +0200 server: Post a message to the desktop window when the cursor clip rectangle changes. --- dlls/user32/cursoricon.c | 3 ++- dlls/user32/message.c | 6 ++++++ dlls/user32/user_private.h | 1 + dlls/winex11.drv/xinerama.c | 1 - include/wine/server_protocol.h | 4 +++- programs/explorer/desktop.c | 1 + server/protocol.def | 1 + server/queue.c | 25 ++++++++++++++++++++----- server/request.h | 3 ++- server/trace.c | 1 + server/user.h | 1 + 11 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7a9c78a..476aa51 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1717,7 +1717,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) SERVER_START_REQ( set_cursor ) { - req->flags = SET_CURSOR_CLIP; + req->flags = SET_CURSOR_CLIP; + req->clip_msg = WM_WINE_CLIPCURSOR; if (rect) { req->clip.left = rect->left; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 59f2e49..51691ab 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1869,6 +1869,12 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam ); } + case WM_WINE_CLIPCURSOR: + { + RECT rect; + GetClipCursor( &rect ); + return USER_Driver->pClipCursor( &rect ); + } default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 6d668ba..bd7d39e 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -47,6 +47,7 @@ enum wine_internal_message WM_WINE_SETACTIVEWINDOW, WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, + WM_WINE_CLIPCURSOR, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 2a66df5..b2014ed 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -197,7 +197,6 @@ void xinerama_init( unsigned int width, unsigned int height ) wine_dbgstr_rect(&rect), screen_width, screen_height ); wine_tsx11_unlock(); - ClipCursor( NULL ); /* reset the cursor clip rectangle */ } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 70e539b..d321a80 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4798,6 +4798,8 @@ struct set_cursor_request int x; int y; rectangle_t clip; + unsigned int clip_msg; + char __pad_52[4]; }; struct set_cursor_reply { @@ -5561,6 +5563,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 418 +#define SERVER_PROTOCOL_VERSION 419 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 78ff389..b2f7730 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -334,6 +334,7 @@ void manage_desktop( WCHAR *arg ) if (name) set_desktop_window_title( hwnd, name ); SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); SetDeskWallPaper( (LPSTR)-1 ); + ClipCursor( NULL ); initialize_display_settings( hwnd ); initialize_appbar(); initialize_systray( using_root ); diff --git a/server/protocol.def b/server/protocol.def index f8fc82b..8aaf2d3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3318,6 +3318,7 @@ enum coords_relative int x; /* cursor position */ int y; rectangle_t clip; /* cursor clip rectangle */ + unsigned int clip_msg; /* message to post on cursor clip changes */ @REPLY user_handle_t prev_handle; /* previous handle */ int prev_count; /* previous show count */ diff --git a/server/queue.c b/server/queue.c index 35448e5..14086eb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -318,11 +318,23 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ return 1; } +/* set the cursor clip rectangle */ +static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect ) +{ + rectangle_t top_rect, new_rect; + + get_top_window_rectangle( desktop, &top_rect ); + if (!rect || !intersect_rect( &new_rect, &top_rect, rect )) new_rect = top_rect; + if (!memcmp( &desktop->cursor.clip, &new_rect, sizeof(new_rect) )) return; + desktop->cursor.clip = new_rect; + if (desktop->cursor.clip_msg) post_desktop_message( desktop, desktop->cursor.clip_msg, 0, 0 ); +} + /* change the foreground input and reset the cursor clip rect */ static void set_foreground_input( struct desktop *desktop, struct thread_input *input ) { if (desktop->foreground_input == input) return; - get_top_window_rectangle( desktop, &desktop->cursor.clip ); + set_clip_rectangle( desktop, NULL ); desktop->foreground_input = input; } @@ -2620,10 +2632,13 @@ DECL_HANDLER(set_cursor) } if (req->flags & SET_CURSOR_CLIP) { - rectangle_t top_rect; - get_top_window_rectangle( input->desktop, &top_rect ); - if (!intersect_rect( &input->desktop->cursor.clip, &top_rect, &req->clip )) - input->desktop->cursor.clip = top_rect; + struct desktop *desktop = input->desktop; + + /* only the desktop owner can set the message */ + if (req->clip_msg && get_top_window_owner(desktop) == current->process) + desktop->cursor.clip_msg = req->clip_msg; + + set_clip_rectangle( desktop, &req->clip ); } reply->new_x = input->desktop->cursor.x; diff --git a/server/request.h b/server/request.h index c2104e9..0133af7 100644 --- a/server/request.h +++ b/server/request.h @@ -2097,7 +2097,8 @@ C_ASSERT( FIELD_OFFSET(struct set_cursor_request, show_count) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_request, x) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_request, y) == 28 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_request, clip) == 32 ); -C_ASSERT( sizeof(struct set_cursor_request) == 48 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_request, clip_msg) == 48 ); +C_ASSERT( sizeof(struct set_cursor_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_handle) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_count) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_x) == 16 ); diff --git a/server/trace.c b/server/trace.c index 553ba4d..06fe545 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3896,6 +3896,7 @@ static void dump_set_cursor_request( const struct set_cursor_request *req ) fprintf( stderr, ", x=%d", req->x ); fprintf( stderr, ", y=%d", req->y ); dump_rectangle( ", clip=", &req->clip ); + fprintf( stderr, ", clip_msg=%08x", req->clip_msg ); } static void dump_set_cursor_reply( const struct set_cursor_reply *req ) diff --git a/server/user.h b/server/user.h index 2a3f369..9b86031 100644 --- a/server/user.h +++ b/server/user.h @@ -56,6 +56,7 @@ struct global_cursor int x; /* cursor position */ int y; rectangle_t clip; /* cursor clip rectangle */ + unsigned int clip_msg; /* message to post for cursor clip changes */ unsigned int last_change; /* time of last position change */ };

1 0

Alexandre Julliard : winex11: Update the cursor on the clipping window while it's mapped.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: ecf217bbe4617cec454e055fa6b163bc9cc64563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf217bbe4617cec454e055fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 15:20:14 2011 +0200 winex11: Update the cursor on the clipping window while it's mapped. --- dlls/winex11.drv/event.c | 17 ++++++++++++++++- dlls/winex11.drv/mouse.c | 10 +++++++--- dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6e4225c..ba5cdff 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -91,6 +91,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); static void X11DRV_Expose( HWND hwnd, XEvent *event ); static void X11DRV_MapNotify( HWND hwnd, XEvent *event ); +static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ); static void X11DRV_ReparentNotify( HWND hwnd, XEvent *event ); static void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); @@ -124,7 +125,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* VisibilityNotify */ /* CreateNotify */ { DestroyNotify, X11DRV_DestroyNotify }, - /* UnmapNotify */ + { UnmapNotify, X11DRV_UnmapNotify }, { MapNotify, X11DRV_MapNotify }, /* MapRequest */ { ReparentNotify, X11DRV_ReparentNotify }, @@ -801,6 +802,11 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; + if (event->xany.window == clip_window) + { + clipping_cursor = 1; + return; + } if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->mapped || data->embedded) return; @@ -812,6 +818,15 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) } +/********************************************************************** + * X11DRV_UnmapNotify + */ +static void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) +{ + if (event->xany.window == clip_window) clipping_cursor = 0; +} + + /*********************************************************************** * is_net_wm_state_maximized */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 63773ce..e7e8d62 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -884,7 +884,8 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) GetTickCount() - last_cursor_change > 100) { last_cursor_change = GetTickCount(); - if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (clipping_cursor) set_window_cursor( clip_window, handle ); + else if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } } @@ -958,12 +959,14 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (!XGrabPointer( display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + clipping_cursor = 1; + wine_tsx11_unlock(); + + if (clipping_cursor) { - wine_tsx11_unlock(); clip_rect = *clip; return TRUE; } - wine_tsx11_unlock(); } } @@ -972,6 +975,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) wine_tsx11_lock(); XUnmapWindow( display, clip_window ); wine_tsx11_unlock(); + clipping_cursor = 0; return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 21c8352..e35547a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -70,6 +70,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /* cursor clipping window */ Window clip_window = 0; +int clipping_cursor = 0; /* X context to associate a hwnd to an X window */ XContext winContext = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 26375fd..986d03a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -586,6 +586,7 @@ static inline size_t get_property_size( int format, unsigned long count ) extern Visual *visual; extern Window root_window; extern Window clip_window; +extern int clipping_cursor; extern unsigned int screen_width; extern unsigned int screen_height; extern unsigned int screen_bpp;

1 0

Alexandre Julliard : server: Don' t run low-level hooks in debugged processes.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 437a838470af2f1ba57c7cce16618d0bfc9fdf19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437a838470af2f1ba57c7cce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 11:12:57 2011 +0200 server: Don't run low-level hooks in debugged processes. --- server/hook.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/server/hook.c b/server/hook.c index c9df5d3..180ddf1 100644 --- a/server/hook.c +++ b/server/hook.c @@ -191,19 +191,6 @@ static inline struct hook *get_first_hook( struct hook_table *table, int index ) return elem ? HOOK_ENTRY( elem ) : NULL; } -/* check if a given hook should run in the current thread */ -static inline int run_hook_in_current_thread( struct hook *hook ) -{ - if ((!hook->process || hook->process == current->process) && - (!(hook->flags & WINEVENT_SKIPOWNPROCESS) || hook->process != current->process)) - { - if ((!hook->thread || hook->thread == current) && - (!(hook->flags & WINEVENT_SKIPOWNTHREAD) || hook->thread != current)) - return 1; - } - return 0; -} - /* check if a given hook should run in the owner thread instead of the current thread */ static inline int run_hook_in_owner_thread( struct hook *hook ) { @@ -213,6 +200,18 @@ static inline int run_hook_in_owner_thread( struct hook *hook ) return 0; } +/* check if a given hook should run in the current thread */ +static inline int run_hook_in_current_thread( struct hook *hook ) +{ + if (hook->process && hook->process != current->process) return 0; + if ((hook->flags & WINEVENT_SKIPOWNPROCESS) && hook->process == current->process) return 0; + if (hook->thread && hook->thread != current) return 0; + if ((hook->flags & WINEVENT_SKIPOWNTHREAD) && hook->thread == current) return 0; + /* don't run low-level hooks in debugged processes */ + if (run_hook_in_owner_thread( hook ) && hook->owner->process->debugger) return 0; + return 1; +} + /* find the first non-deleted hook in the chain */ static inline struct hook *get_first_valid_hook( struct hook_table *table, int index, int event, user_handle_t win,

1 0

Dmitry Timoshkov : user32: Add a test for WM_QUIT handling by DefDlgProc.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 1a65e209f8c638fde7d7b3b8928fdc365a7379f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a65e209f8c638fde7d7b3b89… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 4 20:40:42 2011 +0900 user32: Add a test for WM_QUIT handling by DefDlgProc. --- dlls/user32/tests/msg.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 712f564..65e417a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10026,6 +10026,50 @@ done: flush_events(); } +static INT_PTR CALLBACK wm_quit_dlg_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + struct recvd_message msg; + + if (ignore_message( message )) return 0; + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wp; + msg.lParam = lp; + msg.descr = "dialog"; + add_message(&msg); + + switch (message) + { + case WM_INITDIALOG: + PostMessage(hwnd, WM_QUIT, 0x1234, 0x5678); + PostMessage(hwnd, WM_USER, 0xdead, 0xbeef); + return 0; + + case WM_GETDLGCODE: + return 0; + + case WM_USER: + EndDialog(hwnd, 0); + break; + } + + return 1; +} + +static const struct message WmQuitDialogSeq[] = { + { HCBT_CREATEWND, hook }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { HCBT_DESTROYWND, hook }, + { 0x0090, sent|optional }, /* Vista */ + { WM_DESTROY, sent }, + { WM_NCDESTROY, sent }, + { 0 } +}; + static void test_quit_message(void) { MSG msg; @@ -10076,6 +10120,22 @@ static void test_quit_message(void) ret = GetMessage(&msg, NULL, 0, 0); ok(ret > 0, "GetMessage failed with error %d\n", GetLastError()); ok(msg.message == WM_USER, "Received message 0x%04x instead of WM_USER\n", msg.message); + + flush_events(); + flush_sequence(); + ret = DialogBoxParam(GetModuleHandle(0), "TEST_EMPTY_DIALOG", 0, wm_quit_dlg_proc, 0); +todo_wine + ok(ret == 1, "expected 1, got %d\n", ret); + ok_sequence(WmQuitDialogSeq, "WmQuitDialogSeq", TRUE); + memset(&msg, 0xab, sizeof(msg)); + ret = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE); +todo_wine + ok(ret, "PeekMessage failed\n"); +if (ret) { + ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message); + ok(msg.wParam == 0x1234, "wParam was 0x%lx instead of 0x1234\n", msg.wParam); + ok(msg.lParam == 0, "lParam was 0x%lx instead of 0\n", msg.lParam); +} } static const struct message WmMouseHoverSeq[] = {

1 0

Henri Verbeet : wined3d: Correctly check if the destination format is FBO attachable in fbo_blit_supported ().
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: b372faec3c2d91325e41969cb4252d84792422a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b372faec3c2d91325e41969cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:46:05 2011 +0200 wined3d: Correctly check if the destination format is FBO attachable in fbo_blit_supported(). Like ca381b610c50e3a44713f536ced61e30e0e4f152, this was introduced by f1ca14cb5ba259b8eab9bccbb9a4813027c3beb8. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bbbdd49..88210bb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4983,7 +4983,7 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ return FALSE; if (!((src_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (src_usage & WINED3DUSAGE_RENDERTARGET)) - && ((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + || !((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if (!(src_format->id == dst_format->id

1 0

Vincent Povirk : gdiplus: Respect the CmapLookup flag in GDI32_GdipDrawDriverString.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 64841aac838a9327af134aa613943ae930b652c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64841aac838a9327af134aa61… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 4 17:48:31 2011 -0500 gdiplus: Respect the CmapLookup flag in GDI32_GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5ba3a4f..336929f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5620,10 +5620,11 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix ) { - static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance); + static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance|DriverStringOptionsCmapLookup); INT save_state; GpPointF pt; HFONT hfont; + UINT eto_flags=0; if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); @@ -5631,6 +5632,9 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 if (matrix) FIXME("Ignoring matrix\n"); + if (!(flags & DriverStringOptionsCmapLookup)) + eto_flags |= ETO_GLYPH_INDEX; + save_state = SaveDC(graphics->hdc); SetBkMode(graphics->hdc, TRANSPARENT); SetTextColor(graphics->hdc, brush->lb.lbColor); @@ -5643,7 +5647,7 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); - ExtTextOutW(graphics->hdc, roundr(pt.X), roundr(pt.Y), ETO_GLYPH_INDEX, NULL, text, length, NULL); + ExtTextOutW(graphics->hdc, roundr(pt.X), roundr(pt.Y), eto_flags, NULL, text, length, NULL); RestoreDC(graphics->hdc, save_state);

1 0

Akihiro Sagawa : libwine: MB_ERR_INVALID_CHARS makes an error when the undefined byte character is used .
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 16d57370090a63560e01e64699517ae27ce94c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d57370090a63560e01e6469… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 4 19:01:01 2011 +0900 libwine: MB_ERR_INVALID_CHARS makes an error when the undefined byte character is used. --- dlls/kernel32/tests/codepage.c | 1 - libs/wine/mbtowc.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 96dd45d..13f9b75 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -385,7 +385,6 @@ static void test_undefined_byte_char(void) ret = MultiByteToWideChar(testset[i].codepage, MB_ERR_INVALID_CHARS, testset[i].str, -1, NULL, 0); if (testset[i].is_error) { - todo_wine ok(ret == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "ret is %d, GetLastError is %u (cp %d)\n", ret, GetLastError(), testset[i].codepage); diff --git a/libs/wine/mbtowc.c b/libs/wine/mbtowc.c index 8b06a89..1995b31 100644 --- a/libs/wine/mbtowc.c +++ b/libs/wine/mbtowc.c @@ -39,6 +39,13 @@ static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen ) return res; } +/* check the code whether it is in Unicode Private Use Area (PUA). */ +/* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ +static inline int is_private_use_area_char(WCHAR code) +{ + return (code >= 0xe000 && code <= 0xf8ff); +} + /* check src string for invalid chars; return non-zero if invalid char found */ static inline int check_invalid_chars_sbcs( const struct sbcs_table *table, int flags, const unsigned char *src, unsigned int srclen ) @@ -49,7 +56,8 @@ static inline int check_invalid_chars_sbcs( const struct sbcs_table *table, int + (def_unicode_char & 0xff)]; while (srclen) { - if (cp2uni[*src] == def_unicode_char && *src != def_char) break; + if ((cp2uni[*src] == def_unicode_char && *src != def_char) || + is_private_use_area_char(cp2uni[*src])) break; src++; srclen--; } @@ -167,7 +175,8 @@ static inline int check_invalid_chars_dbcs( const struct dbcs_table *table, src++; srclen--; } - else if (cp2uni[*src] == def_unicode_char && *src != def_char) break; + else if ((cp2uni[*src] == def_unicode_char && *src != def_char) || + is_private_use_area_char(cp2uni[*src])) break; src++; srclen--; }

1 0