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

[Alexandre Julliard]

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

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

ws2_32: Move the getsockopt(SO_OOBINLINE) 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 c809dc17d13..917f883a0f5 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1646,6 +1646,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
             return do_setsockopt( handle, io, SOL_SOCKET, SO_LINGER, &unix_linger, sizeof(unix_linger) );
         }

+        case IOCTL_AFD_WINE_GET_SO_OOBINLINE:
+            return do_getsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, 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 776268b381a..0301454657a 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_OOBINLINE:
         case WS_SO_RCVBUF:
         case WS_SO_REUSEADDR:
         case WS_SO_SNDBUF:
@@ -2252,6 +2251,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
             *optlen = sizeof(int);
             return 0;

+        case WS_SO_OOBINLINE:
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_OOBINLINE, optval, optlen );
+
         /* SO_OPENTYPE does not require a valid socket handle. */
         case WS_SO_OPENTYPE:
             if (!optlen || *optlen < sizeof(int) || !optval)
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 9ffdf491ac6..fec4db4db94 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -167,6 +167,7 @@ struct afd_get_events_params
 #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)
+#define IOCTL_AFD_WINE_GET_SO_OOBINLINE     CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS)

struct afd_create_params
 {