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

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Wed Jun 23 11:23:44 2021 -0500

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

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

---

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

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 04db120dcbd..c3392f94b54 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1146,6 +1146,25 @@ static void complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo
 }

+static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, void *out_buffer,
+                               ULONG out_size, int level, int option )
+{
+    int fd, needs_close = FALSE;
+    socklen_t len = out_size;
+    NTSTATUS status;
+    int ret;
+
+    if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
+        return status;
+
+    ret = getsockopt( fd, level, option, out_buffer, &len );
+    if (needs_close) close( fd );
+    if (ret) return sock_errno_to_status( errno );
+    io->Information = len;
+    return STATUS_SUCCESS;
+}
+
+
 NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io,
                      ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size )
 {
@@ -1566,6 +1585,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
             break;
         }

+        case IOCTL_AFD_WINE_GET_SO_BROADCAST:
+            return do_getsockopt( handle, io, out_buffer, out_size, SOL_SOCKET, SO_BROADCAST );
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 3dac76fd3f0..3b00e65fe3d 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2098,9 +2098,11 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
         case WS_SO_ACCEPTCONN:
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ACCEPTCONN, optval, optlen );

+        case WS_SO_BROADCAST:
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_BROADCAST, optval, optlen );
+
         /* Handle common cases. The special cases are below, sorted
          * alphabetically */
-        case WS_SO_BROADCAST:
         case WS_SO_DEBUG:
         case WS_SO_KEEPALIVE:
         case WS_SO_OOBINLINE:
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 4c501872dde..8916fafae53 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -160,6 +160,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_DEFER                CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_AFD_WINE_GET_INFO             CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN    CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_AFD_WINE_GET_SO_BROADCAST     CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS)

struct afd_create_params
 {