May 2024 - Wine-commits - list.winehq.org

Henri Verbeet : tests: Rename VKD3D_TESTS_SKIP_DXC to VKD3D_TEST_SKIP_DXC.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 9693271dcfb96e9cd8d44c181cf70044edbf6861 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9693271dcfb96e9cd8d44c181cf70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 20:13:53 2024 +0200 tests: Rename VKD3D_TESTS_SKIP_DXC to VKD3D_TEST_SKIP_DXC. For consistency with the other VKD3D_TEST_* environment variables. --- README | 3 +++ gitlab/test.yml | 4 ++-- tests/shader_runner.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README b/README index 5cb8ebb3..27da28b7 100644 --- a/README +++ b/README @@ -86,6 +86,9 @@ commas or semicolons. platform controls the behavior of todo(), todo_if(), bug_if() and broken() conditions in tests. + * VKD3D_TEST_SKIP_DXC - when set, tests requiring the dxcompiler library will + be skipped. + * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests. If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader diff --git a/gitlab/test.yml b/gitlab/test.yml index da01425f..2e8ee834 100644 --- a/gitlab/test.yml +++ b/gitlab/test.yml @@ -19,13 +19,13 @@ test-win-64: extends: .test-win variables: TEST_ARCH: "64" - VKD3D_TESTS_SKIP_DXC: "1" + VKD3D_TEST_SKIP_DXC: "1" test-win-32: extends: .test-win variables: TEST_ARCH: "32" - VKD3D_TESTS_SKIP_DXC: "1" + VKD3D_TEST_SKIP_DXC: "1" test-win-64-dxc: stage: test diff --git a/tests/shader_runner.c b/tests/shader_runner.c index e91db918..c2fc30d1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -2158,7 +2158,7 @@ static IDxcCompiler3 *dxcompiler_create(void) HRESULT hr; void *dll; - if ((skip_dxc = getenv("VKD3D_TESTS_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) + if ((skip_dxc = getenv("VKD3D_TEST_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) return NULL; #ifdef VKD3D_CROSSTEST

1 0

Giovanni Mascellani : tests: Skip a test that freezes the GPU on NVIDIA.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 9a3fa67c1f7af66ac5143289bcfca2d941ecdd0e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9a3fa67c1f7af66ac5143289bcfca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat May 25 14:16:12 2024 +0200 tests: Skip a test that freezes the GPU on NVIDIA. --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 26b6e2b8..75989215 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -35625,6 +35625,13 @@ static void test_conditional_rendering(void) for (i = 0; i < 2; ++i) { + if (i == 0 && is_nvidia_device(context.device)) + { + /* I can reproduce that on an NVIDIA Quadro P2000, driver version 535.161.08. */ + skip("Triggers a GPU freeze on NVIDIA.\n"); + continue; + } + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list,

1 0

Rémi Bernon : user32: Test and implement GetDpiFromDpiAwarenessContext.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: 9f834614a94232fb3a6789dee19d702efec5a8ab URL: https://gitlab.winehq.org/wine/wine/-/commit/9f834614a94232fb3a6789dee19d70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 10:52:45 2024 +0200 user32: Test and implement GetDpiFromDpiAwarenessContext. --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/tests/sysparams.c | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 58 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4bca30cce9a..ad117c12d03 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -700,6 +700,15 @@ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT } } +/*********************************************************************** + * GetDpiFromDpiAwarenessContext (USER32.@) + */ +UINT WINAPI GetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT handle ) +{ + UINT context = get_ntuser_dpi_context( handle ); + return NTUSER_DPI_CONTEXT_GET_DPI( context ); +} + /*********************************************************************** * IsValidDpiAwarenessContext (USER32.@) */ diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 27189474027..468ef3e6486 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -50,6 +50,7 @@ static BOOL (WINAPI *pLogicalToPhysicalPointForPerMonitorDPI)(HWND,POINT*); static BOOL (WINAPI *pPhysicalToLogicalPointForPerMonitorDPI)(HWND,POINT*); static LONG (WINAPI *pGetAutoRotationState)(PAR_STATE); static BOOL (WINAPI *pAreDpiAwarenessContextsEqual)(DPI_AWARENESS_CONTEXT,DPI_AWARENESS_CONTEXT); +static LONG (WINAPI *pGetDpiFromDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; @@ -4156,6 +4157,50 @@ static void test_IsValidDpiAwarenessContext(void) } } +static void test_GetDpiFromDpiAwarenessContext(void) +{ + UINT ret; + + if (!pGetDpiFromDpiAwarenessContext) + { + win_skip( "GetDpiFromDpiAwarenessContext missing, skipping tests\n" ); + return; + } + + ret = pGetDpiFromDpiAwarenessContext( 0 ); + ok( !ret, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x11 ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x12 ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x22 ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6010 ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6011 ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6111 ); + ok( ret == 97, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x7811 ); + ok( ret == 120, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x10011 ); + ok( ret == 256, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x40006010 ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + ok( ret == real_dpi, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ); + ok( ret == 0, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); + ret = pGetDpiFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED ); + ok( ret == 96, "GetDpiFromDpiAwarenessContext returned %u\n", ret ); +} + static void test_dpi_context(void) { DPI_AWARENESS awareness; @@ -4591,6 +4636,7 @@ START_TEST(sysparams) pPhysicalToLogicalPointForPerMonitorDPI = (void*)GetProcAddress(hdll, "PhysicalToLogicalPointForPerMonitorDPI"); pGetAutoRotationState = (void*)GetProcAddress(hdll, "GetAutoRotationState"); pAreDpiAwarenessContextsEqual = (void*)GetProcAddress(hdll, "AreDpiAwarenessContextsEqual"); + pGetDpiFromDpiAwarenessContext = (void*)GetProcAddress(hdll, "GetDpiFromDpiAwarenessContext"); hInstance = GetModuleHandleA( NULL ); hdc = GetDC(0); @@ -4623,6 +4669,7 @@ START_TEST(sysparams) test_GetAutoRotationState( ); test_SetThreadDpiAwarenessContext(); test_IsValidDpiAwarenessContext(); + test_GetDpiFromDpiAwarenessContext(); change_counter = 0; change_last_param = 0; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 21fa904082c..20ca6219bcd 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -302,6 +302,7 @@ @ stdcall GetDpiForMonitorInternal(long long ptr ptr) NtUserGetDpiForMonitor @ stdcall GetDpiForSystem() @ stdcall GetDpiForWindow(long) +@ stdcall GetDpiFromDpiAwarenessContext(long) @ stdcall GetFocus() @ stdcall GetForegroundWindow() NtUserGetForegroundWindow @ stdcall GetGestureConfig(long long long ptr ptr long) diff --git a/include/winuser.h b/include/winuser.h index 7c387e69f54..7d7a2dc557d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4116,6 +4116,7 @@ WINUSERAPI DWORD WINAPI GetAppCompatFlags(HTASK); WINUSERAPI SHORT WINAPI GetAsyncKeyState(INT); WINUSERAPI BOOL WINAPI GetAutoRotationState(AR_STATE*); WINUSERAPI DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext(DPI_AWARENESS_CONTEXT); +WINUSERAPI UINT WINAPI GetDpiFromDpiAwarenessContext(DPI_AWARENESS_CONTEXT); WINUSERAPI HWND WINAPI GetCapture(void); WINUSERAPI UINT WINAPI GetCaretBlinkTime(void); WINUSERAPI BOOL WINAPI GetCaretPos(LPPOINT);

1 0

Rémi Bernon : user32/tests: Add more AreDpiAwarenessContextsEqual tests.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: 72ca475da2efbf42bbc7deabd98f2ff8adeaa68e URL: https://gitlab.winehq.org/wine/wine/-/commit/72ca475da2efbf42bbc7deabd98f2f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 18:01:08 2024 +0200 user32/tests: Add more AreDpiAwarenessContextsEqual tests. --- dlls/user32/sysparams.c | 14 ++--- dlls/user32/tests/sysparams.c | 134 +++++++++++++++++++++++++++--------------- 2 files changed, 89 insertions(+), 59 deletions(-)

1 0

Rémi Bernon : user32/tests: Add more GetAwarenessFromDpiAwarenessContext tests.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: 25a2919a5562967f3a73fd90d9212e17bfb7c11d URL: https://gitlab.winehq.org/wine/wine/-/commit/25a2919a5562967f3a73fd90d9212e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 18:11:11 2024 +0200 user32/tests: Add more GetAwarenessFromDpiAwarenessContext tests. --- dlls/user32/tests/sysparams.c | 117 +++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 69 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a7a6d9f5c0e..d895a184d13 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -4238,11 +4238,57 @@ static void test_AreDpiAwarenessContextsEqual(void) ok( ret, "AreDpiAwarenessContextsEqual returned %u\n", ret ); } +static void test_GetAwarenessFromDpiAwarenessContext(void) +{ + DPI_AWARENESS ret; + + if (!pGetAwarenessFromDpiAwarenessContext) + { + win_skip( "GetAwarenessFromDpiAwarenessContext missing, skipping tests\n" ); + return; + } + + ret = pGetAwarenessFromDpiAwarenessContext( 0 ); + ok( ret == -1, "got %u\n", ret ); + + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x12 ); + ok( ret == DPI_AWARENESS_PER_MONITOR_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x22 ); + ok( ret == DPI_AWARENESS_PER_MONITOR_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6010 ); + todo_wine ok( ret == DPI_AWARENESS_UNAWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6011 ); + todo_wine ok( ret == DPI_AWARENESS_SYSTEM_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x6111 ); + todo_wine ok( ret == DPI_AWARENESS_SYSTEM_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x7811 ); + todo_wine ok( ret == DPI_AWARENESS_SYSTEM_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x10011 ); + todo_wine ok( ret == DPI_AWARENESS_SYSTEM_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x40006010 ); + todo_wine ok( ret == DPI_AWARENESS_UNAWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80000012 ); + ok( ret == DPI_AWARENESS_PER_MONITOR_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x80006010 ); + todo_wine ok( ret == DPI_AWARENESS_UNAWARE, "got %u\n", ret ); + + ret = pGetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + ok( ret == DPI_AWARENESS_UNAWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + ok( ret == DPI_AWARENESS_SYSTEM_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + ok( ret == DPI_AWARENESS_PER_MONITOR_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ); + ok( ret == DPI_AWARENESS_PER_MONITOR_AWARE, "got %u\n", ret ); + ret = pGetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED ); + todo_wine ok( ret == DPI_AWARENESS_UNAWARE, "got %u\n", ret ); +} + static void test_dpi_context(void) { DPI_AWARENESS awareness; DPI_AWARENESS_CONTEXT context; - ULONG_PTR i, flags; + ULONG_PTR flags; BOOL ret; UINT dpi; HDC hdc = GetDC( 0 ); @@ -4384,74 +4430,6 @@ static void test_dpi_context(void) todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); - for (i = 0; i < 0x100; i++) - { - awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)i ); - switch (i) - { - case 0x10: - ok( awareness == DPI_AWARENESS_UNAWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, - "%Ix: wrong value %u\n", i, awareness ); - break; - case 0x11: - ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, - "%Ix: wrong value %u\n", i, awareness ); - break; - case 0x12: - ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i, awareness ); - break; - case 0x22: - ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, - "%Ix: wrong value %u\n", i, awareness ); - break; - default: - ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", i, awareness ); - break; - } - - awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(i | 0x80000000) ); - switch (i) - { - case 0x10: - ok( awareness == DPI_AWARENESS_UNAWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, - "%Ix: wrong value %u\n", i | 0x80000000, awareness ); - break; - case 0x11: - ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, - "%Ix: wrong value %u\n", i | 0x80000000, awareness ); - break; - case 0x12: - ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i | 0x80000000, awareness ); - break; - case 0x22: - ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, - "%Ix: wrong value %u\n", i, awareness ); - break; - default: - ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", i | 0x80000000, awareness ); - break; - } - - awareness = pGetAwarenessFromDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); - switch (~i) - { - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: - ok( awareness == i, "%Ix: wrong value %u\n", ~i, awareness ); - break; - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: - ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); - break; - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED: - todo_wine - ok( awareness == DPI_AWARENESS_UNAWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); - break; - default: - ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", ~i, awareness ); - break; - } - } if (real_dpi != USER_DEFAULT_SCREEN_DPI) test_dpi_stock_objects( hdc ); ReleaseDC( 0, hdc ); } @@ -4706,6 +4684,7 @@ START_TEST(sysparams) test_IsValidDpiAwarenessContext(); test_GetDpiFromDpiAwarenessContext(); test_AreDpiAwarenessContextsEqual(); + test_GetAwarenessFromDpiAwarenessContext(); change_counter = 0; change_last_param = 0;

1 0

Rémi Bernon : win32u: Use NtUserCallOnParam for SetThreadDpiAwarenessContext.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: bcb33fd859286465530439001194c66f2b79a564 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcb33fd859286465530439001194c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 17:08:40 2024 +0200 win32u: Use NtUserCallOnParam for SetThreadDpiAwarenessContext. And an internal function call when possible. --- dlls/win32u/dce.c | 16 ++++++++-------- dlls/win32u/message.c | 6 +++--- dlls/win32u/sysparams.c | 10 +++++----- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 28 ++++++++++++++-------------- dlls/wineandroid.drv/window.c | 4 ++-- include/ntuser.h | 6 ++++++ 7 files changed, 39 insertions(+), 32 deletions(-)

1 0

Rémi Bernon : win32u: Return UINT from NtUserGetWindowDpiAwarenessContext.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: b6223da1180c7bcb4ef00d98865d9af3901c04d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6223da1180c7bcb4ef00d98865d9a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 23 15:43:01 2024 +0200 win32u: Return UINT from NtUserGetWindowDpiAwarenessContext. --- dlls/user32/win.c | 2 +- dlls/win32u/dce.c | 9 ++++----- dlls/win32u/message.c | 8 ++++---- dlls/win32u/sysparams.c | 10 +++++----- dlls/win32u/win32u_private.h | 4 ++-- dlls/win32u/window.c | 27 ++++++++++++--------------- include/ntuser.h | 5 ++--- 7 files changed, 30 insertions(+), 35 deletions(-)

1 0

Rémi Bernon : win32u: Use NtGdiDdDDICreateDCFromMemory for gdi16 DIBDRV.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: b3bec339d7851b14abf6f6ca341731d560c7f44b URL: https://gitlab.winehq.org/wine/wine/-/commit/b3bec339d7851b14abf6f6ca341731… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Mar 17 00:53:39 2024 +0100 win32u: Use NtGdiDdDDICreateDCFromMemory for gdi16 DIBDRV. Instead of a custom dib_window_surface. --- dlls/gdi.exe16/gdi.c | 80 ++++++++++++++++++++++++++- dlls/win32u/dc.c | 6 -- dlls/win32u/dce.c | 128 ------------------------------------------- dlls/win32u/win32u_private.h | 1 - include/ntgdi.h | 3 - 5 files changed, 77 insertions(+), 141 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 3f363ef2401..c634f0739c7 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -43,6 +43,15 @@ struct saved_visrgn static struct list saved_regions = LIST_INIT( saved_regions ); +struct saved_bitmap +{ + struct list entry; + HDC hdc; + HBITMAP hbitmap; +}; + +static struct list saved_bitmaps = LIST_INIT( saved_bitmaps ); + static HPALETTE16 hPrimaryPalette; /* @@ -1175,8 +1184,62 @@ HDC16 WINAPI CreateDC16( LPCSTR driver, LPCSTR device, LPCSTR output, { if (!lstrcmpiA( driver, "dib" ) || !lstrcmpiA( driver, "dirdib" )) { - DRIVER_INFO_2W driver_info = { .cVersion = NTGDI_WIN16_DIB }; - return HDC_16( NtGdiOpenDCW( NULL, NULL, NULL, 0, TRUE, 0, &driver_info, (void *)initData )); + PALETTEENTRY palette[256]; + BITMAPINFO *info = (BITMAPINFO *)initData; + D3DKMT_CREATEDCFROMMEMORY desc = + { + .Width = info->bmiHeader.biWidth, + .Height = info->bmiHeader.biHeight, + .Pitch = info->bmiHeader.biWidth * info->bmiHeader.biBitCount / 8, + }; + struct saved_bitmap *bitmap; + int color; + + if (info->bmiHeader.biBitCount <= 8) + { + if (info->bmiHeader.biClrUsed) + { + for (color = 0; color < info->bmiHeader.biClrUsed; color++) + { + palette[color].peBlue = info->bmiColors[color].rgbBlue; + palette[color].peGreen = info->bmiColors[color].rgbGreen; + palette[color].peRed = info->bmiColors[color].rgbRed; + } + } + else + { + for (color = 0; color < (1 << info->bmiHeader.biBitCount); color++) + { + palette[color].peBlue = color; + palette[color].peGreen = color; + palette[color].peRed = color; + } + } + desc.pColorTable = palette; + desc.Format = D3DDDIFMT_P8; + desc.pMemory = &info->bmiColors[color]; + } + else if (info->bmiHeader.biCompression == BI_BITFIELDS) + { + desc.Format = D3DDDIFMT_R5G6B5; + desc.pMemory = &info->bmiColors[3]; + } + else + { + desc.Format = info->bmiHeader.biBitCount == 24 ? D3DDDIFMT_R8G8B8 : D3DDDIFMT_X8R8G8B8; + desc.pMemory = &info->bmiColors[0]; + } + + if (NtGdiDdDDICreateDCFromMemory( &desc )) return 0; + + if ((bitmap = HeapAlloc( GetProcessHeap(), 0, sizeof(*bitmap) ))) + { + bitmap->hdc = desc.hDc; + bitmap->hbitmap = desc.hBitmap; + list_add_tail( &saved_bitmaps, &bitmap->entry ); + } + + return HDC_16( desc.hDc ); } return HDC_16( CreateDCA( driver, device, output, initData ) ); } @@ -1329,8 +1392,10 @@ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) { if (DeleteDC( HDC_32(hdc) )) { - struct saved_visrgn *saved, *next; + struct saved_visrgn *saved; + struct saved_bitmap *bitmap; struct gdi_thunk* thunk; + void *next; if ((thunk = GDI_FindThunk(hdc))) GDI_DeleteThunk(thunk); @@ -1341,6 +1406,15 @@ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) DeleteObject( saved->hrgn ); HeapFree( GetProcessHeap(), 0, saved ); } + + LIST_FOR_EACH_ENTRY_SAFE( bitmap, next, &saved_bitmaps, struct saved_bitmap, entry ) + { + if (bitmap->hdc != HDC_32(hdc)) continue; + list_remove( &bitmap->entry ); + DeleteObject( bitmap->hbitmap ); + HeapFree( GetProcessHeap(), 0, bitmap ); + } + return TRUE; } return FALSE; diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 16920e08d33..24a3bca5544 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -765,12 +765,6 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD DC_InitDC( dc ); release_dc_ptr( dc ); - if (driver_info && driver_info->cVersion == NTGDI_WIN16_DIB && - !create_dib_surface( hdc, pdev )) - { - NtGdiDeleteObjectApp( hdc ); - return 0; - } return hdc; } diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 39bbc77f29f..5c4f691b460 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -245,134 +245,6 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su *surface = &impl->header; } -/* window surface used to implement the DIB.DRV driver */ - -struct dib_window_surface -{ - struct window_surface header; - RECT bounds; - void *bits; - UINT info_size; - BITMAPINFO info; /* variable size, must be last */ -}; - -static struct dib_window_surface *get_dib_surface( struct window_surface *surface ) -{ - return (struct dib_window_surface *)surface; -} - -/*********************************************************************** - * dib_surface_lock - */ -static void dib_surface_lock( struct window_surface *window_surface ) -{ - /* nothing to do */ -} - -/*********************************************************************** - * dib_surface_unlock - */ -static void dib_surface_unlock( struct window_surface *window_surface ) -{ - /* nothing to do */ -} - -/*********************************************************************** - * dib_surface_get_bitmap_info - */ -static void *dib_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) -{ - struct dib_window_surface *surface = get_dib_surface( window_surface ); - - memcpy( info, &surface->info, surface->info_size ); - return surface->bits; -} - -/*********************************************************************** - * dib_surface_get_bounds - */ -static RECT *dib_surface_get_bounds( struct window_surface *window_surface ) -{ - struct dib_window_surface *surface = get_dib_surface( window_surface ); - - return &surface->bounds; -} - -/*********************************************************************** - * dib_surface_set_region - */ -static void dib_surface_set_region( struct window_surface *window_surface, HRGN region ) -{ - /* nothing to do */ -} - -/*********************************************************************** - * dib_surface_flush - */ -static void dib_surface_flush( struct window_surface *window_surface ) -{ - /* nothing to do */ -} - -/*********************************************************************** - * dib_surface_destroy - */ -static void dib_surface_destroy( struct window_surface *window_surface ) -{ - struct dib_window_surface *surface = get_dib_surface( window_surface ); - - TRACE( "freeing %p\n", surface ); - free( surface ); -} - -static const struct window_surface_funcs dib_surface_funcs = -{ - dib_surface_lock, - dib_surface_unlock, - dib_surface_get_bitmap_info, - dib_surface_get_bounds, - dib_surface_set_region, - dib_surface_flush, - dib_surface_destroy -}; - -BOOL create_dib_surface( HDC hdc, const BITMAPINFO *info ) -{ - struct dib_window_surface *surface; - int color = 0; - HRGN region; - RECT rect; - - if (info->bmiHeader.biBitCount <= 8) - color = info->bmiHeader.biClrUsed ? info->bmiHeader.biClrUsed : (1 << info->bmiHeader.biBitCount); - else if (info->bmiHeader.biCompression == BI_BITFIELDS) - color = 3; - - surface = calloc( 1, offsetof( struct dib_window_surface, info.bmiColors[color] )); - if (!surface) return FALSE; - - rect.left = 0; - rect.top = 0; - rect.right = info->bmiHeader.biWidth; - rect.bottom = abs(info->bmiHeader.biHeight); - - surface->header.funcs = &dib_surface_funcs; - surface->header.rect = rect; - surface->header.ref = 1; - surface->info_size = offsetof( BITMAPINFO, bmiColors[color] ); - surface->bits = (char *)info + surface->info_size; - memcpy( &surface->info, info, surface->info_size ); - - TRACE( "created %p %ux%u for info %p bits %p\n", - surface, (int)rect.right, (int)rect.bottom, info, surface->bits ); - - region = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ); - set_visible_region( hdc, region, &rect, &rect, &surface->header ); - TRACE( "using hdc %p surface %p\n", hdc, surface ); - window_surface_release( &surface->header ); - return TRUE; -} - /******************************************************************* * register_window_surface * diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7672cf3b356..222db6fb5f7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -45,7 +45,6 @@ extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ); /* dce.c */ extern struct window_surface dummy_surface; -extern BOOL create_dib_surface( HDC hdc, const BITMAPINFO *info ); extern void create_offscreen_window_surface( const RECT *visible_rect, struct window_surface **surface ); extern void erase_now( HWND hwnd, UINT rdw_flags ); diff --git a/include/ntgdi.h b/include/ntgdi.h index 50973535c7a..a33638deee4 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -219,9 +219,6 @@ struct font_enum_entry /* flag for NtGdiGetRandomRgn to respect LAYOUT_RTL */ #define NTGDI_RGN_MIRROR_RTL 0x80000000 -/* magic driver version that we use for win16 DCs with DIB surfaces */ -#define NTGDI_WIN16_DIB 0xfafa000 - #endif /* __WINESRC__ */ struct font_realization_info

1 0

Dmitry Timoshkov : comctl32/tests: Create a fully updated ListView window.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: 5f7b9a5b837a77a85754b3b55b974e39e199f817 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f7b9a5b837a77a85754b3b55b974e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 27 15:06:28 2024 +0300 comctl32/tests: Create a fully updated ListView window. so that the tests don't get remaining messages from the window creation process, and verify message sequences for the actually being tested functionality. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ad60fa5b6b6..1081a045cde 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -115,7 +115,6 @@ static const struct message redraw_listview_seq[] = { { WM_NCPAINT, sent|id|defwinproc, 0, 0, HEADER_ID }, { WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, HEADER_ID }, { WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, - { WM_NCPAINT, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, { WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, LISTVIEW_ID }, { 0 } }; @@ -810,6 +809,8 @@ static HWND create_listview_control(DWORD style) if (!hwnd) return NULL; + UpdateWindow(hwnd); + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)listview_subclass_proc); SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); @@ -833,6 +834,8 @@ static HWND create_listview_controlW(DWORD style, HWND parent) if (!hwnd) return NULL; + UpdateWindow(hwnd); + oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)listview_subclass_proc); SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); @@ -1888,7 +1891,10 @@ static void test_create(BOOL is_version_6) /* WM_MEASUREITEM should be sent when created with LVS_OWNERDRAWFIXED */ flush_sequences(sequences, NUM_MSG_SEQUENCES); - hList = create_listview_control(LVS_OWNERDRAWFIXED | LVS_REPORT); + hList = CreateWindowExA(0, WC_LISTVIEWA, NULL, + WS_CHILD | WS_BORDER | WS_VISIBLE | LVS_OWNERDRAWFIXED | LVS_REPORT, + 0, 0, 100, 100, hwndparent, NULL, GetModuleHandleA(NULL), NULL); + ok(hList != NULL, "Failed to create ListView window.\n"); ok_sequence(sequences, PARENT_SEQ_INDEX, create_ownerdrawfixed_parent_seq, "created with LVS_OWNERDRAWFIXED|LVS_REPORT - parent seq", FALSE); DestroyWindow(hList); @@ -2198,8 +2204,8 @@ static void test_color(void) rect.right = rect.bottom = 1; r = GetUpdateRect(hwnd, &rect, TRUE); - todo_wine expect(FALSE, r); - ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + expect(FALSE, r); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect)); r = ValidateRect(hwnd, NULL); expect(TRUE, r); @@ -2208,8 +2214,8 @@ static void test_color(void) rect.right = rect.bottom = 1; r = GetUpdateRect(hwnd, &rect, TRUE); - todo_wine expect(FALSE, r); - ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + expect(FALSE, r); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect)); r = ValidateRect(hwnd, NULL); expect(TRUE, r); @@ -2218,8 +2224,8 @@ static void test_color(void) rect.right = rect.bottom = 1; r = GetUpdateRect(hwnd, &rect, TRUE); - todo_wine expect(FALSE, r); - ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + expect(FALSE, r); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect)); DestroyWindow(hwnd); }

1 0

Alistair Leslie-Hughes : odbc32: Correct SQLSetConnectOptionW length parameter type.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: 55842cee31c6ccc6b86c6d4b753c0a7be4bd5159 URL: https://gitlab.winehq.org/wine/wine/-/commit/55842cee31c6ccc6b86c6d4b753c0a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 17:27:00 2024 +1000 odbc32: Correct SQLSetConnectOptionW length parameter type. --- dlls/odbc32/proxyodbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d5c271bdfa2..a3732c001be 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -2488,7 +2488,7 @@ SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType) /************************************************************************* * SQLSetConnectOptionW [ODBC32.150] */ -SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLLEN Value) +SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value) { struct SQLSetConnectOptionW_params params = { 0, Option, Value }; struct handle *handle = ConnectionHandle;

1 0