wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Rémi Bernon : dinput/tests: Use a polled HID touchscreen device.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: e3c61ba74c6e55dce3ea6eaecbb79562edc2569e URL: https://gitlab.winehq.org/wine/wine/-/commit/e3c61ba74c6e55dce3ea6eaecbb795… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 2 08:55:44 2024 +0100 dinput/tests: Use a polled HID touchscreen device. Looks like touches are automatically released if the device doesn't send updates regularly. --- dlls/dinput/tests/device8.c | 115 ++++++++++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 30 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index aa37679b0a7..e5ae8fcb13b 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1765,16 +1765,15 @@ done: } static UINT pointer_enter_count; -static UINT pointer_down_count; static UINT pointer_up_count; -static UINT pointer_leave_count; +static HANDLE touchdown_event, touchleave_event; static LRESULT CALLBACK touch_screen_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { if (msg == WM_POINTERENTER) pointer_enter_count++; - if (msg == WM_POINTERDOWN) pointer_down_count++; + if (msg == WM_POINTERDOWN) ReleaseSemaphore( touchdown_event, 1, NULL ); if (msg == WM_POINTERUP) pointer_up_count++; - if (msg == WM_POINTERLEAVE) pointer_leave_count++; + if (msg == WM_POINTERLEAVE) ReleaseSemaphore( touchleave_event, 1, NULL ); return DefWindowProcA( hwnd, msg, wparam, lparam ); } @@ -1916,6 +1915,11 @@ static void test_hid_touch_screen(void) HWND hwnd; BOOL ret; + touchdown_event = CreateSemaphoreW( NULL, 0, LONG_MAX, NULL ); + ok( !!touchdown_event, "CreateSemaphoreW failed, error %lu\n", GetLastError() ); + touchleave_event = CreateSemaphoreW( NULL, 0, LONG_MAX, NULL ); + ok( !!touchleave_event, "CreateSemaphoreW failed, error %lu\n", GetLastError() ); + desc.report_descriptor_len = sizeof(report_desc); memcpy( desc.report_descriptor_buf, report_desc, sizeof(report_desc) ); desc.expect_size = sizeof(expect_max_count); @@ -1962,65 +1966,113 @@ static void test_hid_touch_screen(void) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)touch_screen_wndproc ); - pointer_enter_count = pointer_down_count = pointer_up_count = pointer_leave_count = 0; + /* a single touch is automatically released if we don't send continuous updates */ + + pointer_enter_count = pointer_up_count = 0; bus_send_hid_input( file, &desc, &touch_single, sizeof(touch_single) ); res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); todo_wine ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); - msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + + res = msg_wait_for_events( 1, &touchdown_event, 10 ); + todo_wine + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchleave_event, 100 ); + todo_wine + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); todo_wine ok( pointer_enter_count == 1, "got pointer_enter_count %u\n", pointer_enter_count ); todo_wine - ok( pointer_down_count == 1, "got pointer_down_count %u\n", pointer_down_count ); + ok( pointer_up_count == 1, "got pointer_up_count %u\n", pointer_up_count ); + + + DestroyWindow( hwnd ); + + CloseHandle( file ); + hid_device_stop( &desc, 1 ); + + + /* create a polled device instead so updates are sent continuously */ + + desc.is_polled = TRUE; + desc.input_size = sizeof(touch_release); + memcpy( desc.input, &touch_release, sizeof(touch_release) ); + fill_context( desc.context, ARRAY_SIZE(desc.context) ); + + if (!hid_device_start( &desc, 1 )) goto done; + + swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", desc.attributes.VendorID, + desc.attributes.ProductID ); + ret = find_hid_device_path( device_path ); + ok( ret, "Failed to find HID device matching %s\n", debugstr_w( device_path ) ); + + file = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); + + hwnd = create_foreground_window( TRUE ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)touch_screen_wndproc ); + + + /* now the touch is continuously updated */ + + pointer_enter_count = pointer_up_count = 0; + bus_send_hid_input( file, &desc, &touch_single, sizeof(touch_single) ); + + res = msg_wait_for_events( 1, &touchdown_event, 1000 ); + todo_wine + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchleave_event, 10 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); + todo_wine + ok( pointer_enter_count == 1, "got pointer_enter_count %u\n", pointer_enter_count ); ok( pointer_up_count == 0, "got pointer_up_count %u\n", pointer_up_count ); - ok( pointer_leave_count == 0, "got pointer_leave_count %u\n", pointer_leave_count ); - pointer_enter_count = pointer_down_count = pointer_up_count = pointer_leave_count = 0; + pointer_enter_count = pointer_up_count = 0; bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); - res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + res = msg_wait_for_events( 1, &touchleave_event, 1000 ); todo_wine - ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); - msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchdown_event, 10 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); ok( pointer_enter_count == 0, "got pointer_enter_count %u\n", pointer_enter_count ); - ok( pointer_down_count == 0, "got pointer_down_count %u\n", pointer_down_count ); todo_wine ok( pointer_up_count == 1, "got pointer_up_count %u\n", pointer_up_count ); - todo_wine - ok( pointer_leave_count == 1, "got pointer_leave_count %u\n", pointer_leave_count ); - - pointer_enter_count = pointer_down_count = pointer_up_count = pointer_leave_count = 0; + pointer_enter_count = pointer_up_count = 0; bus_send_hid_input( file, &desc, &touch_multiple, sizeof(touch_multiple) ); - res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + res = msg_wait_for_events( 1, &touchdown_event, 1000 ); todo_wine - ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); - msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchdown_event, 1000 ); todo_wine - ok( pointer_enter_count == 2, "got pointer_enter_count %u\n", pointer_enter_count ); + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchleave_event, 10 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); todo_wine - ok( pointer_down_count == 2, "got pointer_down_count %u\n", pointer_down_count ); + ok( pointer_enter_count == 2, "got pointer_enter_count %u\n", pointer_enter_count ); ok( pointer_up_count == 0, "got pointer_up_count %u\n", pointer_up_count ); - ok( pointer_leave_count == 0, "got pointer_leave_count %u\n", pointer_leave_count ); - pointer_enter_count = pointer_down_count = pointer_up_count = pointer_leave_count = 0; + pointer_enter_count = pointer_up_count = 0; bus_send_hid_input( file, &desc, &touch_release, sizeof(touch_release) ); - res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_POINTER ); + res = msg_wait_for_events( 1, &touchleave_event, 1000 ); todo_wine - ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); - msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchleave_event, 1000 ); + todo_wine + ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); + res = msg_wait_for_events( 1, &touchdown_event, 10 ); + ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); ok( pointer_enter_count == 0, "got pointer_enter_count %u\n", pointer_enter_count ); - ok( pointer_down_count == 0, "got pointer_down_count %u\n", pointer_down_count ); todo_wine ok( pointer_up_count == 2, "got pointer_up_count %u\n", pointer_up_count ); - todo_wine - ok( pointer_leave_count == 2, "got pointer_leave_count %u\n", pointer_leave_count ); DestroyWindow( hwnd ); @@ -2029,6 +2081,9 @@ static void test_hid_touch_screen(void) done: hid_device_stop( &desc, 1 ); + + CloseHandle( touchdown_event ); + CloseHandle( touchleave_event ); } static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwnd, DWORD version )

1 0

Rémi Bernon : dinput/tests: Test rawinput messages with non-input desktop.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: e25d23d5dce44038a3bd4fa0481ef394d6c94914 URL: https://gitlab.winehq.org/wine/wine/-/commit/e25d23d5dce44038a3bd4fa0481ef3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 27 13:07:18 2024 +0100 dinput/tests: Test rawinput messages with non-input desktop. --- dlls/dinput/tests/joystick8.c | 294 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 292 insertions(+), 2 deletions(-)

1 0

Rémi Bernon : dinput/tests: Add more tests for HID rawinput buffer.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 5d7bf639e8cf3d428ba3192dadba762c6dcdc60b URL: https://gitlab.winehq.org/wine/wine/-/commit/5d7bf639e8cf3d428ba3192dadba76… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 26 00:59:24 2024 +0100 dinput/tests: Add more tests for HID rawinput buffer. --- dlls/dinput/tests/joystick8.c | 167 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 152 insertions(+), 15 deletions(-)

1 0

Rémi Bernon : dinput/tests: Add a helper to wait on HID input reads.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: bd2b89806a8fdae0d775013274f2b355dc971227 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd2b89806a8fdae0d775013274f2b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 26 14:11:16 2024 +0100 dinput/tests: Add a helper to wait on HID input reads. --- dlls/dinput/tests/device8.c | 1 + dlls/dinput/tests/dinput_test.h | 5 ++ dlls/dinput/tests/driver_bus.c | 153 ++++++++++++++++++++++++---------------- dlls/dinput/tests/driver_hid.c | 1 + dlls/dinput/tests/driver_hid.h | 2 + dlls/dinput/tests/hid.c | 18 +++++ 6 files changed, 119 insertions(+), 61 deletions(-)

1 0

Rémi Bernon : user32/tests: Rewrite the rawinput buffer test with keyboard input.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: a4d2e62a2f01be5101f4e160497d8e22958a3b81 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4d2e62a2f01be5101f4e160497d8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 25 20:08:16 2024 +0100 user32/tests: Rewrite the rawinput buffer test with keyboard input. This should be more reliable than mouse moves and it exhibits more issues with the rawinput buffer struct sizes on new WoW64. --- dlls/user32/tests/input.c | 474 ++++++++++++++++++++++++---------------------- 1 file changed, 252 insertions(+), 222 deletions(-)

1 0

Rémi Bernon : user32/tests: Run rawinput device tests in the separate desktop.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 9e8a8b5246f623be3fbf447afe3feb5c1b7e9f51 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e8a8b5246f623be3fbf447afe3feb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 25 20:08:16 2024 +0100 user32/tests: Run rawinput device tests in the separate desktop. --- dlls/user32/tests/input.c | 189 ++++++++++++++++++++++++---------------------- 1 file changed, 97 insertions(+), 92 deletions(-)

1 0

Paul Gofman : server: Check if we have waiting asyncs in sock_dispatch_asyncs() before clearing POLLOUT.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: da6e707850dff714cc698feac83646dde748870e URL: https://gitlab.winehq.org/wine/wine/-/commit/da6e707850dff714cc698feac83646… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 29 17:13:33 2024 -0600 server: Check if we have waiting asyncs in sock_dispatch_asyncs() before clearing POLLOUT. --- dlls/ws2_32/tests/sock.c | 12 ++++++++++++ server/sock.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d37c25f9225..b0287fdd004 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3115,13 +3115,19 @@ struct send_udp_thread_param static DWORD WINAPI send_udp_thread( void *param ) { struct send_udp_thread_param *p = param; + static const TIMEVAL timeout_zero = {0}; static char buf[256]; + fd_set writefds; unsigned int i; int ret; WaitForSingleObject( p->start_event, INFINITE ); for (i = 0; i < 256; ++i) { + FD_ZERO(&writefds); + FD_SET(p->sock, &writefds); + ret = select( 1, NULL, &writefds, NULL, &timeout_zero ); + ok( ret == 1, "got %d, i %u.\n", ret, i ); ret = send( p->sock, buf, sizeof(buf), 0 ); ok( ret == sizeof(buf), "got %d, error %u, i %u.\n", ret, WSAGetLastError(), i ); } @@ -3135,6 +3141,7 @@ static void test_UDP(void) possible that this test fails due to dropped packets. */ /* peer 0 receives data from all other peers */ + static const TIMEVAL timeout_zero = {0}; struct sock_info peer[NUM_UDP_PEERS]; char buf[16]; int ss, i, n_recv, n_sent, ret; @@ -3142,6 +3149,7 @@ static void test_UDP(void) int sock; struct send_udp_thread_param udp_thread_param; HANDLE thread; + fd_set writefds; memset (buf,0,sizeof(buf)); @@ -3211,6 +3219,10 @@ static void test_UDP(void) { ret = send( sock, buf, sizeof(buf), 0 ); ok( ret == sizeof(buf), "got %d, error %u, i %u.\n", ret, WSAGetLastError(), i ); + FD_ZERO(&writefds); + FD_SET(sock, &writefds); + ret = select( 1, NULL, &writefds, NULL, &timeout_zero ); + ok( ret == 1, "got %d, i %u.\n", ret, i ); } WaitForSingleObject( thread, INFINITE ); CloseHandle( thread ); diff --git a/server/sock.c b/server/sock.c index a884179c604..3ad1ce39194 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1231,7 +1231,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) event &= ~(POLLIN | POLLPRI); } - if ((event & POLLOUT) && async_queued( &sock->write_q )) + if ((event & POLLOUT) && async_queue_has_waiting_asyncs( &sock->write_q )) { if (async_waiting( &sock->write_q )) {

1 0

Paul Gofman : server: Check if we have waiting asyncs in (send_socket) before enforcing blocking send.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: aac099826259b143710ce42bbe6fadcbda1563a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/aac099826259b143710ce42bbe6fad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 29 18:11:25 2024 -0600 server: Check if we have waiting asyncs in (send_socket) before enforcing blocking send. --- dlls/ws2_32/tests/sock.c | 42 ++++++++++++++++++++++++++++++++++++++++++ server/async.c | 10 ++++++++++ server/file.h | 1 + server/sock.c | 2 +- 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b43d7d61867..d37c25f9225 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3106,6 +3106,29 @@ static test_setup tests [] = } }; +struct send_udp_thread_param +{ + int sock; + HANDLE start_event; +}; + +static DWORD WINAPI send_udp_thread( void *param ) +{ + struct send_udp_thread_param *p = param; + static char buf[256]; + unsigned int i; + int ret; + + WaitForSingleObject( p->start_event, INFINITE ); + for (i = 0; i < 256; ++i) + { + ret = send( p->sock, buf, sizeof(buf), 0 ); + ok( ret == sizeof(buf), "got %d, error %u, i %u.\n", ret, WSAGetLastError(), i ); + } + + return 0; +} + static void test_UDP(void) { /* This function tests UDP sendto() and recvfrom(). UDP is unreliable, so it is @@ -3117,6 +3140,9 @@ static void test_UDP(void) int ss, i, n_recv, n_sent, ret; struct sockaddr_in addr; int sock; + struct send_udp_thread_param udp_thread_param; + HANDLE thread; + memset (buf,0,sizeof(buf)); for ( i = NUM_UDP_PEERS - 1; i >= 0; i-- ) { @@ -3174,6 +3200,22 @@ static void test_UDP(void) ok( ret == sizeof(buf), "got %d, error %u.\n", ret, WSAGetLastError() ); } + /* Test sending packets in parallel (mostly a regression test for Wine async handling race conditions). */ + set_blocking( sock, FALSE ); + + udp_thread_param.sock = sock; + udp_thread_param.start_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + thread = CreateThread( NULL, 0, send_udp_thread, &udp_thread_param, 0, NULL ); + SetEvent( udp_thread_param.start_event ); + for (i = 0; i < 256; ++i) + { + ret = send( sock, buf, sizeof(buf), 0 ); + ok( ret == sizeof(buf), "got %d, error %u, i %u.\n", ret, WSAGetLastError(), i ); + } + WaitForSingleObject( thread, INFINITE ); + CloseHandle( thread ); + CloseHandle( udp_thread_param.start_event ); + closesocket(sock); } diff --git a/server/async.c b/server/async.c index 9cb251df5ce..80129ac0ac3 100644 --- a/server/async.c +++ b/server/async.c @@ -551,6 +551,16 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota } } +int async_queue_has_waiting_asyncs( struct async_queue *queue ) +{ + struct async *async; + + LIST_FOR_EACH_ENTRY( async, &queue->queue, struct async, queue_entry ) + if (!async->unknown_status) return 1; + + return 0; +} + /* check if an async operation is waiting to be alerted */ int async_waiting( struct async_queue *queue ) { diff --git a/server/file.h b/server/file.h index 39a833cd105..7f2d1637863 100644 --- a/server/file.h +++ b/server/file.h @@ -237,6 +237,7 @@ extern void set_async_pending( struct async *async ); extern void async_set_initial_status( struct async *async, unsigned int status ); extern void async_wake_obj( struct async *async ); extern int async_waiting( struct async_queue *queue ); +extern int async_queue_has_waiting_asyncs( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); extern void async_request_complete( struct async *async, unsigned int status, data_size_t result, data_size_t out_size, void *out_data ); diff --git a/server/sock.c b/server/sock.c index c34fd3eb5eb..a884179c604 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3945,7 +3945,7 @@ DECL_HANDLER(send_socket) if (bind_errno) status = sock_get_ntstatus( bind_errno ); else if (sock->wr_shutdown) status = STATUS_PIPE_DISCONNECTED; - else if (!async_queued( &sock->write_q )) + else if (!async_queue_has_waiting_asyncs( &sock->write_q )) { /* If write_q is not empty, we cannot really tell if the already queued * asyncs will not consume all available space; if there's no space

1 0

Esme Povirk : gdiplus: Prefer Tahoma for generic sans serif font.
by Alexandre Julliard 05 Feb '24

05 Feb '24

Module: wine Branch: master Commit: 294efcdf444ed90ee6bb39889dd0a2f33f3eff74 URL: https://gitlab.winehq.org/wine/wine/-/commit/294efcdf444ed90ee6bb39889dd0a2… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 26 16:38:38 2024 +0000 gdiplus: Prefer Tahoma for generic sans serif font. Partial revert of 413fc34be7fca948dc53b3eb8cd1a08e951f2b4e. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55421 --- dlls/gdiplus/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 0dcfad34bbb..da37279fbef 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1037,13 +1037,13 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamil stat = GdipCreateFontFamilyFromName(L"Microsoft Sans Serif", NULL, nativeFamily); if (stat == FontFamilyNotFound) - stat = GdipCreateFontFamilyFromName(L"Arial", NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Tahoma", NULL, nativeFamily); if (stat == FontFamilyNotFound) - stat = GdipCreateFontFamilyFromName(L"Liberation Sans", NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Arial", NULL, nativeFamily); if (stat == FontFamilyNotFound) - stat = GdipCreateFontFamilyFromName(L"Tahoma", NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(L"Liberation Sans", NULL, nativeFamily); return stat; }

1 0

Henri Verbeet : vkd3d: Introduce a debug helper for CPU descriptor handles.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: 06ddb10c4008adde7d81e1ece4fdce7a2b267870 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06ddb10c4008adde7d81e1ece4fdc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 14:50:03 2024 +0100 vkd3d: Introduce a debug helper for CPU descriptor handles. --- libs/vkd3d/command.c | 16 ++++++++-------- libs/vkd3d/device.c | 28 ++++++++++++++-------------- libs/vkd3d/utils.c | 5 +++++ libs/vkd3d/vkd3d_private.h | 1 + 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3cf58e06..f9940b3d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5132,8 +5132,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference ds_reference; - TRACE("iface %p, dsv %#lx, flags %#x, depth %.8e, stencil 0x%02x, rect_count %u, rects %p.\n", - iface, dsv.ptr, flags, depth, stencil, rect_count, rects); + TRACE("iface %p, dsv %s, flags %#x, depth %.8e, stencil 0x%02x, rect_count %u, rects %p.\n", + iface, debug_cpu_handle(dsv), flags, depth, stencil, rect_count, rects); d3d12_command_list_track_resource_usage(list, dsv_desc->resource); @@ -5180,8 +5180,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra struct VkAttachmentReference color_reference; VkClearValue clear_value; - TRACE("iface %p, rtv %#lx, color %p, rect_count %u, rects %p.\n", - iface, rtv.ptr, color, rect_count, rects); + TRACE("iface %p, rtv %s, color %p, rect_count %u, rects %p.\n", + iface, debug_cpu_handle(rtv), color, rect_count, rects); d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -5432,8 +5432,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID struct d3d12_resource *resource_impl; VkClearColorValue colour; - TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", - iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); + TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %s, resource %p, values %p, rect_count %u, rects %p.\n", + iface, gpu_handle.ptr, debug_cpu_handle(cpu_handle), resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); if (!(descriptor = d3d12_desc_from_cpu_handle(cpu_handle)->s.u.view)) @@ -5496,8 +5496,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I VkClearColorValue colour; struct vkd3d_view *view; - TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", - iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); + TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %s, resource %p, values %p, rect_count %u, rects %p.\n", + iface, gpu_handle.ptr, debug_cpu_handle(cpu_handle), resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); if (!(view = d3d12_desc_from_cpu_handle(cpu_handle)->s.u.view)) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 81386df9..cf8b506f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3420,7 +3420,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device struct d3d12_device *device = impl_from_ID3D12Device7(iface); struct d3d12_desc tmp = {0}; - TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); + TRACE("iface %p, desc %p, descriptor %s.\n", iface, desc, debug_cpu_handle(descriptor)); d3d12_desc_create_cbv(&tmp, device, desc); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); @@ -3433,8 +3433,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device struct d3d12_device *device = impl_from_ID3D12Device7(iface); struct d3d12_desc tmp = {0}; - TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", - iface, resource, desc, descriptor.ptr); + TRACE("iface %p, resource %p, desc %p, descriptor %s.\n", + iface, resource, desc, debug_cpu_handle(descriptor)); d3d12_desc_create_srv(&tmp, device, unsafe_impl_from_ID3D12Resource(resource), desc); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); @@ -3447,8 +3447,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Devic struct d3d12_device *device = impl_from_ID3D12Device7(iface); struct d3d12_desc tmp = {0}; - TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %#lx.\n", - iface, resource, counter_resource, desc, descriptor.ptr); + TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %s.\n", + iface, resource, counter_resource, desc, debug_cpu_handle(descriptor)); d3d12_desc_create_uav(&tmp, device, unsafe_impl_from_ID3D12Resource(resource), unsafe_impl_from_ID3D12Resource(counter_resource), desc); @@ -3459,8 +3459,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device7 ID3D12Resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor) { - TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", - iface, resource, desc, descriptor.ptr); + TRACE("iface %p, resource %p, desc %p, descriptor %s.\n", + iface, resource, desc, debug_cpu_handle(descriptor)); d3d12_rtv_desc_create_rtv(d3d12_rtv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device7(iface), unsafe_impl_from_ID3D12Resource(resource), desc); @@ -3470,8 +3470,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device7 ID3D12Resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor) { - TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", - iface, resource, desc, descriptor.ptr); + TRACE("iface %p, resource %p, desc %p, descriptor %s.\n", + iface, resource, desc, debug_cpu_handle(descriptor)); d3d12_dsv_desc_create_dsv(d3d12_dsv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device7(iface), unsafe_impl_from_ID3D12Resource(resource), desc); @@ -3483,7 +3483,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device7 *iface, struct d3d12_device *device = impl_from_ID3D12Device7(iface); struct d3d12_desc tmp = {0}; - TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); + TRACE("iface %p, desc %p, descriptor %s.\n", iface, desc, debug_cpu_handle(descriptor)); d3d12_desc_create_sampler(&tmp, device, desc); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); @@ -3557,10 +3557,10 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device7 * const D3D12_CPU_DESCRIPTOR_HANDLE src_descriptor_range_offset, D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type) { - TRACE("iface %p, descriptor_count %u, dst_descriptor_range_offset %#lx, " - "src_descriptor_range_offset %#lx, descriptor_heap_type %#x.\n", - iface, descriptor_count, dst_descriptor_range_offset.ptr, src_descriptor_range_offset.ptr, - descriptor_heap_type); + TRACE("iface %p, descriptor_count %u, dst_descriptor_range_offset %s, " + "src_descriptor_range_offset %s, descriptor_heap_type %#x.\n", + iface, descriptor_count, debug_cpu_handle(dst_descriptor_range_offset), + debug_cpu_handle(src_descriptor_range_offset), descriptor_heap_type); d3d12_device_CopyDescriptors(iface, 1, &dst_descriptor_range_offset, &descriptor_count, 1, &src_descriptor_range_offset, &descriptor_count, descriptor_heap_type); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 75197122..28913a83 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -632,6 +632,11 @@ HRESULT return_interface(void *iface, REFIID iface_iid, return hr; } +const char *debug_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE handle) +{ + return vkd3d_dbg_sprintf("{%#"PRIxPTR"}", (uintptr_t)handle.ptr); +} + const char *debug_d3d12_box(const D3D12_BOX *box) { if (!box) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d46f434d..bb78ba77 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1960,6 +1960,7 @@ bool is_write_resource_state(D3D12_RESOURCE_STATES state); HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object); +const char *debug_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE handle); const char *debug_d3d12_box(const D3D12_BOX *box); const char *debug_d3d12_shader_component_mapping(unsigned int mapping); const char *debug_vk_extent_3d(VkExtent3D extent);

1 0

← Newer
1
...
64
65
66
67
68
69
70
71
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024