wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_SHUTDOWN in WS_shutdown().
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 53dc1b0a58d6f30029a1f517bc9efce048bde229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53dc1b0a58d6f30029a1f517… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 18 22:35:51 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_SHUTDOWN in WS_shutdown(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 130 ++++------------------------------------------- dlls/ws2_32/tests/sock.c | 20 ++++---- 2 files changed, 21 insertions(+), 129 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0110d53ab48..3632397ef3d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2272,64 +2272,6 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS stat return status; } -/*********************************************************************** - * WS2_async_shutdown (INTERNAL) - * - * Handler for shutdown() operations on overlapped sockets. - */ -static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) -{ - struct ws2_async_shutdown *wsa = user; - int fd, err = 1; - - switch (status) - { - case STATUS_ALERTED: - if ((status = wine_server_handle_to_fd( wsa->hSocket, 0, &fd, NULL ) )) - break; - - switch ( wsa->type ) - { - case ASYNC_TYPE_READ: break; - case ASYNC_TYPE_WRITE: err = shutdown( fd, 1 ); break; - } - status = err ? wsaErrStatus() : STATUS_SUCCESS; - close( fd ); - break; - } - iosb->u.Status = status; - iosb->Information = 0; - release_async_io( &wsa->io ); - return status; -} - -/*********************************************************************** - * WS2_register_async_shutdown (INTERNAL) - * - * Helper function for WS_shutdown() on overlapped sockets. - */ -static int WS2_register_async_shutdown( SOCKET s, int type ) -{ - struct ws2_async_shutdown *wsa; - NTSTATUS status; - - TRACE("socket %04lx type %d\n", s, type); - - wsa = (struct ws2_async_shutdown *)alloc_async_io( sizeof(*wsa), WS2_async_shutdown ); - if ( !wsa ) - return WSAEFAULT; - - wsa->hSocket = SOCKET2HANDLE(s); - wsa->type = type; - - status = register_async( type, wsa->hSocket, &wsa->io, 0, NULL, NULL, &wsa->iosb ); - if (status != STATUS_PENDING) - { - HeapFree( GetProcessHeap(), 0, wsa ); - return NtStatusToWSAError( status ); - } - return 0; -} /*********************************************************************** * accept (WS2_32.1) @@ -5512,74 +5454,24 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return SOCKET_ERROR; } + /*********************************************************************** - * shutdown (WS2_32.22) + * shutdown (ws2_32.22) */ -int WINAPI WS_shutdown(SOCKET s, int how) +int WINAPI WS_shutdown( SOCKET s, int how ) { - int fd, err = WSAENOTSOCK; - unsigned int options = 0, clear_flags = 0; - - fd = get_sock_fd( s, 0, &options ); - TRACE("socket %04lx, how 0x%x, options 0x%x\n", s, how, options ); - - if (fd == -1) - return SOCKET_ERROR; - - switch( how ) - { - case SD_RECEIVE: /* drop receives */ - clear_flags |= FD_READ; - break; - case SD_SEND: /* drop sends */ - clear_flags |= FD_WRITE; - break; - case SD_BOTH: /* drop all */ - clear_flags |= FD_READ|FD_WRITE; - /*fall through */ - default: - clear_flags |= FD_WINE_LISTENING; - } - - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) - { - switch ( how ) - { - case SD_RECEIVE: - err = WS2_register_async_shutdown( s, ASYNC_TYPE_READ ); - break; - case SD_SEND: - err = WS2_register_async_shutdown( s, ASYNC_TYPE_WRITE ); - break; - case SD_BOTH: - default: - err = WS2_register_async_shutdown( s, ASYNC_TYPE_READ ); - if (!err) err = WS2_register_async_shutdown( s, ASYNC_TYPE_WRITE ); - break; - } - if (err) goto error; - } - else /* non-overlapped mode */ - { - if (how != SD_RECEIVE && shutdown( fd, SHUT_WR )) - { - err = wsaErrno(); - goto error; - } - } + IO_STATUS_BLOCK io; + NTSTATUS status; - release_sock_fd( s, fd ); - _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); - if ( how > 1) WSAAsyncSelect( s, 0, 0, 0 ); - return 0; + TRACE( "socket %#lx, how %u\n", s, how ); -error: - release_sock_fd( s, fd ); - _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); - SetLastError( err ); - return SOCKET_ERROR; + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, + IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; } + /*********************************************************************** * socket (WS2_32.23) */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2c1f0e6142a..8bec781ac6f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6405,12 +6405,12 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(client, SD_SEND); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = shutdown(client, SD_RECEIVE); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); @@ -6425,8 +6425,8 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(client, SD_SEND); - todo_wine ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = send(client, "test", 5, 0); @@ -6501,7 +6501,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(client, 0xdeadbeef); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); closesocket(client); closesocket(server); @@ -6628,12 +6628,12 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(listener, SD_SEND); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = shutdown(listener, SD_RECEIVE); - todo_wine ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); closesocket(listener); @@ -6671,8 +6671,8 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(client, SD_SEND); - todo_wine ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = sendto(client, "test", 5, 0, (struct sockaddr *)&server_addr, sizeof(server_addr));

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_SHUTDOWN in WS2_DisconnectEx().
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 89e1cf3d44ff5670e67e3f5e5caf50d7fa551e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89e1cf3d44ff5670e67e3f5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 18 22:35:50 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_SHUTDOWN in WS2_DisconnectEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 29 ++++++++++++++------- dlls/ws2_32/tests/sock.c | 65 +++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 45 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aad92d5d4df..0110d53ab48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3110,23 +3110,34 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct WS_sockaddr *name, int return !status; } -/*********************************************************************** - * DisconnectEx - */ -static BOOL WINAPI WS2_DisconnectEx( SOCKET s, LPOVERLAPPED ov, DWORD flags, DWORD reserved ) + +static BOOL WINAPI WS2_DisconnectEx( SOCKET s, OVERLAPPED *overlapped, DWORD flags, DWORD reserved ) { - TRACE( "socket %04lx, ov %p, flags 0x%x, reserved 0x%x\n", s, ov, flags, reserved ); + IO_STATUS_BLOCK iosb, *piosb = &iosb; + void *cvalue = NULL; + int how = SD_SEND; + HANDLE event = 0; + NTSTATUS status; + + TRACE( "socket %#lx, overlapped %p, flags %#x, reserved %#x\n", s, overlapped, flags, reserved ); if (flags & TF_REUSE_SOCKET) FIXME( "Reusing socket not supported yet\n" ); - if (ov) + if (overlapped) { - ov->Internal = STATUS_PENDING; - ov->InternalHigh = 0; + piosb = (IO_STATUS_BLOCK *)overlapped; + if (!((ULONG_PTR)overlapped->hEvent & 1)) cvalue = overlapped; + event = overlapped->hEvent; + overlapped->Internal = STATUS_PENDING; + overlapped->InternalHigh = 0; } - return !WS_shutdown( s, SD_BOTH ); + status = NtDeviceIoControlFile( (HANDLE)s, event, NULL, cvalue, piosb, + IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); + if (!status && overlapped) status = STATUS_PENDING; + SetLastError( NtStatusToWSAError( status ) ); + return !status; } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5028a4e749e..2c1f0e6142a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6732,7 +6732,7 @@ static void test_DisconnectEx(void) WSASetLastError(0xdeadbeef); ret = pDisconnectEx(client, &overlapped, 0, 0); ok(!ret, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); @@ -6741,18 +6741,15 @@ static void test_DisconnectEx(void) WSASetLastError(0xdeadbeef); ret = pDisconnectEx(client, &overlapped, 0, 0); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ok(!ret, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - if (WSAGetLastError() == ERROR_IO_PENDING) - { - ret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(!ret, "wait timed out\n"); - size = 0xdeadbeef; - ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); - ok(ret, "got error %u\n", GetLastError()); - ok(!size, "got size %u\n", size); - } + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait timed out\n"); + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); ok(ret == -1, "expected failure\n"); @@ -6805,8 +6802,8 @@ static void test_DisconnectEx(void) WSASetLastError(0xdeadbeef); ret = pDisconnectEx(client, NULL, 0, 0); - todo_wine ok(ret, "expected success\n"); - todo_wine ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + ok(ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); ok(ret == -1, "expected failure\n"); @@ -8552,18 +8549,16 @@ static void test_shutdown_completion_port(void) SetLastError(0xdeadbeef); ret = pDisconnectEx(client, &overlapped, 0, 0); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); - if (GetLastError() == ERROR_IO_PENDING) - { - ret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(!ret, "wait failed\n"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); - size = 0xdeadbeef; - ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, TRUE); - ok(ret, "got error %u\n", GetLastError()); - ok(!size, "got %u bytes\n", size); - } + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait failed\n"); + + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, TRUE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got %u bytes\n", size); size = 0xdeadbeef; key = 0xdeadbeef; @@ -8617,18 +8612,16 @@ static void test_shutdown_completion_port(void) SetLastError(0xdeadbeef); ret = pDisconnectEx(client, &overlapped, 0, 0); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); - if (GetLastError() == ERROR_IO_PENDING) - { - ret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(!ret, "wait failed\n"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); - size = 0xdeadbeef; - ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, TRUE); - ok(ret, "got error %u\n", GetLastError()); - ok(!size, "got %u bytes\n", size); - } + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait failed\n"); + + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, TRUE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got %u bytes\n", size); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); ok(!ret, "expected failure\n");

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_SHUTDOWN.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: e68f41e4fe6285a26edd30c01084666a2cf3fc9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68f41e4fe6285a26edd30c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 18 22:35:49 2021 -0500 server: Introduce IOCTL_AFD_WINE_SHUTDOWN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index b085981b6c0..30429b02324 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -37,6 +37,7 @@ struct afd_listen_params #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_CONNECT CTL_CODE(FILE_DEVICE_NETWORK, 203, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SHUTDOWN CTL_CODE(FILE_DEVICE_NETWORK, 204, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index 9896810def1..b523e8db780 100644 --- a/server/sock.c +++ b/server/sock.c @@ -135,6 +135,7 @@ struct sock unsigned int reported_events; unsigned int flags; /* socket flags */ int polling; /* is socket being polled? */ + int wr_shutdown_pending; /* is a write shutdown pending? */ unsigned short proto; /* socket protocol */ unsigned short type; /* socket type */ unsigned short family; /* socket family */ @@ -912,6 +913,9 @@ static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) { struct sock *sock = get_fd_user( fd ); + if (sock->wr_shutdown_pending && list_empty( &sock->write_q.queue )) + shutdown( get_unix_fd( sock->fd ), SHUT_WR ); + /* Don't reselect the ifchange queue; we always ask for POLLIN. * Don't reselect an uninitialized socket; we can't call set_fd_events() on * a pseudo-fd. */ @@ -983,6 +987,7 @@ static struct sock *create_socket(void) sock->pending_events = 0; sock->reported_events = 0; sock->polling = 0; + sock->wr_shutdown_pending = 0; sock->flags = 0; sock->proto = 0; sock->type = 0; @@ -1638,6 +1643,55 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_SHUTDOWN: + { + unsigned int how; + + if (get_req_data_size() < sizeof(int)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + how = *(int *)get_req_data(); + + if (how > SD_BOTH) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + if (sock->type == WS_SOCK_STREAM && !(sock->state & FD_WINE_CONNECTED)) + { + set_error( STATUS_INVALID_CONNECTION ); + return 0; + } + + if (how != SD_SEND) + { + sock->state &= ~FD_READ; + } + if (how != SD_RECEIVE) + { + sock->state &= ~FD_WRITE; + if (list_empty( &sock->write_q.queue )) + shutdown( unix_fd, SHUT_WR ); + else + sock->wr_shutdown_pending = 1; + } + + if (how == SD_BOTH) + { + if (sock->event) release_object( sock->event ); + sock->event = NULL; + sock->window = 0; + sock->mask = 0; + sock->state |= FD_WINE_NONBLOCKING; + } + + sock_reselect( sock ); + return 1; + } + case IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) {

1 0

Zebediah Figura : ws2_32: Do not use SHUT_RD.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 416072a84c5bea7f619c3fa1396274396d44236b URL: https://source.winehq.org/git/wine.git/?a=commit;h=416072a84c5bea7f619c3fa1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 18 22:35:48 2021 -0500 ws2_32: Do not use SHUT_RD. Win32 SD_RECEIVE has the following effects on a TCP or UDP socket: * further calls to recv() et al. fail with ESHUTDOWN. However, Linux and Mac instead return 0. * currently pending calls to recv() are not affected. However, Linux and Mac cause them to return 0. * calls to WSAPoll() are unaffected. However, Linux and Mac instead signal both POLLHUP and POLLIN. * for TCP connections, further data sent by the peer causes the connection to be reset. Mac and BSD will silently drop data, and Linux simply queues it forever. In short, SHUT_RD does nothing that we want it to do on Linux or Mac (and probably also BSD, though I am unable to test this). Most of this impedance mismatch can be worked around in Wine, except for WSAPoll(). Since poll() will always return POLLHUP, we can't safely ask for POLLOUT, which we may need to do. Hence, since we aren't getting any benefit from SHUT_RD, don't use it. Note that this doesn't actually fix any tests, since we have some rather bizarre logic to defer shutdown anyway (for an asynchronous socket, we don't call shutdown(SHUT_RD) until the peer sends data; this is probably an unintended bug, but "fixing" it ends up causing test failures, which is the main impetus for this patch.) Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 889f0327baf..aad92d5d4df 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2290,7 +2290,7 @@ static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS switch ( wsa->type ) { - case ASYNC_TYPE_READ: err = shutdown( fd, 0 ); break; + case ASYNC_TYPE_READ: break; case ASYNC_TYPE_WRITE: err = shutdown( fd, 1 ); break; } status = err ? wsaErrStatus() : STATUS_SUCCESS; @@ -5550,7 +5550,7 @@ int WINAPI WS_shutdown(SOCKET s, int how) } else /* non-overlapped mode */ { - if ( shutdown( fd, how ) ) + if (how != SD_RECEIVE && shutdown( fd, SHUT_WR )) { err = wsaErrno(); goto error;

1 0

Piotr Caban : ucrtbase: Copy fenv tests from msvcr120.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 9cd51b02eebc6339c21b8ebcb9438d7d5a9d666f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cd51b02eebc6339c21b8ebc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 21:07:04 2021 +0200 ucrtbase: Copy fenv tests from msvcr120. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 167 +++++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/fenv.h | 1 + 2 files changed, 168 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 5fcec2e2bb5..aaa8ada2a8a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1371,6 +1371,172 @@ static void test_thread_storage(void) "can't find se_translator in thread storage\n"); } +static unsigned long fenv_encode(unsigned int e) +{ + ok(!(e & ~FE_ALL_EXCEPT), "incorrect argument: %x\n", e); + +#if defined(__i386__) + return e<<24 | e<<16 | e; +#else + return e<<24 | e; +#endif +} + +static void test_fenv(void) +{ +#if defined(__i386__) || defined(__x86_64__) + static const int tests[] = { + 0, + FE_INEXACT, + FE_UNDERFLOW, + FE_OVERFLOW, + FE_DIVBYZERO, + FE_INVALID, + FE_ALL_EXCEPT, + }; + static const struct { + fexcept_t except; + unsigned int flag; + unsigned int get; + fexcept_t expect; + } tests2[] = { + /* except flag get expect */ + { 0, 0, 0, 0 }, + { FE_ALL_EXCEPT, FE_INEXACT, 0, 0 }, + { FE_ALL_EXCEPT, FE_INEXACT, FE_ALL_EXCEPT, FE_INEXACT }, + { FE_ALL_EXCEPT, FE_INEXACT, FE_INEXACT, FE_INEXACT }, + { FE_ALL_EXCEPT, FE_INEXACT, FE_OVERFLOW, 0 }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_ALL_EXCEPT }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_INEXACT, FE_INEXACT }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, 0, 0 }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, ~0, FE_ALL_EXCEPT }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, ~FE_ALL_EXCEPT, 0 }, + { FE_INEXACT, FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_INEXACT }, + { FE_INEXACT, FE_UNDERFLOW, FE_ALL_EXCEPT, 0 }, + { FE_UNDERFLOW, FE_INEXACT, FE_ALL_EXCEPT, 0 }, + { FE_INEXACT|FE_UNDERFLOW, FE_UNDERFLOW, FE_ALL_EXCEPT, FE_UNDERFLOW }, + { FE_UNDERFLOW, FE_INEXACT|FE_UNDERFLOW, FE_ALL_EXCEPT, FE_UNDERFLOW }, + }; + fenv_t env, env2; + fexcept_t except; + int i, ret, flags; + + _clearfp(); + + ret = fegetenv(&env); + ok(!ret, "fegetenv returned %x\n", ret); + if (env._Fe_ctl >> 24 != (env._Fe_ctl & 0xff)) + { + win_skip("fenv_t format not supported (too old ucrtbase)\n"); + return; + } + fesetround(FE_UPWARD); + ok(!env._Fe_stat, "env._Fe_stat = %lx\n", env._Fe_stat); + ret = fegetenv(&env2); + ok(!ret, "fegetenv returned %x\n", ret); + ok(env._Fe_ctl != env2._Fe_ctl, "fesetround didn't change _Fe_ctl (%lx).", env._Fe_ctl); + ret = fesetenv(&env); + ok(!ret, "fesetenv returned %x\n", ret); + ret = fegetround(); + ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); + + except = fenv_encode(FE_ALL_EXCEPT); + ret = fesetexceptflag(&except, FE_INEXACT|FE_UNDERFLOW); + ok(!ret, "fesetexceptflag returned %x\n", ret); + except = fetestexcept(FE_ALL_EXCEPT); + ok(except == (FE_INEXACT|FE_UNDERFLOW), "expected %x, got %lx\n", FE_INEXACT|FE_UNDERFLOW, except); + + ret = feclearexcept(~FE_ALL_EXCEPT); + ok(!ret, "feclearexceptflag returned %x\n", ret); + except = fetestexcept(FE_ALL_EXCEPT); + ok(except == (FE_INEXACT|FE_UNDERFLOW), "expected %x, got %lx\n", FE_INEXACT|FE_UNDERFLOW, except); + + /* no crash, but no-op */ + ret = fesetexceptflag(NULL, 0); + ok(!ret, "fesetexceptflag returned %x\n", ret); + except = fetestexcept(FE_ALL_EXCEPT); + ok(except == (FE_INEXACT|FE_UNDERFLOW), "expected %x, got %lx\n", FE_INEXACT|FE_UNDERFLOW, except); + + /* zero clears all */ + except = 0; + ret = fesetexceptflag(&except, FE_ALL_EXCEPT); + ok(!ret, "fesetexceptflag returned %x\n", ret); + except = fetestexcept(FE_ALL_EXCEPT); + ok(!except, "expected 0, got %lx\n", except); + + ret = fetestexcept(FE_ALL_EXCEPT); + ok(!ret, "fetestexcept returned %x\n", ret); + + flags = 0; + /* adding bits with flags */ + for(i=0; i<ARRAY_SIZE(tests); i++) { + except = fenv_encode(FE_ALL_EXCEPT); + ret = fesetexceptflag(&except, tests[i]); + ok(!ret, "Test %d: fesetexceptflag returned %x\n", i, ret); + + ret = fetestexcept(tests[i]); + ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); + + flags |= tests[i]; + ret = fetestexcept(FE_ALL_EXCEPT); + ok(ret == flags, "Test %d: expected %x, got %x\n", i, flags, ret); + + except = ~0; + ret = fegetexceptflag(&except, ~0); + ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); + ok(except == fenv_encode(flags), + "Test %d: expected %x, got %lx\n", i, flags, except); + + except = ~0; + ret = fegetexceptflag(&except, tests[i]); + ok(!ret, "Test %d: fegetexceptflag returned %x.\n", i, ret); + ok(except == fenv_encode(tests[i]), + "Test %d: expected %x, got %lx\n", i, tests[i], except); + } + + for(i=0; i<ARRAY_SIZE(tests); i++) { + ret = feclearexcept(tests[i]); + ok(!ret, "Test %d: feclearexceptflag returned %x\n", i, ret); + + flags &= ~tests[i]; + except = fetestexcept(tests[i]); + ok(!except, "Test %d: expected %x, got %lx\n", i, flags, except); + } + + except = fetestexcept(FE_ALL_EXCEPT); + ok(!except, "expected 0, got %lx\n", except); + + /* setting bits with except */ + for(i=0; i<ARRAY_SIZE(tests); i++) { + except = fenv_encode(tests[i]); + ret = fesetexceptflag(&except, FE_ALL_EXCEPT); + ok(!ret, "Test %d: fesetexceptflag returned %x\n", i, ret); + + ret = fetestexcept(tests[i]); + ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); + + ret = fetestexcept(FE_ALL_EXCEPT); + ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); + } + + for(i=0; i<ARRAY_SIZE(tests2); i++) { + _clearfp(); + + except = fenv_encode(tests2[i].except); + ret = fesetexceptflag(&except, tests2[i].flag); + ok(!ret, "Test %d: fesetexceptflag returned %x\n", i, ret); + + ret = fetestexcept(tests2[i].get); + ok(ret == tests2[i].expect, "Test %d: expected %lx, got %x\n", i, tests2[i].expect, ret); + } + + ret = feclearexcept(FE_ALL_EXCEPT); + ok(!ret, "feclearexceptflag returned %x\n", ret); + except = fetestexcept(FE_ALL_EXCEPT); + ok(!except, "expected 0, got %lx\n", except); +#endif +} + START_TEST(misc) { int arg_c; @@ -1411,4 +1577,5 @@ START_TEST(misc) test__o_malloc(); test_clock(); test_thread_storage(); + test_fenv(); } diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index a6b53eca567..2039a1fb4c8 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -36,6 +36,7 @@ _ACRTIMP int __cdecl fegetenv(fenv_t*); _ACRTIMP int __cdecl fesetenv(const fenv_t*); _ACRTIMP int __cdecl fegetexceptflag(fexcept_t*, int); _ACRTIMP int __cdecl fegetround(void); +_ACRTIMP int __cdecl feholdexcept(fenv_t*); _ACRTIMP int __cdecl fesetround(int); _ACRTIMP int __cdecl fesetexceptflag(const fexcept_t*, int); _ACRTIMP int __cdecl feclearexcept(int);

1 0

Jacek Caban : winepulse: Move pulse_set_event_handle to unix lib.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: a5997bece730beb8ab72d66b824ed2a1cb92c254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5997bece730beb8ab72d66b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 18 16:59:16 2021 +0200 winepulse: Move pulse_set_event_handle to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 19 +++---------------- dlls/winepulse.drv/pulse.c | 19 +++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 40391e19641..292d85a1c1f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -943,28 +943,15 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; TRACE("(%p)->(%p)\n", This, event); if (!event) return E_INVALIDARG; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr)) { - pulse->unlock(); - return hr; - } - - if (!(This->pulse_stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) - hr = AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; - else if (This->pulse_stream->event) - hr = HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - else - This->pulse_stream->event = event; - pulse->unlock(); - return hr; + return pulse->set_event_handle(This->pulse_stream, event); } static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index b115ae76a43..3fc238faf39 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1541,6 +1541,24 @@ static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_v stream->vol[i] = volumes[i] * master_volume * session_volumes[i]; } +static HRESULT WINAPI pulse_set_event_handle(struct pulse_stream *stream, HANDLE event) +{ + HRESULT hr = S_OK; + + pulse_lock(); + if (!pulse_stream_valid(stream)) + hr = AUDCLNT_E_DEVICE_INVALIDATED; + else if (!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + hr = AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; + else if (stream->event) + hr = HRESULT_FROM_WIN32(ERROR_INVALID_NAME); + else + stream->event = event; + pulse_unlock(); + + return hr; +} + static const struct unix_funcs unix_funcs = { pulse_lock, @@ -1556,6 +1574,7 @@ static const struct unix_funcs unix_funcs = pulse_get_render_buffer, pulse_release_render_buffer, pulse_set_volumes, + pulse_set_event_handle, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 6ec7cdc7fcc..9242cb3856b 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -86,5 +86,6 @@ struct unix_funcs DWORD flags); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes); + HRESULT (WINAPI *set_event_handle)(struct pulse_stream *stream, HANDLE event); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config); };

1 0

Jacek Caban : winepulse: Move release_render_buffer to unix lib.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 24a7c33fc1ad6dbab489284cfb6dba4130297ddb URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a7c33fc1ad6dbab489284c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 18 16:59:03 2021 +0200 winepulse: Move release_render_buffer to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 61 ++------------------------------------- dlls/winepulse.drv/pulse.c | 66 +++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 71 insertions(+), 58 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 63c14b0ae68..40391e19641 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -238,11 +238,6 @@ static HRESULT pulse_stream_valid(ACImpl *This) { return S_OK; } -static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes) -{ - memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); -} - static DWORD WINAPI pulse_timer_cb(void *user) { ACImpl *This = user; @@ -1196,67 +1191,17 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return pulse->get_render_buffer(This->pulse_stream, frames, data); } -static void pulse_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_bytes) -{ - UINT32 wri_offs_bytes = (This->pulse_stream->lcl_offs_bytes + This->pulse_stream->held_bytes) % This->pulse_stream->real_bufsize_bytes; - UINT32 chunk_bytes = This->pulse_stream->real_bufsize_bytes - wri_offs_bytes; - - if(written_bytes <= chunk_bytes){ - memcpy(This->pulse_stream->local_buffer + wri_offs_bytes, buffer, written_bytes); - }else{ - memcpy(This->pulse_stream->local_buffer + wri_offs_bytes, buffer, chunk_bytes); - memcpy(This->pulse_stream->local_buffer, buffer + chunk_bytes, - written_bytes - chunk_bytes); - } -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - UINT32 written_bytes = written_frames * pa_frame_size(&This->pulse_stream->ss); - BYTE *buffer; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - pulse->lock(); - if (!This->pulse_stream->locked || !written_frames) { - This->pulse_stream->locked = 0; - pulse->unlock(); - return written_frames ? AUDCLNT_E_OUT_OF_ORDER : S_OK; - } - - if(written_frames * pa_frame_size(&This->pulse_stream->ss) > (This->pulse_stream->locked >= 0 ? This->pulse_stream->locked : -This->pulse_stream->locked)){ - pulse->unlock(); - return AUDCLNT_E_INVALID_SIZE; - } - - if(This->pulse_stream->locked >= 0) - buffer = This->pulse_stream->local_buffer + (This->pulse_stream->lcl_offs_bytes + This->pulse_stream->held_bytes) % This->pulse_stream->real_bufsize_bytes; - else - buffer = This->pulse_stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This->pulse_stream->ss.format, buffer, written_bytes); - - if(This->pulse_stream->locked < 0) - pulse_wrap_buffer(This, buffer, written_bytes); - - This->pulse_stream->held_bytes += written_bytes; - This->pulse_stream->pa_held_bytes += written_bytes; - if(This->pulse_stream->pa_held_bytes > This->pulse_stream->real_bufsize_bytes){ - This->pulse_stream->pa_offs_bytes += This->pulse_stream->pa_held_bytes - This->pulse_stream->real_bufsize_bytes; - This->pulse_stream->pa_offs_bytes %= This->pulse_stream->real_bufsize_bytes; - This->pulse_stream->pa_held_bytes = This->pulse_stream->real_bufsize_bytes; - } - This->pulse_stream->clock_written += written_bytes; - This->pulse_stream->locked = 0; - - TRACE("Released %u, held %zu\n", written_frames, This->pulse_stream->held_bytes / pa_frame_size(&This->pulse_stream->ss)); - - pulse->unlock(); + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - return S_OK; + return pulse->release_render_buffer(This->pulse_stream, written_frames, flags); } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 767e555017f..b115ae76a43 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1467,6 +1467,71 @@ static HRESULT WINAPI pulse_get_render_buffer(struct pulse_stream *stream, UINT3 return S_OK; } +static void pulse_wrap_buffer(struct pulse_stream *stream, BYTE *buffer, UINT32 written_bytes) +{ + UINT32 wri_offs_bytes = (stream->lcl_offs_bytes + stream->held_bytes) % stream->real_bufsize_bytes; + UINT32 chunk_bytes = stream->real_bufsize_bytes - wri_offs_bytes; + + if (written_bytes <= chunk_bytes) + { + memcpy(stream->local_buffer + wri_offs_bytes, buffer, written_bytes); + } + else + { + memcpy(stream->local_buffer + wri_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, written_bytes - chunk_bytes); + } +} + +static HRESULT WINAPI pulse_release_render_buffer(struct pulse_stream *stream, UINT32 written_frames, + DWORD flags) +{ + UINT32 written_bytes; + BYTE *buffer; + + pulse_lock(); + if (!stream->locked || !written_frames) + { + stream->locked = 0; + pulse_unlock(); + return written_frames ? AUDCLNT_E_OUT_OF_ORDER : S_OK; + } + + if (written_frames * pa_frame_size(&stream->ss) > (stream->locked >= 0 ? stream->locked : -stream->locked)) + { + pulse_unlock(); + return AUDCLNT_E_INVALID_SIZE; + } + + if (stream->locked >= 0) + buffer = stream->local_buffer + (stream->lcl_offs_bytes + stream->held_bytes) % stream->real_bufsize_bytes; + else + buffer = stream->tmp_buffer; + + written_bytes = written_frames * pa_frame_size(&stream->ss); + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream->ss.format, buffer, written_bytes); + + if (stream->locked < 0) + pulse_wrap_buffer(stream, buffer, written_bytes); + + stream->held_bytes += written_bytes; + stream->pa_held_bytes += written_bytes; + if (stream->pa_held_bytes > stream->real_bufsize_bytes) + { + stream->pa_offs_bytes += stream->pa_held_bytes - stream->real_bufsize_bytes; + stream->pa_offs_bytes %= stream->real_bufsize_bytes; + stream->pa_held_bytes = stream->real_bufsize_bytes; + } + stream->clock_written += written_bytes; + stream->locked = 0; + + TRACE("Released %u, held %zu\n", written_frames, stream->held_bytes / pa_frame_size(&stream->ss)); + + pulse_unlock(); + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1489,6 +1554,7 @@ static const struct unix_funcs unix_funcs = pulse_reset, pulse_timer_loop, pulse_get_render_buffer, + pulse_release_render_buffer, pulse_set_volumes, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index f1f5d7ee66d..6ec7cdc7fcc 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -82,6 +82,8 @@ struct unix_funcs HRESULT (WINAPI *reset)(struct pulse_stream *stream); void (WINAPI *timer_loop)(struct pulse_stream *stream); HRESULT (WINAPI *get_render_buffer)(struct pulse_stream *stream, UINT32 frames, BYTE **data); + HRESULT (WINAPI *release_render_buffer)(struct pulse_stream *stream, UINT32 written_frames, + DWORD flags); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config);

1 0

Jacek Caban : winepulse: Move pulse_get_render_buffer to unix lib.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 8cb88173d87efedce8c345beea05641f5617d857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cb88173d87efedce8c345be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 18 16:58:55 2021 +0200 winepulse: Move pulse_get_render_buffer to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 47 +++----------------------------- dlls/winepulse.drv/pulse.c | 62 +++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 66 insertions(+), 44 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0cfb1106d2c..63c14b0ae68 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1180,61 +1180,20 @@ static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) return AudioClient_Release(&This->IAudioClient3_iface); } -static void alloc_tmp_buffer(ACImpl *This, UINT32 bytes) -{ - if(This->pulse_stream->tmp_buffer_bytes >= bytes) - return; - - HeapFree(GetProcessHeap(), 0, This->pulse_stream->tmp_buffer); - This->pulse_stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, bytes); - This->pulse_stream->tmp_buffer_bytes = bytes; -} - static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - size_t bytes = frames * pa_frame_size(&This->pulse_stream->ss); - HRESULT hr = S_OK; - UINT32 wri_offs_bytes; TRACE("(%p)->(%u, %p)\n", This, frames, data); if (!data) return E_POINTER; + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; *data = NULL; - pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr) || This->pulse_stream->locked) { - pulse->unlock(); - return FAILED(hr) ? hr : AUDCLNT_E_OUT_OF_ORDER; - } - if (!frames) { - pulse->unlock(); - return S_OK; - } - - if(This->pulse_stream->held_bytes / pa_frame_size(&This->pulse_stream->ss) + frames > This->pulse_stream->bufsize_frames){ - pulse->unlock(); - return AUDCLNT_E_BUFFER_TOO_LARGE; - } - - wri_offs_bytes = (This->pulse_stream->lcl_offs_bytes + This->pulse_stream->held_bytes) % This->pulse_stream->real_bufsize_bytes; - if(wri_offs_bytes + bytes > This->pulse_stream->real_bufsize_bytes){ - alloc_tmp_buffer(This, bytes); - *data = This->pulse_stream->tmp_buffer; - This->pulse_stream->locked = -bytes; - }else{ - *data = This->pulse_stream->local_buffer + wri_offs_bytes; - This->pulse_stream->locked = bytes; - } - - silence_buffer(This->pulse_stream->ss.format, *data, bytes); - - pulse->unlock(); - - return hr; + return pulse->get_render_buffer(This->pulse_stream, frames, data); } static void pulse_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_bytes) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index dbdf94b2672..767e555017f 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1406,6 +1406,67 @@ static HRESULT WINAPI pulse_reset(struct pulse_stream *stream) return S_OK; } +static void alloc_tmp_buffer(struct pulse_stream *stream, UINT32 bytes) +{ + if (stream->tmp_buffer_bytes >= bytes) + return; + + RtlFreeHeap(GetProcessHeap(), 0, stream->tmp_buffer); + stream->tmp_buffer = RtlAllocateHeap(GetProcessHeap(), 0, bytes); + stream->tmp_buffer_bytes = bytes; +} + +static HRESULT WINAPI pulse_get_render_buffer(struct pulse_stream *stream, UINT32 frames, BYTE **data) +{ + size_t bytes; + UINT32 wri_offs_bytes; + + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + + if (stream->locked) + { + pulse_unlock(); + return AUDCLNT_E_OUT_OF_ORDER; + } + + if (!frames) + { + pulse_unlock(); + *data = NULL; + return S_OK; + } + + if (stream->held_bytes / pa_frame_size(&stream->ss) + frames > stream->bufsize_frames) + { + pulse_unlock(); + return AUDCLNT_E_BUFFER_TOO_LARGE; + } + + bytes = frames * pa_frame_size(&stream->ss); + wri_offs_bytes = (stream->lcl_offs_bytes + stream->held_bytes) % stream->real_bufsize_bytes; + if (wri_offs_bytes + bytes > stream->real_bufsize_bytes) + { + alloc_tmp_buffer(stream, bytes); + *data = stream->tmp_buffer; + stream->locked = -bytes; + } + else + { + *data = stream->local_buffer + wri_offs_bytes; + stream->locked = bytes; + } + + silence_buffer(stream->ss.format, *data, bytes); + + pulse_unlock(); + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1427,6 +1488,7 @@ static const struct unix_funcs unix_funcs = pulse_stop, pulse_reset, pulse_timer_loop, + pulse_get_render_buffer, pulse_set_volumes, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index f6ecf778558..f1f5d7ee66d 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -81,6 +81,7 @@ struct unix_funcs HRESULT (WINAPI *stop)(struct pulse_stream *stream); HRESULT (WINAPI *reset)(struct pulse_stream *stream); void (WINAPI *timer_loop)(struct pulse_stream *stream); + HRESULT (WINAPI *get_render_buffer)(struct pulse_stream *stream, UINT32 frames, BYTE **data); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config);

1 0

Jacek Caban : winepulse: Move pulse_reset to unix lib.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 505d4b8b14913f3abd362bf27272e6b239cb6ce4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=505d4b8b14913f3abd362bf2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 18 16:58:48 2021 +0200 winepulse: Move pulse_reset to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 55 +++---------------------------------- dlls/winepulse.drv/pulse.c | 63 +++++++++++++++++++++++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 65 insertions(+), 55 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 46d3b308f38..0cfb1106d2c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -243,12 +243,6 @@ static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); } -static void pulse_op_cb(pa_stream *s, int success, void *user) { - TRACE("Success: %i\n", success); - *(int*)user = success; - pulse->broadcast(); -} - static DWORD WINAPI pulse_timer_cb(void *user) { ACImpl *This = user; @@ -941,56 +935,13 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr = S_OK; TRACE("(%p)\n", This); - pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr)) { - pulse->unlock(); - return hr; - } - - if (This->pulse_stream->started) { - pulse->unlock(); - return AUDCLNT_E_NOT_STOPPED; - } - - if (This->pulse_stream->locked) { - pulse->unlock(); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if (This->dataflow == eRender) { - /* If there is still data in the render buffer it needs to be removed from the server */ - int success = 0; - if (This->pulse_stream->held_bytes) { - pa_operation *o = pa_stream_flush(This->pulse_stream->stream, pulse_op_cb, &success); - if (o) { - while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse->cond_wait(); - pa_operation_unref(o); - } - } - if (success || !This->pulse_stream->held_bytes){ - This->pulse_stream->clock_lastpos = This->pulse_stream->clock_written = 0; - This->pulse_stream->pa_offs_bytes = This->pulse_stream->lcl_offs_bytes = This->pulse_stream->held_bytes = This->pulse_stream->pa_held_bytes = 0; - } - } else { - ACPacket *p; - This->pulse_stream->clock_written += This->pulse_stream->held_bytes; - This->pulse_stream->held_bytes = 0; - - if ((p = This->pulse_stream->locked_ptr)) { - This->pulse_stream->locked_ptr = NULL; - list_add_tail(&This->pulse_stream->packet_free_head, &p->entry); - } - list_move_tail(&This->pulse_stream->packet_free_head, &This->pulse_stream->packet_filled_head); - } - pulse->unlock(); + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - return hr; + return pulse->reset(This->pulse_stream); } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 28b221e5f03..dbdf94b2672 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -76,7 +76,7 @@ static int WINAPI pulse_cond_wait(void) return pthread_cond_wait(&pulse_cond, &pulse_mutex); } -static void WINAPI pulse_broadcast(void) +static void pulse_broadcast(void) { pthread_cond_broadcast(&pulse_cond); } @@ -1347,6 +1347,65 @@ static HRESULT WINAPI pulse_stop(struct pulse_stream *stream) return hr; } +static HRESULT WINAPI pulse_reset(struct pulse_stream *stream) +{ + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + + if (stream->started) + { + pulse_unlock(); + return AUDCLNT_E_NOT_STOPPED; + } + + if (stream->locked) + { + pulse_unlock(); + return AUDCLNT_E_BUFFER_OPERATION_PENDING; + } + + if (stream->dataflow == eRender) + { + /* If there is still data in the render buffer it needs to be removed from the server */ + int success = 0; + if (stream->held_bytes) + { + pa_operation *o = pa_stream_flush(stream->stream, pulse_op_cb, &success); + if (o) + { + while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) + pulse_cond_wait(); + pa_operation_unref(o); + } + } + if (success || !stream->held_bytes) + { + stream->clock_lastpos = stream->clock_written = 0; + stream->pa_offs_bytes = stream->lcl_offs_bytes = 0; + stream->held_bytes = stream->pa_held_bytes = 0; + } + } + else + { + ACPacket *p; + stream->clock_written += stream->held_bytes; + stream->held_bytes = 0; + + if ((p = stream->locked_ptr)) + { + stream->locked_ptr = NULL; + list_add_tail(&stream->packet_free_head, &p->entry); + } + list_move_tail(&stream->packet_free_head, &stream->packet_filled_head); + } + pulse_unlock(); + return S_OK; +} + static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes) { @@ -1361,12 +1420,12 @@ static const struct unix_funcs unix_funcs = pulse_lock, pulse_unlock, pulse_cond_wait, - pulse_broadcast, pulse_main_loop, pulse_create_stream, pulse_release_stream, pulse_start, pulse_stop, + pulse_reset, pulse_timer_loop, pulse_set_volumes, pulse_test_connect, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 38996792ffe..f6ecf778558 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -71,7 +71,6 @@ struct unix_funcs void (WINAPI *lock)(void); void (WINAPI *unlock)(void); int (WINAPI *cond_wait)(void); - void (WINAPI *broadcast)(void); void (WINAPI *main_loop)(void); HRESULT (WINAPI *create_stream)(const char *name, EDataFlow dataflow, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, @@ -80,6 +79,7 @@ struct unix_funcs void (WINAPI *release_stream)(struct pulse_stream *stream, HANDLE timer); HRESULT (WINAPI *start)(struct pulse_stream *stream); HRESULT (WINAPI *stop)(struct pulse_stream *stream); + HRESULT (WINAPI *reset)(struct pulse_stream *stream); void (WINAPI *timer_loop)(struct pulse_stream *stream); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes);

1 0

Jacek Caban : winepulse: Move pulse_start to unix lib.
by Alexandre Julliard 19 May '21

19 May '21

Module: wine Branch: master Commit: 638455136b4d30b853b02b77a2f33dc61c60b267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=638455136b4d30b853b02b77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 18 16:57:18 2021 +0200 winepulse: Move pulse_start to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 51 ++++++++------------------------------- dlls/winepulse.drv/pulse.c | 55 +++++++++++++++++++++++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 64 insertions(+), 44 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index f9b16bee66b..46d3b308f38 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -908,54 +908,23 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr = S_OK; - int success; - pa_operation *o; + HRESULT hr; TRACE("(%p)\n", This); - pulse->lock(); - hr = pulse_stream_valid(This); - if (FAILED(hr)) { - pulse->unlock(); - return hr; - } - - if ((This->pulse_stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->pulse_stream->event) { - pulse->unlock(); - return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } + if (!This->pulse_stream) + return AUDCLNT_E_NOT_INITIALIZED; - if (This->pulse_stream->started) { - pulse->unlock(); - return AUDCLNT_E_NOT_STOPPED; - } + hr = pulse->start(This->pulse_stream); + if (FAILED(hr)) + return hr; - pulse->write(This->pulse_stream); - - if (pa_stream_is_corked(This->pulse_stream->stream)) { - o = pa_stream_cork(This->pulse_stream->stream, 0, pulse_op_cb, &success); - if (o) { - while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse->cond_wait(); - pa_operation_unref(o); - } else - success = 0; - if (!success) - hr = E_FAIL; + if (!This->timer) { + This->timer = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL); + SetThreadPriority(This->timer, THREAD_PRIORITY_TIME_CRITICAL); } - if (SUCCEEDED(hr)) { - This->pulse_stream->started = TRUE; - This->pulse_stream->just_started = TRUE; - - if(!This->timer) { - This->timer = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL); - SetThreadPriority(This->timer, THREAD_PRIORITY_TIME_CRITICAL); - } - } - pulse->unlock(); - return hr; + return S_OK; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index d720b79a22d..28b221e5f03 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1007,7 +1007,7 @@ write: return pa_stream_write(stream->stream, buffer, bytes, NULL, 0, PA_SEEK_RELATIVE); } -static void WINAPI pulse_write(struct pulse_stream *stream) +static void pulse_write(struct pulse_stream *stream) { /* write as much data to PA as we can */ UINT32 to_write; @@ -1257,6 +1257,57 @@ static void WINAPI pulse_timer_loop(struct pulse_stream *stream) } } +static HRESULT WINAPI pulse_start(struct pulse_stream *stream) +{ + HRESULT hr = S_OK; + int success; + pa_operation *o; + + pulse_lock(); + if (!pulse_stream_valid(stream)) + { + pulse_unlock(); + return hr; + } + + if ((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event) + { + pulse_unlock(); + return AUDCLNT_E_EVENTHANDLE_NOT_SET; + } + + if (stream->started) + { + pulse_unlock(); + return AUDCLNT_E_NOT_STOPPED; + } + + pulse_write(stream); + + if (pa_stream_is_corked(stream->stream)) + { + o = pa_stream_cork(stream->stream, 0, pulse_op_cb, &success); + if (o) + { + while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) + pulse_cond_wait(); + pa_operation_unref(o); + } + else + success = 0; + if (!success) + hr = E_FAIL; + } + + if (SUCCEEDED(hr)) + { + stream->started = TRUE; + stream->just_started = TRUE; + } + pulse_unlock(); + return hr; +} + static HRESULT WINAPI pulse_stop(struct pulse_stream *stream) { HRESULT hr = S_OK; @@ -1314,7 +1365,7 @@ static const struct unix_funcs unix_funcs = pulse_main_loop, pulse_create_stream, pulse_release_stream, - pulse_write, + pulse_start, pulse_stop, pulse_timer_loop, pulse_set_volumes, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 4188dacc25f..38996792ffe 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -78,7 +78,7 @@ struct unix_funcs const WAVEFORMATEX *fmt, UINT32 *channel_count, struct pulse_stream **ret); void (WINAPI *release_stream)(struct pulse_stream *stream, HANDLE timer); - void (WINAPI *write)(struct pulse_stream *stream); + HRESULT (WINAPI *start)(struct pulse_stream *stream); HRESULT (WINAPI *stop)(struct pulse_stream *stream); void (WINAPI *timer_loop)(struct pulse_stream *stream); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume,

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
77
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 May 2021