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

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Fri Jul 30 00:00:44 2021 -0500

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

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

---

dlls/ntdll/unix/socket.c | 5 +++++
 dlls/ws2_32/socket.c     | 6 +++---
 include/wine/afd.h       | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index efbfc375969..09318a279ed 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1888,6 +1888,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS:
             return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, in_buffer, in_size );

+#ifdef IPV6_UNICAST_IF
+        case IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF:
+            return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_IF, out_buffer, out_size );
+#endif
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 3ca2ce545b4..2ca4f2c1831 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2424,10 +2424,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
         case WS_IPV6_UNICAST_HOPS:
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen );

-        case WS_IPV6_V6ONLY:
-#ifdef IPV6_UNICAST_IF
         case WS_IPV6_UNICAST_IF:
-#endif
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF, optval, optlen );
+
+        case WS_IPV6_V6ONLY:
             if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
                 return SOCKET_ERROR;
             convert_sockopt(&level, &optname);
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 64d555889f5..b43d53522a4 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -219,6 +219,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP          WINE_AFD_IOC(274)
 #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS            WINE_AFD_IOC(275)
 #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS            WINE_AFD_IOC(276)
+#define IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF              WINE_AFD_IOC(277)

struct afd_create_params
 {