Zebediah Figura : ws2_32: Move the getsockopt(SO_KEEPALIVE) implementation to ntdll.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8aaef4cafd2a6bb968b62cd067416dcb522577cd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8aaef4cafd2a6bb968b62cd06...

Author: Zebediah Figura 
Date:   Thu Jun 24 00:00:14 2021 -0500

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

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

---

dlls/ntdll/unix/socket.c | 3 +++
 dlls/ws2_32/socket.c     | 4 +++-
 include/wine/afd.h       | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 959f0e7bc00..e23997bc476 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1607,6 +1607,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_SET_SO_BROADCAST:
             return do_setsockopt( handle, io, SOL_SOCKET, SO_BROADCAST, in_buffer, in_size );

+        case IOCTL_AFD_WINE_GET_SO_KEEPALIVE:
+            return do_getsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, out_buffer, out_size );
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 2dd3cf20752..4381c4f0408 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2090,7 +2090,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,

/* Handle common cases. The special cases are below, sorted
          * alphabetically */
-        case WS_SO_KEEPALIVE:
         case WS_SO_OOBINLINE:
         case WS_SO_RCVBUF:
         case WS_SO_REUSEADDR:
@@ -2225,6 +2224,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
         case WS_SO_ERROR:
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen );

+        case WS_SO_KEEPALIVE:
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_KEEPALIVE, optval, optlen );
+
         case WS_SO_LINGER:
         {
             struct linger lingval;
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 0ccd248e614..93e1b2c1b1c 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -163,6 +163,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_GET_SO_BROADCAST     CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_AFD_WINE_SET_SO_BROADCAST     CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #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)

struct afd_create_params
 {