- Wine-Devel - list.winehq.org

[PATCH 3/3] comctl32/button: Support image list margin for buttons with BS_CENTER or BS_VCENTER.
by Zhiyi Zhang Dec. 9, 2021

Dec. 9, 2021

WinSCP uses image list margin to adjust image position on a button when theming is on. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52076 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 063149e91a4..72c1a17402c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1156,7 +1156,10 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe switch (style & BS_CENTER) { case BS_CENTER: - innerRect->left = outerRect->left + (outerRect->right - outerRect->left - width) / 2; + /* The left and right margins are added to the inner rectangle to get a new rectangle. Then + * the new rectangle is adjusted to be in the horizontal center */ + innerRect->left = outerRect->left + (outerRect->right - outerRect->left - width + + margin->left - margin->right) / 2; innerRect->right = innerRect->left + width; break; case BS_RIGHT: @@ -1182,7 +1185,10 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe break; case BS_VCENTER: default: - innerRect->top = outerRect->top + (outerRect->bottom - outerRect->top - height) / 2; + /* The top and bottom margins are added to the inner rectangle to get a new rectangle. Then + * the new rectangle is adjusted to be in the vertical center */ + innerRect->top = outerRect->top + (outerRect->bottom - outerRect->top - height + + margin->top - margin->bottom) / 2; innerRect->bottom = innerRect->top + height; break; } -- 2.32.0

1 0

[PATCH 2/3] comctl32/button: Avoid drawing over content in themed group boxes.
by Zhiyi Zhang Dec. 9, 2021

Dec. 9, 2021

Fix a regression from 7c9cacd, in which a ExcludeClipRect() call was removed by mistake. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52080 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 9e0ed8a8987..063149e91a4 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2877,12 +2877,13 @@ cleanup: static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT clientRect, contentRect, imageRect, textRect, bgRect; + RECT clientRect, contentRect, labelRect, imageRect, textRect, bgRect; HRGN region, textRegion = NULL; LOGFONTW lf; HFONT font, hPrevFont = NULL; BOOL created_font = FALSE; TEXTMETRICW textMetric; + LONG style; int part; HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); @@ -2900,22 +2901,32 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } GetClientRect(infoPtr->hwnd, &clientRect); - contentRect = clientRect; region = set_control_clipping(hDC, &clientRect); - bgRect = contentRect; + bgRect = clientRect; GetTextMetricsW(hDC, &textMetric); bgRect.top += (textMetric.tmHeight / 2) - 1; - InflateRect(&contentRect, -7, 1); - dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &contentRect, &imageRect, &textRect); + labelRect = clientRect; + InflateRect(&labelRect, -7, 1); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); if (dtFlags != (UINT)-1 && !show_image_only(infoPtr)) { textRegion = CreateRectRgnIndirect(&textRect); ExtSelectClipRgn(hDC, textRegion, RGN_DIFF); } - part = GetWindowLongW(infoPtr->hwnd, GWL_STYLE) & BS_PUSHLIKE ? BP_PUSHBUTTON : BP_GROUPBOX; + style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + if (style & BS_PUSHLIKE) + { + part = BP_PUSHBUTTON; + } + else + { + part = BP_GROUPBOX; + GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &contentRect); + ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); + } if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); -- 2.32.0

1 0

[PATCH 1/3] comctl32/button: Remove useless calculation when drawing themed group boxes.
by Zhiyi Zhang Dec. 9, 2021

Dec. 9, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index d537629fa35..9e0ed8a8987 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2922,9 +2922,6 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (dtFlags != (UINT)-1) { - contentRect.left--; - contentRect.right++; - contentRect.bottom++; if (textRegion) { SelectClipRgn(hDC, textRegion); -- 2.32.0

1 0

[PATCH 1/2] user32/tests: Call Destroy{icon, cursor}() before GetIconInfo().
by Ziqing Hui Dec. 9, 2021

Dec. 9, 2021

For icons/cursors created by CreateIconFromResource(), GetIconInfo() still succeed after they were destroyed, which indicates that these icons/cursors are shared. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/user32/tests/cursoricon.c | 37 +++++++++++++++------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index a4bdc4f13cf..d73650e08f7 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1589,12 +1589,16 @@ static void test_CreateIconFromResource(void) SetLastError(0xdeadbeef); handle = CreateIconFromResource((PBYTE) hotspot, CRSR_RES_SIZE, FALSE, 0x00030000); ok(handle != NULL, "Create cursor failed.\n"); + ret = DestroyCursor(handle); + ok(ret, "Destroy cursor failed, error %u.\n", GetLastError()); /* Test the icon information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); + todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); + todo_wine ok(error == 0xdeadbeef, "Last error: %u\n", error); if (ret) @@ -1612,30 +1616,31 @@ static void test_CreateIconFromResource(void) ICONINFOEXA infoex; infoex.cbSize = sizeof(infoex); ret = pGetIconInfoExA( handle, &infoex ); + todo_wine ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + if (ret) + { ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName ); ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + } } - /* Clean up. */ - SetLastError(0xdeadbeef); - ret = DestroyCursor(handle); - ok(ret, "DestroyCursor() failed.\n"); - error = GetLastError(); - ok(error == 0xdeadbeef, "Last error: %u\n", error); - /* Test creating an icon. */ SetLastError(0xdeadbeef); handle = CreateIconFromResource((PBYTE) icon_header, ICON_RES_SIZE, TRUE, 0x00030000); ok(handle != NULL, "Create icon failed.\n"); + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %u.\n", GetLastError()); /* Test the icon information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); + todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); + todo_wine ok(error == 0xdeadbeef, "Last error: %u\n", error); if (ret) @@ -1648,13 +1653,6 @@ static void test_CreateIconFromResource(void) ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } - /* Clean up. */ - SetLastError(0xdeadbeef); - ret = DestroyCursor(handle); - ok(ret, "DestroyCursor() failed.\n"); - error = GetLastError(); - ok(error == 0xdeadbeef, "Last error: %u\n", error); - /* Rejection of NULL pointer crashes at least on WNT4WSSP6, W2KPROSP4, WXPPROSP3 * * handle = CreateIconFromResource(NULL, ICON_RES_SIZE, TRUE, 0x00030000); @@ -1667,12 +1665,16 @@ static void test_CreateIconFromResource(void) empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; handle = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); ok(handle != NULL, "Create cursor failed.\n"); + ret = DestroyCursor(handle); + ok(ret, "Destroy cursor failed, error %u.\n", GetLastError()); /* Test the animated cursor's information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); + todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); + todo_wine ok(error == 0xdeadbeef, "Last error: %u\n", error); if (ret) @@ -1685,13 +1687,6 @@ static void test_CreateIconFromResource(void) ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); } - /* Clean up. */ - SetLastError(0xdeadbeef); - ret = DestroyCursor(handle); - ok(ret, "DestroyCursor() failed.\n"); - error = GetLastError(); - ok(error == 0xdeadbeef, "Last error: %u\n", error); - /* Test creating and destroying a non-shared icon. */ handle = CreateIconFromResourceEx((BYTE *)icon_header, ICON_RES_SIZE, TRUE, 0x00030000, 0, 0, LR_DEFAULTSIZE); -- 2.25.1

1 1

[PATCH 6/6] winevulkan: Use __wine_unix_call interface for all functions that don't need to call display driver functions.
by Jacek Caban Dec. 9, 2021

Dec. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/loader.c | 12 ++++++++++-- dlls/winevulkan/make_vulkan | 9 ++++++++- 2 files changed, 18 insertions(+), 3 deletions(-)

1 0

[PATCH 4/6] winevulkan: Support prefixing function parameters.
by Jacek Caban Dec. 9, 2021

Dec. 9, 2021

To allow them being accessed from a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 61 +++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 27 deletions(-)

1 0

[PATCH 3/6] winevulkan: Use KeUserModeCallback for debug callbacks.
by Jacek Caban Dec. 9, 2021

Dec. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 2 +- dlls/winevulkan/loader.c | 19 +++++++++++++- dlls/winevulkan/vulkan.c | 46 +++++++++++++++++++++++---------- dlls/winevulkan/vulkan_loader.h | 26 +++++++++++++++++++ include/ntuser.h | 3 +++ 5 files changed, 81 insertions(+), 15 deletions(-)

1 0

[PATCH 2/6] ntdll: Temporarily allow KeUserModeCallback calls from client stack.
by Jacek Caban Dec. 9, 2021

Dec. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- In winevulkan, we can't predict how we will be called until the conversion in fully complete. dlls/ntdll/unix/signal_arm.c | 8 ++++++++ dlls/ntdll/unix/signal_arm64.c | 8 ++++++++ dlls/ntdll/unix/signal_i386.c | 8 ++++++++ dlls/ntdll/unix/signal_x86_64.c | 8 ++++++++ include/wine/unixlib.h | 2 ++ 5 files changed, 34 insertions(+)

1 0

[PATCH 1/2] msvcrt: Add DECLSPEC_HOTPATCH to strlen and strrchr.
by Roman Pišl Dec. 8, 2021

Dec. 8, 2021

I see no other way how to make Clang ASAN work. ASAN recognizes first instruction(s) and inserts trampoline, but the loop in the function body jumps back to the start of the function (and hangs) or somewhere inside the trampoline (that leads to invalid instruction). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50993 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/msvcrt/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d92b7a38d12..9fa8700da3d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1510,7 +1510,7 @@ int CDECL _atoldbl(_LDOUBLE *value, char *str) /********************************************************************* * strlen (MSVCRT.@) */ -size_t __cdecl strlen(const char *str) +size_t __cdecl DECLSPEC_HOTPATCH strlen(const char *str) { const char *s = str; while (*s) s++; @@ -3160,7 +3160,7 @@ char* __cdecl strchr(const char *str, int c) /********************************************************************* * strrchr (MSVCRT.@) */ -char* __cdecl strrchr(const char *str, int c) +char* __cdecl DECLSPEC_HOTPATCH strrchr(const char *str, int c) { char *ret = NULL; do { if (*str == (char)c) ret = (char*)str; } while (*str++); -- 2.30.2

1 1

[PATCH] wininet: Fix misleading indentation
by Alistair Leslie-Hughes Dec. 8, 2021

Dec. 8, 2021

../wine/dlls/wininet/internet.c: In function ‘InternetSetOptionW’: ../wine/dlls/wininet/internet.c:2890:11: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] 2890 | } else | ^~~~ ../wine/dlls/wininet/internet.c:2892:13: note: ...this statement, but the latter is misleadingly indented as if it were guard ed by the ‘else’ 2892 | lpwhh->ErrorMask = *(ULONG*)lpBuffer; | ^~~~~ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b0fe8a5e3fb..59fae2fbc95 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2887,9 +2887,10 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } else if(dwBufferLength != sizeof(ULONG)) { SetLastError(ERROR_INTERNET_BAD_OPTION_LENGTH); ret = FALSE; - } else + } else { TRACE("INTERNET_OPTION_ERROR_MASK: %x\n", *(ULONG*)lpBuffer); lpwhh->ErrorMask = *(ULONG*)lpBuffer; + } } break; case INTERNET_OPTION_PROXY: -- 2.33.0

1 0