June 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Also return the top-level message window in the get_desktop_window request .
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 6b36e2131df032809b1ecb6b90162d11edd43684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b36e2131df032809b1ecb6b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 14:26:14 2008 +0200 server: Also return the top-level message window in the get_desktop_window request. --- dlls/user32/win.c | 12 +++++++++- include/wine/server_protocol.h | 5 ++- server/protocol.def | 3 +- server/trace.c | 3 +- server/window.c | 43 +++++++++++++++++++++++++++------------ 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5252cea..a924fe3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1636,7 +1636,11 @@ HWND WINAPI GetDesktopWindow(void) SERVER_START_REQ( get_desktop_window ) { req->force = 0; - if (!wine_server_call( req )) thread_info->top_window = reply->handle; + if (!wine_server_call( req )) + { + thread_info->top_window = reply->top_window; + thread_info->msg_window = reply->msg_window; + } } SERVER_END_REQ; @@ -1675,7 +1679,11 @@ HWND WINAPI GetDesktopWindow(void) SERVER_START_REQ( get_desktop_window ) { req->force = 1; - if (!wine_server_call( req )) thread_info->top_window = reply->handle; + if (!wine_server_call( req )) + { + thread_info->top_window = reply->top_window; + thread_info->msg_window = reply->msg_window; + } } SERVER_END_REQ; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 810464c..5f5565a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2796,7 +2796,8 @@ struct get_desktop_window_request struct get_desktop_window_reply { struct reply_header __header; - user_handle_t handle; + user_handle_t top_window; + user_handle_t msg_window; }; @@ -4996,6 +4997,6 @@ union generic_reply struct add_fd_completion_reply add_fd_completion_reply; }; -#define SERVER_PROTOCOL_VERSION 339 +#define SERVER_PROTOCOL_VERSION 340 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 01d94d2..034bb1a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2061,7 +2061,8 @@ enum message_type @REQ(get_desktop_window) int force; /* force creation if it doesn't exist */ @REPLY - user_handle_t handle; /* handle to the desktop window */ + user_handle_t top_window; /* handle to the desktop window */ + user_handle_t msg_window; /* handle to the top-level HWND_MESSAGE parent */ @END diff --git a/server/trace.c b/server/trace.c index bbae524..777255c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2575,7 +2575,8 @@ static void dump_get_desktop_window_request( const struct get_desktop_window_req static void dump_get_desktop_window_reply( const struct get_desktop_window_reply *req ) { - fprintf( stderr, " handle=%p", req->handle ); + fprintf( stderr, " top_window=%p,", req->top_window ); + fprintf( stderr, " msg_window=%p", req->msg_window ); } static void dump_set_window_owner_request( const struct set_window_owner_request *req ) diff --git a/server/window.c b/server/window.c index cae5603..53ea59f 100644 --- a/server/window.c +++ b/server/window.c @@ -549,21 +549,13 @@ void destroy_thread_windows( struct thread *thread ) } /* get the desktop window */ -static struct window *get_desktop_window( struct thread *thread, int create ) +static struct window *get_desktop_window( struct thread *thread ) { struct window *top_window; struct desktop *desktop = get_thread_desktop( thread, 0 ); if (!desktop) return NULL; - - if (!(top_window = desktop->top_window) && create) - { - if ((top_window = create_window( NULL, NULL, DESKTOP_ATOM, 0 ))) - { - detach_window_thread( top_window ); - top_window->style = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; - } - } + top_window = desktop->top_window; release_object( desktop ); return top_window; } @@ -786,7 +778,7 @@ static struct window *find_child_to_repaint( struct window *parent, struct threa /* find a window that needs to receive a WM_PAINT; also clear its internal paint flag */ user_handle_t find_window_to_repaint( user_handle_t parent, struct thread *thread ) { - struct window *ptr, *win, *top_window = get_desktop_window( thread, 0 ); + struct window *ptr, *win, *top_window = get_desktop_window( thread ); if (!top_window) return 0; @@ -1794,9 +1786,34 @@ DECL_HANDLER(destroy_window) /* retrieve the desktop window for the current thread */ DECL_HANDLER(get_desktop_window) { - struct window *win = get_desktop_window( current, req->force ); + struct desktop *desktop = get_thread_desktop( current, 0 ); + + if (!desktop) return; + + if (!desktop->top_window && req->force) /* create it */ + { + if ((desktop->top_window = create_window( NULL, NULL, DESKTOP_ATOM, 0 ))) + { + detach_window_thread( desktop->top_window ); + desktop->top_window->style = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + } + } - if (win) reply->handle = win->handle; + if (!desktop->msg_window && req->force) /* create it */ + { + static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; + static const struct unicode_str name = { messageW, sizeof(messageW) }; + atom_t atom = add_global_atom( NULL, &name ); + if (atom && (desktop->msg_window = create_window( NULL, NULL, atom, 0 ))) + { + detach_window_thread( desktop->msg_window ); + desktop->msg_window->style = WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + } + } + + reply->top_window = desktop->top_window ? desktop->top_window->handle : 0; + reply->msg_window = desktop->msg_window ? desktop->msg_window->handle : 0; + release_object( desktop ); }

1 0

Alexandre Julliard : user32: Add support for a top-level message parent window in parallel to the desktop window .
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: d71303e91c13db58480ee56e75ea856e3f07cc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71303e91c13db58480ee56e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 14:26:06 2008 +0200 user32: Add support for a top-level message parent window in parallel to the desktop window. --- dlls/user32/user_main.c | 9 ++++++--- dlls/user32/user_private.h | 5 +++-- dlls/user32/win.c | 33 ++++++++++++++++++++++----------- dlls/user32/winstation.c | 7 ++++++- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 77913a8..1d9e193 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -312,13 +312,16 @@ BOOL USER_IsExitingThread( DWORD tid ) */ static void thread_detach(void) { + struct user_thread_info *thread_info = get_user_thread_info(); + exiting_thread_id = GetCurrentThreadId(); WDML_NotifyThreadDetach(); - WIN_DestroyThreadWindows( get_user_thread_info()->desktop ); - CloseHandle( get_user_thread_info()->server_queue ); - HeapFree( GetProcessHeap(), 0, get_user_thread_info()->wmchar_data ); + if (thread_info->top_window) WIN_DestroyThreadWindows( thread_info->top_window ); + if (thread_info->msg_window) WIN_DestroyThreadWindows( thread_info->msg_window ); + CloseHandle( thread_info->server_queue ); + HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data ); exiting_thread_id = 0; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 9ffdb21..8bb1ef9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -204,9 +204,10 @@ struct user_thread_info HCURSOR cursor; /* Current cursor */ INT cursor_count; /* Cursor show count */ UINT active_hooks; /* Bitmap of active hooks */ - HWND desktop; /* Desktop window */ + HWND top_window; /* Desktop window */ + HWND msg_window; /* HWND_MESSAGE parent window */ - ULONG pad[10]; /* Available for more data */ + ULONG pad[9]; /* Available for more data */ }; struct hook_extra_info diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1824a52..5252cea 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -150,10 +150,17 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, { struct user_thread_info *thread_info = get_user_thread_info(); - if (!thread_info->desktop) thread_info->desktop = full_parent ? full_parent : handle; - else assert( full_parent == thread_info->desktop ); - if (full_parent && !USER_Driver->pCreateDesktopWindow( thread_info->desktop )) - ERR( "failed to create desktop window\n" ); + if (name == (LPCWSTR)DESKTOP_CLASS_ATOM) + { + if (!thread_info->top_window) thread_info->top_window = full_parent ? full_parent : handle; + else assert( full_parent == thread_info->top_window ); + if (full_parent && !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) + ERR( "failed to create desktop window\n" ); + } + else /* HWND_MESSAGE parent */ + { + if (!thread_info->msg_window && !full_parent) thread_info->msg_window = handle; + } } USER_Lock(); @@ -978,13 +985,17 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags } else { + static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; + if ((cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) { WARN("No parent for child window\n" ); SetLastError(ERROR_TLW_WITH_WSCHILD); return 0; /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } - if (className != (LPCWSTR)DESKTOP_CLASS_ATOM) /* are we creating the desktop itself? */ + /* are we creating the desktop or HWND_MESSAGE parent itself? */ + if (className != (LPCWSTR)DESKTOP_CLASS_ATOM && + (IS_INTRESOURCE(className) || strcmpiW( className, messageW ))) parent = GetDesktopWindow(); } @@ -1620,16 +1631,16 @@ HWND WINAPI GetDesktopWindow(void) { struct user_thread_info *thread_info = get_user_thread_info(); - if (thread_info->desktop) return thread_info->desktop; + if (thread_info->top_window) return thread_info->top_window; SERVER_START_REQ( get_desktop_window ) { req->force = 0; - if (!wine_server_call( req )) thread_info->desktop = reply->handle; + if (!wine_server_call( req )) thread_info->top_window = reply->handle; } SERVER_END_REQ; - if (!thread_info->desktop) + if (!thread_info->top_window) { USEROBJECTFLAGS flags; if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_FLAGS, &flags, @@ -1664,15 +1675,15 @@ HWND WINAPI GetDesktopWindow(void) SERVER_START_REQ( get_desktop_window ) { req->force = 1; - if (!wine_server_call( req )) thread_info->desktop = reply->handle; + if (!wine_server_call( req )) thread_info->top_window = reply->handle; } SERVER_END_REQ; } - if (!thread_info->desktop || !USER_Driver->pCreateDesktopWindow( thread_info->desktop )) + if (!thread_info->top_window || !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); - return thread_info->desktop; + return thread_info->top_window; } diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index abee286..57ce952 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -395,7 +395,12 @@ BOOL WINAPI SetThreadDesktop( HDESK handle ) ret = !wine_server_call_err( req ); } SERVER_END_REQ; - if (ret) get_user_thread_info()->desktop = 0; /* reset the desktop window */ + if (ret) /* reset the desktop windows */ + { + struct user_thread_info *thread_info = get_user_thread_info(); + thread_info->top_window = 0; + thread_info->msg_window = 0; + } return ret; }

1 0

Alexandre Julliard : server: Add support for a top-level message parent window in parallel to the desktop window .
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 81e6edbda9334c2e2060ece2f163c393eac6cd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e6edbda9334c2e2060ece2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 14:43:39 2008 +0200 server: Add support for a top-level message parent window in parallel to the desktop window. --- server/class.c | 8 ++++++ server/user.h | 2 + server/window.c | 65 +++++++++++++++++++++++++++++++------------------- server/winstation.c | 2 + 4 files changed, 52 insertions(+), 25 deletions(-) diff --git a/server/class.c b/server/class.c index ae594df..5c30738 100644 --- a/server/class.c +++ b/server/class.c @@ -128,6 +128,14 @@ int is_desktop_class( struct window_class *class ) return (class->atom == DESKTOP_ATOM && !class->local); } +int is_hwnd_message_class( struct window_class *class ) +{ + static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; + static const struct unicode_str name = { messageW, sizeof(messageW) }; + + return (!class->local && class->atom == find_global_atom( NULL, &name )); +} + atom_t get_class_atom( struct window_class *class ) { return class->atom; diff --git a/server/user.h b/server/user.h index f58f4d4..b12fccb 100644 --- a/server/user.h +++ b/server/user.h @@ -57,6 +57,7 @@ struct desktop struct winstation *winstation; /* winstation this desktop belongs to */ struct list entry; /* entry in winstation list of desktops */ struct window *top_window; /* desktop window for this desktop */ + struct window *msg_window; /* HWND_MESSAGE top window */ struct hook_table *global_hooks; /* table of global hooks on this desktop */ struct timeout_user *close_timeout; /* timeout before closing the desktop */ unsigned int users; /* processes and threads using this desktop */ @@ -145,6 +146,7 @@ extern struct window_class *grab_class( struct process *process, atom_t atom, void *instance, int *extra_bytes ); extern void release_class( struct window_class *class ); extern int is_desktop_class( struct window_class *class ); +extern int is_hwnd_message_class( struct window_class *class ); extern atom_t get_class_atom( struct window_class *class ); extern void *get_class_client_ptr( struct window_class *class ); diff --git a/server/window.c b/server/window.c index 8c87004..cae5603 100644 --- a/server/window.c +++ b/server/window.c @@ -393,8 +393,10 @@ void destroy_window( struct window *win ) list_remove( &win->entry ); if (is_desktop_window(win)) { - assert( win->desktop->top_window == win ); - win->desktop->top_window = NULL; + struct desktop *desktop = win->desktop; + assert( desktop->top_window == win || desktop->msg_window == win ); + if (desktop->top_window == win) desktop->top_window = NULL; + else desktop->msg_window = NULL; } detach_window_thread( win ); if (win->win_region) free_region( win->win_region ); @@ -426,7 +428,7 @@ static struct window *create_window( struct window *parent, struct window *owner { static const rectangle_t empty_rect; int extra_bytes; - struct window *win; + struct window *win = NULL; struct desktop *desktop; struct window_class *class; @@ -438,6 +440,27 @@ static struct window *create_window( struct window *parent, struct window *owner return NULL; } + if (!parent) /* null parent is only allowed for desktop or HWND_MESSAGE top window */ + { + if (is_desktop_class( class )) + parent = desktop->top_window; /* use existing desktop if any */ + else if (is_hwnd_message_class( class )) + /* use desktop window if message window is already created */ + parent = desktop->msg_window ? desktop->top_window : NULL; + else if (!(parent = desktop->top_window)) /* must already have a desktop then */ + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + } + + /* parent must be on the same desktop */ + if (parent && parent->desktop != desktop) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + if (!(win = mem_alloc( sizeof(*win) + extra_bytes - 1 ))) goto failed; if (!(win->handle = alloc_user_handle( win, USER_WINDOW ))) goto failed; @@ -468,20 +491,6 @@ static struct window *create_window( struct window *parent, struct window *owner list_init( &win->children ); list_init( &win->unlinked ); - /* parent must be on the same desktop */ - if (parent && parent->desktop != desktop) - { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } - - /* if no parent, class must be the desktop */ - if (!parent && !is_desktop_class( class )) - { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } - /* if parent belongs to a different thread and the window isn't */ /* top-level, attach the two threads */ if (parent && parent->thread && parent->thread != current && !is_desktop_window(parent)) @@ -498,9 +507,17 @@ static struct window *create_window( struct window *parent, struct window *owner else { list_init( &win->entry ); - assert( !desktop->top_window ); - desktop->top_window = win; - set_process_default_desktop( current->process, desktop, current->desktop ); + if (is_desktop_class( class )) + { + assert( !desktop->top_window ); + desktop->top_window = win; + set_process_default_desktop( current->process, desktop, current->desktop ); + } + else + { + assert( !desktop->msg_window ); + desktop->msg_window = win; + } } current->desktop_users++; @@ -1708,20 +1725,18 @@ static void set_window_region( struct window *win, struct region *region, int re /* create a window */ DECL_HANDLER(create_window) { - struct window *win, *parent, *owner = NULL; + struct window *win, *parent = NULL, *owner = NULL; struct unicode_str cls_name; atom_t atom; reply->handle = 0; - - if (!req->parent) parent = get_desktop_window( current, 0 ); - else if (!(parent = get_window( req->parent ))) return; + if (req->parent && !(parent = get_window( req->parent ))) return; if (req->owner) { if (!(owner = get_window( req->owner ))) return; if (is_desktop_window(owner)) owner = NULL; - else if (!is_desktop_window(parent)) + else if (parent && !is_desktop_window(parent)) { /* an owned window must be created as top-level */ set_error( STATUS_ACCESS_DENIED ); diff --git a/server/winstation.c b/server/winstation.c index 2ad4146..cfff0a4 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -227,6 +227,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned desktop->flags = flags; desktop->winstation = (struct winstation *)grab_object( winstation ); desktop->top_window = NULL; + desktop->msg_window = NULL; desktop->global_hooks = NULL; desktop->close_timeout = NULL; desktop->users = 0; @@ -270,6 +271,7 @@ static void desktop_destroy( struct object *obj ) struct desktop *desktop = (struct desktop *)obj; if (desktop->top_window) destroy_window( desktop->top_window ); + if (desktop->msg_window) destroy_window( desktop->msg_window ); if (desktop->global_hooks) release_object( desktop->global_hooks ); if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); list_remove( &desktop->entry );

1 0

Alexandre Julliard : user32: Register the builtin 'Message' window class.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: c9370c44ba13ed8f06d24d4513300ed70a31c24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9370c44ba13ed8f06d24d451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 14:19:34 2008 +0200 user32: Register the builtin 'Message' window class. --- dlls/user32/class.c | 1 + dlls/user32/controls.h | 1 + dlls/user32/message.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 1ca50f5..1f4b7b5 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -421,6 +421,7 @@ void CLASS_RegisterBuiltinClasses(void) register_builtin( &LISTBOX_builtin_class ); register_builtin( &MDICLIENT_builtin_class ); register_builtin( &MENU_builtin_class ); + register_builtin( &MESSAGE_builtin_class ); register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index dbec147..a16d166 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -53,6 +53,7 @@ extern const struct builtin_class_descr ICONTITLE_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr LISTBOX_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr MDICLIENT_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr MENU_builtin_class DECLSPEC_HIDDEN; +extern const struct builtin_class_descr MESSAGE_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr SCROLL_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr STATIC_builtin_class DECLSPEC_HIDDEN; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index ce18acd..19b3935 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -89,6 +89,22 @@ struct send_message_info }; +/* Message class descriptor */ +static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; +static LRESULT WINAPI message_winproc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); +const struct builtin_class_descr MESSAGE_builtin_class = +{ + messageW, /* name */ + 0, /* style */ + NULL, /* procA (winproc is Unicode only) */ + message_winproc, /* procW */ + 0, /* extra */ + IDC_ARROW, /* cursor */ + 0 /* brush */ +}; + + + /* flag for messages that contain pointers */ /* 32 messages per entry, messages 0..31 map to bits 0..31 */ @@ -315,6 +331,19 @@ static inline BOOL get_pending_wmchar( MSG *msg, UINT first, UINT last, BOOL rem return TRUE; } + +/*********************************************************************** + * message_winproc + * + * Window procedure for "Message" windows (HWND_MESSAGE parent). + */ +static LRESULT WINAPI message_winproc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +{ + if (message == WM_NCCREATE) return TRUE; + return 0; /* all other messages are ignored */ +} + + /*********************************************************************** * broadcast_message_callback *

1 0

Alexandre Julliard : server: Use a unicode_str to represent atom names.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 25e070c0ac5fbc7e366af18127b20b438d6742dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e070c0ac5fbc7e366af1812… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 14:03:08 2008 +0200 server: Use a unicode_str to represent atom names. --- server/atom.c | 64 +++++++++++++++++++++++++++++------------------------- server/class.c | 11 ++++++--- server/object.h | 4 +- server/window.c | 33 +++++++++++++-------------- 4 files changed, 59 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25e070c0ac5fbc7e366af…

1 0

Dylan Smith : richedit: Tests for undo coalescing.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 88a9ca7c41e80336dcfb7cce8e834028df733321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a9ca7c41e80336dcfb7cce8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 23 19:52:01 2008 -0400 richedit: Tests for undo coalescing. Tests for undo coalescing from previous patches sent as suggested by Alex Villacís Lasso. --- dlls/riched20/tests/editor.c | 132 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bbdba4d..8838d05 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4265,6 +4265,137 @@ static void test_WM_NOTIFY(void) DestroyWindow(parent); } +static void simulate_typing_characters(HWND hwnd, const char* szChars) +{ + int ret; + + while (*szChars != '\0') { + SendMessageA(hwnd, WM_KEYDOWN, *szChars, 1); + ret = SendMessageA(hwnd, WM_CHAR, *szChars, 1); + ok(ret == 0, "WM_CHAR('%c') ret=%d\n", *szChars, ret); + SendMessageA(hwnd, WM_KEYUP, *szChars, 1); + szChars++; + } +} + +static void test_undo_coalescing(void) +{ + HWND hwnd; + int result; + char buffer[64] = {0}; + + /* multi-line control inserts CR normally */ + hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP|ES_MULTILINE, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + result = SendMessage(hwnd, EM_CANUNDO, 0, 0); + ok (result == FALSE, "Can undo after window creation.\n"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + ok (result == FALSE, "Undo operation successful with nothing to undo.\n"); + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == FALSE, "Can redo after window creation.\n"); + result = SendMessage(hwnd, EM_REDO, 0, 0); + ok (result == FALSE, "Redo operation successful with nothing undone.\n"); + + /* Test the effect of arrows keys during typing on undo transactions*/ + simulate_typing_characters(hwnd, "one two three"); + SendMessage(hwnd, WM_KEYDOWN, VK_RIGHT, 1); + SendMessage(hwnd, WM_KEYUP, VK_RIGHT, 1); + simulate_typing_characters(hwnd, " four five six"); + + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == FALSE, "Can redo before anything is undone.\n"); + result = SendMessage(hwnd, EM_CANUNDO, 0, 0); + ok (result == TRUE, "Cannot undo typed characters.\n"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + todo_wine ok (result == TRUE, "EM_UNDO Failed to undo typed characters.\n"); + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == TRUE, "Cannot redo after undo.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "one two three"); + todo_wine ok (result == 0, "expected '%s' but got '%s'\n", "one two three", buffer); + + result = SendMessage(hwnd, EM_CANUNDO, 0, 0); + ok (result == TRUE, "Cannot undo typed characters.\n"); + result = SendMessage(hwnd, WM_UNDO, 0, 0); + todo_wine ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, ""); + todo_wine ok (result == 0, "expected '%s' but got '%s'\n", "", buffer); + + /* Test the effect of focus changes during typing on undo transactions*/ + simulate_typing_characters(hwnd, "one two three"); + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == FALSE, "Redo buffer should have been cleared by typing.\n"); + SendMessage(hwnd, WM_KILLFOCUS, (WPARAM)NULL, 0); + SendMessage(hwnd, WM_SETFOCUS, (WPARAM)NULL, 0); + simulate_typing_characters(hwnd, " four five six"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + todo_wine ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "one two three"); + todo_wine ok (result == 0, "expected '%s' but got '%s'\n", "one two three", buffer); + + /* Test the effect of the back key during typing on undo transactions */ + SendMessage(hwnd, EM_EMPTYUNDOBUFFER, 0, 0); + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + ok (result == TRUE, "Failed to clear the text.\n"); + simulate_typing_characters(hwnd, "one two threa"); + result = SendMessage(hwnd, EM_CANREDO, 0, 0); + ok (result == FALSE, "Redo buffer should have been cleared by typing.\n"); + SendMessage(hwnd, WM_KEYDOWN, VK_BACK, 1); + SendMessage(hwnd, WM_KEYUP, VK_BACK, 1); + simulate_typing_characters(hwnd, "e four five six"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + todo_wine ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, ""); + todo_wine ok (result == 0, "expected '%s' but got '%s'\n", "", buffer); + + /* Test the effect of the delete key during typing on undo transactions */ + SendMessage(hwnd, EM_EMPTYUNDOBUFFER, 0, 0); + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"abcd"); + ok(result == TRUE, "Failed to set the text.\n"); + SendMessage(hwnd, EM_SETSEL, (WPARAM)1, (LPARAM)1); + SendMessage(hwnd, WM_KEYDOWN, VK_DELETE, 1); + SendMessage(hwnd, WM_KEYUP, VK_DELETE, 1); + SendMessage(hwnd, WM_KEYDOWN, VK_DELETE, 1); + SendMessage(hwnd, WM_KEYUP, VK_DELETE, 1); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + todo_wine ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "acd"); + ok (result == 0, "expected '%s' but got '%s'\n", "acd", buffer); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + todo_wine ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "abcd"); + ok (result == 0, "expected '%s' but got '%s'\n", "abcd", buffer); + + /* Test the effect of EM_STOPGROUPTYPING on undo transactions*/ + SendMessage(hwnd, EM_EMPTYUNDOBUFFER, 0, 0); + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + ok (result == TRUE, "Failed to clear the text.\n"); + simulate_typing_characters(hwnd, "one two three"); + result = SendMessage(hwnd, EM_STOPGROUPTYPING, 0, 0); + ok (result == 0, "expected %d but got %d\n", 0, result); + simulate_typing_characters(hwnd, " four five six"); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + todo_wine ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, "one two three"); + todo_wine ok (result == 0, "expected '%s' but got '%s'\n", "one two three", buffer); + result = SendMessage(hwnd, EM_UNDO, 0, 0); + todo_wine ok (result == TRUE, "Failed to undo typed characters.\n"); + todo_wine ok (result == TRUE, "Failed to undo typed characters.\n"); + SendMessageA(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + result = strcmp(buffer, ""); + todo_wine ok (result == 0, "expected '%s' but got '%s'\n", "", buffer); + + DestroyWindow(hwnd); +} + START_TEST( editor ) { MSG msg; @@ -4310,6 +4441,7 @@ START_TEST( editor ) test_WM_NOTIFY(); test_EM_AUTOURLDETECT(); test_eventMask(); + test_undo_coalescing(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Dan Hipschman : gdi32: Return the correct value from GetTextFace.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 92c8cac214715633459227b2d47df61a18dc8d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c8cac214715633459227b2d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 23 12:04:48 2008 -0700 gdi32: Return the correct value from GetTextFace. --- dlls/gdi32/font.c | 17 +++++++++++++---- dlls/gdi32/freetype.c | 5 +++-- dlls/gdi32/tests/font.c | 5 ----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b43873a..20a009a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -800,9 +800,17 @@ INT WINAPI GetTextFaceA( HDC hdc, INT count, LPSTR name ) if (name) { - if (count && !WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, count, NULL, NULL)) + if (count) + { + res = WideCharToMultiByte(CP_ACP, 0, nameW, -1, name, count, NULL, NULL); + if (res == 0) + res = count; name[count-1] = 0; - res = strlen(name); + /* GetTextFaceA does NOT include the nul byte in the return count. */ + res--; + } + else + res = 0; } else res = WideCharToMultiByte( CP_ACP, 0, nameW, -1, NULL, 0, NULL, NULL); @@ -825,12 +833,13 @@ INT WINAPI GetTextFaceW( HDC hdc, INT count, LPWSTR name ) ret = WineEngGetTextFace(dc->gdiFont, count, name); else if ((font = (FONTOBJ *) GDI_GetObjPtr( dc->hFont, FONT_MAGIC ))) { + INT n = strlenW(font->logfont.lfFaceName) + 1; if (name) { lstrcpynW( name, font->logfont.lfFaceName, count ); - ret = strlenW(name); + ret = min(count, n); } - else ret = strlenW(font->logfont.lfFaceName) + 1; + else ret = n; GDI_ReleaseObj( dc->hFont ); } release_dc_ptr( dc ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 95b260a..731b1c5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5569,11 +5569,12 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, */ INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) { + INT n = strlenW(font->name) + 1; if(str) { lstrcpynW(str, font->name, count); - return strlenW(font->name); + return min(count, n); } else - return strlenW(font->name) + 1; + return n; } UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4610536..868661c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2261,7 +2261,6 @@ static void test_GetTextFace(void) /* Play with the count arg. */ bufA[0] = 'x'; n = GetTextFaceA(dc, 0, bufA); - todo_wine ok(n == 0, "GetTextFaceA returned %d\n", n); ok(bufA[0] == 'x', "GetTextFaceA buf[0] == %d\n", bufA[0]); @@ -2289,26 +2288,22 @@ static void test_GetTextFace(void) dc = GetDC(NULL); g = SelectObject(dc, f); n = GetTextFaceW(dc, sizeof bufW / sizeof bufW[0], bufW); - todo_wine ok(n == sizeof faceW / sizeof faceW[0], "GetTextFaceW returned %d\n", n); ok(lstrcmpW(faceW, bufW) == 0, "GetTextFaceW\n"); /* Play with the count arg. */ bufW[0] = 'x'; n = GetTextFaceW(dc, 0, bufW); - todo_wine ok(n == 0, "GetTextFaceW returned %d\n", n); ok(bufW[0] == 'x', "GetTextFaceW buf[0] == %d\n", bufW[0]); bufW[0] = 'x'; n = GetTextFaceW(dc, 1, bufW); - todo_wine ok(n == 1, "GetTextFaceW returned %d\n", n); ok(bufW[0] == '\0', "GetTextFaceW buf[0] == %d\n", bufW[0]); bufW[0] = 'x'; bufW[1] = 'y'; n = GetTextFaceW(dc, 2, bufW); - todo_wine ok(n == 2, "GetTextFaceW returned %d\n", n); ok(bufW[0] == faceW[0] && bufW[1] == '\0', "GetTextFaceW didn't copy\n");

1 0

Dylan Smith : richedit: bCaretAtEnd should not be reset from rewrapping text.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 6f9f01f28f7a191d3f62b9f72e6afe787aeb0c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9f01f28f7a191d3f62b9f72… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 23 17:09:58 2008 -0400 richedit: bCaretAtEnd should not be reset from rewrapping text. The bCaretAtEnd value in ME_TextEditor is used to identify that the caret is at the end of a wrapped line instead of the start of the next line in the paragraph since both these positions correspond to the same position in the document. The bCaretAtEnd value was previously being set back to FALSE whenever the window was resized. --- dlls/riched20/caret.c | 4 ---- dlls/riched20/run.c | 6 +----- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0ae034c..02c375c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -164,7 +164,6 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, ME_DisplayItem *pCursorRun = pCursor->pRun; ME_DisplayItem *pSizeRun = pCursor->pRun; - assert(!pCursor->nOffset || !editor->bCaretAtEnd); assert(height && x && y); assert(!(ME_GetParagraph(pCursorRun)->member.para.nFlags & MEPF_REWRAP)); assert(pCursor->pRun); @@ -1179,9 +1178,6 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) { ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow); - /* bCaretAtEnd doesn't make sense if the cursor isn't set at the - first character of the next row */ - assert(!editor->bCaretAtEnd || !pCursor->nOffset); ME_WrapMarkedParagraphs(editor); if (pRow) { ME_DisplayItem *pRun; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 0af3ba0..805975c 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -241,11 +241,7 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) assert(p->member.run.nCharOfs != -1); ME_GetParagraph(p)->member.para.nFlags |= MEPF_REWRAP; - /* if we were at the end of screen line, and the next run is in the new - * line, then it's not the end of the line anymore */ - if (editor->bCaretAtEnd && editor->pCursors[0].pRun == pNext) - editor->bCaretAtEnd = FALSE; - /* Update all cursors so that they don't contain the soon deleted run */ + /* Update all cursors so that they don't contain the soon deleted run */ for (i=0; i<editor->nCursors; i++) { if (editor->pCursors[i].pRun == pNext) { editor->pCursors[i].pRun = p;

1 0

Dylan Smith : richedit: Trailing spaces should not affect alignment shift length.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: c8e2552ad9b79cd7ab8ba68e8a50fa0ae46b6de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e2552ad9b79cd7ab8ba68e8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 23 17:09:53 2008 -0400 richedit: Trailing spaces should not affect alignment shift length. --- dlls/riched20/wrap.c | 48 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 3230ff7..adabea1 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -58,21 +58,47 @@ static void ME_BeginRow(ME_WrapContext *wc) static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) { ME_DisplayItem *p, *row, *para; + BOOL bSkippingSpaces = TRUE; int ascent = 0, descent = 0, width=0, shift = 0, align = 0; /* wrap text */ para = ME_GetParagraph(wc->pRowStart); - for (p = wc->pRowStart; p!=pEnd; p = p->next) + + for (p = pEnd->prev; p!=wc->pRowStart->prev; p = p->prev) { - /* ENDPARA run shouldn't affect row height, except if it's the only run in the paragraph */ - if (p->type==diRun && ((p==wc->pRowStart) || !(p->member.run.nFlags & MERF_ENDPARA))) { /* FIXME add more run types */ - if (p->member.run.nAscent>ascent) - ascent = p->member.run.nAscent; - if (p->member.run.nDescent>descent) - descent = p->member.run.nDescent; - if (!(p->member.run.nFlags & (MERF_ENDPARA|MERF_SKIPPED))) - width += p->member.run.nWidth; - } + /* ENDPARA run shouldn't affect row height, except if it's the only run in the paragraph */ + if (p->type==diRun && ((p==wc->pRowStart) || !(p->member.run.nFlags & MERF_ENDPARA))) { /* FIXME add more run types */ + if (p->member.run.nAscent>ascent) + ascent = p->member.run.nAscent; + if (p->member.run.nDescent>descent) + descent = p->member.run.nDescent; + if (bSkippingSpaces) + { + /* Exclude space characters from run width. + * Other whitespace or delimiters are not treated this way. */ + SIZE sz; + int len = p->member.run.strText->nLen; + WCHAR *text = p->member.run.strText->szData + len - 1; + + assert (len); + while (len && *(text--) == ' ') + len--; + if (len) + { + if (len == p->member.run.strText->nLen) + { + width += p->member.run.nWidth; + } else { + sz = ME_GetRunSize(wc->context, &para->member.para, + &p->member.run, len, p->member.run.pt.x); + width += sz.cx; + } + } + bSkippingSpaces = !len; + } else if (!(p->member.run.nFlags & MERF_ENDPARA)) + width += p->member.run.nWidth; + } } + row = ME_MakeRow(ascent+descent, ascent, width); row->member.row.nYPos = wc->pt.y; row->member.row.nLMargin = (!wc->nRow ? wc->nFirstMargin : wc->nLeftMargin); @@ -98,7 +124,7 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) static void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p) { if (wc->pRowStart) - ME_InsertRowStart(wc, p->next); + ME_InsertRowStart(wc, p); /* p = p->member.para.prev_para->next;

1 0

Dylan Smith : richedit: Allow cursor to move over trailing spaces in wrapped lines.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 308582b4f5fc1bedeebf3ffdec88760a988324f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308582b4f5fc1bedeebf3ffde… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 23 17:09:44 2008 -0400 richedit: Allow cursor to move over trailing spaces in wrapped lines. --- dlls/riched20/caret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 3451301..0ae034c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -209,7 +209,7 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, row->member.row.nLMargin); } } - if (pCursor->nOffset && !(run->member.run.nFlags & MERF_SKIPPED)) { + if (pCursor->nOffset) { sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, pCursor->nOffset, row->member.row.nLMargin); }

1 0