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

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Wed Jul 28 10:17:09 2021 -0500

ws2_32: Move the getsockopt(IPV6_MULTICAST_HOPS) 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 2beb4f1778f..85763d032ed 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1864,6 +1864,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
             return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, in_buffer, in_size );
 #endif

+        case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS:
+            return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, 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 cd8bd63b88c..9c2d58827ba 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2412,8 +2412,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
         case WS_IPV6_DONTFRAG:
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_DONTFRAG, optval, optlen );

-        case WS_IPV6_MULTICAST_IF:
         case WS_IPV6_MULTICAST_HOPS:
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen );
+
+        case WS_IPV6_MULTICAST_IF:
         case WS_IPV6_MULTICAST_LOOP:
         case WS_IPV6_UNICAST_HOPS:
         case WS_IPV6_V6ONLY:
diff --git a/include/wine/afd.h b/include/wine/afd.h
index ad12c55af12..0f04cc824a8 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -211,6 +211,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG                WINE_AFD_IOC(266)
 #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG                WINE_AFD_IOC(267)
 #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP         WINE_AFD_IOC(268)
+#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS          WINE_AFD_IOC(269)

struct afd_create_params
 {