[PATCH v2 0/1] MR822: ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY.

[Alistair Leslie-Hughes (＠alesliehughes)]

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

--
  v2: ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/822

[PATCH v2 1/1] ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/ws2_32/socket.c     | 39 +++++++++++++++++++++++++++++++
 dlls/ws2_32/tests/sock.c | 50 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 9d51fef1adb..2f115f02e48 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2327,6 +2327,45 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
         return ret ? -1 : 0;
     }
 
+    case SIO_IDEAL_SEND_BACKLOG_QUERY:
+    {
+        DWORD ret;
+        WSAPROTOCOL_INFOA proto_info;
+        int proto_len, len;
+        struct sockaddr addr;
+
+        if (!out_buff || out_size < sizeof(DWORD))
+        {
+            SetLastError(WSAEFAULT);
+            return SOCKET_ERROR;
+        }
+
+        proto_len = sizeof(WSAPROTOCOL_INFOA);
+        ret = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *)&proto_info, &proto_len);
+        if (ret == SOCKET_ERROR)
+            return SOCKET_ERROR;
+
+        if (proto_info.iSocketType != SOCK_STREAM)
+        {
+            SetLastError( WSAEOPNOTSUPP );
+            return SOCKET_ERROR;
+        }
+
+        len = sizeof(addr);
+        if (getpeername( s, &addr, &len ) == SOCKET_ERROR)
+        {
+            return SOCKET_ERROR;
+        }
+
+        *(DWORD*)out_buff = 0x10000; /* 64k */
+
+        WARN("SIO_IDEAL_SEND_BACKLOG_QUERY Always returning 64k\n");
+
+        SetLastError( ret );
+        *ret_size = sizeof(DWORD);
+        return 0;
+    }
+
     case SIOCATMARK:
     {
         DWORD ret;
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 3e6faaffa4c..d4f430a29d2 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -5273,6 +5273,55 @@ static void test_get_extension_func(void)
     closesocket(s);
 }
 
+static void test_backlog_query(void)
+{
+    const struct sockaddr_in addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)};
+    GUID acceptex_guid = WSAID_ACCEPTEX;
+    LPFN_ACCEPTEX pAcceptEx;
+    struct sockaddr_in destaddr;
+    DWORD size;
+    SOCKET s, listener;
+    int len, ret;
+    ULONG backlog = 0;
+
+    listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError());
+
+    ret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptex_guid, sizeof(acceptex_guid),
+            &pAcceptEx, sizeof(pAcceptEx), &size, NULL, NULL);
+    ok(!ret, "failed to get AcceptEx, error %u\n", WSAGetLastError());
+
+    ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr));
+    ok(!ret, "failed to bind, error %u\n", WSAGetLastError());
+    len = sizeof(destaddr);
+    ret = getsockname(listener, (struct sockaddr *)&destaddr, &len);
+    ok(!ret, "failed to get address, error %u\n", WSAGetLastError());
+    ret = listen(listener, 2);
+    ok(!ret, "failed to listen, error %u\n", WSAGetLastError());
+
+    s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL);
+    ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTCONN,
+       "WSAIoctl() failed: %d/%d\n", ret, WSAGetLastError());
+
+    ret = connect(s, (struct sockaddr *)&destaddr, sizeof(destaddr));
+    ok(!ret, "failed to connect, error %u\n", WSAGetLastError());
+    ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL);
+    ok(!ret, "WSAIoctl() failed: %d\n", WSAGetLastError());
+    ok(backlog == 0x10000, "got %08lx\n", backlog);
+
+    closesocket(listener);
+    closesocket(s);
+
+    s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+
+    backlog = 0;
+    ret = WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, &backlog, sizeof(backlog), &size, NULL, NULL);
+    ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEOPNOTSUPP,
+       "WSAIoctl() failed: %d/%d\n", ret, WSAGetLastError());
+    closesocket(s);
+}
+
 static void test_base_handle(void)
 {
     OVERLAPPED overlapped = {0}, *overlapped_ptr;
@@ -13242,6 +13291,7 @@ START_TEST( sock )
     test_fionbio();
     test_fionread_siocatmark();
     test_get_extension_func();
+    test_backlog_query();
     test_get_interface_list();
     test_keepalive_vals();
     test_sioRoutingInterfaceQuery();
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/822

[PATCH v2 0/1] MR822: ws2_32: Return a valid value for WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/822