Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
130b5496
Commit
130b5496
authored
Jun 24, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Jun 25, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws2_32: Move the setsockopt(SO_LINGER) implementation to ntdll.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f52df002
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
14 deletions
+15
-14
socket.c
dlls/ntdll/unix/socket.c
+11
-0
socket.c
dlls/ws2_32/socket.c
+3
-14
afd.h
include/wine/afd.h
+1
-0
No files found.
dlls/ntdll/unix/socket.c
View file @
130b5496
...
...
@@ -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
)
...
...
dlls/ws2_32/socket.c
View file @
130b5496
...
...
@@ -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
)
{
...
...
include/wine/afd.h
View file @
130b5496
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment