[PATCH 6/6] ws2_32: Move the setsockopt(SO_OOBINLINE) implementation to ntdll.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 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 917f883a0f5..0ab30ec6515 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1649,6 +1649,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_GET_SO_OOBINLINE:
             return do_getsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, out_buffer, out_size );
 
+        case IOCTL_AFD_WINE_SET_SO_OOBINLINE:
+            return do_setsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, in_buffer, in_size );
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 0301454657a..88d8e9bf134 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3556,6 +3556,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
         case WS_SO_LINGER:
             return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen );
 
+        case WS_SO_OOBINLINE:
+            return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_OOBINLINE, 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
@@ -3583,7 +3586,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
         /* The options listed here don't need any special handling. Thanks to
          * the conversion happening above, options from there will fall through
          * to this, too.*/
-        case WS_SO_OOBINLINE:
         /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics.
          * however, using it the BSD way fixes bug 8513 and seems to be what
          * most programmers assume, anyway */
diff --git a/include/wine/afd.h b/include/wine/afd.h
index fec4db4db94..ae5a0584bdc 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -168,6 +168,7 @@ struct afd_get_events_params
 #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)
+#define IOCTL_AFD_WINE_SET_SO_OOBINLINE     CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
 struct afd_create_params
 {
-- 
2.30.2