- Wine-Devel - list.winehq.org

[PATCH resend 5/7] comctl32: send WM_CTLCOLORSTATIC for all static control types
by Rafał Harabień March 26, 2022

March 26, 2022

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 134 ++++++++++++++++------------------- dlls/comctl32/tests/static.c | 16 ++--- 2 files changed, 69 insertions(+), 81 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 1b5d1ade291..2fb914b3fb2 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -44,13 +44,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(static); -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); struct static_extra_info { @@ -64,7 +64,7 @@ struct static_extra_info BOOL image_has_alpha; }; -typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); +typedef void (*pfPaint)( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ); static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = { @@ -360,6 +360,22 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) return hicon; } +static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) +{ + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if (!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + if (!hBrush) /* did the app forget to call DefWindowProc ? */ + { + /* FIXME: DefWindowProc should return different colors if a + manifest is present */ + hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +} + /*********************************************************************** * STATIC_TryPaintFcn * @@ -367,40 +383,26 @@ static HICON STATIC_LoadIconW( HINSTANCE hInstance, LPCWSTR name, DWORD style ) */ static VOID STATIC_TryPaintFcn(HWND hwnd, LONG full_style) { - LONG style = full_style & SS_TYPEMASK; - RECT rc; - - GetClientRect( hwnd, &rc ); - if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) + if (IsWindowVisible(hwnd)) { + RECT rc; HDC hdc; HRGN hrgn; + HBRUSH hbrush; + LONG style = full_style & SS_TYPEMASK; + GetClientRect( hwnd, &rc ); hdc = GetDC( hwnd ); hrgn = set_control_clipping( hdc, &rc ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); + if (staticPaintFunc[style]) + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); SelectClipRgn( hdc, hrgn ); if (hrgn) DeleteObject( hrgn ); ReleaseDC( hwnd, hdc ); } } -static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) -{ - HBRUSH hBrush; - HWND parent = GetParent(hwnd); - - if (!parent) parent = hwnd; - hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); - if (!hBrush) /* did the app forget to call DefWindowProc ? */ - { - /* FIXME: DefWindowProc should return different colors if a - manifest is present */ - hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - } - return hBrush; -} - /*********************************************************************** * hasTextStyle * @@ -481,14 +483,16 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, PAINTSTRUCT ps; RECT rect; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); + HRGN hrgn; + HBRUSH hbrush; + GetClientRect( hwnd, &rect ); + hrgn = set_control_clipping( hdc, &rect ); + hbrush = STATIC_SendWmCtlColorStatic( hwnd, hdc ); if (staticPaintFunc[style]) - { - HRGN hrgn = set_control_clipping( hdc, &rect ); - (staticPaintFunc[style])( hwnd, hdc, full_style ); - SelectClipRgn( hdc, hrgn ); - if (hrgn) DeleteObject( hrgn ); - } + (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); + SelectClipRgn( hdc, hrgn ); + if (hrgn) DeleteObject( hrgn ); if (!wParam) EndPaint(hwnd, &ps); } break; @@ -642,7 +646,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, return lResult; } -static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { DRAWITEMSTRUCT dis; HFONT font, oldFont = NULL; @@ -660,15 +664,13 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) font = STATIC_GetFont( hwnd ); if (font) oldFont = SelectObject( hdc, font ); - SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); if (font) SelectObject( hdc, oldFont ); } -static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; HFONT hFont, hOldFont = NULL; UINT format; INT len, buf_size; @@ -725,13 +727,9 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) if ((hFont = STATIC_GetFont( hwnd ))) hOldFont = SelectObject( hdc, hFont ); - /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned - brush is not used */ - hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((style & SS_TYPEMASK) != SS_SIMPLE) { - FillRect( hdc, &rc, hBrush ); + FillRect( hdc, &rc, hbrush ); if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); } @@ -768,56 +766,52 @@ no_TextOut: SelectObject( hdc, hOldFont ); } -static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - HBRUSH hBrush; GetClientRect( hwnd, &rc); - /* FIXME: send WM_CTLCOLORSTATIC */ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FillRect( hdc, &rc, hbrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FillRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FillRect( hdc, &rc, hbrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dShadow); + FrameRect( hdc, &rc, hbrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); - FrameRect( hdc, &rc, hBrush ); + hbrush = CreateSolidBrush(comctl32_color.clr3dHilight); + FrameRect( hdc, &rc, hbrush ); break; default: return; } - DeleteObject( hBrush ); + DeleteObject( hbrush ); } -static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc, iconRect; - HBRUSH hbrush; HICON hIcon; SIZE size; GetClientRect( hwnd, &rc ); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = STATIC_GetImage( hwnd, IMAGE_ICON, style ); if (!hIcon || !get_icon_size( hIcon, &size )) { @@ -840,13 +834,10 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; - HBRUSH hbrush; - - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) @@ -891,14 +882,12 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { HENHMETAFILE hEnhMetaFile; RECT rc; - HBRUSH hbrush; GetClientRect(hwnd, &rc); - hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); FillRect(hdc, &rc, hbrush); if ((hEnhMetaFile = STATIC_GetImage( hwnd, IMAGE_ENHMETAFILE, style ))) { @@ -909,11 +898,10 @@ static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) } } -static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) +static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) { RECT rc; - /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 7206e19c070..324301212dc 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -426,18 +426,18 @@ START_TEST(static) test_updates(0, 0); test_updates(SS_ICON, 0); - test_updates(SS_BLACKRECT, TODO_COUNT); - test_updates(SS_WHITERECT, TODO_COUNT); - test_updates(SS_BLACKFRAME, TODO_COUNT); - test_updates(SS_WHITEFRAME, TODO_COUNT); - test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_BLACKRECT, 0); + test_updates(SS_WHITERECT, 0); + test_updates(SS_BLACKFRAME, 0); + test_updates(SS_WHITEFRAME, 0); + test_updates(SS_USERITEM, 0); test_updates(SS_SIMPLE, 0); test_updates(SS_OWNERDRAW, 0); test_updates(SS_BITMAP, 0); test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); - test_updates(SS_ETCHEDHORZ, TODO_COUNT); - test_updates(SS_ETCHEDVERT, TODO_COUNT); - test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, 0); + test_updates(SS_ETCHEDVERT, 0); + test_updates(SS_ETCHEDFRAME, 0); test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); -- 2.25.1

2 1

[PATCH resend 4/7] comctl32: fix handling of SS_ETCHEDHORZ/SS_ETCHEDVERT static control styles
by Rafał Harabień March 26, 2022

March 26, 2022

Instead of drawing the frame in WM_PAINT use WS_EX_STATICEDGE style that adds the frame outside of the client rect and change control size after creation to make it look like a line. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/static.c | 30 +++++++++++++++--------------- dlls/comctl32/tests/static.c | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 7a3ac958111..1b5d1ade291 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -84,8 +84,8 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintBitmapfn, /* SS_BITMAP */ STATIC_PaintEnhMetafn, /* SS_ENHMETAFILE */ - STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ - STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ + NULL, /* SS_ETCHEDHORZ */ + NULL, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; @@ -519,10 +519,21 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - if (full_style & SS_SUNKEN) + if (full_style & SS_SUNKEN || style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) SetWindowLongW( hwnd, GWL_EXSTYLE, GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) { + RECT rc; + GetClientRect(hwnd, &rc); + if (style == SS_ETCHEDHORZ) + rc.bottom = rc.top; + else + rc.right = rc.left; + AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + } + switch (style) { case SS_ICON: @@ -904,18 +915,7 @@ static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); - switch (style & SS_TYPEMASK) - { - case SS_ETCHEDHORZ: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_TOP | BF_BOTTOM); - break; - case SS_ETCHEDVERT: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_LEFT | BF_RIGHT); - break; - case SS_ETCHEDFRAME: - DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); - break; - } + DrawEdge(hdc, &rc, EDGE_ETCHED, BF_RECT); } void STATIC_Register(void) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index d1573b84d64..7206e19c070 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -91,17 +91,17 @@ static void test_updates(int style, int flags) exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) - todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); else ok(exstyle == 0, "expected 0, got %d\n", exstyle); GetClientRect(hStatic, &rcClient); if (style == SS_ETCHEDVERT) - todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); else ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); if (style == SS_ETCHEDHORZ) - todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); else ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); -- 2.25.1

2 1

[PATCH resend 3/7] comctl32/tests: add more static control tests
by Rafał Harabień March 26, 2022

March 26, 2022

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/comctl32/tests/static.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b8f43142d6b..d1573b84d64 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -82,10 +82,29 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara static void test_updates(int style, int flags) { HWND hStatic = create_static(style); - RECT r1 = {20, 20, 30, 30}; + RECT r1 = {20, 20, 30, 30}, rcClient; int exp; + LONG exstyle; flush_events(); + trace("Testing style 0x%x\n", style); + + exstyle = GetWindowLongW(hStatic, GWL_EXSTYLE); + if (style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT || style == SS_SUNKEN) + todo_wine_if(style == SS_ETCHEDHORZ || style == SS_ETCHEDVERT) ok(exstyle == WS_EX_STATICEDGE, "expected WS_EX_STATICEDGE, got %d\n", exstyle); + else + ok(exstyle == 0, "expected 0, got %d\n", exstyle); + + GetClientRect(hStatic, &rcClient); + if (style == SS_ETCHEDVERT) + todo_wine ok(rcClient.right == 0, "expected zero width, got %d\n", rcClient.right); + else + ok(rcClient.right > 0, "expected non-zero width, got %d\n", rcClient.right); + if (style == SS_ETCHEDHORZ) + todo_wine ok(rcClient.bottom == 0, "expected zero height, got %d\n", rcClient.bottom); + else + ok(rcClient.bottom > 0, "expected non-zero height, got %d\n", rcClient.bottom); + g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ InvalidateRect(hMainWnd, NULL, FALSE); @@ -406,14 +425,20 @@ START_TEST(static) ShowWindow(hMainWnd, SW_SHOW); test_updates(0, 0); - test_updates(SS_SIMPLE, 0); test_updates(SS_ICON, 0); - test_updates(SS_BITMAP, 0); - test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_BLACKRECT, TODO_COUNT); test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_BLACKFRAME, TODO_COUNT); + test_updates(SS_WHITEFRAME, TODO_COUNT); + test_updates(SS_USERITEM, TODO_COUNT); + test_updates(SS_SIMPLE, 0); + test_updates(SS_OWNERDRAW, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BITMAP | SS_CENTERIMAGE, 0); test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_updates(SS_ETCHEDFRAME, TODO_COUNT); + test_updates(SS_SUNKEN, 0); test_set_text(); test_set_image(); test_STM_SETIMAGE(); -- 2.25.1

2 1

[PATCH resend 2/7] user32: use SWP_NOACTIVATE flag when resizing etched static control
by Rafał Harabień March 26, 2022

March 26, 2022

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/static.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index d19df22dcb9..dc9a210862a 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -425,7 +425,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam else rc.right = rc.left; AdjustWindowRectEx(&rc, full_style, FALSE, GetWindowLongW(hwnd, GWL_EXSTYLE)); - SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER); + SetWindowPos(hwnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); } switch (style) { -- 2.25.1

2 1

[PATCH resend 1/7] user32/tests: remove redundant SS_*RECT static control tests
by Rafał Harabień March 26, 2022

March 26, 2022

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/user32/tests/static.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0899f4c6187..999ff2a8d76 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -344,8 +344,6 @@ START_TEST(static) test_updates(SS_OWNERDRAW); test_updates(SS_BITMAP); test_updates(SS_BITMAP | SS_CENTERIMAGE); - test_updates(SS_BLACKRECT); - test_updates(SS_WHITERECT); test_updates(SS_ETCHEDHORZ); test_updates(SS_ETCHEDVERT); test_updates(SS_ETCHEDFRAME); -- 2.25.1

1 0

[PATCH 0/2] wmd speedup
by Eric Pouech March 26, 2022

March 26, 2022

The following series drastically improves cmd performance by caching label resolution when executing a batch file. Testbot is hitting a timeout when running the tests. See https://bugs.winehq.org/show_bug.cgi?id=52720 Local tests show a reduction of test duration of 90%! Don't always expect those numbers; in some extreme cases, the patchset will even slightly increase execution time. Note: the reason why testbot started timing out is still unknown. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (2): programs/cmd: introduce structure BATCH_FILE to hold information about a .cmd file programs/cmd: add label => file offset lookup in BATCH_FILE programs/cmd/batch.c | 153 ++++++++++++++++++++++++++++++++++++++-- programs/cmd/builtins.c | 63 +++-------------- programs/cmd/wcmd.h | 19 ++++- 3 files changed, 172 insertions(+), 63 deletions(-)

1 2

Wine staging 7.5 release
by Alistair Leslie-Hughes March 26, 2022

March 26, 2022

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.5 (561 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * Various patches to remove the long warnings. Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5 v2] cmd/tests: Add tests for the magic environment variables.
by Francois Gouget March 25, 2022

March 25, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: - Some locales add the day-of-week before the date. Adjust the tests accordingly. - Add more for %cd%, %errorlevel%, defined, tests. - Compare date /t with %date%, and time /t with %time%. - Modify the tests so they work with @todo_wine(a). --- programs/cmd/tests/test_builtins.cmd | 39 +++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 15 ++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..f9e26da34b6 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -585,7 +585,6 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir -echo CD value %CD% echo %% echo P% echo %P @@ -1789,6 +1788,44 @@ set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6 +echo --- Magic environment variables +if defined cd (echo Has %%cd%%) else (echo Not defined) +echo CD value %CD% + +rem Some locales include the day-of-week either before or after the +rem day-month-year part. This makes it impossible to check the content of %date% +if defined date (echo Has %%date%%) else (echo Not defined) +set WINE_foo=%date:~9,1% +if defined WINE_foo (echo Good %%date%%) else (echo Too short) + +set WINE_before=%date% +for /f "usebackq tokens=*" %%i in (`date /t`) do set WINE_foo=%%i +set WINE_after=%date% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before% " (if not "%WINE_foo%"=="%WINE_after% " (echo date /t != %%date%%) else (echo Match)) else (echo Match) + +if defined errorlevel (echo Has %%errorlevel%%) else (echo Not defined) + +if defined time (echo Has %%time%%) else (echo Not defined) +set WINE_foo=%time:~7,1% +if defined WINE_foo (echo %%time%% has seconds) else (echo Too short) +set WINE_foo=%time:~10,1% +if defined WINE_foo (echo %%time%% has 1/100s) else (echo Too short) +set WINE_foo=%time:~11,1% +if not defined WINE_foo (echo End of %%time%%) else (echo Too long) + +rem %time% has a leading space instead of a zero so ignore the first character +set WINE_before=%time:~1,4% +for /f "usebackq tokens=*" %%i in (`time /t`) do set WINE_foo=%%i +set WINE_after=%time:~1,4% +set WINE_foo=%WINE_foo:~1,99% +rem Use extra parentheses to work around a Wine bug +if not "%WINE_foo%"=="%WINE_before%" (if not "%WINE_foo%"=="%WINE_after%" (echo time /t != %%time:~1,4%%) else (echo Match)) else (echo Match) + +if defined random (echo Has %%random%%) else (echo Not defined) +set WINE_foo=%random% +if %WINE_foo% neq %random% (echo %%random%% looks random) else (echo Constant?) + echo --- for /F mkdir foobar & cd foobar echo ------ string argument diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..15fda131a5c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -500,7 +500,6 @@ I'm here!@space@ ~dp0 should be directory containing batch file @drive@@path@ @drive@@path@ -CD value @pwd@@or_broken(a)CD value(a)space@ % P P @@ -1216,6 +1215,20 @@ WINE_foo correctly 7 WINE_foo correctly 8(a)or_broken@ERROR: WINE_foo incorrectly 4 [8] WINE_foo correctly 6(a)or_broken@ERROR: WINE_foo incorrectly 5 [6] WINE_bar correctly 6(a)or_broken@ERROR: WINE_bar incorrectly 5 [6] +--- Magic environment variables +(a)todo_wine@Has %cd% +CD value @pwd@@or_broken(a)CD value(a)space@ +(a)todo_wine@Has %date% +(a)todo_wine@Good %date% +(a)todo_wine@Match +(a)todo_wine@Has %errorlevel% +(a)todo_wine@Has %time% +(a)todo_wine@%time% has seconds +(a)todo_wine@%time% has 1/100s +End of %time% +(a)todo_wine@Match +(a)todo_wine@Has %random% +%random% looks random --- for /F ------ string argument a -- 2.30.2

2 9

[PATCH v8 0/7] Fix sock_send reordering issue (#52401)
by Jinoh Kang March 25, 2022

March 25, 2022

This fixes the send part of the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Changelog: v1 -> v2: - drop patch "server: Compact struct set_async_direct_result_reply." - add async and fd arguments to async_initial_status_callback - recv_socket_initial_callback: pass OOB flag via private instead of implementing two separate functions for OOB and non-OOB - detect short write in send_socket_initial_callback - preserve the behaviour of returning success if we had a short write and the socket is nonblocking and force_async is unset v2 -> v3: - fix typo in comment v3 -> v4: - fix typo in commit message - address feedback - drop patch "server: Defer postprocessing until after setting initial status in recv_socket handler." v4 -> v5: - drop patch "server: Add async_initial_status_callback." - drop patch "server: Defer postprocessing until after setting initial status in send_socket handler." - add patch "server: Ensure completion_callback is called before async is destroyed." - add patch "ws2_32/tests: Continue sending remaining data on short write in test_write_events." - add patch "server: Defer clearing events until async is either pending or completed in send_socket handler." - add patch "server: Ensure datagram sockets are bound in send_socket." v5 -> v6: - centralise status code computation in one place, even for bind errno translation - fix erroneous subject (s/either pending or completed/completed/) v6 -> v7: - drop patch "server: Ensure completion_callback is called before async is destroyed." - add patch "server: Ensure async completion callback is called on synchronous failure." - add patch "server: Allow async completion callback to retrieve status on synchronous failure." v7 -> v8: - drop committed patches - edit commit message of "server: Ensure completion_callback is called before async is destroyed." as per feedback (thanks zf) - move a sock_reselect() into the prior if block (thanks zf) Supersedes 227636 - 227644. Supersedes 228988 - 228998. Supersedes 230282 - 230293 (sans already committed patches). [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html Jinoh Kang (7): server: Generalise async completion callback to be called on synchronous failure. server: Allow async completion callback to retrieve status on synchronous failure. server: Defer clearing events until async is completed in send_socket handler. server: Attempt to complete I/O request immediately in send_socket. server: Ensure datagram sockets are bound in send_socket. ntdll: Don't call try_send before server call in sock_send. server: Replace redundant send_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 89 +++++++++++++++------- dlls/ws2_32/tests/sock.c | 14 ++-- server/async.c | 14 +++- server/protocol.def | 4 +- server/sock.c | 161 +++++++++++++++++++++++++++------------ 5 files changed, 195 insertions(+), 87 deletions(-) -- 2.34.1

3 15

[PATCH] user32: Avoid pointer truncation in free_user_handle.
by Rémi Bernon March 25, 2022

March 25, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 77dfc131928..fac534a7c87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -72,7 +72,7 @@ void release_user_handle_ptr( void *ptr ) */ void *free_user_handle( HANDLE handle, unsigned int type ) { - return UlongToHandle( NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle )); + return (void *)NtUserCallTwoParam( HandleToUlong(handle), type, NtUserFreeHandle ); } -- 2.35.1

3 4