- Wine-devel - list.winehq.org

[PATCH 7/7] comctl32/button: Use pressed state when a pushlike checkbox or radio button is checked and hovered.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

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> --- 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); -- 2.32.0

1 0

[PATCH 6/7] comctl32/treeview: Do not draw client edge without WS_EX_CLIENTEDGE.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Fix foobar2000 having an extra edge around tree view non-client size box. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/treeview.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index d00bba8e625..23e87bdce04 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5498,18 +5498,25 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) /* Draw themed border */ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM lParam) { - HTHEME theme = GetWindowTheme (infoPtr->hwnd); + int cxEdge, cyEdge; + LONG ex_style; + HTHEME theme; HDC dc; RECT r; HRGN cliprgn; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); + ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + if (!(ex_style & WS_EX_CLIENTEDGE)) + return DefWindowProcW(infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); + + theme = GetWindowTheme(infoPtr->hwnd); if (!theme) return DefWindowProcW (infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); GetWindowRect(infoPtr->hwnd, &r); + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); if (region != (HRGN)1) -- 2.32.0

1 0

[PATCH 5/7] uxtheme: Use COLOR_BTNFACE to fill scroll bar background.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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; -- 2.32.0

1 0

[PATCH 4/7] user32: Use COLOR_BTNFACE to fill scroll bar background.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Fix foobar2000 wrong scroll bar size box color when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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); -- 2.32.0

1 0

[PATCH 3/7] user32/tests: Test scroll bars use COLOR_BTNFACE instead of COLOR_SCROLLBAR to fill background.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/scroll.c | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 7181a028748..c378669991b 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -774,6 +774,46 @@ static void test_subclass(void) DestroyWindow(hwnd); } +static void test_visual(void) +{ + static const int color_indices[] = {COLOR_SCROLLBAR, COLOR_BTNFACE}; + static const DWORD styles[] = {SBS_SIZEBOX, SBS_SIZEGRIP}; + COLORREF old_colors[2], colors[2], color; + HWND hwnd; + BOOL ret; + HDC hdc; + int i; + + old_colors[0] = GetSysColor(color_indices[0]); + old_colors[1] = GetSysColor(color_indices[1]); + colors[0] = RGB(0x11, 0x22, 0x33); + colors[1] = RGB(0xaa, 0xbb, 0xcc); + ret = SetSysColors(ARRAY_SIZE(color_indices), color_indices, colors); + ok(ret, "SetSysColors failed, error %u.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + winetest_push_context("style %#x", styles[i]); + + hwnd = CreateWindowA("ScrollBar", "", WS_POPUP | WS_VISIBLE | styles[i], 0, 0, 20, 20, 0, 0, + 0, 0); + ok(hwnd != NULL, "CreateWindowA failed, error %u.\n", GetLastError()); + RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + + hdc = GetDC(hwnd); + color = GetPixel(hdc, 5, 5); + todo_wine_if(styles[i] == SBS_SIZEBOX || bThemeActive) + ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + winetest_pop_context(); + } + + ret = SetSysColors(ARRAY_SIZE(color_indices), color_indices, old_colors); + ok(ret, "SetSysColors failed, error %u.\n", GetLastError()); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -810,6 +850,8 @@ START_TEST ( scroll ) FreeLibrary(hUxtheme); } + test_visual(); + scrollbar_test_default( 0); scrollbar_test_default( WS_HSCROLL); scrollbar_test_default( WS_VSCROLL); -- 2.32.0

1 0

[PATCH 2/7] comctl32/tab: Always draw parent background when themed.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tab.c | 5 +++++ dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 8e34f8b97b3..1275381489a 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2315,9 +2315,14 @@ static void TAB_DrawBorder(const TAB_INFO *infoPtr, HDC hdc) TRACE("border=(%s)\n", wine_dbgstr_rect(&rect)); if (theme) + { + DrawThemeParentBackground(infoPtr->hwnd, hdc, &rect); DrawThemeBackground (theme, hdc, TABP_PANE, 0, &rect, NULL); + } else + { DrawEdge(hdc, &rect, EDGE_RAISED, BF_SOFT|BF_RECT); + } } /****************************************************************************** diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5daca6aff93..069d1200c82 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -881,7 +881,7 @@ static void test_themed_background(void) {WC_STATICA, SS_ETCHEDHORZ, wm_ctlcolorstatic_seq, TRUE}, {STATUSCLASSNAMEA, 0, empty_seq}, {"SysLink", 0, wm_ctlcolorstatic_seq}, - {WC_TABCONTROLA, 0, drawthemeparentbackground_seq, TRUE}, + {WC_TABCONTROLA, 0, drawthemeparentbackground_seq}, {TOOLBARCLASSNAMEA, 0, empty_seq, TRUE}, {TOOLTIPS_CLASSA, 0, empty_seq}, {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq}, -- 2.32.0

1 0

[PATCH 1/7] comctl32/tests: Fix occasional test failures on TestBot w7u_2qxl.
by Zhiyi Zhang 10 Feb '22

10 Feb '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index dc9648c1bf0..5daca6aff93 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -531,7 +531,8 @@ static const struct message wm_themechanged_paint_erase_seq[] = { {WM_THEMECHANGED, sent | wparam | lparam}, {WM_PAINT, sent | wparam | lparam}, - {WM_ERASEBKGND, sent | defwinproc}, + /* TestBot w7u_2qxl VM occasionally doesn't send WM_ERASEBKGND, hence the 'optional' */ + {WM_ERASEBKGND, sent | defwinproc | optional}, {0}, }; -- 2.32.0

1 0

Wine Issue while running Windows exe
by Chandan Sharma 10 Feb '22

10 Feb '22

Dear Sir/Madam, We have quite few queries regarding Wine installation on Ubuntu 18.04. These are following . 1. I have successfully installed wine7.0 on Ubuntu 18.04 64bit. 2.winecfg command is not working .it does not launch any prompt. 3. Even I am not able to run any windows exe like notepad.exe which is installed by default when we installed Wine. 4.My concern is how can we run simple WPF .net core windows application in ubuntu using wine. Please provide any support. Regards , Chandan Sharma

1 0

[PATCH 1/4] ntdll: Use exit_frame as the initial syscall_frame prev_frame value.
by Rémi Bernon 10 Feb '22

10 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52213 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Something like that seems to let pthread_exit unwinding work and call its cleanup handlers. Unwinding also seems to work fine when adding .cfi metadata to point to the right PE frames, although I didn't look exactly how it handles that. Maybe it only works in the context of builtin libraries. As we don't want pthread to do anything with the PE code I'm keeping track of unix address only here instead, which I'm assuming makes sure it only unwinds syscall frames. Somehow libunwind only cares about %rip .cfi directives, although I've also added .cfi for %rsp here (resp. %eip, %esp on i386), I'm not completely sure why or which option is best. dlls/ntdll/unix/signal_i386.c | 5 +++-- dlls/ntdll/unix/signal_x86_64.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..0e3b1daf51a 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1613,8 +1613,9 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { struct user_callback_frame *frame = (struct user_callback_frame *)x86_thread_data()->syscall_frame; + void *exit_frame = x86_thread_data()->exit_frame; - if (!frame->frame.prev_frame) return STATUS_NO_CALLBACK_ACTIVE; + if (frame->frame.prev_frame == exit_frame) return STATUS_NO_CALLBACK_ACTIVE; *frame->ret_ptr = ret_ptr; *frame->ret_len = ret_len; @@ -2399,7 +2400,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B *(--stack) = 0xdeadbabe; frame->esp = (DWORD)stack; frame->eip = (DWORD)pLdrInitializeThunk; - frame->prev_frame = NULL; + frame->prev_frame = thread_data->exit_frame; frame->syscall_flags = syscall_flags; frame->syscall_table = KeServiceDescriptorTable; frame->restore_flags |= LOWORD(CONTEXT_INTEGER); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 68855dccacf..da89b958665 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2364,8 +2364,9 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { struct user_callback_frame *frame = (struct user_callback_frame *)amd64_thread_data()->syscall_frame; + void *exit_frame = amd64_thread_data()->exit_frame; - if (!frame->frame.prev_frame) return STATUS_NO_CALLBACK_ACTIVE; + if (frame->frame.prev_frame == exit_frame) return STATUS_NO_CALLBACK_ACTIVE; *frame->ret_ptr = ret_ptr; *frame->ret_len = ret_len; @@ -3072,7 +3073,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B frame->rsp = (ULONG64)ctx - 8; frame->rip = (ULONG64)pLdrInitializeThunk; frame->rcx = (ULONG64)ctx; - frame->prev_frame = NULL; + frame->prev_frame = thread_data->exit_frame; frame->restore_flags |= CONTEXT_INTEGER; frame->syscall_flags = syscall_flags; frame->syscall_table = KeServiceDescriptorTable; -- 2.34.1

3 12

[PATCH] kernelbase: Implement SetCurrentConsoleFontEx.
by Jacek Caban 10 Feb '22

10 Feb '22

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- 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(-)

2 1