October 2021 - Wine-commits

Nikolay Sivov : d3d10/effect: Use separate enum to describe property container.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 74d8129fc61e163cedf4de6d9eba4ece667b5f1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d8129fc61e163cedf4de6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 1 09:13:59 2021 +0300 d3d10/effect: Use separate enum to describe property container. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 114 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74d8129fc61e163cedf4…

1 0

Nikolay Sivov : d3d10/effect: Make it clear which assignment types are supported in state groups.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 0182f1f8489c607e1859c8fcd1e9f49f2b498bbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0182f1f8489c607e1859c8fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 1 09:14:00 2021 +0300 d3d10/effect: Make it clear which assignment types are supported in state groups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 8 +++++--- dlls/d3d10/effect.c | 25 ++++++++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f980007427f..3fd17c7400d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -60,9 +60,11 @@ enum d3d10_effect_object_type_flags enum d3d10_effect_object_operation { - D3D10_EOO_VALUE = 1, - D3D10_EOO_PARSED_OBJECT = 2, - D3D10_EOO_PARSED_OBJECT_INDEX = 3, + D3D10_EOO_CONST = 1, + D3D10_EOO_VAR = 2, + D3D10_EOO_CONST_INDEX = 3, + D3D10_EOO_VAR_INDEX = 4, + D3D10_EOO_INDEX_EXPRESSION = 5, D3D10_EOO_ANONYMOUS_SHADER = 7, }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5d5db4eea6c..1823ffdc04b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1741,11 +1741,22 @@ static BOOL parse_fx10_state_group(const char *data, size_t data_size, return FALSE; } - if (!read_value_list(data, data_size, value_offset, property_info->type, idx, - property_info->size, (char *)container + property_info->offset)) + switch (operation) { - ERR("Failed to read values for property %#x.\n", id); - return FALSE; + case D3D10_EOO_CONST: + + /* Constant values output directly to backing store. */ + if (!read_value_list(data, data_size, value_offset, property_info->type, idx, + property_info->size, (char *)container + property_info->offset)) + { + ERR("Failed to read values for property %#x.\n", id); + return FALSE; + } + break; + + default: + FIXME("Unhandled operation %#x.\n", operation); + return E_FAIL; } } @@ -1787,7 +1798,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, switch(operation) { - case D3D10_EOO_VALUE: + case D3D10_EOO_CONST: TRACE("Copy variable values\n"); switch (o->type) @@ -1837,7 +1848,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, } break; - case D3D10_EOO_PARSED_OBJECT: + case D3D10_EOO_VAR: /* This is a local object, we've parsed in parse_fx10_local_object. */ if (!fx10_get_string(data, data_size, offset, &name, &name_len)) { @@ -1849,7 +1860,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, variable = e->lpVtbl->GetVariableByName(e, name); break; - case D3D10_EOO_PARSED_OBJECT_INDEX: + case D3D10_EOO_CONST_INDEX: /* This is a local object, we've parsed in parse_fx10_local_object, which has an array index. */ if (offset >= data_size || !require_space(offset, 2, sizeof(DWORD), data_size)) {

1 0

Nikolay Sivov : d3d10/effect: Remove a bit of a dead code for semantic handling, for anonymous shader variables.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 9a9468ccc0916f6e6a5955cff60c8fd2a7dea1c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9468ccc0916f6e6a5955cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 1 09:14:01 2021 +0300 d3d10/effect: Remove a bit of a dead code for semantic handling, for anonymous shader variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1823ffdc04b..5a5f9f37e6d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1543,13 +1543,6 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ } TRACE("Variable name: %s.\n", debugstr_a(v->name)); - if (!copy_name(NULL, &v->semantic)) - { - ERR("Failed to copy semantic.\n"); - return E_OUTOFMEMORY; - } - TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - return S_OK; }

1 0

Zebediah Figura : winegstreamer: Move the GstAutoplugSelectResult definition to wg_parser.c.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 959bc42892a6dcce17302cd6fc2d53538a20f018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=959bc42892a6dcce17302cd6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 1 17:18:08 2021 -0500 winegstreamer: Move the GstAutoplugSelectResult definition to wg_parser.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 7 ------- dlls/winegstreamer/wg_parser.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 49e06b31369..923bba25d38 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -36,13 +36,6 @@ #include "wine/debug.h" #include "wine/strmbase.h" -typedef enum -{ - GST_AUTOPLUG_SELECT_TRY, - GST_AUTOPLUG_SELECT_EXPOSE, - GST_AUTOPLUG_SELECT_SKIP, -} GstAutoplugSelectResult; - static inline const char *debugstr_time(REFERENCE_TIME time) { ULONGLONG abstime = time >= 0 ? time : -time; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f0815e37689..dde137ef186 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -34,6 +34,13 @@ #include <gst/video/video.h> #include <gst/audio/audio.h> +typedef enum +{ + GST_AUTOPLUG_SELECT_TRY, + GST_AUTOPLUG_SELECT_EXPOSE, + GST_AUTOPLUG_SELECT_SKIP, +} GstAutoplugSelectResult; + /* GStreamer callbacks may be called on threads not created by Wine, and * therefore cannot access the Wine TEB. This means that we must use GStreamer * debug logging instead of Wine debug logging. In order to be safe we forbid

1 0

Jacek Caban : gdi32: Use native memory allocators in Unix library.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 6ea18f668174e8122e0c192f2b67d8b2c1daca2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea18f668174e8122e0c192f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:57:05 2021 +0200 gdi32: Use native memory allocators in Unix library. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 14 ++--- dlls/gdi32/bitmap.c | 16 +++--- dlls/gdi32/brush.c | 12 ++--- dlls/gdi32/dc.c | 20 ++++---- dlls/gdi32/dib.c | 27 +++++----- dlls/gdi32/dibdrv/bitblt.c | 8 +-- dlls/gdi32/dibdrv/dc.c | 12 ++--- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 44 ++++++++-------- dlls/gdi32/dibdrv/objects.c | 10 ++-- dlls/gdi32/dibdrv/opengl.c | 6 +-- dlls/gdi32/driver.c | 9 ++-- dlls/gdi32/emfdrv.c | 4 +- dlls/gdi32/font.c | 120 ++++++++++++++++++++----------------------- dlls/gdi32/freetype.c | 100 ++++++++++++++++++------------------ dlls/gdi32/gdiobj.c | 6 +-- dlls/gdi32/painting.c | 25 +++++---- dlls/gdi32/palette.c | 25 ++++----- dlls/gdi32/path.c | 52 +++++++++---------- dlls/gdi32/pen.c | 12 ++--- dlls/gdi32/region.c | 22 ++++---- dlls/gdi32/win32u_private.h | 3 -- 22 files changed, 266 insertions(+), 283 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ea18f668174e8122e0c…

1 0

Jacek Caban : gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 01b6ba88d615125d2244a28a0adfda07dca79d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b6ba88d615125d2244a28a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:57:54 2021 +0200 gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c00e5128ced..c21993a8ca5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -26,6 +26,8 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <pthread.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -39,6 +41,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dc); +static pthread_mutex_t dc_attr_lock = PTHREAD_MUTEX_INITIALIZER; + +struct dc_attr_bucket +{ + struct list entry; + DC_ATTR *entries; + DC_ATTR *next_free; + DC_ATTR *next_unused; +}; + +static struct list dc_attr_buckets = LIST_INIT( dc_attr_buckets ); + static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -74,6 +88,70 @@ static inline DC *get_dc_obj( HDC hdc ) } } +/* alloc DC_ATTR from a pool of memory accessible from client */ +static DC_ATTR *alloc_dc_attr(void) +{ + struct dc_attr_bucket *bucket; + DC_ATTR *dc_attr = NULL; + + pthread_mutex_lock( &dc_attr_lock ); + + LIST_FOR_EACH_ENTRY( bucket, &dc_attr_buckets, struct dc_attr_bucket, entry ) + { + if (bucket->next_free) + { + dc_attr = bucket->next_free; + bucket->next_free = *(void **)bucket->next_free; + break; + } + if ((char *)bucket->next_unused - (char *)bucket->entries + sizeof(*dc_attr) <= + system_info.AllocationGranularity) + { + dc_attr = bucket->next_unused++; + break; + } + } + + if (!dc_attr && (bucket = malloc( sizeof(*bucket) ))) + { + SIZE_T size = system_info.AllocationGranularity; + bucket->entries = NULL; + if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, 0, &size, + MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )) + { + bucket->next_free = NULL; + bucket->next_unused = bucket->entries + 1; + dc_attr = bucket->entries; + list_add_head( &dc_attr_buckets, &bucket->entry ); + } + else free( bucket ); + } + + if (dc_attr) memset( dc_attr, 0, sizeof( *dc_attr )); + + pthread_mutex_unlock( &dc_attr_lock ); + + return dc_attr; +} + + +static void free_dc_attr( DC_ATTR *dc_attr ) +{ + struct dc_attr_bucket *bucket; + + pthread_mutex_lock( &dc_attr_lock ); + + LIST_FOR_EACH_ENTRY( bucket, &dc_attr_buckets, struct dc_attr_bucket, entry ) + { + if (bucket->entries > dc_attr || dc_attr >= bucket->next_unused) continue; + *(void **)dc_attr = bucket->next_free; + bucket->next_free = dc_attr; + break; + } + + pthread_mutex_unlock( &dc_attr_lock ); +} + /*********************************************************************** * set_initial_dc_state @@ -133,7 +211,7 @@ DC *alloc_dc_ptr( DWORD magic ) DC *dc; if (!(dc = calloc( 1, sizeof(*dc) ))) return NULL; - if (!(dc->attr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc->attr) ))) + if (!(dc->attr = alloc_dc_attr())) { free( dc ); return NULL; @@ -152,7 +230,7 @@ DC *alloc_dc_ptr( DWORD magic ) if (!(dc->hSelf = alloc_gdi_handle( &dc->obj, magic, &dc_funcs ))) { - RtlFreeHeap( GetProcessHeap(), 0, dc->attr ); + free_dc_attr( dc->attr ); free( dc ); return NULL; } @@ -179,7 +257,7 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) NtGdiDeleteObjectApp( dc->hVisRgn ); if (dc->region) NtGdiDeleteObjectApp( dc->region ); if (dc->path) free_gdi_path( dc->path ); - RtlFreeHeap( GetProcessHeap(), 0, dc->attr ); + free_dc_attr( dc->attr ); free( dc ); }

1 0

Jacek Caban : gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: fc7420de71f8126112ada8bf380d3a79785bb661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc7420de71f8126112ada8bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:58:03 2021 +0200 gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 47b413ab0aa..8381c9e2746 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -42,9 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define FIRST_GDI_HANDLE 32 -static GDI_SHARED_MEMORY gdi_shared; +static GDI_SHARED_MEMORY *gdi_shared; static GDI_HANDLE_ENTRY *next_free; -static GDI_HANDLE_ENTRY *next_unused = gdi_shared.Handles + FIRST_GDI_HANDLE; +static GDI_HANDLE_ENTRY *next_unused; static LONG debug_count; SYSTEM_BASIC_INFORMATION system_info; @@ -52,7 +52,7 @@ const struct user_callbacks *user_callbacks = NULL; static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { - unsigned int idx = entry - gdi_shared.Handles; + unsigned int idx = entry - gdi_shared->Handles; return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } @@ -60,10 +60,10 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) { unsigned int idx = LOWORD(handle); - if (idx < GDI_MAX_HANDLE_COUNT && gdi_shared.Handles[idx].Type) + if (idx < GDI_MAX_HANDLE_COUNT && gdi_shared->Handles[idx].Type) { - if (!HIWORD( handle ) || HIWORD( handle ) == gdi_shared.Handles[idx].Unique) - return &gdi_shared.Handles[idx]; + if (!HIWORD( handle ) || HIWORD( handle ) == gdi_shared->Handles[idx].Unique) + return &gdi_shared->Handles[idx]; } if (handle) WARN( "invalid handle %p\n", handle ); return NULL; @@ -605,19 +605,26 @@ static HFONT create_scaled_font( const LOGFONTW *deffont, unsigned int dpi ) return create_font( &lf ); } -static void set_gdi_shared(void) +static void init_gdi_shared(void) { + SIZE_T size = sizeof(*gdi_shared); + + if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) + return; + next_unused = gdi_shared->Handles + FIRST_GDI_HANDLE; + #ifndef _WIN64 if (NtCurrentTeb()->GdiBatchCount) { TEB64 *teb64 = (TEB64 *)(UINT_PTR)NtCurrentTeb()->GdiBatchCount; PEB64 *peb64 = (PEB64 *)(UINT_PTR)teb64->Peb; - peb64->GdiSharedHandleTable = (UINT_PTR)&gdi_shared; + peb64->GdiSharedHandleTable = (UINT_PTR)gdi_shared; return; } #endif /* NOTE: Windows uses 32-bit for 32-bit kernel */ - NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; + NtCurrentTeb()->Peb->GdiSharedHandleTable = gdi_shared; } HGDIOBJ get_stock_object( INT obj ) @@ -695,7 +702,7 @@ static void init_stock_objects( unsigned int dpi ) /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < STOCK_LAST + 5; i++) { - GDI_HANDLE_ENTRY *entry = &gdi_shared.Handles[FIRST_GDI_HANDLE + i]; + GDI_HANDLE_ENTRY *entry = &gdi_shared->Handles[FIRST_GDI_HANDLE + i]; entry_obj( entry )->system = TRUE; entry->StockFlag = 1; } @@ -730,7 +737,7 @@ static void dump_gdi_objects( void ) TRACE( "%u objects:\n", GDI_MAX_HANDLE_COUNT ); EnterCriticalSection( &gdi_section ); - for (entry = gdi_shared.Handles; entry < next_unused; entry++) + for (entry = gdi_shared->Handles; entry < next_unused; entry++) { if (!entry->Type) TRACE( "handle %p FREE\n", entry_to_handle( entry )); @@ -760,7 +767,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g entry = next_free; if (entry) next_free = (GDI_HANDLE_ENTRY *)(UINT_PTR)entry->Object; - else if (next_unused < gdi_shared.Handles + GDI_MAX_HANDLE_COUNT) + else if (next_unused < gdi_shared->Handles + GDI_MAX_HANDLE_COUNT) entry = next_unused++; else { @@ -1269,7 +1276,9 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p if (reason != DLL_PROCESS_ATTACH) return 0; NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); - set_gdi_shared(); + init_gdi_shared(); + if (!gdi_shared) return STATUS_NO_MEMORY; + dpi = font_init(); init_stock_objects( dpi ); user_callbacks = ptr_in;

1 0

Zhiyi Zhang : light.msstyles: Add scrollbar width and height.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 760acf6c1300dc66d0524981436168b1a586574d URL: https://source.winehq.org/git/wine.git/?a=commit;h=760acf6c1300dc66d0524981… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:26:14 2021 +0800 light.msstyles: Add scrollbar width and height. Fix a bug that scrollbar width and height don't change when activating Light theme. For example, when theming is inactive, change scrollbar width from the default 16 pixels to 32 pixels, then activate Light theme. Then scrollbar width should be changed to the theme specified scrollbar width. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 76adf8f8398..cf9271cb612 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -144,7 +144,10 @@ BLUE_INI TEXTFILE "EdgeFillColor = 255 255 255\r\n" "\r\n[SysMetrics]\r\n" -"; System colors\r\n" +"ScrollbarWidth = 16\r\n" +"ScrollbarHeight = 16\r\n" + +"\r\n; System colors\r\n" "Scrollbar = 255 255 255\r\n" "Background = 37 111 149\r\n" "ActiveCaption = 50 150 250\r\n"

1 0

Zhiyi Zhang : comctl32/button: Do not restore push button font after themed painting.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 8b30c00a7bf38f6b80779c2d1bceecb4fbbf8b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b30c00a7bf38f6b80779c2d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:26:53 2021 +0800 comctl32/button: Do not restore push button font after themed painting. Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index d3dcc67b169..7dfc1720508 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2656,13 +2656,13 @@ cleanup: static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { RECT bgRect, textRect; - HFONT font = infoPtr->font; - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; WCHAR *text; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); @@ -2672,7 +2672,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send erase notifications */ cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -2687,7 +2687,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) { @@ -2700,7 +2700,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + if (cdrf & CDRF_SKIPPOSTPAINT) return; if (focused) { @@ -2716,9 +2716,6 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in DrawFocusRect( hDC, &focusRect ); } - -cleanup: - if (hPrevFont) SelectObject(hDC, hPrevFont); } static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)

1 0

Zhiyi Zhang : comctl32/button: Do not restore checkbox font after themed painting.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 687d9d0beefeb6b1b5c78b5a4554ab0315a8f64d URL: https://source.winehq.org/git/wine.git/?a=commit;h=687d9d0beefeb6b1b5c78b5a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:27:00 2021 +0800 comctl32/button: Do not restore checkbox font after themed painting. Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7dfc1720508..894cc6a3df9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2744,8 +2744,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in created_font = TRUE; } } else { - font = (HFONT)SendMessageW(infoPtr->hwnd, WM_GETFONT, 0, 0); - hPrevFont = SelectObject(hDC, font); + if (infoPtr->font) SelectObject(hDC, infoPtr->font); } if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz)))

1 0