Commit 32334704 authored by Kimmo Myllyvirta's avatar Kimmo Myllyvirta Committed by Alexandre Julliard

ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER.

parent a324786b
...@@ -4907,6 +4907,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID ...@@ -4907,6 +4907,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
{ {
TRACE("-> got %s\n", guid_funcs[i].name); TRACE("-> got %s\n", guid_funcs[i].name);
*(void **)out_buff = guid_funcs[i].func_ptr; *(void **)out_buff = guid_funcs[i].func_ptr;
total = sizeof(void *);
break; break;
} }
......
...@@ -7677,6 +7677,7 @@ static void test_ConnectEx(void) ...@@ -7677,6 +7677,7 @@ static void test_ConnectEx(void)
goto end; goto end;
} }
bytesReturned = 0xdeadbeef;
iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid),
&pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL);
if (iret) { if (iret) {
...@@ -7684,6 +7685,8 @@ static void test_ConnectEx(void) ...@@ -7684,6 +7685,8 @@ static void test_ConnectEx(void)
goto end; goto end;
} }
ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned);
bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped);
ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket "
"returned %d + errno %d\n", bret, WSAGetLastError()); "returned %d + errno %d\n", bret, WSAGetLastError());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment