wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Paul Gofman : winhttp: Use send_socket_shutdown() in WinHttpWebSocketClose().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: f6ce4e23fa39bf0f9226ac2121e71c7186f87eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ce4e23fa39bf0f9226ac21… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:07:59 2022 +0300 winhttp: Use send_socket_shutdown() in WinHttpWebSocketClose(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 41 +++++++++++++++++++---------------------- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 51e450c5ff1..893afdbfb52 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3660,16 +3660,18 @@ static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void ret = send_frame( s->socket, SOCKET_OPCODE_CLOSE, s->status, s->reason, s->len, TRUE, NULL ); send_io_complete( &s->socket->hdr ); - if (!ret) send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); - else + if (s->send_callback) { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_WRITE_DATA; - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION; - send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + if (!ret) send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_WRITE_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION; + send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } } - release_object( &s->socket->hdr ); free( s ); } @@ -3690,6 +3692,7 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v s->status = status; memcpy( s->reason, reason, len ); s->len = len; + s->send_callback = send_callback; addref_object( &socket->hdr ); InterlockedIncrement( &socket->hdr.pending_sends ); @@ -3731,19 +3734,12 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r return ret; } -static DWORD socket_close( struct socket *socket, USHORT status, const void *reason, DWORD len, BOOL async ) +static DWORD socket_close( struct socket *socket, BOOL async ) { DWORD ret, count; if ((ret = socket_drain( socket ))) goto done; - if (socket->state < SOCKET_STATE_SHUTDOWN) - { - stop_queue( &socket->send_q ); - if ((ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, NULL ))) goto done; - socket->state = SOCKET_STATE_SHUTDOWN; - } - while (1) { if ((ret = receive_frame( socket, &count, &socket->opcode ))) goto done; @@ -3788,7 +3784,7 @@ static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ct { struct socket_shutdown *s = ctx; - socket_close( s->socket, s->status, s->reason, s->len, TRUE ); + socket_close( s->socket, TRUE ); TRACE("running %p\n", work); release_object( &s->socket->hdr ); @@ -3816,15 +3812,15 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas return ERROR_INVALID_OPERATION; } + if (socket->state < SOCKET_STATE_SHUTDOWN + && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) goto done; + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { struct socket_shutdown *s; - if (!(s = malloc( sizeof(*s) ))) return FALSE; + if (!(s = calloc( 1, sizeof(*s) ))) return FALSE; s->socket = socket; - s->status = status; - memcpy( s->reason, reason, len ); - s->len = len; addref_object( &socket->hdr ); if ((ret = queue_task( &socket->recv_q, task_socket_close, s ))) @@ -3833,8 +3829,9 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas free( s ); } } - else ret = socket_close( socket, status, reason, len, FALSE ); + else ret = socket_close( socket, FALSE ); +done: release_object( &socket->hdr ); return ret; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7c904071a14..ef52944e412 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -314,6 +314,7 @@ struct socket_shutdown USHORT status; char reason[123]; DWORD len; + BOOL send_callback; }; struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN;

1 0

Paul Gofman : winhttp: Factor out send_socket_shutdown() function.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 45872934aa5a3c8a873b8951edfb0a7f88f988fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=45872934aa5a3c8a873b8951… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:07:58 2022 +0300 winhttp: Factor out send_socket_shutdown() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 54 +++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d9c5174f152..51e450c5ff1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3650,11 +3650,6 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D return ret; } -static DWORD socket_shutdown( struct socket *socket, USHORT status, const void *reason, DWORD len ) -{ - return send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, NULL ); -} - static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { struct socket_shutdown *s = ctx; @@ -3662,7 +3657,7 @@ static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void TRACE("running %p\n", work); - ret = socket_shutdown( s->socket, s->status, s->reason, s->len ); + ret = send_frame( s->socket, SOCKET_OPCODE_CLOSE, s->status, s->reason, s->len, TRUE, NULL ); send_io_complete( &s->socket->hdr ); if (!ret) send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); @@ -3679,27 +3674,11 @@ static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void free( s ); } -DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) +static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const void *reason, DWORD len, + BOOL send_callback) { - struct socket *socket; DWORD ret; - TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - - if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; - - if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; - if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) - { - release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; - } - if (socket->state >= SOCKET_STATE_SHUTDOWN) - { - release_object( &socket->hdr ); - return ERROR_INVALID_OPERATION; - } - socket->state = SOCKET_STATE_SHUTDOWN; if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3721,8 +3700,33 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r free( s ); } } - else ret = socket_shutdown( socket, status, reason, len ); + else ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, NULL ); + + return ret; +} + +DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) +{ + struct socket *socket; + DWORD ret; + + TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); + + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; + + if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + if (socket->state >= SOCKET_STATE_SHUTDOWN) + { + release_object( &socket->hdr ); + return ERROR_INVALID_OPERATION; + } + ret = send_socket_shutdown( socket, status, reason, len, TRUE ); release_object( &socket->hdr ); return ret; }

1 0

Paul Gofman : winhttp: Set socket state to shutdown right away in WinHttpWebSocketShutdown().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 5ea5db9021a8f273d4c79c2eec65257491149b27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea5db9021a8f273d4c79c2e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:07:57 2022 +0300 winhttp: Set socket state to shutdown right away in WinHttpWebSocketShutdown(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 11 +++-------- dlls/winhttp/tests/notification.c | 5 +++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index fc2c06bd11f..d9c5174f152 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3652,14 +3652,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D static DWORD socket_shutdown( struct socket *socket, USHORT status, const void *reason, DWORD len ) { - DWORD ret; - - stop_queue( &socket->send_q ); - if (!(ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, NULL ))) - { - socket->state = SOCKET_STATE_SHUTDOWN; - } - return ret; + return send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, NULL ); } static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) @@ -3707,6 +3700,8 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r return ERROR_INVALID_OPERATION; } + socket->state = SOCKET_STATE_SHUTDOWN; + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { struct socket_shutdown *s; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 0c3ff98c342..4127f9933bb 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -814,6 +814,11 @@ static void test_websocket(BOOL secure) setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); ok( err == ERROR_SUCCESS, "got %u\n", err ); + + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, + (void*)"hello", sizeof("hello") ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") );

1 0

Paul Gofman : winhttp: Return ERROR_INVALID_OPERATION when websocket is in the wrong state.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 01c02f60d4dae78cab644dd936c486d23a136664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c02f60d4dae78cab644dd9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 25 03:07:56 2022 +0300 winhttp: Return ERROR_INVALID_OPERATION when websocket is in the wrong state. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 10 +++++----- dlls/winhttp/tests/notification.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 31e65a68359..fc2c06bd11f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3324,7 +3324,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ if (socket->state != SOCKET_STATE_OPEN) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3625,7 +3625,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D if (socket->state > SOCKET_STATE_SHUTDOWN) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3704,7 +3704,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r if (socket->state >= SOCKET_STATE_SHUTDOWN) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3814,7 +3814,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (socket->state >= SOCKET_STATE_CLOSED) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3859,7 +3859,7 @@ DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status if (socket->state < SOCKET_STATE_CLOSED) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } *status = socket->status; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index e919159ba98..0c3ff98c342 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -816,6 +816,12 @@ static void test_websocket(BOOL secure) ok( err == ERROR_SUCCESS, "got %u\n", err ); WaitForSingleObject( info.wait, INFINITE ); + err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, + (void*)"hello", sizeof("hello") ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; size = 0xdeadbeef; @@ -838,8 +844,15 @@ static void test_websocket(BOOL secure) ok( type == 0xdeadbeef, "got %u\n", type ); ok( buffer[0] == 'h', "unexpected data\n" ); + close_status = 0xdead; + size = sizeof(buffer) + 1; + err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( close_status == 0xdead, "got %u\n", close_status ); + ok( size == sizeof(buffer) + 1, "got %u\n", size ); + setup_test( &info, winhttp_websocket_close, __LINE__ ); - ret = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); + err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); ok( err == ERROR_SUCCESS, "got %u\n", err ); WaitForSingleObject( info.wait, INFINITE );

1 0

Stefan Dösinger : ddraw/tests: Accept broken depth readback of new-ish AMD GPUs.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 917e8dbf671f607f75ffd5d249280d76d87eb3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917e8dbf671f607f75ffd5d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 24 15:20:29 2022 +0300 ddraw/tests: Accept broken depth readback of new-ish AMD GPUs. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 8 +++++++- dlls/ddraw/tests/ddraw4.c | 8 +++++++- dlls/ddraw/tests/ddraw7.c | 9 +++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f80d4fe3ab8..00c8f820edb 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -148,6 +148,11 @@ static BOOL ddraw_is_vendor(IDirectDraw2 *ddraw, DWORD vendor) && identifier.dwVendorId == vendor; } +static BOOL ddraw_is_amd(IDirectDraw2 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x1002); +} + static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { return ddraw_is_vendor(ddraw, 0x8086); @@ -13640,7 +13645,8 @@ static void test_depth_readback(void) /* The ddraw2 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, * except that we only have D16 (broken on geforce 9) and D24X8 (broken on geforce 7) available. * Accept all nvidia GPUs as broken here, but still expect one of the formats to pass. */ - ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw), + ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw) + || (ddraw_is_amd(ddraw) && tests[i].z_depth == 24), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff)) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4447c5675ea..a8b68b8a20b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -149,6 +149,11 @@ static BOOL ddraw_is_vendor(IDirectDraw4 *ddraw, DWORD vendor) && identifier.dwVendorId == vendor; } +static BOOL ddraw_is_amd(IDirectDraw4 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x1002); +} + static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { return ddraw_is_vendor(ddraw, 0x8086); @@ -16252,7 +16257,8 @@ static void test_depth_readback(void) * * Some of the tested places pass on some GPUs on Wine by accident. */ todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff)) - ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw), + ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw) + || (ddraw_is_amd(ddraw) && !tests[i].s_depth && tests[i].z_mask == 0x00ffffff), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff)) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e5324cfe8bd..f4388296702 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15716,7 +15716,8 @@ static void test_depth_readback(void) depth = raw_value & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; - /* This test is very reliably on AMD, but fails in a number of interesting ways on Nvidia GPUs: + /* This test is very reliably on older AMD drivers, but fails in a number of interesting + * ways on Nvidia GPUs: * * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. * @@ -15729,10 +15730,14 @@ static void test_depth_readback(void) * Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654). * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. * + * On new-ish AMD GPUs (Radeon Polaris at least) returns weird data for D24 and D24X8. D16 + * and D24S8 work. + * * Some of the tested places pass on some GPUs on Wine by accident. */ todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff)) ok(compare_uint(expected_depth, depth, max_diff) - || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)), + || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)) + || (ddraw_is_amd(ddraw) && !tests[i].s_depth && tests[i].z_mask == 0x00ffffff), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff))

1 0

Ben Shefte : ntdll: Use case insensitive comparison in is_import_dll_system().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 9d1ac957b4e4e399b49f9b7f443336806482707e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1ac957b4e4e399b49f9b7f… Author: Ben Shefte <shefben(a)gmail.com> Date: Tue Jan 25 15:20:24 2022 +0300 ntdll: Use case insensitive comparison in is_import_dll_system(). Fixes a regression introduced by commit 250c113169217933b1fffa8024fa958f71b8aee7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..b50b9e61bbc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -628,7 +628,7 @@ static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_ { const char *name = get_rva( mod->DllBase, import->Name ); - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + return !_stricmp( name, "ntdll.dll" ) || !_stricmp( name, "kernel32.dll" ); } /**********************************************************************

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in set_glsl_shader_program().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: c8c79a9043f1f50b34b4333e108dac7414ce8616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c79a9043f1f50b34b4333e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 11:51:45 2022 +0100 wined3d: Use wined3d_mask_from_size() in set_glsl_shader_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a49644a8fc5..e6381265def 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10506,7 +10506,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, { unsigned int clip_distance_count = wined3d_popcount(pre_rasterization_shader->reg_maps.clip_distance_mask); entry->shader_controlled_clip_distances = 1; - entry->clip_distance_mask = (1u << clip_distance_count) - 1; + entry->clip_distance_mask = wined3d_mask_from_size(clip_distance_count); } if (needs_legacy_glsl_syntax(gl_info))

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in shader_glsl_generate_stream_output_setup().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 8c7dce6949250eb313d2e797e6127fe5c1c466ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7dce6949250eb313d2e797… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 11:51:44 2022 +0100 wined3d: Use wined3d_mask_from_size() in shader_glsl_generate_stream_output_setup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b2f9d1e0e41..a49644a8fc5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7318,7 +7318,7 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe DWORD write_mask; char str_mask[6]; - write_mask = ((1u << e->component_count) - 1) << component_idx; + write_mask = wined3d_mask_from_size(e->component_count) << component_idx; shader_glsl_write_mask_to_str(write_mask, str_mask); shader_addline(buffer, "shader_out.reg%u_%u_%u = outputs[%u]%s;\n", register_idx, component_idx, component_idx + e->component_count - 1,

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in shader_glsl_gather4().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 02106b019565263d75d3c80e478e9d8f6e7f898c URL: https://source.winehq.org/git/wine.git/?a=commit;h=02106b019565263d75d3c80e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 11:51:43 2022 +0100 wined3d: Use wined3d_mask_from_size() in shader_glsl_gather4(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b5d36884f5..b2f9d1e0e41 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6215,7 +6215,7 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) shader_glsl_swizzle_to_str(ins->src[resource_param_idx].swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], 0, resource_info->data_type); - shader_glsl_add_src_param(ins, &ins->src[0], (1u << coord_size) - 1, &coord_param); + shader_glsl_add_src_param(ins, &ins->src[0], wined3d_mask_from_size(coord_size), &coord_param); shader_addline(buffer, "textureGather%s(%s_sampler%u, %s", has_offset ? "Offset" : "", prefix, sampler_bind_idx, coord_param.param_str); @@ -6226,7 +6226,7 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) } if (ins->handler_idx == WINED3DSIH_GATHER4_PO || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) { - shader_glsl_add_src_param(ins, &ins->src[1], (1u << offset_size) - 1, &offset_param); + shader_glsl_add_src_param(ins, &ins->src[1], wined3d_mask_from_size(offset_size), &offset_param); shader_addline(buffer, ", %s", offset_param.param_str); } else if (has_offset)

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in shader_glsl_store_uav().
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: e804eebe0b3e4a748fe965ef366926fcc510c7d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e804eebe0b3e4a748fe965ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 11:51:42 2022 +0100 wined3d: Use wined3d_mask_from_size() in shader_glsl_store_uav(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7983aeddcec..4b5d36884f5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5659,7 +5659,7 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) return; } data_type = reg_maps->uav_resource_info[uav_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + coord_mask = wined3d_mask_from_size(resource_type_info[resource_type].coord_size); shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); shader_glsl_add_src_param_ext(ins->ctx, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
73
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 January 2022