February 2022 - Wine-Commits

Dmitry Timoshkov : user32/tests: Add more missing ShowWindow() return value checks.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: b4815849af6c8dc612ef12ac36c11198dbb98572 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4815849af6c8dc612ef12ac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 10 15:26:34 2022 +0300 user32/tests: Add more missing ShowWindow() return value checks. Also change 'BOOL ret' to 'LRESULT ret' to avoid introducing new variable for DefWindowProc() return value checks in the next patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 70 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4815849af6c8dc612ef…

1 0

Dmitry Timoshkov : user32/tests: Add more tests for WM_NCCALCSIZE.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: d65e280751a03cace6453c01c783f79d78b18b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65e280751a03cace6453c01… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 10 15:26:41 2022 +0300 user32/tests: Add more tests for WM_NCCALCSIZE. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 164 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 154 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d65e280751a03cace645…

1 0

Jacek Caban : user32: Destroy window server objects from destroy_thread_windows.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 6366694d2b12c3227f303f6b2edd6b4efe106bb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6366694d2b12c3227f303f6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 10 14:59:09 2022 +0100 user32: Destroy window server objects from destroy_thread_windows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 9 +++++++++ server/window.c | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5e42872ed7a..82975cadd23 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1216,6 +1216,15 @@ void destroy_thread_windows(void) win->obj.handle = *free_list_ptr; free_list_ptr = (WND **)&win->obj.handle; } + if (free_list) + { + SERVER_START_REQ( destroy_window ) + { + req->handle = 0; /* destroy all thread windows */ + wine_server_call( req ); + } + SERVER_END_REQ; + } USER_Unlock(); while ((win = free_list)) diff --git a/server/window.c b/server/window.c index ec8ee2f1790..6b889df9149 100644 --- a/server/window.c +++ b/server/window.c @@ -2101,8 +2101,13 @@ DECL_HANDLER(set_parent) /* destroy a window */ DECL_HANDLER(destroy_window) { - struct window *win = get_window( req->handle ); - if (win) + struct window *win; + + if (!req->handle) + { + destroy_thread_windows( current ); + } + else if ((win = get_window( req->handle ))) { if (!is_desktop_window(win)) free_window_handle( win ); else if (win->thread == current) detach_window_thread( win );

1 0

Eric Pouech : gdi32: Enable compilation with long types.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: b31225da218d4d2b895b0b6298ba134800182abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b31225da218d4d2b895b0b62… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 10 08:43:01 2022 +0100 gdi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/dc.c | 18 +++++++++--------- dlls/gdi32/emfdc.c | 6 +++--- dlls/gdi32/enhmetafile.c | 32 ++++++++++++++++---------------- dlls/gdi32/icm.c | 10 +++++----- dlls/gdi32/metadc.c | 2 +- dlls/gdi32/metafile.c | 12 ++++++------ dlls/gdi32/objects.c | 10 +++++----- dlls/gdi32/text.c | 18 +++++++++--------- dlls/gdi32/uniscribe/opentype.c | 6 +++--- dlls/gdi32/uniscribe/usp10.c | 12 ++++++------ 11 files changed, 64 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b31225da218d4d2b895b…

1 0

Jacek Caban : user32: Use a single lock in destroy_thread_windows.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 72ec1c18a0513fba7218bdeee68aa7d09ce745a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ec1c18a0513fba7218bdee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 10 14:57:00 2022 +0100 user32: Use a single lock in destroy_thread_windows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9e483b4c494..5e42872ed7a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1185,7 +1185,6 @@ static WND *next_thread_window( HWND *hwnd ) WND *win; WORD index = *hwnd ? USER_HANDLE_TO_INDEX( *hwnd ) + 1 : 0; - USER_Lock(); while (index < NB_USER_HANDLES) { if (!(ptr = user_handles[index++])) continue; @@ -1195,7 +1194,6 @@ static WND *next_thread_window( HWND *hwnd ) *hwnd = ptr->handle; return win; } - USER_Unlock(); return NULL; } @@ -1207,29 +1205,33 @@ static WND *next_thread_window( HWND *hwnd ) */ void destroy_thread_windows(void) { - WND *wndPtr; + WND *win, *free_list = NULL, **free_list_ptr = &free_list; HWND hwnd = 0; - HMENU menu, sys_menu; - struct window_surface *surface; - while ((wndPtr = next_thread_window( &hwnd ))) + USER_Lock(); + while ((win = next_thread_window( &hwnd ))) + { + free_dce( win->dce, win->obj.handle ); + InterlockedCompareExchangePointer( &user_handles[USER_HANDLE_TO_INDEX(hwnd)], NULL, win ); + win->obj.handle = *free_list_ptr; + free_list_ptr = (WND **)&win->obj.handle; + } + USER_Unlock(); + + while ((win = free_list)) { - /* destroy the client-side storage */ + free_list = win->obj.handle; + TRACE( "destroying %p\n", win ); - menu = ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) ? (HMENU)wndPtr->wIDmenu : 0; - sys_menu = wndPtr->hSysMenu; - free_dce( wndPtr->dce, hwnd ); - surface = wndPtr->surface; - InterlockedCompareExchangePointer( &user_handles[USER_HANDLE_TO_INDEX(hwnd)], NULL, wndPtr ); - WIN_ReleasePtr( wndPtr ); - HeapFree( GetProcessHeap(), 0, wndPtr ); - if (menu) DestroyMenu( menu ); - if (sys_menu) DestroyMenu( sys_menu ); - if (surface) + if ((win->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD && win->wIDmenu) + DestroyMenu( UlongToHandle(win->wIDmenu) ); + if (win->hSysMenu) DestroyMenu( win->hSysMenu ); + if (win->surface) { - register_window_surface( surface, NULL ); - window_surface_release( surface ); + register_window_surface( win->surface, NULL ); + window_surface_release( win->surface ); } + HeapFree( GetProcessHeap(), 0, win ); } }

1 0

Jinoh Kang : server: Allow calling async_handoff() with status code STATUS_ALERTED.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 15483b1a126902a8c7b7b59800a376bc473e2ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15483b1a126902a8c7b7b598… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Feb 10 01:17:53 2022 +0900 server: Allow calling async_handoff() with status code STATUS_ALERTED. If the server detects that an I/O request could be completed immediately (e.g. the socket to read from already has incoming data), it can now return STATUS_ALERTED to allow opportunistic synchronous I/O. The Unix side will then attempt to perform I/O in nonblocking mode and report back the I/O status to the server via the new server request "set_async_direct_result". If the operation returns e.g. EAGAIN or EWOULDBLOCK, the client can opt to either abandon the request (by specifying an error status) or poll for it in the server as usual (by waiting on the wait handle). Without such mechanism in place, the client cannot safely perform immediately satiable I/O operations synchronously, since it can potentially conflict with other pending I/O operations that have already been queued. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 22 ++++++++++++- server/async.c | 72 ++++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 10 ++++++ server/request.h | 8 +++++ server/trace.c | 15 +++++++++ 5 files changed, 126 insertions(+), 1 deletion(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 97ab4e25834..5ed95a41c19 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2905,6 +2905,23 @@ struct get_async_result_reply +struct set_async_direct_result_request +{ + struct request_header __header; + obj_handle_t handle; + apc_param_t information; + unsigned int status; + char __pad_28[4]; +}; +struct set_async_direct_result_reply +{ + struct reply_header __header; + obj_handle_t handle; + char __pad_12[4]; +}; + + + struct read_request { struct request_header __header; @@ -5547,6 +5564,7 @@ enum request REQ_register_async, REQ_cancel_async, REQ_get_async_result, + REQ_set_async_direct_result, REQ_read, REQ_write, REQ_ioctl, @@ -5828,6 +5846,7 @@ union generic_request struct register_async_request register_async_request; struct cancel_async_request cancel_async_request; struct get_async_result_request get_async_result_request; + struct set_async_direct_result_request set_async_direct_result_request; struct read_request read_request; struct write_request write_request; struct ioctl_request ioctl_request; @@ -6107,6 +6126,7 @@ union generic_reply struct register_async_reply register_async_reply; struct cancel_async_reply cancel_async_reply; struct get_async_result_reply get_async_result_reply; + struct set_async_direct_result_reply set_async_direct_result_reply; struct read_reply read_reply; struct write_reply write_reply; struct ioctl_reply ioctl_reply; @@ -6262,7 +6282,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 743 +#define SERVER_PROTOCOL_VERSION 744 /* ### protocol_version end ### */ diff --git a/server/async.c b/server/async.c index 7aef28355f0..7d0ff10f7a4 100644 --- a/server/async.c +++ b/server/async.c @@ -338,6 +338,31 @@ obj_handle_t async_handoff( struct async *async, data_size_t *result, int force_ return async->wait_handle; } + if (get_error() == STATUS_ALERTED) + { + /* give the client opportunity to complete synchronously. after the + * client performs the I/O, it reports the result back to the server + * via the set_async_direct_result request. if it turns out that the + * I/O request is not actually immediately satiable, the client may + * then choose to re-queue the async by reporting STATUS_PENDING + * instead. + * + * since we're deferring the initial I/O (to the client), we mark the + * async as having unknown initial status (unknown_status = 1). note + * that we don't reuse async_set_unknown_status() here. this is because + * the one responsible for performing the I/O is not the device driver, + * but instead the client that requested the I/O in the first place. + * + * also, async_set_unknown_status() would set direct_result to zero + * forcing APC_ASYNC_IO to fire in async_terminate(), which is not + * useful due to subtle semantic differences between synchronous and + * asynchronous completion. + */ + async->unknown_status = 1; + async_terminate( async, STATUS_ALERTED ); + return async->wait_handle; + } + async->initial_status = get_error(); if (!async->pending && NT_ERROR( get_error() )) @@ -728,3 +753,50 @@ DECL_HANDLER(get_async_result) } set_error( iosb->status ); } + +/* notify direct completion of async and close the wait handle if not blocking */ +DECL_HANDLER(set_async_direct_result) +{ + struct async *async = (struct async *)get_handle_obj( current->process, req->handle, 0, &async_ops ); + unsigned int status = req->status; + + if (!async) return; + + if (!async->unknown_status || !async->terminated || !async->alerted) + { + set_error( STATUS_INVALID_PARAMETER ); + release_object( &async->obj ); + return; + } + + async_set_initial_status( async, status ); + + if (status == STATUS_PENDING) + { + async->direct_result = 0; + async->pending = 1; + } + + /* if the I/O has completed successfully, the client would have already + * set the IOSB. therefore, we can skip waiting on wait_handle and do + * async_set_result() directly. + */ + async_set_result( &async->obj, status, req->information ); + + /* close wait handle here to avoid extra server round trip, if the I/O + * either has completed, or is pending and not blocking. + */ + if (status != STATUS_PENDING || !async->blocking) + { + close_handle( async->thread->process, async->wait_handle ); + async->wait_handle = 0; + } + + /* report back to the client whether the wait handle has been closed. + * handle will be 0 if closed by us; otherwise the original value is + * retained + */ + reply->handle = async->wait_handle; + + release_object( &async->obj ); +} diff --git a/server/protocol.def b/server/protocol.def index 21b17c11551..ce05e9a38c6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2163,6 +2163,16 @@ enum message_type @END +/* Notify direct completion of async and close the wait handle if not blocking */ +(a)REQ(set_async_direct_result) + obj_handle_t handle; /* wait handle */ + apc_param_t information; /* IO_STATUS_BLOCK Information */ + unsigned int status; /* completion status */ +(a)REPLY + obj_handle_t handle; /* wait handle, or NULL if closed */ +(a)END + + /* Perform a read on a file object */ @REQ(read) async_data_t async; /* async I/O parameters */ diff --git a/server/request.h b/server/request.h index f2d0e827d94..128b70fe3cf 100644 --- a/server/request.h +++ b/server/request.h @@ -242,6 +242,7 @@ DECL_HANDLER(set_serial_info); DECL_HANDLER(register_async); DECL_HANDLER(cancel_async); DECL_HANDLER(get_async_result); +DECL_HANDLER(set_async_direct_result); DECL_HANDLER(read); DECL_HANDLER(write); DECL_HANDLER(ioctl); @@ -522,6 +523,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_register_async, (req_handler)req_cancel_async, (req_handler)req_get_async_result, + (req_handler)req_set_async_direct_result, (req_handler)req_read, (req_handler)req_write, (req_handler)req_ioctl, @@ -1396,6 +1398,12 @@ C_ASSERT( sizeof(struct cancel_async_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_async_result_request, user_arg) == 16 ); C_ASSERT( sizeof(struct get_async_result_request) == 24 ); C_ASSERT( sizeof(struct get_async_result_reply) == 8 ); +C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_request, information) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_request, status) == 24 ); +C_ASSERT( sizeof(struct set_async_direct_result_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct set_async_direct_result_reply, handle) == 8 ); +C_ASSERT( sizeof(struct set_async_direct_result_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct read_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct read_request, pos) == 56 ); C_ASSERT( sizeof(struct read_request) == 64 ); diff --git a/server/trace.c b/server/trace.c index 32606d540f7..6b50b9d0d18 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2758,6 +2758,18 @@ static void dump_get_async_result_reply( const struct get_async_result_reply *re dump_varargs_bytes( " out_data=", cur_size ); } +static void dump_set_async_direct_result_request( const struct set_async_direct_result_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + dump_uint64( ", information=", &req->information ); + fprintf( stderr, ", status=%08x", req->status ); +} + +static void dump_set_async_direct_result_reply( const struct set_async_direct_result_reply *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + static void dump_read_request( const struct read_request *req ) { dump_async_data( " async=", &req->async ); @@ -4595,6 +4607,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_register_async_request, (dump_func)dump_cancel_async_request, (dump_func)dump_get_async_result_request, + (dump_func)dump_set_async_direct_result_request, (dump_func)dump_read_request, (dump_func)dump_write_request, (dump_func)dump_ioctl_request, @@ -4872,6 +4885,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_async_result_reply, + (dump_func)dump_set_async_direct_result_reply, (dump_func)dump_read_reply, (dump_func)dump_write_reply, (dump_func)dump_ioctl_reply, @@ -5149,6 +5163,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "register_async", "cancel_async", "get_async_result", + "set_async_direct_result", "read", "write", "ioctl",

1 0

Zhiyi Zhang : user32: Use COLOR_BTNFACE to fill scroll bar background.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 0457376c0a3a3ae39cf41476157b51e942c6f80d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0457376c0a3a3ae39cf41476… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:04 2022 +0800 user32: Use COLOR_BTNFACE to fill scroll bar background. Fix foobar2000 wrong scroll bar size box color when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 2 +- dlls/user32/scroll.c | 4 ++-- dlls/user32/tests/scroll.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 639cca707fb..a9768defa3c 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1073,7 +1073,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip ) else r.left = r.right - GetSystemMetrics(SM_CXVSCROLL) + 1; r.top = r.bottom - GetSystemMetrics(SM_CYHSCROLL) + 1; - FillRect( hdc, &r, GetSysColorBrush(COLOR_SCROLLBAR) ); + FillRect( hdc, &r, GetSysColorBrush( COLOR_BTNFACE ) ); } ReleaseDC( hwnd, hdc ); diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a3f0becbbd6..c5bfb0b2203 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -585,7 +585,7 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES { RECT rc = *rect; - FillRect( hdc, &rc, GetSysColorBrush( COLOR_SCROLLBAR ) ); + FillRect( hdc, &rc, GetSysColorBrush( COLOR_BTNFACE ) ); rc.left = max( rc.left, rc.right - GetSystemMetrics( SM_CXVSCROLL ) - 1 ); rc.top = max( rc.top, rc.bottom - GetSystemMetrics( SM_CYHSCROLL ) - 1 ); DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); @@ -594,7 +594,7 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES if (style & SBS_SIZEBOX) { - FillRect( hdc, rect, GetSysColorBrush( COLOR_SCROLLBAR ) ); + FillRect( hdc, rect, GetSysColorBrush( COLOR_BTNFACE ) ); return; } } diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index c378669991b..154d3c8d434 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -802,7 +802,7 @@ static void test_visual(void) hdc = GetDC(hwnd); color = GetPixel(hdc, 5, 5); - todo_wine_if(styles[i] == SBS_SIZEBOX || bThemeActive) + todo_wine_if(bThemeActive) ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); ReleaseDC(hwnd, hdc);

1 0

Zhiyi Zhang : comctl32/button: Use pressed state when a pushlike checkbox or radio button is checked and hovered.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 0cbfa9be51eafc985678bf2d67c34fb906282e05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cbfa9be51eafc985678bf2d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:36 2022 +0800 comctl32/button: Use pressed state when a pushlike checkbox or radio button is checked and hovered. On XP, when a pushlike checkbox or radio button is checked and hovered, PBS_HOT is used. In later versions of Windows, PBS_PRESSED is used. This patch changes pushlike checkboxes and radio buttons to use the new behavior because it seems more intuitive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52436 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2ce12252460..ee7c2c288b1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -396,7 +396,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) static const int pushlike_cb_states[3][DRAW_STATE_COUNT] = { { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, - { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED }, + { PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED }, { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL } }; static const int rb_states[2][DRAW_STATE_COUNT] = @@ -407,7 +407,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) static const int pushlike_rb_states[2][DRAW_STATE_COUNT] = { { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, - { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED } + { PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED } }; static const int gb_states[DRAW_STATE_COUNT] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE);

1 0

Hugh McMaster : kernelbase: Implement SetCurrentConsoleFontEx.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 27df7f518caa237cd629e26131dbd23b1685c4d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27df7f518caa237cd629e261… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 9 20:43:54 2022 +0100 kernelbase: Implement SetCurrentConsoleFontEx. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 ------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/console.c | 40 ++++++++++++++++++++-------------------- dlls/kernelbase/console.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 1 + include/wine/condrv.h | 1 + programs/conhost/conhost.c | 25 ++++++++++++++++++++++--- programs/conhost/conhost.h | 14 +++++++++----- programs/conhost/window.c | 28 ++++++++++++++++++---------- 9 files changed, 108 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27df7f518caa237cd629…

1 0

Zhiyi Zhang : uxtheme: Use COLOR_BTNFACE to fill scroll bar background.
by Alexandre Julliard Feb. 10, 2022

Feb. 10, 2022

Module: wine Branch: master Commit: 19a77a8b6a71f349e630f532330635202c2179bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=19a77a8b6a71f349e630f532… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:19 2022 +0800 uxtheme: Use COLOR_BTNFACE to fill scroll bar background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 4 ++-- dlls/user32/tests/scroll.c | 1 - dlls/uxtheme/scrollbar.c | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 069d1200c82..2fe6ad68426 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -888,8 +888,8 @@ static void test_themed_background(void) {WC_TREEVIEWA, 0, treeview_seq}, {UPDOWN_CLASSA, 0, empty_seq}, {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, - {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq, TRUE}, - {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq, TRUE}, + {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq}, + {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq}, }; uxtheme = LoadLibraryA("uxtheme.dll"); diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 154d3c8d434..57bf759879c 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -802,7 +802,6 @@ static void test_visual(void) hdc = GetDC(hwnd); color = GetPixel(hdc, 5, 5); - todo_wine_if(bThemeActive) ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); ReleaseDC(hwnd, hdc); diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 0e42de7d77f..e96e5e89b69 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -62,8 +62,9 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES else state = SZB_RIGHTALIGN; - if (IsThemeBackgroundPartiallyTransparent(theme, SBP_SIZEBOX, state)) - DrawThemeParentBackground(hwnd, dc, NULL); + /* Tests show that COLOR_BTNFACE is used instead of DrawThemeParentBackground() for drawing + * background */ + FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, rect, NULL); } else { int uppertrackstate, lowertrackstate, thumbstate;

1 0