Zebediah Figura : ws2_32: Move the setsockopt(SO_LINGER) implementation to ntdll.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 130b549671fc82b77890f50681b3e83d64b09a3a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=130b549671fc82b77890f5068...

Author: Zebediah Figura 
Date:   Thu Jun 24 22:32:46 2021 -0500

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

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/ntdll/unix/socket.c | 11 +++++++++++
 dlls/ws2_32/socket.c     | 17 +++--------------
 include/wine/afd.h       |  1 +
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 89926411a40..c809dc17d13 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -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)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index de83563bd29..3925a7ed500 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -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)
             {
diff --git a/include/wine/afd.h b/include/wine/afd.h
index f1dd392ed32..9ffdf491ac6 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -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
 {