[PATCH v3 0/1] MR9111: ws2_32: Implement SIO_BSP_HANDLE_SELECT.

[Josh Steffen (＠joshsteffen)]

My understanding is that, in the absence of layered service providers, `SIO_BSP_HANDLE_SELECT` should behave like `SIO_BASE_HANDLE` (this is relied upon by https://github.com/python-trio/trio). Should I add tests to verify this? If so, should they basically just be the same as the existing `SIO_BASE_HANDLE` tests?

--
  v3: ws2_32: Implement SIO_BSP_HANDLE_SELECT.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9111

[PATCH v3 1/1] ws2_32: Implement SIO_BSP_HANDLE_SELECT.

[Josh Steffen]

From: Josh Steffen <josh(a)joshsteffen.com>

Wine does not support layered service providers, so just fall through to
SIO_BASE_HANDLE.
---
 dlls/ws2_32/socket.c     |   1 +
 dlls/ws2_32/tests/sock.c | 123 +++++++++++++++++++++------------------
 include/mswsock.h        |   2 +
 3 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index d4223e93bd1..a267f65ab91 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2701,6 +2701,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
         return ret ? -1 : 0;
     }
 
+    case SIO_BSP_HANDLE_SELECT:
     case SIO_BASE_HANDLE:
     {
         NTSTATUS status;
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 77bc3beeabf..1cfa0f2b3ed 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -6165,7 +6165,7 @@ static void test_backlog_query(void)
 static void test_base_handle(void)
 {
     OVERLAPPED overlapped = {0}, *overlapped_ptr;
-    unsigned int i;
+    unsigned int i, j;
     SOCKET s, base;
     ULONG_PTR key;
     HANDLE port;
@@ -6184,72 +6184,81 @@ static void test_base_handle(void)
         {AF_INET6, SOCK_DGRAM, IPPROTO_UDP},
     };
 
-    for (i = 0; i < ARRAY_SIZE(tests); ++i)
+    static const DWORD ioctl_codes[] =
     {
-        s = socket(tests[i].family, tests[i].type, tests[i].protocol);
-        if (s == INVALID_SOCKET) continue;
-        port = CreateIoCompletionPort((HANDLE)s, NULL, 123, 0);
-
-        WSASetLastError(0xdeadbeef);
-        ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), NULL, &overlapped, NULL);
-        ok(ret == -1, "expected failure\n");
-        ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError());
+        SIO_BASE_HANDLE,
+        SIO_BSP_HANDLE_SELECT,
+    };
 
-        WSASetLastError(0xdeadbeef);
-        size = 0xdeadbeef;
-        base = 0xdeadbeef;
-        ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), &size, NULL, NULL);
-        ok(!ret, "expected success\n");
-        ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError());
-        ok(size == sizeof(base), "got size %lu\n", size);
-        ok(base == s, "expected %#Ix, got %#Ix\n", s, base);
+    for (i = 0; i < ARRAY_SIZE(tests); ++i)
+    {
+        for (j = 0; j < ARRAY_SIZE(ioctl_codes); ++j)
+        {
+            s = socket(tests[i].family, tests[i].type, tests[i].protocol);
+            if (s == INVALID_SOCKET) continue;
+            port = CreateIoCompletionPort((HANDLE)s, NULL, 123, 0);
 
-        WSASetLastError(0xdeadbeef);
-        size = 0xdeadbeef;
-        base = 0xdeadbeef;
-        overlapped.Internal = 0xdeadbeef;
-        overlapped.InternalHigh = 0xdeadbeef;
-        ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), &size, &overlapped, NULL);
-        ok(ret == -1, "expected failure\n");
-        ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError());
-        ok(size == 0xdeadbeef, "got size %lu\n", size);
+            WSASetLastError(0xdeadbeef);
+            ret = WSAIoctl(s, ioctl_codes[j], NULL, 0, &base, sizeof(base), NULL, &overlapped, NULL);
+            ok(ret == -1, "expected failure\n");
+            ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError());
 
-        ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0);
-        ok(!ret, "expected failure\n");
-        ok(GetLastError() == ERROR_NOT_SUPPORTED, "got error %lu\n", GetLastError());
-        ok(!size, "got size %lu\n", size);
-        ok(key == 123, "got key %Iu\n", key);
-        ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr);
-        ok((NTSTATUS)overlapped.Internal == STATUS_NOT_SUPPORTED, "got status %#lx\n", (NTSTATUS)overlapped.Internal);
-        ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh);
-        ok(base == 0xdeadbeef, "expected %#Ix, got %#Ix\n", s, base);
+            WSASetLastError(0xdeadbeef);
+            size = 0xdeadbeef;
+            base = 0xdeadbeef;
+            ret = WSAIoctl(s, ioctl_codes[j], NULL, 0, &base, sizeof(base), &size, NULL, NULL);
+            ok(!ret, "expected success\n");
+            ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError());
+            ok(size == sizeof(base), "got size %lu\n", size);
+            ok(base == s, "expected %#Ix, got %#Ix\n", s, base);
 
-        CloseHandle(port);
-        closesocket(s);
+            WSASetLastError(0xdeadbeef);
+            size = 0xdeadbeef;
+            base = 0xdeadbeef;
+            overlapped.Internal = 0xdeadbeef;
+            overlapped.InternalHigh = 0xdeadbeef;
+            ret = WSAIoctl(s, ioctl_codes[j], NULL, 0, &base, sizeof(base), &size, &overlapped, NULL);
+            ok(ret == -1, "expected failure\n");
+            ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError());
+            ok(size == 0xdeadbeef, "got size %lu\n", size);
+
+            ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0);
+            ok(!ret, "expected failure\n");
+            ok(GetLastError() == ERROR_NOT_SUPPORTED, "got error %lu\n", GetLastError());
+            ok(!size, "got size %lu\n", size);
+            ok(key == 123, "got key %Iu\n", key);
+            ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr);
+            ok((NTSTATUS)overlapped.Internal == STATUS_NOT_SUPPORTED, "got status %#lx\n", (NTSTATUS)overlapped.Internal);
+            ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh);
+            ok(base == 0xdeadbeef, "expected %#Ix, got %#Ix\n", s, base);
+
+            CloseHandle(port);
+            closesocket(s);
 
-        s = socket(tests[i].family, tests[i].type, tests[i].protocol);
+            s = socket(tests[i].family, tests[i].type, tests[i].protocol);
 
-        ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), NULL, &overlapped, socket_apc);
-        ok(ret == -1, "expected failure\n");
-        ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError());
+            ret = WSAIoctl(s, ioctl_codes[j], NULL, 0, &base, sizeof(base), NULL, &overlapped, socket_apc);
+            ok(ret == -1, "expected failure\n");
+            ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError());
 
-        apc_count = 0;
-        size = 0xdeadbeef;
-        base = 0xdeadbeef;
-        ret = WSAIoctl(s, SIO_BASE_HANDLE, NULL, 0, &base, sizeof(base), &size, &overlapped, socket_apc);
-        ok(ret == -1, "expected failure\n");
-        ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError());
-        ok(size == 0xdeadbeef, "got size %lu\n", size);
+            apc_count = 0;
+            size = 0xdeadbeef;
+            base = 0xdeadbeef;
+            ret = WSAIoctl(s, ioctl_codes[j], NULL, 0, &base, sizeof(base), &size, &overlapped, socket_apc);
+            ok(ret == -1, "expected failure\n");
+            ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError());
+            ok(size == 0xdeadbeef, "got size %lu\n", size);
 
-        ret = SleepEx(0, TRUE);
-        ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret);
-        ok(apc_count == 1, "APC was called %u times\n", apc_count);
-        ok(apc_error == WSAEOPNOTSUPP, "got APC error %lu\n", apc_error);
-        ok(!apc_size, "got APC size %lu\n", apc_size);
-        ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped);
-        ok(base == 0xdeadbeef, "expected %#Ix, got %#Ix\n", s, base);
+            ret = SleepEx(0, TRUE);
+            ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret);
+            ok(apc_count == 1, "APC was called %u times\n", apc_count);
+            ok(apc_error == WSAEOPNOTSUPP, "got APC error %lu\n", apc_error);
+            ok(!apc_size, "got APC size %lu\n", apc_size);
+            ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped);
+            ok(base == 0xdeadbeef, "expected %#Ix, got %#Ix\n", s, base);
 
-        closesocket(s);
+            closesocket(s);
+        }
     }
 }
 
diff --git a/include/mswsock.h b/include/mswsock.h
index fa97d5bf04d..754b8ec3dd0 100644
--- a/include/mswsock.h
+++ b/include/mswsock.h
@@ -85,10 +85,12 @@ extern "C" {
 #ifndef USE_WS_PREFIX
 #define SIO_UDP_CONNRESET               _WSAIOW(IOC_VENDOR, 12)
 #define SIO_SET_COMPATIBILITY_MODE      _WSAIOW(IOC_VENDOR, 300)
+#define SIO_BSP_HANDLE_SELECT           _WSAIOR(IOC_WS2, 28)
 #define SIO_BASE_HANDLE                 _WSAIOR(IOC_WS2, 34)
 #else
 #define WS_SIO_UDP_CONNRESET            _WSAIOW(WS_IOC_VENDOR, 12)
 #define WS_SIO_SET_COMPATIBILITY_MODE   _WSAIOW(WS_IOC_VENDOR, 300)
+#define WS_SIO_BSP_HANDLE_SELECT        _WSAIOR(WS_IOC_WS2, 28)
 #define WS_SIO_BASE_HANDLE              _WSAIOR(WS_IOC_WS2, 34)
 #endif
 
-- 
GitLab

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