[PATCH 0/1] MR5308: win32u: Support HiDPI for the non-client close button in WS_EX_TOOLWINDOW windows.

[Zhiyi Zhang (＠zhiyi)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5308

[PATCH 1/1] win32u: Support HiDPI for the non-client close button in WS_EX_TOOLWINDOW windows.

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

---
 dlls/win32u/defwnd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c
index cf3af86d161..744f4527dc6 100644
--- a/dlls/win32u/defwnd.c
+++ b/dlls/win32u/defwnd.c
@@ -1462,8 +1462,8 @@ static void draw_close_button( HWND hwnd, HDC hdc, BOOL down, BOOL grayed )
     {
         /* Windows does not use SM_CXSMSIZE and SM_CYSMSIZE
          * it uses 11x11 for  the close button in tool window */
-        const int bmp_height = 11;
-        const int bmp_width = 11;
+        int bmp_height = muldiv( 11, get_dpi_for_window( hwnd ), 96 );
+        int bmp_width = bmp_height;
         int caption_height = get_system_metrics( SM_CYSMCAPTION );
 
         rect.top = rect.top + (caption_height - 1 - bmp_height) / 2;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/5308

[PATCH 1/1] win32u: Support HiDPI for the non-client close button in WS_EX_TOOLWINDOW windows.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144062

Your paranoid android.


=== debian11b (64 bit WoW report) ===

d3dx10_34:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239650.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001239650.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001194A80.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C3550.

d3dx10_35:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D19F0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D19F0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D1820.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E3670.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B7270.

d3dx10_36:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C3440.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001195B50.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195A10.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D55F0.

d3dx10_37:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001230C40.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001230C40.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239E20.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195B10.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 0000000001230C40.

d3dx10_39:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239CF0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B5D90.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239CF0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C3550.

d3dx10_40:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011A4690.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A4860.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D18E0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D1AB0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D55F0.

d3dx10_41:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011C21B0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C2380.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001195A50.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E3C70.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 0000000001195A50.

d3dx10_42:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011C2E00.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A4A80.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239D00.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195800.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011959D0.

d3dx10_43:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D1A60.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BB560.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D1950.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D1B20.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D6920.