ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Return the needed buffer size for SIO_ADDRESS_LIST_QUERY.

This commit is contained in:
Henri Verbeet 2014-10-03 09:19:21 +02:00 committed by Alexandre Julliard
parent 2bcbbea534
commit 4e6ebd633a
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ws2_32/socket.c
View File

@ -3957,6 +3957,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID
if (total > out_size) if (total > out_size)
{ {
*ret_size = total;
HeapFree(GetProcessHeap(), 0, table); HeapFree(GetProcessHeap(), 0, table);
status = WSAEFAULT; status = WSAEFAULT;
break; break;

41
dlls/ws2_32/tests/sock.c
View File

@ -7462,6 +7462,46 @@ static void test_completion_port(void)
CloseHandle(previous_port); CloseHandle(previous_port);
} }
static void test_address_list_query(void)
{
SOCKET_ADDRESS_LIST *address_list;
DWORD bytes_returned, size;
unsigned int i;
SOCKET s;
int ret;
s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
ok(s != INVALID_SOCKET, "Failed to create socket, error %d.\n", WSAGetLastError());
bytes_returned = 0;
ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, 0, &bytes_returned, NULL, NULL);
ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret);
ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError());
ok(bytes_returned >= FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0]),
"Got unexpected bytes_returned %u.\n", bytes_returned);
size = bytes_returned;
bytes_returned = 0;
address_list = HeapAlloc(GetProcessHeap(), 0, size * 2);
ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, size * 2, &bytes_returned, NULL, NULL);
ok(!ret, "Got unexpected ret %d, error %d.\n", ret, WSAGetLastError());
ok(bytes_returned == size, "Got unexpected bytes_returned %u, expected %u.\n", bytes_returned, size);
bytes_returned = FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[address_list->iAddressCount]);
for (i = 0; i < address_list->iAddressCount; ++i)
{
bytes_returned += address_list->Address[i].iSockaddrLength;
}
ok(size == bytes_returned, "Got unexpected size %u, expected %u.\n", size, bytes_returned);
ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, size, NULL, NULL, NULL);
ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret);
ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError());
HeapFree(GetProcessHeap(), 0, address_list);
closesocket(s);
}
static DWORD WINAPI inet_ntoa_thread_proc(void *param) static DWORD WINAPI inet_ntoa_thread_proc(void *param)
{ {
ULONG addr; ULONG addr;
@ -7739,6 +7779,7 @@ START_TEST( sock )
test_WSAAsyncGetServByName(); test_WSAAsyncGetServByName();
test_completion_port(); test_completion_port();
test_address_list_query();
/* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */
test_send(); test_send();