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

ws2_32: Move the setsockopt(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:46 -05:00 committed by Alexandre Julliard
parent f52df002b0
commit 130b549671
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1635,6 +1635,17 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS;
}
case IOCTL_AFD_WINE_SET_SO_LINGER:
{
const struct WS_linger *ws_linger = in_buffer;
struct linger unix_linger;
unix_linger.l_onoff = ws_linger->l_onoff;
unix_linger.l_linger = ws_linger->l_linger;
return do_setsockopt( handle, io, SOL_SOCKET, SO_LINGER, &unix_linger, sizeof(unix_linger) );
}
default:
{
if ((code >> 16) == FILE_DEVICE_NETWORK)

17
dlls/ws2_32/socket.c
View file

@ -3545,6 +3545,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
case WS_SO_KEEPALIVE:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen );
case WS_SO_LINGER:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen );
/* Some options need some conversion before they can be sent to
* setsockopt. The conversions are done here, then they will fall through
* to the general case. Special options that are not passed to
@ -3564,20 +3567,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
optlen = sizeof(struct linger);
break;
case WS_SO_LINGER:
if (!optval)
{
SetLastError(WSAEFAULT);
return SOCKET_ERROR;
}
linger.l_onoff = ((LINGER*)optval)->l_onoff;
linger.l_linger = ((LINGER*)optval)->l_linger;
level = SOL_SOCKET;
optname = SO_LINGER;
optval = (char*)&linger;
optlen = sizeof(struct linger);
break;
case WS_SO_SNDBUF:
if (!*(const int *)optval)
{

1
include/wine/afd.h
View file

@ -166,6 +166,7 @@ struct afd_get_events_params
#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)
#define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS)
struct afd_create_params
{