system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 21:34:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ws2_32: Move the getsockopt(SO_LINGER) implementation to ntdll.

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-06-24 22:32:45 -05:00 committed by Alexandre Julliard
parent ee7be6ea7c
commit f52df002b0
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dlls/ntdll/unix/socket.c
View file

@ -1613,6 +1613,28 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_SET_SO_KEEPALIVE:
return do_setsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, in_buffer, in_size );
case IOCTL_AFD_WINE_GET_SO_LINGER:
{
struct WS_linger *ws_linger = out_buffer;
struct linger unix_linger;
socklen_t len = sizeof(unix_linger);
int ret;
if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
return status;
ret = getsockopt( fd, SOL_SOCKET, SO_LINGER, &unix_linger, &len );
if (needs_close) close( fd );
if (!ret)
{
ws_linger->l_onoff = unix_linger.l_onoff;
ws_linger->l_linger = unix_linger.l_linger;
io->Information = sizeof(*ws_linger);
}
return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS;
}
default:
{
if ((code >> 16) == FILE_DEVICE_NETWORK)

23
dlls/ws2_32/socket.c
View file

@ -2229,9 +2229,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
case WS_SO_LINGER:
{
struct linger lingval;
socklen_t len = sizeof(struct linger);
/* struct linger and LINGER have different sizes */
if (!optlen || *optlen < sizeof(LINGER) || !optval)
{
@ -2243,23 +2240,13 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
if (_get_fd_type(fd) == SOCK_DGRAM)
{
SetLastError(WSAENOPROTOOPT);
ret = SOCKET_ERROR;
release_sock_fd( s, fd );
SetLastError( WSAENOPROTOOPT );
return -1;
}
else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0)
{
SetLastError(wsaErrno());
ret = SOCKET_ERROR;
}
else
{
((LINGER *)optval)->l_onoff = lingval.l_onoff;
((LINGER *)optval)->l_linger = lingval.l_linger;
*optlen = sizeof(struct linger);
}
release_sock_fd( s, fd );
return ret;
return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_LINGER, optval, optlen );
}
case WS_SO_MAX_MSG_SIZE:

1
include/wine/afd.h
View file

@ -165,6 +165,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS)
struct afd_create_params
{