February 2022 - Wine-Commits

Stefan Dösinger : makedep: Fix some signed vs unsigned msvc warnings.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: e5041acfa2b38c73dcb340c5a5ee1244b9d9af82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5041acfa2b38c73dcb340c5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 1 16:58:23 2022 +0300 makedep: Fix some signed vs unsigned msvc warnings. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4172720fbf0..edb5d5a42d0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2036,7 +2036,7 @@ static const char *get_native_unix_lib( const struct makefile *make, const char static struct makefile *get_parent_makefile( struct makefile *make ) { char *dir, *p; - int i; + unsigned int i; if (!make->obj_dir) return NULL; dir = xstrdup( make->obj_dir ); @@ -3924,7 +3924,7 @@ static void output_testlist( const struct makefile *make ) */ static void output_gitignore( const char *dest, struct strarray files ) { - int i; + unsigned int i; output_file = create_temp_file( dest ); @@ -4026,7 +4026,8 @@ static void output_top_makefile( struct makefile *make ) { char buffer[1024]; FILE *src_file; - int i, found = 0; + unsigned int i; + int found = 0; output_file_name = obj_dir_path( make, output_makefile_name ); output_file = create_temp_file( output_file_name );

1 0

Alex Henrie : shell32/tests: Wait for window to close in check_window_exists.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 4dcc7a5ae8427b35254713edf1a1a19ce38213f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dcc7a5ae8427b35254713ed… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 7 00:54:29 2022 -0700 shell32/tests: Wait for window to close in check_window_exists. This fixes a race condition where the directory is deleted before the window closes, which causes an error dialog to appear. Cutting the number of iterations per wait loop in half is necessary so that doubling the number of wait loops does not result in a timeout when new tests are added. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index ef087893016..5d532f9222f 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -164,7 +164,7 @@ static BOOL check_window_exists(const char *name) else strcpy(title, name); - for (i = 0; i < 20; i++) + for (i = 0; i < 10; i++) { Sleep(100 * i); if ((window = FindWindowA("ExplorerWClass", title)) || @@ -175,7 +175,17 @@ static BOOL check_window_exists(const char *name) } } - return (window != NULL); + if (!window) + return FALSE; + + for (i = 0; i < 10; i++) + { + Sleep(100 * i); + if (!IsWindow(window)) + break; + } + + return TRUE; } static BOOL check_exists(const char *name)

1 0

Zhiyi Zhang : comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill text background for group boxes.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: cb3b982148753f1d5b0485d1d075cab8965fa2cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb3b982148753f1d5b0485d1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:45:23 2022 +0800 comctl32/button: Use the brush from WM_CTLCOLORSTATIC to fill text background for group boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 13 ++++++++++++- dlls/comctl32/tests/misc.c | 3 +-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1349e10c4c0..2ce12252460 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2914,10 +2914,20 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in HFONT font, hPrevFont = NULL; BOOL created_font = FALSE; TEXTMETRICW textMetric; + HBRUSH brush; + HWND parent; + HRESULT hr; LONG style; int part; - HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); + /* DrawThemeParentBackground() is used for filling content background. The brush from + * WM_CTLCOLORSTATIC is used for filling text background */ + parent = GetParent(infoPtr->hwnd); + if (!parent) + parent = infoPtr->hwnd; + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + + hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { font = CreateFontIndirectW(&lf); if (!font) @@ -2969,6 +2979,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in SelectClipRgn(hDC, textRegion); DeleteObject(textRegion); } + FillRect(hDC, &textRect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, part, state); } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index c3de9e68c5a..dc9648c1bf0 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -848,7 +848,7 @@ static void test_themed_background(void) {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_GROUPBOX, groupbox_seq}, {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, @@ -962,7 +962,6 @@ static void test_themed_background(void) /* WM_CTLCOLORSTATIC is used to fill text background */ color = GetPixel(hdc, 10, 10); - todo_wine ok(color == 0x808080, "Expected color %#x, got %#x.\n", 0x808080, color); }

1 0

Jacek Caban : server: Allocate extra_bytes separately from window struct.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 88131e476410fc907c0dc2d0c293ae5ca5f7730b URL: https://source.winehq.org/git/wine.git/?a=commit;h=88131e476410fc907c0dc2d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:12:10 2022 +0100 server: Allocate extra_bytes separately from window struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/server/window.c b/server/window.c index 7ea91d2a7dc..8fc4022a3ee 100644 --- a/server/window.c +++ b/server/window.c @@ -93,7 +93,7 @@ struct window int prop_alloc; /* number of allocated window properties */ struct property *properties; /* window properties array */ int nb_extra_bytes; /* number of extra bytes */ - char extra_bytes[1]; /* extra bytes storage */ + char *extra_bytes; /* extra bytes storage */ }; /* flags that can be set by the client */ @@ -483,7 +483,7 @@ static struct window *create_window( struct window *parent, struct window *owner goto failed; } - if (!(win = mem_alloc( sizeof(*win) + extra_bytes - 1 ))) goto failed; + if (!(win = mem_alloc( sizeof(*win) ))) goto failed; if (!(win->handle = alloc_user_handle( win, USER_WINDOW ))) goto failed; win->parent = parent; @@ -511,12 +511,19 @@ static struct window *create_window( struct window *parent, struct window *owner win->prop_inuse = 0; win->prop_alloc = 0; win->properties = NULL; - win->nb_extra_bytes = extra_bytes; + win->nb_extra_bytes = 0; + win->extra_bytes = NULL; win->window_rect = win->visible_rect = win->surface_rect = win->client_rect = empty_rect; - memset( win->extra_bytes, 0, extra_bytes ); list_init( &win->children ); list_init( &win->unlinked ); + if (extra_bytes) + { + if (!(win->extra_bytes = mem_alloc( extra_bytes ))) goto failed; + memset( win->extra_bytes, 0, extra_bytes ); + win->nb_extra_bytes = extra_bytes; + } + /* 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)) @@ -553,6 +560,7 @@ failed: if (win) { if (win->handle) free_user_handle( win->handle ); + free( win->extra_bytes ); free( win ); } release_object( desktop ); @@ -1920,7 +1928,11 @@ void destroy_window( struct window *win ) if (win->update_region) free_region( win->update_region ); if (win->class) release_class( win->class ); free( win->text ); - memset( win, 0x55, sizeof(*win) + win->nb_extra_bytes - 1 ); + if (win->nb_extra_bytes) + { + memset( win->extra_bytes, 0x55, win->nb_extra_bytes ); + free( win->extra_bytes ); + } free( win ); }

1 0

Jacek Caban : server: Keep a reference to parent in window objects.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: d52e454c12305857bf750ac9988e7e0752ced79e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d52e454c12305857bf750ac9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:12:50 2022 +0100 server: Keep a reference to parent in window objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/server/window.c b/server/window.c index 4373297b152..9fd67656eea 100644 --- a/server/window.c +++ b/server/window.c @@ -170,6 +170,12 @@ static void window_destroy( struct object *obj ) assert( !win->handle ); + if (win->parent) + { + list_remove( &win->entry ); + release_object( win->parent ); + } + 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 ); @@ -312,7 +318,8 @@ static int set_parent_window( struct window *win, struct window *parent ) if (parent) { - win->parent = parent; + if (win->parent) release_object( win->parent ); + win->parent = (struct window *)grab_object( parent ); link_window( win, WINPTR_TOP ); if (!is_desktop_window( parent )) @@ -537,7 +544,7 @@ static struct window *create_window( struct window *parent, struct window *owner } if (!(win = alloc_object( &window_ops ))) goto failed; - win->parent = parent; + win->parent = parent ? (struct window *)grab_object( parent ) : NULL; win->owner = owner ? owner->handle : 0; win->thread = current; win->desktop = desktop; @@ -1935,6 +1942,8 @@ static void set_window_region( struct window *win, struct region *region, int re /* destroy a window */ void free_window_handle( struct window *win ) { + struct window *child, *next; + assert( win->handle ); /* hide the window */ @@ -1953,10 +1962,16 @@ void free_window_handle( struct window *win ) } /* destroy all children */ - while (!list_empty(&win->children)) - free_window_handle( LIST_ENTRY( list_head(&win->children), struct window, entry )); - while (!list_empty(&win->unlinked)) - free_window_handle( LIST_ENTRY( list_head(&win->unlinked), struct window, entry )); + LIST_FOR_EACH_ENTRY_SAFE( child, next, &win->children, struct window, entry ) + { + if (!child->handle) continue; + free_window_handle( child ); + } + LIST_FOR_EACH_ENTRY_SAFE( child, next, &win->children, struct window, entry ) + { + if (!child->handle) continue; + free_window_handle( child ); + } /* reset global window pointers, if the corresponding window is destroyed */ if (win == shell_window) shell_window = NULL; @@ -1966,7 +1981,6 @@ void free_window_handle( struct window *win ) free_hotkeys( win->desktop, win->handle ); cleanup_clipboard_window( win->desktop, win->handle ); destroy_properties( win ); - list_remove( &win->entry ); if (is_desktop_window(win)) { struct desktop *desktop = win->desktop; @@ -1981,6 +1995,7 @@ void free_window_handle( struct window *win ) detach_window_thread( win ); + if (win->parent) set_parent_window( win, NULL ); free_user_handle( win->handle ); win->handle = 0; release_object( win );

1 0

Jacek Caban : server: Don't allow orphaned windows in set_parent request.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 82572350cd1d302bf4402526d6c5152e02c6f4a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82572350cd1d302bf4402526… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 8 13:13:19 2022 +0100 server: Don't allow orphaned windows in set_parent request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- server/window.c | 10 +++++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 48b9e5e332c..d38ce382b86 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -865,16 +865,13 @@ static void test_thread_exit_destroy(void) SetLastError( 0xdeadbeef ); tmp = SetParent( child1, adopter ); ok( tmp == 0, "SetParent returned %p\n", tmp ); - todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp = SetParent( child3, adopter ); ok( tmp == 0, "SetParent returned %p\n", tmp ); - todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp = GetParent( child1 ); - todo_wine ok( tmp == params.hwnd, "GetParent returned %p, error %u\n", tmp, GetLastError() ); ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %u\n", GetLastError() ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4f860889024..9e483b4c494 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3374,7 +3374,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) { req->handle = wine_server_user_handle( hwnd ); req->parent = wine_server_user_handle( parent ); - if ((ret = !wine_server_call( req ))) + if ((ret = !wine_server_call_err( req ))) { old_parent = wine_server_ptr_handle( reply->old_parent ); wndPtr->parent = parent = wine_server_ptr_handle( reply->full_parent ); diff --git a/server/window.c b/server/window.c index 506f0269ee1..6cc2f9d0f70 100644 --- a/server/window.c +++ b/server/window.c @@ -200,6 +200,14 @@ static inline int is_desktop_window( const struct window *win ) return !win->parent; /* only desktop windows have no parent */ } +/* check if window is orphaned */ +static int is_orphan_window( struct window *win ) +{ + do if (!win->handle) return 1; + while ((win = win->parent)); + return 0; +} + /* get next window in Z-order list */ static inline struct window *get_next_window( struct window *win ) { @@ -2066,7 +2074,7 @@ DECL_HANDLER(set_parent) if (!(win = get_window( req->handle ))) return; if (req->parent && !(parent = get_window( req->parent ))) return; - if (is_desktop_window(win)) + if (is_desktop_window(win) || is_orphan_window( win ) || (parent && is_orphan_window( parent ))) { set_error( STATUS_INVALID_PARAMETER ); return;

1 0

Esme Povirk : diasymreader: Stub ISymUnmanagedDocumentWriter.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 0de459d0de38cb928adb1e08522bb1ff5f64bd18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de459d0de38cb928adb1e08… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Feb 8 13:21:33 2022 -0600 diasymreader: Stub ISymUnmanagedDocumentWriter. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/writer.c | 96 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 1820ccb51b0..3c07b77ab81 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -45,6 +45,11 @@ typedef struct SymWriter { WCHAR pdb_filename[MAX_PATH]; } SymWriter; +typedef struct SymDocumentWriter { + ISymUnmanagedDocumentWriter iface; + LONG ref; +} SymDocumentWriter; + static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *iface) { return CONTAINING_RECORD(iface, SymWriter, iface); @@ -55,6 +60,81 @@ static inline SymWriter *impl_from_IPdbWriter(IPdbWriter *iface) return CONTAINING_RECORD(iface, SymWriter, IPdbWriter_iface); } +static inline SymDocumentWriter *impl_from_ISymUnmanagedDocumentWriter(ISymUnmanagedDocumentWriter *iface) +{ + return CONTAINING_RECORD(iface, SymDocumentWriter, iface); +} + +static HRESULT WINAPI SymDocumentWriter_QueryInterface(ISymUnmanagedDocumentWriter *iface, REFIID iid, + void **ppv) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ISymUnmanagedDocumentWriter, iid)) + { + *ppv = &This->iface; + } + else + { + WARN("unknown interface %s\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI SymDocumentWriter_AddRef(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%lu\n", iface, ref); + + return ref; +} + +static ULONG WINAPI SymDocumentWriter_Release(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%lu\n", iface, ref); + + if (ref == 0) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI SymDocumentWriter_SetSource(ISymUnmanagedDocumentWriter *iface, ULONG32 sourceSize, + BYTE source[]) +{ + FIXME("(%p,%u,%p)\n", iface, sourceSize, source); + return S_OK; +} + +static HRESULT WINAPI SymDocumentWriter_SetChecksum(ISymUnmanagedDocumentWriter *iface, GUID algorithmID, + ULONG32 checkSumSize, BYTE checkSum[]) +{ + FIXME("(%p,%s,%u,%p)\n", iface, debugstr_guid(&algorithmID), checkSumSize, checkSum); + return S_OK; +} + +static const ISymUnmanagedDocumentWriterVtbl SymDocumentWriter_Vtbl = { + SymDocumentWriter_QueryInterface, + SymDocumentWriter_AddRef, + SymDocumentWriter_Release, + SymDocumentWriter_SetSource, + SymDocumentWriter_SetChecksum +}; + static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFIID iid, void **ppv) { @@ -117,9 +197,23 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons const GUID *language, const GUID *languageVendor, const GUID *documentType, ISymUnmanagedDocumentWriter** pRetVal) { + SymDocumentWriter *result; + FIXME("(%p,%s,%s,%s,%s,%p)\n", iface, debugstr_w(url), debugstr_guid(language), debugstr_guid(languageVendor), debugstr_guid(documentType), pRetVal); - return E_NOTIMPL; + + if (!pRetVal) + return E_POINTER; + + result = heap_alloc(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + result->iface.lpVtbl = &SymDocumentWriter_Vtbl; + result->ref = 1; + *pRetVal = &result->iface; + + return S_OK; } static HRESULT WINAPI SymWriter_SetUserEntryPoint(ISymUnmanagedWriter5 *iface, mdMethodDef entryMethod)

1 0

Zhiyi Zhang : comctl32/button: Use the brush from WM_CTLCOLORBTN to fill background for push buttons.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 509d6a1d5f4ecfebb28dce33e7fc09540ae1403c URL: https://source.winehq.org/git/wine.git/?a=commit;h=509d6a1d5f4ecfebb28dce33… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:45:01 2022 +0800 comctl32/button: Use the brush from WM_CTLCOLORBTN to fill background for push buttons. The brush from WM_CTLCOLORBTN is used for filling background for push buttons after a DrawThemeParentBackground() call according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 7 +++++++ dlls/comctl32/tests/misc.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 88b48a4a5c0..14b2200afed 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2729,6 +2729,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { RECT bgRect, labelRect, imageRect, textRect, focusRect; NMCUSTOMDRAW nmcd; + HBRUSH brush; LRESULT cdrf; HWND parent; @@ -2748,7 +2749,13 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + { DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + /* Tests show that the brush from WM_CTLCOLORBTN is used for filling background after a + * DrawThemeParentBackground() call */ + brush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + FillRect(hDC, &bgRect, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); + } DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); if (cdrf & CDRF_NOTIFYPOSTERASE) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 72674ea5942..09c5b3d6c40 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -841,15 +841,15 @@ static void test_themed_background(void) tests[] = { {ANIMATE_CLASSA, 0, empty_seq, TRUE}, - {WC_BUTTONA, BS_PUSHBUTTON, pushbutton_seq, TRUE}, - {WC_BUTTONA, BS_DEFPUSHBUTTON, defpushbutton_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_GROUPBOX, groupbox_seq, TRUE}, - {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq, TRUE}, + {WC_BUTTONA, BS_USERBUTTON, pushbutton_seq}, {WC_BUTTONA, BS_AUTORADIOBUTTON, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_PUSHBOX, radiobutton_seq, TRUE}, {WC_BUTTONA, BS_OWNERDRAW, ownerdrawbutton_seq},

1 0

Rémi Bernon : user32/tests: Add a test for child window destruction on thread exit.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: ce3abc225f50c0734dfae83d9216fe13148603f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce3abc225f50c0734dfae83d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 13:13:11 2022 +0100 user32/tests: Add a test for child window destruction on thread exit. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 235 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce3abc225f50c0734dfa…

1 0

Zhiyi Zhang : comctl32/trackbar: Always use brush from WM_CTLCOLORSTATIC to fill background.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 179117a6892401e7ee7f988b5b00341c0981213b URL: https://source.winehq.org/git/wine.git/?a=commit;h=179117a6892401e7ee7f988b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:44:53 2022 +0800 comctl32/trackbar: Always use brush from WM_CTLCOLORSTATIC to fill background. Fix the track bar of Mupen64-RR-Lua input window having black background. Mupen64-RR-Lua doesn't actually handle WM_ERASEBKGND even though it returns nonzero. And tests show that only WM_CTLCOLORSTATIC is sent when drawing themed trackbar background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/trackbar.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 3a1b5253b58..72674ea5942 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -883,7 +883,7 @@ static void test_themed_background(void) {WC_TABCONTROLA, 0, drawthemeparentbackground_seq, TRUE}, {TOOLBARCLASSNAMEA, 0, empty_seq, TRUE}, {TOOLTIPS_CLASSA, 0, empty_seq}, - {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq, TRUE}, + {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq}, {WC_TREEVIEWA, 0, treeview_seq}, {UPDOWN_CLASSA, 0, empty_seq}, {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 6643752c043..f2cb2a07a8d 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -899,6 +899,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) HBITMAP hOldBmp = 0, hOffScreenBmp = 0; NMCUSTOMDRAW nmcd; int gcdrf, icdrf; + HBRUSH brush; if (infoPtr->flags & TB_THUMBCHANGED) { TRACKBAR_UpdateThumb (infoPtr); @@ -943,14 +944,9 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) /* Erase background */ if (gcdrf == CDRF_DODEFAULT || notify_customdraw(infoPtr, &nmcd, CDDS_PREERASE) != CDRF_SKIPDEFAULT) { - if (GetWindowTheme (infoPtr->hwndSelf)) { - DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); - } - else { - HBRUSH brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); - FillRect (hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); - } + brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, (WPARAM)hdc, + (LPARAM)infoPtr->hwndSelf); + FillRect(hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); if (gcdrf != CDRF_DODEFAULT) notify_customdraw(infoPtr, &nmcd, CDDS_POSTERASE); }

1 0