February 2022 - Wine-Commits

Jacek Caban : server: Don't allow creating children of orphaned windows.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 3cbccd4477c0ca00385126025bbb487fbd97f255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cbccd4477c0ca0038512602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:13:36 2022 +0100 server: Don't allow creating children of orphaned windows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 33 +++++++++++++++++++++++++++++++-- server/window.c | 10 +++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a5848ac28da..3ace25056de 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -765,7 +765,7 @@ static LRESULT CALLBACK test_thread_exit_wnd_proc( HWND hwnd, UINT msg, WPARAM w static void test_thread_exit_destroy(void) { struct test_thread_exit_parent_params params; - HWND adopter, child1, child2, child3; + HWND adopter, child1, child2, child3, child; WNDPROC old_wndproc, wndproc; WCHAR buffer[MAX_PATH]; HANDLE thread; @@ -889,6 +889,14 @@ static void test_thread_exit_destroy(void) tmp = GetPropW( child2, L"myprop" ); ok( HandleToULong(tmp) == 0xdeadbeef, "GetPropW returned %p\n", tmp ); + child = CreateWindowExA( 0, "ToolWindowClass", "Tool window 1", WS_CHILD, + 0, 0, 100, 100, child1, 0, 0, NULL ); + ok( !child && GetLastError() == ERROR_INVALID_PARAMETER, + "CreateWindowExA returned %p %u\n", child, GetLastError() ); + + ret = MoveWindow( child1, 5, 5, 10, 10, FALSE ); + ok( ret, "MoveWindow failed: %u\n", GetLastError() ); + /* destroying child1 ourselves succeeds */ ret = DestroyWindow( child1 ); ok( ret, "DestroyWindow returned %u\n", ret ); @@ -12789,7 +12797,8 @@ static void test_DragDetect(void) static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { unsigned int ret; - HWND parent; + HWND parent, child; + RECT rect, exp; switch (msg) { @@ -12805,6 +12814,25 @@ static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARA parent = SetParent( hwnd, hwndMain ); ok( parent == 0, "SetParent returned %p\n", parent ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + + ret = GetWindowRect( hwnd, &rect ); + ok( ret, "GetWindowRect failed: %u\n", GetLastError() ); + SetRect( &exp, 10, 20, 110, 220 ); + ok( EqualRect( &rect, &exp ), "unexpected rect %s, expected %s\n", wine_dbgstr_rect( &rect ), + wine_dbgstr_rect( &exp )); + + ret = MoveWindow( hwnd, 11, 12, 20, 30, FALSE ); + ok( ret, "MoveWindow failed: %u\n", GetLastError() ); + ret = GetWindowRect( hwnd, &rect ); + ok( ret, "GetWindowRect failed: %u\n", GetLastError() ); + SetRect( &exp, 11, 12, 31, 42 ); + ok( EqualRect( &rect, &exp ), "unexpected rect %s, expected %s\n", wine_dbgstr_rect( &rect ), + wine_dbgstr_rect( &exp )); + + child = CreateWindowExA( 0, "ToolWindowClass", "Tool window 1", WS_CHILD, + 0, 0, 100, 100, hwnd, 0, 0, NULL ); + ok( !child && GetLastError() == ERROR_INVALID_PARAMETER, + "CreateWindowExA returned %p %u\n", child, GetLastError() ); break; } @@ -12816,6 +12844,7 @@ static void test_ncdestroy(void) HWND hwnd; hwnd = create_tool_window( WS_POPUP, 0 ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)ncdestroy_test_proc ); + MoveWindow( hwnd, 10, 20, 100, 200, FALSE ); DestroyWindow(hwnd); } diff --git a/server/window.c b/server/window.c index da05d024056..ec8ee2f1790 100644 --- a/server/window.c +++ b/server/window.c @@ -2025,7 +2025,15 @@ DECL_HANDLER(create_window) atom_t atom; reply->handle = 0; - if (req->parent && !(parent = get_window( req->parent ))) return; + if (req->parent) + { + if (!(parent = get_window( req->parent ))) return; + if (is_orphan_window( parent )) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } if (req->owner) {

1 0

Jacek Caban : server: Don't immediately destroy child windows belonging to different thread in free_window_handle.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 078bcc066ccf4eeee84a4f00e94c802988363093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=078bcc066ccf4eeee84a4f00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:13:00 2022 +0100 server: Don't immediately destroy child windows belonging to different thread in free_window_handle. Notify their thread instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_private.h | 18 ------------------ dlls/user32/win.c | 12 +----------- include/ntuser.h | 19 +++++++++++++++++++ server/window.c | 14 +++++++++----- 4 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 9e65e9f1f66..73f01871d8c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -44,24 +44,6 @@ struct window_surface; -/* internal messages codes */ -enum wine_internal_message -{ - WM_WINE_DESTROYWINDOW = 0x80000000, - WM_WINE_SETWINDOWPOS, - WM_WINE_SHOWWINDOW, - WM_WINE_SETPARENT, - WM_WINE_SETWINDOWLONG, - WM_WINE_SETSTYLE, - WM_WINE_SETACTIVEWINDOW, - WM_WINE_KEYBOARD_LL_HOOK, - WM_WINE_MOUSE_LL_HOOK, - WM_WINE_CLIPCURSOR, - WM_WINE_UPDATEWINDOWSTATE, - WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ - WM_WINE_LAST_DRIVER_MSG = 0x80001fff -}; - extern const struct user_driver_funcs *USER_Driver DECLSPEC_HIDDEN; extern void USER_unload_driver(void) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 02891cd34ce..4f860889024 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1208,16 +1208,14 @@ static WND *next_thread_window( HWND *hwnd ) void destroy_thread_windows(void) { WND *wndPtr; - HWND hwnd = 0, *list; + HWND hwnd = 0; HMENU menu, sys_menu; struct window_surface *surface; - int i; while ((wndPtr = next_thread_window( &hwnd ))) { /* destroy the client-side storage */ - list = WIN_ListChildren( hwnd ); menu = ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) ? (HMENU)wndPtr->wIDmenu : 0; sys_menu = wndPtr->hSysMenu; free_dce( wndPtr->dce, hwnd ); @@ -1232,14 +1230,6 @@ void destroy_thread_windows(void) register_window_surface( surface, NULL ); window_surface_release( surface ); } - - /* free child windows */ - - if (!list) continue; - for (i = 0; list[i]; i++) - if (!WIN_IsCurrentThread( list[i] )) - SendNotifyMessageW( list[i], WM_WINE_DESTROYWINDOW, 0, 0 ); - HeapFree( GetProcessHeap(), 0, list ); } } diff --git a/include/ntuser.h b/include/ntuser.h index a9dd8d2e3fd..4b665e6a364 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -102,6 +102,25 @@ struct user_thread_info C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); +/* internal messages codes */ +enum wine_internal_message +{ + WM_WINE_DESTROYWINDOW = 0x80000000, + WM_WINE_SETWINDOWPOS, + WM_WINE_SHOWWINDOW, + WM_WINE_SETPARENT, + WM_WINE_SETWINDOWLONG, + WM_WINE_SETSTYLE, + WM_WINE_SETACTIVEWINDOW, + WM_WINE_KEYBOARD_LL_HOOK, + WM_WINE_MOUSE_LL_HOOK, + WM_WINE_CLIPCURSOR, + WM_WINE_UPDATEWINDOWSTATE, + WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ + WM_WINE_LAST_DRIVER_MSG = 0x80001fff +}; + + HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ); BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); diff --git a/server/window.c b/server/window.c index 9fd67656eea..506f0269ee1 100644 --- a/server/window.c +++ b/server/window.c @@ -27,9 +27,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winternl.h" +#include "ntuser.h" #include "object.h" #include "request.h" @@ -1965,12 +1963,18 @@ void free_window_handle( struct window *win ) LIST_FOR_EACH_ENTRY_SAFE( child, next, &win->children, struct window, entry ) { if (!child->handle) continue; - free_window_handle( child ); + if (!win->thread || !child->thread || win->thread == child->thread) + free_window_handle( child ); + else + send_notify_message( child->handle, WM_WINE_DESTROYWINDOW, 0, 0 ); } LIST_FOR_EACH_ENTRY_SAFE( child, next, &win->children, struct window, entry ) { if (!child->handle) continue; - free_window_handle( child ); + if (!win->thread || !child->thread || win->thread == child->thread) + free_window_handle( child ); + else + send_notify_message( child->handle, WM_WINE_DESTROYWINDOW, 0, 0 ); } /* reset global window pointers, if the corresponding window is destroyed */

1 0

Jacek Caban : server: Make window struct a server object.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 5b56bad50b85acb05244894990053f8b0de2e458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b56bad50b85acb052448949… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:12:43 2022 +0100 server: Make window struct a server object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/user.h | 2 +- server/window.c | 94 ++++++++++++++++++++++++++++++++++++++++------------- server/winstation.c | 4 +-- 3 files changed, 75 insertions(+), 25 deletions(-) diff --git a/server/user.h b/server/user.h index 80f7e91f12c..55a0d35feff 100644 --- a/server/user.h +++ b/server/user.h @@ -154,7 +154,7 @@ extern struct process *get_top_window_owner( struct desktop *desktop ); extern void get_top_window_rectangle( struct desktop *desktop, rectangle_t *rect ); 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 free_window_handle( struct window *win ); extern void destroy_thread_windows( struct thread *thread ); extern int is_child_window( user_handle_t parent, user_handle_t child ); extern int is_valid_foreground_window( user_handle_t window ); diff --git a/server/window.c b/server/window.c index 8fc4022a3ee..4373297b152 100644 --- a/server/window.c +++ b/server/window.c @@ -56,6 +56,7 @@ enum property_type struct window { + struct object obj; /* object header */ struct window *parent; /* parent window */ user_handle_t owner; /* owner of this window */ struct list children; /* list of children in Z-order */ @@ -96,6 +97,33 @@ struct window char *extra_bytes; /* extra bytes storage */ }; +static void window_dump( struct object *obj, int verbose ); +static void window_destroy( struct object *obj ); + +static const struct object_ops window_ops = +{ + sizeof(struct window), /* size */ + &no_type, /* type */ + window_dump, /* dump */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + default_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_get_full_name, /* get_full_name */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + window_destroy /* destroy */ +}; + /* flags that can be set by the client */ #define PAINT_HAS_SURFACE SET_WINPOS_PAINT_SURFACE #define PAINT_HAS_PIXEL_FORMAT SET_WINPOS_PIXEL_FORMAT @@ -129,6 +157,31 @@ static struct window *taskman_window; #define WINPTR_TOPMOST ((struct window *)3L) #define WINPTR_NOTOPMOST ((struct window *)4L) +static void window_dump( struct object *obj, int verbose ) +{ + struct window *win = (struct window *)obj; + assert( obj->ops == &window_ops ); + fprintf( stderr, "window %p handle %x\n", win, win->handle ); +} + +static void window_destroy( struct object *obj ) +{ + struct window *win = (struct window *)obj; + + assert( !win->handle ); + + if (win->win_region) free_region( win->win_region ); + if (win->update_region) free_region( win->update_region ); + if (win->class) release_class( win->class ); + free( win->text ); + + if (win->nb_extra_bytes) + { + memset( win->extra_bytes, 0x55, win->nb_extra_bytes ); + free( win->extra_bytes ); + } +} + /* retrieve a pointer to a window from its handle */ static inline struct window *get_window( user_handle_t handle ) { @@ -483,9 +536,7 @@ static struct window *create_window( struct window *parent, struct window *owner goto failed; } - if (!(win = mem_alloc( sizeof(*win) ))) goto failed; - if (!(win->handle = alloc_user_handle( win, USER_WINDOW ))) goto failed; - + if (!(win = alloc_object( &window_ops ))) goto failed; win->parent = parent; win->owner = owner ? owner->handle : 0; win->thread = current; @@ -523,6 +574,7 @@ static struct window *create_window( struct window *parent, struct window *owner memset( win->extra_bytes, 0, extra_bytes ); win->nb_extra_bytes = extra_bytes; } + if (!(win->handle = alloc_user_handle( win, USER_WINDOW ))) goto failed; /* if parent belongs to a different thread and the window isn't */ /* top-level, attach the two threads */ @@ -559,9 +611,12 @@ static struct window *create_window( struct window *parent, struct window *owner failed: if (win) { - if (win->handle) free_user_handle( win->handle ); - free( win->extra_bytes ); - free( win ); + if (win->handle) + { + free_user_handle( win->handle ); + win->handle = 0; + } + release_object( win ); } release_object( desktop ); release_class( class ); @@ -578,7 +633,7 @@ void destroy_thread_windows( struct thread *thread ) { if (win->thread != thread) continue; if (is_desktop_window( win )) detach_window_thread( win ); - else destroy_window( win ); + else free_window_handle( win ); } } @@ -1878,8 +1933,10 @@ static void set_window_region( struct window *win, struct region *region, int re /* destroy a window */ -void destroy_window( struct window *win ) +void free_window_handle( struct window *win ) { + assert( win->handle ); + /* hide the window */ if (is_visible(win)) { @@ -1897,9 +1954,9 @@ void destroy_window( struct window *win ) /* destroy all children */ while (!list_empty(&win->children)) - destroy_window( LIST_ENTRY( list_head(&win->children), struct window, entry )); + free_window_handle( LIST_ENTRY( list_head(&win->children), struct window, entry )); while (!list_empty(&win->unlinked)) - destroy_window( LIST_ENTRY( list_head(&win->unlinked), struct window, entry )); + free_window_handle( LIST_ENTRY( list_head(&win->unlinked), struct window, entry )); /* reset global window pointers, if the corresponding window is destroyed */ if (win == shell_window) shell_window = NULL; @@ -1908,7 +1965,6 @@ void destroy_window( struct window *win ) if (win == taskman_window) taskman_window = NULL; free_hotkeys( win->desktop, win->handle ); cleanup_clipboard_window( win->desktop, win->handle ); - free_user_handle( win->handle ); destroy_properties( win ); list_remove( &win->entry ); if (is_desktop_window(win)) @@ -1924,16 +1980,10 @@ void destroy_window( struct window *win ) } detach_window_thread( win ); - if (win->win_region) free_region( win->win_region ); - if (win->update_region) free_region( win->update_region ); - if (win->class) release_class( win->class ); - free( win->text ); - if (win->nb_extra_bytes) - { - memset( win->extra_bytes, 0x55, win->nb_extra_bytes ); - free( win->extra_bytes ); - } - free( win ); + + free_user_handle( win->handle ); + win->handle = 0; + release_object( win ); } @@ -2016,7 +2066,7 @@ DECL_HANDLER(destroy_window) struct window *win = get_window( req->handle ); if (win) { - if (!is_desktop_window(win)) destroy_window( win ); + if (!is_desktop_window(win)) free_window_handle( win ); else if (win->thread == current) detach_window_thread( win ); else set_error( STATUS_ACCESS_DENIED ); } diff --git a/server/winstation.c b/server/winstation.c index 854affead77..1408e1a9e65 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -287,8 +287,8 @@ static void desktop_destroy( struct object *obj ) struct desktop *desktop = (struct desktop *)obj; free_hotkeys( desktop, 0 ); - if (desktop->top_window) destroy_window( desktop->top_window ); - if (desktop->msg_window) destroy_window( desktop->msg_window ); + if (desktop->top_window) free_window_handle( desktop->top_window ); + if (desktop->msg_window) free_window_handle( 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

Nikolay Sivov : dbgeng/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 6c80346dbc8613f6093cca7843e47445fd12a6cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c80346dbc8613f6093cca78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 9 13:19:29 2022 +0300 dbgeng/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/tests/Makefile.in | 1 - dlls/dbgeng/tests/dbgeng.c | 136 +++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c80346dbc8613f6093c…

1 0

Hans Leidekker : bcrypt/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 5ce0e86d048faf532940eaf527d7a2543e392ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce0e86d048faf532940eaf5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 9 10:57:53 2022 +0100 bcrypt/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/Makefile.in | 1 - dlls/bcrypt/tests/bcrypt.c | 1172 ++++++++++++++++++++--------------------- 2 files changed, 586 insertions(+), 587 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ce0e86d048faf532940…

1 0

Zhiyi Zhang : comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill background for checkboxes and radio buttons.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: c69d3bb78115b6037edec8b396374a30b2ce6e27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69d3bb78115b6037edec8b3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:45:13 2022 +0800 comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill background for checkboxes and radio buttons. Fix radio buttons of Mupen64-RR-Lua input window having stale background. Mupen64-RR-Lua doesn't actually handle WM_ERASEBKGND even though it returns nonzero. And tests show that a WM_CTLCOLORSTATIC is sent and the returned brush is used for filling background, even painting over the content from DrawThemeParentBackground(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52433 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 5 +++++ dlls/comctl32/tests/misc.c | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 14b2200afed..1349e10c4c0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2796,6 +2796,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; NMCUSTOMDRAW nmcd; + HBRUSH brush; LRESULT cdrf; LOGFONTW lf; HWND parent; @@ -2859,6 +2860,10 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + /* Tests show that the brush from WM_CTLCOLORSTATIC is used for filling background after a + * DrawThemeParentBackground() call */ + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + FillRect(hDC, &client_rect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); if (cdrf & CDRF_NOTIFYPOSTERASE) { diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 09c5b3d6c40..c3de9e68c5a 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -843,14 +843,14 @@ static void test_themed_background(void) {ANIMATE_CLASSA, 0, empty_seq, TRUE}, {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_seq}, - {WC_BUTTONA, BS_CHECKBOX, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq, TRUE}, - {WC_BUTTONA, BS_3STATE, checkbox_seq, TRUE}, - {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq, TRUE}, + {WC_BUTTONA, BS_CHECKBOX, checkbox_seq}, + {WC_BUTTONA, BS_AUTOCHECKBOX, checkbox_seq}, + {WC_BUTTONA, BS_RADIOBUTTON, radiobutton_seq}, + {WC_BUTTONA, BS_3STATE, checkbox_seq}, + {WC_BUTTONA, BS_AUTO3STATE, checkbox_seq}, {WC_BUTTONA, BS_GROUPBOX, groupbox_seq, TRUE}, {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, - {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq, TRUE}, + {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_OWNERDRAW, ownerdrawbutton_seq}, {WC_BUTTONA, BS_SPLITBUTTON, splitbutton_seq}, @@ -950,7 +950,8 @@ static void test_themed_background(void) { /* WM_CTLCOLORSTATIC is used to fill background */ color = GetPixel(hdc, 40, 40); - todo_wine + /* BS_PUSHBOX is unimplemented on Wine */ + todo_wine_if(i == 11) ok(color == 0x808080, "Expected color %#x, got %#x.\n", 0x808080, color); } else if (tests[i].seq == groupbox_seq)

1 0

Zhiyi Zhang : comctl32/tests: Add themed background tests.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 5c901a04b3b5e69db8019fb75631de4b057fb217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c901a04b3b5e69db8019fb7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:44:42 2022 +0800 comctl32/tests: Add themed background tests. Add themed background tests to determine whether DrawThemeParentBackground() or WM_CTLCOLOR* are used to draw themed background for comctl32 classes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 327 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c901a04b3b5e69db801…

1 0

Jacek Caban : server: Orphan child windows when unlinking them from parent.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 862d0eeff978c6a2294e0bf9d39febdd3ef98f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=862d0eeff978c6a2294e0bf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:13:28 2022 +0100 server: Orphan child windows when unlinking them from parent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++++ server/window.c | 5 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d38ce382b86..a5848ac28da 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12786,6 +12786,39 @@ static void test_DragDetect(void) ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); } +static LRESULT WINAPI ncdestroy_test_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + unsigned int ret; + HWND parent; + + switch (msg) + { + case WM_NCDESTROY: + SetLastError( 0xdeadbeef ); + ret = SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 100, 100, SWP_NOSIZE|SWP_NOMOVE ); + todo_wine + ok( !ret, "SetWindowPos succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + parent = SetParent( hwnd, hwndMain ); + ok( parent == 0, "SetParent returned %p\n", parent ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + break; + } + + return DefWindowProcW( hwnd, msg, wp, lp ); +} + +static void test_ncdestroy(void) +{ + HWND hwnd; + hwnd = create_tool_window( WS_POPUP, 0 ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)ncdestroy_test_proc ); + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -12900,6 +12933,7 @@ START_TEST(win) test_parent_owner(); test_enum_thread_windows(); test_thread_exit_destroy(); + test_ncdestroy(); test_icons(); test_SetWindowPos(hwndMain, hwndMain2); diff --git a/server/window.c b/server/window.c index 6cc2f9d0f70..da05d024056 100644 --- a/server/window.c +++ b/server/window.c @@ -79,6 +79,7 @@ struct window unsigned int is_unicode : 1; /* ANSI or unicode */ unsigned int is_linked : 1; /* is it linked into the parent z-order list? */ unsigned int is_layered : 1; /* has layered info been set? */ + unsigned int is_orphan : 1; /* is window orphaned */ unsigned int color_key; /* color key for a layered window */ unsigned int alpha; /* alpha value for a layered window */ unsigned int layered_flags; /* flags for a layered window */ @@ -203,7 +204,7 @@ static inline int is_desktop_window( const struct window *win ) /* check if window is orphaned */ static int is_orphan_window( struct window *win ) { - do if (!win->handle) return 1; + do if (win->is_orphan) return 1; while ((win = win->parent)); return 0; } @@ -347,6 +348,7 @@ static int set_parent_window( struct window *win, struct window *parent ) list_remove( &win->entry ); /* unlink it from the previous location */ list_add_head( &win->parent->unlinked, &win->entry ); win->is_linked = 0; + win->is_orphan = 1; } return 1; } @@ -566,6 +568,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->is_unicode = 1; win->is_linked = 0; win->is_layered = 0; + win->is_orphan = 0; win->dpi_awareness = DPI_AWARENESS_PER_MONITOR_AWARE; win->dpi = 0; win->user_data = 0;

1 0

Hans Leidekker : dnsapi: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 5a446236352d8adba7be33ebba85ad7199f7dd4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a446236352d8adba7be33eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 9 10:57:54 2022 +0100 dnsapi: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/Makefile.in | 1 - dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/main.c | 81 +++++++++++++++++-------------------------- dlls/dnsapi/query.c | 37 +++++++++----------- dlls/dnsapi/tests/Makefile.in | 1 - dlls/dnsapi/tests/name.c | 4 +-- dlls/dnsapi/tests/query.c | 63 +++++++++++++++++---------------- dlls/dnsapi/tests/record.c | 42 +++++++++++----------- 8 files changed, 106 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a446236352d8adba7be…

1 0

Zhiyi Zhang : uxtheme: Use tab background as dialog texture for more WM_CTLCOLOR* messages.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 25daa0fa06e94bf26b82035023d5490eb49e0f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25daa0fa06e94bf26b820350… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:44:34 2022 +0800 uxtheme: Use tab background as dialog texture for more WM_CTLCOLOR* messages. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/dialog.c | 3 +++ dlls/uxtheme/tests/system.c | 15 ++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 87c2b7d1c13..b91e20f0f33 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -149,6 +149,9 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO SetBrushOrgEx(hdc, old_org.x, old_org.y, NULL); return TRUE; } + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: case WM_CTLCOLORSTATIC: { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 77a12f3fa44..c70e6c27361 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1854,7 +1854,6 @@ static void test_EnableThemeDialogTexture(void) } else { - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); } @@ -1863,7 +1862,6 @@ static void test_EnableThemeDialogTexture(void) ok(old_mode != 0, "SetBkMode failed.\n"); SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); /* Test that some WM_CTLCOLOR* messages change background color when dialog texture is on */ @@ -1879,24 +1877,18 @@ static void test_EnableThemeDialogTexture(void) memset(&log_brush, 0, sizeof(log_brush)); count = GetObjectA(brush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, log_brush.lbStyle); memset(&bmp, 0, sizeof(bmp)); count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); /* Test that DefDlgProcA/W() are hooked for some WM_CTLCOLOR* messages */ brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); brush2 = (HBRUSH)DefDlgProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); ok(brush2 == brush, "Expected the same brush.\n"); @@ -1905,24 +1897,21 @@ static void test_EnableThemeDialogTexture(void) /* Test that DefWindowProcA/W() are also hooked for some WM_CTLCOLOR* messages */ brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg != WM_CTLCOLORSTATIC) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); if (msg != WM_CTLCOLORDLG) { brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg == WM_CTLCOLORSTATIC) + todo_wine ok(brush2 == brush, "Expected the same brush.\n"); brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(msg == WM_CTLCOLORSTATIC) + todo_wine ok(brush2 == brush, "Expected the same brush.\n"); } else { brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); }

1 0