- Wine-Devel - list.winehq.org

[PATCH] msdasql/tests: Fix the spelling of the command_text variable.
by Francois Gouget Dec. 7, 2021

Dec. 7, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msdasql/tests/provider.c | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b520b127d67..dfe3e3af886 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -187,7 +187,7 @@ static void test_command_interfaces(IUnknown *cmd) { HRESULT hr; ICommandProperties *commandProp; - ICommandText *comand_text; + ICommandText *command_text; IConvertType *convertype; ICommandPrepare *commandprepare; ICommandStream *commandstream; @@ -204,9 +204,9 @@ static void test_command_interfaces(IUnknown *cmd) ok(hr == S_OK, "got 0x%08x\n", hr); ICommandWithParameters_Release(cmdwithparams); - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -238,70 +238,70 @@ static void test_command_interfaces(IUnknown *cmd) static void test_command_text(IUnknown *cmd) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; OLECHAR *str; GUID dialect; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); if (0) { /* Crashes under windows */ - hr = ICommandText_SetCommandText(comand_text, NULL, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, NULL, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, NULL); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, NULL, &str); + hr = ICommandText_GetCommandText(command_text, NULL, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); /* dialect empty value */ - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr); ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); dialect = DBGUID_DEFAULT; - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } static void test_command_dbsession(IUnknown *cmd, IUnknown *session) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; IUnknown *sess; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetDBSession(comand_text, &IID_IUnknown, &sess); + hr = ICommandText_GetDBSession(command_text, &IID_IUnknown, &sess); ok(hr == S_OK, "got 0x%08x\n", hr); ok(session == sess, "different session pointers\n"); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) @@ -353,33 +353,33 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) static void test_command_rowset(IUnknown *cmd) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; IUnknown *unk = NULL; IRowset *rowset; DBROWCOUNT affected; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); ok(hr == S_OK, "got 0x%08x\n", hr); affected = 9999; - hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(unk == NULL, "Unexepcted value\n"); + todo_wine ok(unk == NULL, "Unexpected value\n"); todo_wine ok(affected == -1, "got %ld\n", affected); if (unk) IUnknown_Release(unk); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); affected = 9999; - hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(unk != NULL, "Unexepcted value\n"); + ok(unk != NULL, "Unexpected value\n"); if (hr == S_OK) { ok(affected == -1, "wrong affected value\n"); @@ -387,13 +387,13 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); - test_rowset_interfaces(rowset, comand_text); + test_rowset_interfaces(rowset, command_text); IRowset_Release(rowset); IUnknown_Release(unk); } - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } -- 2.30.2

1 0

[PATCH] win32u: Fix the trailing linefeed in a TRACE().
by Francois Gouget Dec. 7, 2021

Dec. 7, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2072597a968..56523210bdf 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1291,7 +1291,7 @@ static BOOL update_display_cache(void) .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, }; - TRACE( "adding default fake monitor\n "); + TRACE( "adding default fake monitor\n"); add_monitor( &default_monitor, &ctx ); } release_display_manager_ctx( &ctx ); -- 2.30.2

1 0

[PATCH] msvcp120/tests: Compare thread IDs in test_thrd, not thread handles
by Alex Henrie Dec. 7, 2021

Dec. 7, 2021

Fixes an intermittent testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 495ee9dd6fb..3241e577b88 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2093,8 +2093,8 @@ static void test_thrd(void) tb = p__Thrd_current(); ok(ta.id == tb.id, "got a %d b %d\n", ta.id, tb.id); ok(ta.id == GetCurrentThreadId(), "expected %d, got %d\n", GetCurrentThreadId(), ta.id); - /* these can be different if new threads are created at same time */ - ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); + /* the handles can be different if new threads are created at same time, but the IDs are always the same */ + ok(GetThreadId(ta.hnd) == GetThreadId(tb.hnd), "got a %d b %d\n", GetThreadId(ta.hnd), GetThreadId(tb.hnd)); ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd); -- 2.34.1

2 1

[PATCH 1/4] server: Split waitable object off completion port.
by Paul Gofman Dec. 7, 2021

Dec. 7, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- server/completion.c | 118 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 24 deletions(-) diff --git a/server/completion.c b/server/completion.c index 6933195e72d..8dd8d4b1247 100644 --- a/server/completion.c +++ b/server/completion.c @@ -56,15 +56,50 @@ struct type_descr completion_type = }, }; -struct completion +struct completion_wait { struct object obj; struct list queue; unsigned int depth; }; +struct completion +{ + struct object obj; + struct completion_wait *wait; +}; + +static void completion_wait_dump( struct object*, int ); +static int completion_wait_signaled( struct object *obj, struct wait_queue_entry *entry ); +static void completion_wait_destroy( struct object * ); + +static const struct object_ops completion_wait_ops = +{ + sizeof(struct completion_wait), /* size */ + &no_type, /* type */ + completion_wait_dump, /* dump */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + completion_wait_signaled, /* signaled */ + no_satisfied, /* 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 */ + completion_wait_destroy /* destroy */ +}; + static void completion_dump( struct object*, int ); -static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ); +static int completion_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static void completion_remove_queue( struct object *obj, struct wait_queue_entry *entry ); static void completion_destroy( struct object * ); static const struct object_ops completion_ops = @@ -72,9 +107,9 @@ static const struct object_ops completion_ops = sizeof(struct completion), /* size */ &completion_type, /* type */ completion_dump, /* dump */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - completion_signaled, /* signaled */ + completion_add_queue, /* add_queue */ + completion_remove_queue, /* remove_queue */ + NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ @@ -100,30 +135,63 @@ struct comp_msg unsigned int status; }; -static void completion_destroy( struct object *obj) +static void completion_wait_destroy( struct object *obj) { - struct completion *completion = (struct completion *) obj; + struct completion_wait *wait = (struct completion_wait *)obj; struct comp_msg *tmp, *next; - LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &completion->queue, struct comp_msg, queue_entry ) + LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &wait->queue, struct comp_msg, queue_entry ) { free( tmp ); } } +static void completion_wait_dump( struct object *obj, int verbose ) +{ + struct completion_wait *wait = (struct completion_wait *)obj; + + assert( obj->ops == &completion_wait_ops ); + fprintf( stderr, "Completion depth=%u\n", wait->depth ); +} + +static int completion_wait_signaled( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion_wait *wait = (struct completion_wait *)obj; + + assert( obj->ops == &completion_wait_ops ); + return !list_empty( &wait->queue ); +} + static void completion_dump( struct object *obj, int verbose ) { - struct completion *completion = (struct completion *) obj; + struct completion *completion = (struct completion *)obj; + + assert( obj->ops == &completion_ops ); + completion->wait->obj.ops->dump( &completion->wait->obj, verbose ); +} + +static int completion_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion *completion = (struct completion *)obj; + + assert( obj->ops == &completion_ops ); + return completion->wait->obj.ops->add_queue( &completion->wait->obj, entry ); +} + +static void completion_remove_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion *completion = (struct completion *)obj; assert( obj->ops == &completion_ops ); - fprintf( stderr, "Completion depth=%u\n", completion->depth ); + completion->wait->obj.ops->remove_queue( &completion->wait->obj, entry ); } -static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ) +static void completion_destroy( struct object *obj ) { struct completion *completion = (struct completion *)obj; - return !list_empty( &completion->queue ); + assert( obj->ops == &completion_ops ); + release_object( &completion->wait->obj ); } static struct completion *create_completion( struct object *root, const struct unicode_str *name, @@ -132,15 +200,17 @@ static struct completion *create_completion( struct object *root, const struct u { struct completion *completion; - if ((completion = create_named_object( root, &completion_ops, name, attr, sd ))) + if (!(completion = create_named_object( root, &completion_ops, name, attr, sd ))) return NULL; + if (get_error() == STATUS_OBJECT_NAME_EXISTS) return completion; + if (!(completion->wait = alloc_object( &completion_wait_ops ))) { - if (get_error() != STATUS_OBJECT_NAME_EXISTS) - { - list_init( &completion->queue ); - completion->depth = 0; - } + release_object( completion ); + set_error( STATUS_NO_MEMORY ); + return NULL; } + list_init( &completion->wait->queue ); + completion->wait->depth = 0; return completion; } @@ -162,9 +232,9 @@ void add_completion( struct completion *completion, apc_param_t ckey, apc_param_ msg->status = status; msg->information = information; - list_add_tail( &completion->queue, &msg->queue_entry ); - completion->depth++; - wake_up( &completion->obj, 1 ); + list_add_tail( &completion->wait->queue, &msg->queue_entry ); + completion->wait->depth++; + wake_up( &completion->wait->obj, 1 ); } /* create a completion */ @@ -218,13 +288,13 @@ DECL_HANDLER(remove_completion) if (!completion) return; - entry = list_head( &completion->queue ); + entry = list_head( &completion->wait->queue ); if (!entry) set_error( STATUS_PENDING ); else { list_remove( entry ); - completion->depth--; + completion->wait->depth--; msg = LIST_ENTRY( entry, struct comp_msg, queue_entry ); reply->ckey = msg->ckey; reply->cvalue = msg->cvalue; @@ -243,7 +313,7 @@ DECL_HANDLER(query_completion) if (!completion) return; - reply->depth = completion->depth; + reply->depth = completion->wait->depth; release_object( completion ); } -- 2.33.1

1 3

[PATCH 1/9] gdi32/tests: Test deleting the bitmap used for pattern brush creation.
by Zhiyi Zhang Dec. 7, 2021

Dec. 7, 2021

Test that the bitmap for pattern brush creation can be deleted after CreatePatternBrush() and the created brush will still function normally. However, the bitmap object can not be retrieved from LOGBRUSH.lbHatch if the bitmap is deleted. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/brush.c | 67 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index f04ee22ab6d..0841eb2f2e1 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -120,9 +120,14 @@ static void test_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD) + 32 * 32 / 8]; BITMAPINFO *info = (BITMAPINFO *)buffer; - HBRUSH brush; - HBITMAP bitmap; + HBITMAP bitmap, bitmap2, old_bitmap; + HBRUSH brush, brush2; + HDC hdc, hdc_screen; + COLORREF color; + BOOL result; LOGBRUSH br; + BITMAP bm; + RECT rect; INT ret; void *bits; DIBSECTION dib; @@ -269,6 +274,64 @@ static void test_pattern_brush(void) ok( !brush, "CreatePatternBrush succeeded\n" ); GlobalFree( mem ); + + /* Test deleting bitmap after brush creation */ + /* Create hdc and bitmaps */ + hdc_screen = GetDC( NULL ); + hdc = CreateCompatibleDC( hdc_screen ); + bitmap = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + bitmap2 = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + + /* Fill the first bitmap with 0xff5511 */ + old_bitmap = SelectObject( hdc, bitmap ); + SetRect( &rect, 0, 0, 16, 16 ); + brush = CreateSolidBrush( 0xff5511 ); + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + DeleteObject( brush ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + + /* Create a pattern brush with the first bitmap filled with 0xff5511 */ + brush = CreatePatternBrush( bitmap ); + ok( brush != NULL, "CreatePatternBrush failed, error %u.\n", GetLastError() ); + + /* Delete the first bitmap used for pattern brush creation */ + SelectObject( hdc, bitmap2 ); + DeleteObject( bitmap ); + + memset( &br, 0, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + + /* The first bitmap is now invalid */ + memset( &bm, 0, sizeof (bm)); + ret = GetObjectW( bitmap, sizeof(bm), &bm ); + ok( !ret, "wrong size %u\n", ret ); + + /* Fill hdc with 0xabcdef */ + brush2 = CreateSolidBrush( 0xabcdef ); + result = FillRect( hdc, &rect, brush2 ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xabcdef, "Expected color %#x, got %#x.\n", 0xabcdef, color ); + DeleteObject( brush2 ); + + /* Fill hdc with the brush created with the deleted bitmap */ + /* FillRect() succeeds and hdc is filled with the deleted bitmap content */ + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + DeleteObject( brush ); + + SelectObject( hdc, old_bitmap ); + DeleteObject( bitmap2 ); + DeleteDC( hdc ); + ReleaseDC( NULL, hdc_screen ); } static void test_palette_brush(void) -- 2.32.0

2 1

[PATCH 1/4] user32/tests: Fix cursor state test failures for win10.
by Ziqing Hui Dec. 7, 2021

Dec. 7, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/user32/tests/cursoricon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 33ca2e3cb63..267aff70fb5 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2505,7 +2505,7 @@ static void test_ShowCursor(void) memset( &info, 0, sizeof(info) ); info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } event_start = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2529,7 +2529,7 @@ static void test_ShowCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); /* global show count is not affected since we don't have a window */ - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } parent_id = 0; @@ -2582,7 +2582,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } count = ShowCursor( TRUE ); @@ -2594,7 +2594,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } } -- 2.25.1

1 3

[PATCH v2] win32u: Use the replacement name in otmpFamilyName and GetTextFace().
by Huw Davies Dec. 7, 2021

Dec. 7, 2021

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Houkago Cinderella verifies that otmpFamilyName matches the desired font name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52176 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/win32u/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index fca3ed0fc76..3fa90ebc0f8 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1799,17 +1799,17 @@ static struct gdi_font_face *find_best_matching_face( const struct gdi_font_fami static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, const WCHAR *subst, const LOGFONTW *lf, FONTSIGNATURE fs, - BOOL can_use_bitmap ) + BOOL can_use_bitmap, const WCHAR **orig_name ) { struct gdi_font_family *family; struct gdi_font_face *face; family = find_family_from_any_name( name ); - if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; + if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) goto found; if (subst) { family = find_family_from_any_name( subst ); - if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; + if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) goto found; } /* search by full face name */ @@ -1824,6 +1824,11 @@ static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, cons if ((face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; } return NULL; + +found: + if (orig_name && family != face->family) + *orig_name = family->family_name; + return face; } static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs, @@ -1863,7 +1868,7 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs } static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO *csi, BOOL can_use_bitmap, - BOOL *substituted ) + BOOL *substituted, const WCHAR **orig_name ) { BOOL want_vertical = (lf->lfFaceName[0] == '@'); struct gdi_font_face *face; @@ -1888,7 +1893,7 @@ static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO *substituted = TRUE; } - if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap ))) + if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap, orig_name ))) return face; } *substituted = FALSE; /* substitution is no longer relevant */ @@ -2460,7 +2465,7 @@ static void add_child_font( struct gdi_font *font, const WCHAR *family_name ) struct gdi_font *child; struct gdi_font_face *face; - if (!(face = find_matching_face_by_name( family_name, NULL, &font->lf, fs, FALSE ))) return; + if (!(face = find_matching_face_by_name( family_name, NULL, &font->lf, fs, FALSE, NULL ))) return; if (!(child = create_gdi_font( face, family_name, &font->lf ))) return; child->matrix = font->matrix; @@ -4077,6 +4082,7 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit struct gdi_font_face *face; INT height; CHARSETINFO csi; + const WCHAR *orig_name = NULL; BOOL substituted = FALSE; static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; @@ -4093,14 +4099,14 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit TRACE( "returning cached gdiFont(%p)\n", font ); return font; } - if (!(face = find_matching_face( lf, &csi, can_use_bitmap, &substituted ))) + if (!(face = find_matching_face( lf, &csi, can_use_bitmap, &substituted, &orig_name ))) { FIXME( "can't find a single appropriate font - bailing\n" ); return NULL; } height = lf->lfHeight; - font = create_gdi_font( face, NULL, lf ); + font = create_gdi_font( face, orig_name, lf ); font->use_logfont_name = substituted; font->matrix = dcmat; font->can_use_bitmap = can_use_bitmap; -- 2.23.0

1 0

[PATCH 9/9] comctl32/propsheet: Return a pattern brush when handling WM_CTLCOLORSTATIC for theming.
by Zhiyi Zhang Dec. 7, 2021

Dec. 7, 2021

Fix a regression from 2f1bbd8 that makes the static control for DPI sample text in winecfg not refreshing its background when moving the DPI slider. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/propsheet.c | 11 ++++++++++- dlls/comctl32/tests/propsheet.c | 11 +---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4c9b42e6ed7..9309250f65a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1309,10 +1309,19 @@ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM if (lr) return lr; + brush = get_propsheet_background_brush(hwnd); + if (!brush) + break; + hdc = (HDC)wp; SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); SetBkMode(hdc, TRANSPARENT); - return (LRESULT)GetStockObject(NULL_BRUSH); + + org.x = 0; + org.y = 0; + MapWindowPoints((HWND)lp, hwnd, &org, 1); + SetBrushOrgEx(hdc, -org.x, -org.y, NULL); + return (LRESULT)brush; } } diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 0b012df1cca..6cc29a8b6f1 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1293,7 +1293,6 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that brush origin is changed after WM_CTLCOLORSTATIC */ ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - todo_wine ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ @@ -1302,7 +1301,6 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - todo_wine_if(is_theme_active) ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); ok(hbrush2 != hbrush, "Expected a different brush.\n"); @@ -1311,13 +1309,11 @@ static void test_WM_CTLCOLORSTATIC(void) count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - todo_wine 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 ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); @@ -1340,9 +1336,7 @@ static void test_WM_CTLCOLORSTATIC(void) size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); @@ -1415,13 +1409,11 @@ static void test_WM_CTLCOLORSTATIC(void) SetLastError(0xdeadbeef); ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); error = GetLastError(); - todo_wine ok(!ret, "GetObjectA succeeded.\n"); todo_wine ok(error == ERROR_INVALID_PARAMETER, "Expected error %u, got %u.\n", ERROR_INVALID_PARAMETER, error); ret = DeleteObject(hbrush); - todo_wine ok(!ret, "DeleteObject succeeded.\n"); /* Should still report the same brush handle after the brush handle was freed */ @@ -1432,10 +1424,8 @@ static void test_WM_CTLCOLORSTATIC(void) hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); SendMessageW(sheethwnd, WM_THEMECHANGED, 0, 0); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(is_theme_active) ok(hbrush2 != hbrush, "Expected a different brush.\n"); ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); - todo_wine ok(!ret, "GetObjectA succeeded.\n"); } else @@ -1443,6 +1433,7 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that brush origin is at (0,0) */ ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + todo_wine_if(is_theme_active) ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); todo_wine_if(is_theme_active) -- 2.32.0

1 0

[PATCH 8/9] uxtheme: Do not hook DefDlgProc() for theming.
by Zhiyi Zhang Dec. 7, 2021

Dec. 7, 2021

Currently there is no need to hook DefDlgProc(). Tests show that dialog theming shouldn't be implemented in DefDlgProc(). Also fix a double free bug because WM_DESTROY in UXTHEME_DefDlgProc() calls CloseThemeData() even when the theme handle is not opened when handling WM_CREATE in UXTHEME_DefDlgProc(). The bug can be demonstrated by running comctl32/tests/propsheet.c tests with Light theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/propsheet.c | 9 ++--- dlls/comctl32/tests/static.c | 5 +-- dlls/user32/defdlg.c | 34 +++++-------------- dlls/user32/hook.c | 1 - dlls/user32/user_private.h | 1 - dlls/uxtheme/Makefile.in | 1 - dlls/uxtheme/dialog.c | 59 --------------------------------- dlls/uxtheme/system.c | 1 - dlls/uxtheme/uxthemedll.h | 1 - include/winuser.h | 1 - 10 files changed, 11 insertions(+), 102 deletions(-) delete mode 100644 dlls/uxtheme/dialog.c diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 199b280879e..0b012df1cca 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1320,9 +1320,7 @@ static void test_WM_CTLCOLORSTATIC(void) todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(pGetWindowTheme(hdlg) != NULL) ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) ok(pGetWindowTheme(sheethwnd) == NULL, "Expected NULL theme handle.\n"); memset(&cls, 0, sizeof(cls)); @@ -1336,18 +1334,15 @@ static void test_WM_CTLCOLORSTATIC(void) hwnd = CreateWindowA("TestClass", "test", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, 0, 0, NULL); ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); theme = pOpenThemeData(hwnd, L"Tab"); - /* Light theme triggers a double free bug in uxtheme */ - todo_wine_if(!theme) ok(theme != NULL, "OpenThemeData failed.\n"); size.cx = 0; size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); - todo_wine_if(!theme) ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine_if(theme) + todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine_if(theme) + todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b507cf1e02b..529396b3f0d 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -408,11 +408,11 @@ static void test_WM_CTLCOLORSTATIC(void) HWND parent, dialog, child; COLORREF color, old_color; HDC child_hdc, dialog_hdc; - BOOL ret, todo = FALSE; int mode, old_mode; HBRUSH brush; HRESULT hr; POINT org; + BOOL ret; struct { @@ -434,8 +434,6 @@ static void test_WM_CTLCOLORSTATIC(void) child = GetDlgItem(dialog, 100); ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - todo = !!pGetWindowTheme(dialog); - dialog_hdc = GetDC(dialog); child_hdc = GetDC(child); PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); @@ -447,7 +445,6 @@ static void test_WM_CTLCOLORSTATIC(void) ret = pIsThemeDialogTextureEnabled(dialog); ok(ret, "Expected theme dialog texture supported.\n"); - todo_wine_if(todo) ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 4f44a93cd49..81c7cb0f207 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -354,7 +354,10 @@ out: return dlgInfo; } -static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcA (USER32.@) + */ +LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -408,7 +411,10 @@ static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } -static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcW (USER32.@) + */ +LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -461,27 +467,3 @@ static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } - -LRESULT WINAPI USER_DefDlgProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - if (unicode) - return USER_DefDlgProcW( hwnd, msg, wParam, lParam ); - else - return USER_DefDlgProcA( hwnd, msg, wParam, lParam ); -} - -/*********************************************************************** - * DefDlgProcA (USER32.@) - */ -LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * DefDlgProcW (USER32.@) - */ -LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, TRUE ); -} diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index f5b4c6ab8a1..159797020f2 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -83,7 +83,6 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static struct user_api_hook original_user_api = { - USER_DefDlgProc, USER_ScrollBarDraw, USER_ScrollBarProc, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c2152900a9b..96704ac68ae 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -302,7 +302,6 @@ extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; #endif extern struct user_api_hook *user_api DECLSPEC_HIDDEN; -LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 933650f4261..01751d3243a 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = msimg32 C_SRCS = \ buffer.c \ - dialog.c \ draw.c \ main.c \ metric.c \ diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c deleted file mode 100644 index 776f54e1d31..00000000000 --- a/dlls/uxtheme/dialog.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Theming - Dialogs - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "uxthemedll.h" -#include "vssym32.h" -#include "wine/debug.h" - -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) -{ - HTHEME theme = GetWindowTheme ( hWnd ); - static const WCHAR themeClass[] = L"Window"; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - theme = OpenThemeData( hWnd, themeClass ); - return result; - - case WM_DESTROY: - CloseThemeData ( theme ); - SetWindowTheme( hWnd, NULL, NULL ); - OpenThemeData( hWnd, NULL ); - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - - default: - /* Call old proc */ - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - } - return 0; -} diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 37c484387ec..61a608e5962 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1245,7 +1245,6 @@ BOOL WINAPI ThemeHooksInstall(void) { struct user_api_hook hooks; - hooks.pDefDlgProc = UXTHEME_DefDlgProc; hooks.pScrollBarDraw = UXTHEME_ScrollBarDraw; hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; return RegisterUserApiHook(&hooks, &user_api); diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 67130774392..c43ad703884 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -106,7 +106,6 @@ extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..1d37bd44344 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4435,7 +4435,6 @@ struct SCROLL_TRACKING_INFO struct user_api_hook { - LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL); -- 2.32.0

1 0

[PATCH 7/9] comctl32/propsheet: Handle WM_ERASEBKGND in the property sheet page window procedure.
by Zhiyi Zhang Dec. 7, 2021

Dec. 7, 2021

Handle WM_ERASEBKGND in the property sheet page window procedure and use a pattern brush created from theme parts to fill background instead of calling DrawThemeBackground() directly. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/propsheet.c | 113 ++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/dialog.c | 38 ------------- 2 files changed, 113 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4fe80241855..4c9b42e6ed7 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -63,6 +63,7 @@ #include "prsht.h" #include "comctl32.h" #include "uxtheme.h" +#include "vsstyle.h" #include "wine/debug.h" @@ -140,6 +141,7 @@ typedef struct */ static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo"; +static const WCHAR PropSheetPageBackgroundBrush[] = L"PropSheetPageBackgroundBrush"; #define PSP_INTERNAL_UNICODE 0x80000000 @@ -1196,16 +1198,107 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +static HBRUSH get_propsheet_background_brush(HWND hwnd) +{ + HBITMAP bitmap, old_bitmap; + HDC hdc, hdc_screen; + HBRUSH brush; + HTHEME theme; + HRESULT hr; + RECT rect; + SIZE size; + + brush = GetPropW(hwnd, PropSheetPageBackgroundBrush); + if (brush) + return brush; + + theme = OpenThemeData(NULL, L"Tab"); + if (!theme) + return NULL; + + hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); + if (FAILED(hr)) + { + size.cx = 10; + size.cy = 600; + } + + hdc_screen = GetDC(NULL); + hdc = CreateCompatibleDC(hdc_screen); + bitmap = CreateCompatibleBitmap(hdc_screen, size.cx, size.cy); + old_bitmap = SelectObject(hdc, bitmap); + + SetRect(&rect, 0, 0, size.cx, size.cy); + /* FIXME: XP draws the tab body bitmap directly without transparency even if there is */ + FillRect(hdc, &rect, GetSysColorBrush(COLOR_3DFACE)); + hr = DrawThemeBackground(theme, hdc, TABP_BODY, 0, &rect, NULL); + if (SUCCEEDED(hr)) + { + brush = CreatePatternBrush(bitmap); + SetPropW(hwnd, PropSheetPageBackgroundBrush, brush); + } + + SelectObject(hdc, old_bitmap); + DeleteDC(hdc); + ReleaseDC(NULL, hdc_screen); + CloseThemeData(theme); + return brush; +} + /* Subclassing window procedure for theming dialogs in property sheet pages */ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, UINT_PTR id, DWORD_PTR ref) { + POINT org, old_org; + LOGBRUSH logbrush; WNDPROC dlgproc; + HBRUSH brush; LRESULT lr; + RECT rect; HDC hdc; switch (msg) { + case WM_THEMECHANGED: + { + brush = GetPropW(hwnd, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(hwnd, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } + InvalidateRect(hwnd, NULL, TRUE); + break; + } + case WM_ERASEBKGND: + { + if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) + break; + + dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + if (lr) + return lr; + + brush = get_propsheet_background_brush(hwnd); + if (!brush) + break; + + /* Using FillRect() to draw background could introduce a tiling effect if the destination + * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is + * visible on property sheet pages if system DPI is set to 192. However, the same bug also + * exists on XP and explains why vista+ don't use gradient tab body backgound anymore */ + hdc = (HDC)wp; + GetViewportOrgEx(hdc, &org); + SetBrushOrgEx(hdc, org.x, org.y, &old_org); + GetClientRect(hwnd, &rect); + FillRect(hdc, &rect, brush); + SetBrushOrgEx(hdc, old_org.x, old_org.y, NULL); + return TRUE; + } + case WM_CTLCOLORSTATIC: { if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) @@ -2385,6 +2478,8 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); PropPageInfo* oldPages; + LOGBRUSH logbrush; + HBRUSH brush; TRACE("index %d, hpage %p\n", index, hpage); if (!psInfo) { @@ -2445,6 +2540,14 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, else { RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + brush = GetPropW(psInfo->proppage[index].hwndPage, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(psInfo->proppage[index].hwndPage, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } } /* Destroy page dialog window */ @@ -2743,6 +2846,8 @@ static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psIn */ static void PROPSHEET_CleanUp(HWND hwndDlg) { + LOGBRUSH logbrush; + HBRUSH brush; int i; PropSheetInfo* psInfo = RemovePropW(hwndDlg, PropSheetInfoStr); @@ -2766,6 +2871,14 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) else { RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + brush = GetPropW(psInfo->proppage[i].hwndPage, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(psInfo->proppage[i].hwndPage, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } } if(psInfo->proppage[i].hwndPage) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index bbfdaba639b..776f54e1d31 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -36,9 +36,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa { HTHEME theme = GetWindowTheme ( hWnd ); static const WCHAR themeClass[] = L"Window"; - BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); - BOOL doTheming = themingActive && (theme != NULL); - HRESULT hr = E_FAIL; LRESULT result; switch (msg) @@ -54,41 +51,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa OpenThemeData( hWnd, NULL ); return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - case WM_THEMECHANGED: - CloseThemeData ( theme ); - OpenThemeData( hWnd, themeClass ); - InvalidateRect( hWnd, NULL, TRUE ); - return 0; - - case WM_ERASEBKGND: - if (!doTheming) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - { - RECT rc; - WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - if (!CallWindowProcW(dlgp, hWnd, msg, wParam, lParam)) - { - /* Draw background*/ - GetClientRect (hWnd, &rc); - if (IsThemePartDefined (theme, WP_DIALOG, 0)) - /* Although there is a theme for the WINDOW class/DIALOG part, - * but I[res] haven't seen Windows using it yet... Even when - * dialog theming is activated, the good ol' BTNFACE - * background seems to be used. */ -#if 0 - DrawThemeBackground (theme, (HDC)wParam, WP_DIALOG, 0, &rc, - NULL); -#endif - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - /* We might have gotten a TAB theme class, so check if we can draw as a tab page */ - else if (IsThemePartDefined(theme, TABP_BODY, 0)) - hr = DrawThemeBackground(theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); - - if (FAILED(hr)) - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - } - return 1; - } - default: /* Call old proc */ return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); -- 2.32.0

1 0