Zebediah Figura : ws2_32: Fail with WSAEINVAL if a requested extension function is not found.

Alexandre Julliard julliard at winehq.org
Thu Jun 3 16:23:08 CDT 2021


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Wed Jun  2 17:03:58 2021 -0500

ws2_32: Fail with WSAEINVAL if a requested extension function is not found.

Rather than WSAEOPNOTSUPP.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ws2_32/socket.c     | 2 +-
 dlls/ws2_32/tests/sock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 79085cf0c2a..478ae960541 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3536,7 +3536,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
         }
 
         FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff));
-        SetLastError( WSAEOPNOTSUPP );
+        SetLastError( WSAEINVAL );
         return -1;
     }
     case WS_SIO_KEEPALIVE_VALS:
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index c0b1abcaaa5..ec138fcf29a 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -4258,7 +4258,7 @@ static void test_get_extension_func(void)
     ret = WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &bogus_guid, sizeof(GUID),
             &func, sizeof(func), &size, &overlapped, NULL);
     ok(ret == -1, "expected failure\n");
-    todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError());
+    ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError());
     ok(size == 0xdeadbeef, "got size %u\n", size);
     ok(overlapped.Internal == 0xdeadbeef, "got status %#x\n", (NTSTATUS)overlapped.Internal);
     ok(overlapped.InternalHigh == 0xdeadbeef, "got size %Iu\n", overlapped.InternalHigh);




More information about the wine-cvs mailing list