From 18379018c2e0cd599c5529a959ede559020a5548 Mon Sep 17 00:00:00 2001 From: Scott Lindeneau Date: Mon, 1 Sep 2008 23:11:35 +0900 Subject: [PATCH] AcceptEx and GetAcceptExSockaddrs Confromance Tests To: wine-patches Basic funcitonality tested. --- dlls/ws2_32/tests/sock.c | 331 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 282 insertions(+), 49 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e2d2162..323109a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -20,7 +20,7 @@ */ #include - +#include #include #include #include @@ -31,7 +31,7 @@ #include #define MAX_CLIENTS 4 /* Max number of clients */ -#define NUM_TESTS 4 /* Number of tests performed */ +#define NUM_TESTS 6 /* Number of tests performed */ #define FIRST_CHAR 'A' /* First character in transferred pattern */ #define BIND_SLEEP 10 /* seconds to wait between attempts to bind() */ #define BIND_TRIES 6 /* Number of bind() attempts */ @@ -54,6 +54,14 @@ ok ( cond tmp, msg, GetCurrentThreadId(), err); \ } while (0); +#define wsap_ok(op, cond, msg) \ + do { \ + void* tmp; \ + int err = 0; \ + tmp = op; \ + if ( !(cond tmp) ) err = WSAGetLastError(); \ + ok ( cond tmp, msg, GetCurrentThreadId(), err); \ + } while (0); /**************** Structs and typedefs ***************/ @@ -244,8 +252,10 @@ static void read_zero_bytes ( SOCKET s ) { char buf[256]; int tmp, n = 0; - while ( ( tmp = recv ( s, buf, 256, 0 ) ) > 0 ) + while ( ( tmp = recv ( s, buf, 256, 0 ) ) > 0 ){ n += tmp; + fprintf(stderr,"read_zero_bytes error\n"); + } ok ( n <= 0, "garbage data received: %d bytes\n", n ); } @@ -492,7 +502,7 @@ static VOID WINAPI select_server ( server_params *par ) n_set = 0; - wsa_ok ( ( n_ready = select ( 0, &fds_recv, &fds_send, NULL, &timeout ) ), SOCKET_ERROR !=, + wsa_ok ( ( n_ready = select ( 0, &fds_recv, &fds_send, NULL, &timeout ) ), SOCKET_ERROR !=, "select_server (%x): select() failed: %d\n" ); /* check for incoming requests */ @@ -564,7 +574,7 @@ static VOID WINAPI select_server ( server_params *par ) ok ( ( n_set == n_ready ), "select_server (%x): select() returns wrong number of ready sockets\n", id ); /* check if all clients are done */ - if ( ( fds_opensend.fd_count == 0 ) + if ( ( fds_opensend.fd_count == 0 ) && ( fds_openrecv.fd_count == 1 ) /* initial socket that accepts clients */ && ( n_connections == min ( gen->n_clients, MAX_CLIENTS ) ) ) { break; @@ -583,6 +593,201 @@ static VOID WINAPI select_server ( server_params *par ) server_stop (); } +/* + * overlapped_server: A (partially)non-blocking server built on acceptex. + */ +static VOID WINAPI overlapped_server ( server_params *par ) +{ + test_params *gen = par->general; + server_memory *mem; + WSAEVENT peerSockets[MAX_CLIENTS]; + WSAOVERLAPPED overLap[MAX_CLIENTS]; + LPSOCKADDR addrAddr; + LPSOCKADDR addrPeer; + LPFN_ACCEPTEX lpfnAcceptEx = NULL; + GUID GuidAcceptEx = WSAID_ACCEPTEX; + LPFN_GETACCEPTEXSOCKADDRS lpfnGetAcceptExSockaddrs = NULL; + GUID GuidGetAccpetExSockaddrs = WSAID_GETACCEPTEXSOCKADDRS; + DWORD dummy,dummy2; + int outBuf[MAX_CLIENTS]; + int event_i; + int size; + int n_expected = gen->n_chunks * gen->chunk_size, i, + id = GetCurrentThreadId(), n_connections = 0, n_sent, n_recvd, + n_set, delta, n_ready; + char *p; + fd_set fds_recv, fds_send, fds_openrecv, fds_opensend; + + trace ( "overlapped_server (%x) starting\n", id ); + + set_so_opentype ( TRUE ); /* overlapped server */ + par->sock_flags = WSA_FLAG_OVERLAPPED; + server_start ( par ); + mem = TlsGetValue ( tls ); + + wsa_ok ( set_blocking ( mem->s, FALSE ), 0 ==, "overlapped_server (%x): failed to set blocking mode: %d\n" ); + wsa_ok ( listen ( mem->s, SOMAXCONN ), 0 ==, "overlapped_server (%x): listen failed: %d\n" ); + + WSAIoctl(mem->s, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &GuidAcceptEx, + sizeof(GuidAcceptEx), + &lpfnAcceptEx, + sizeof(lpfnAcceptEx), + &dummy, + NULL, + NULL); + wsap_ok(lpfnAcceptEx, NULL !=, "overlapped_server (%x): WSAIoctl failed loading AcceptEx: %d\n"); + WSAIoctl(mem->s, + SIO_GET_EXTENSION_FUNCTION_POINTER, + &GuidGetAccpetExSockaddrs, + sizeof(GuidGetAccpetExSockaddrs), + &lpfnGetAcceptExSockaddrs, + sizeof(lpfnGetAcceptExSockaddrs), + &dummy2, + NULL, + NULL); + wsap_ok(lpfnGetAcceptExSockaddrs, NULL !=, "overlapped_server (%x): WSAIoctl failed loading GetAcceptExSockaddrs: %d\n"); + + if(lpfnGetAcceptExSockaddrs == NULL || lpfnAcceptEx == NULL){ + trace ( "overlapped_server (%x) failing stop\n", id ); + server_stop(); + } + + + /*empty overlapped structures*/ + memset( overLap,0,sizeof(WSAOVERLAPPED) * MAX_CLIENTS ); + for ( i = 0; i < min ( gen->n_clients, MAX_CLIENTS ); i++ ) + { + /*Create accepting socket*/ + mem->sock[i].s = WSASocketA ( AF_INET, gen->sock_type, gen->sock_prot, + NULL, 0, par->sock_flags ); + /*Create event to wait on*/ + peerSockets[i] = WSACreateEvent(); + overLap[i].hEvent = peerSockets[i]; + /*Call AcceptEx*/ + lpfnAcceptEx( mem->s, /*listen socket*/ + mem->sock[i].s, /*accept socket*/ + mem->sock[i].buf, /*socket buffer*/ + 0, /*don't recieve any data*/ + sizeof(struct sockaddr_in) + 16, /*size of address*/ + sizeof(struct sockaddr_in) + 16, /*size of address*/ + (LPDWORD)(outBuf + i), /*Pointer to an int that returns the number of bytes recieved*/ + (overLap + i) ); /*Overlapped data structure */ + + ok(WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned unexpected value\n"); + } + + trace ( "overlapped_server (%x) ready\n", id ); + SetEvent ( server_ready ); /* notify clients */ + + FD_ZERO ( &fds_openrecv ); + FD_ZERO ( &fds_recv ); + FD_ZERO ( &fds_send ); + FD_ZERO ( &fds_opensend ); + + FD_SET ( mem->s, &fds_openrecv ); + event_i = WSA_WAIT_TIMEOUT; + while(1) + { + DWORD bytes; + fds_recv = fds_openrecv; + fds_send = fds_opensend; + n_set = 0; + n_ready = 0; + event_i = WSAWaitForMultipleEvents(min ( gen->n_clients, MAX_CLIENTS ), peerSockets, FALSE, 0, FALSE); + /* check for incoming requests */ + if ( event_i != WSA_WAIT_TIMEOUT ) + { + n_set += 1; + WSAResetEvent(peerSockets[event_i]); + GetOverlappedResult((HANDLE)mem->sock[event_i].s,(overLap + event_i), &bytes, FALSE); + trace ( "overlapped_server (%x): accepting client connection\n", id ); + /* accept a single connection */ + wsa_ok ( mem->sock[event_i].s, INVALID_SOCKET !=, "overlapped_server (%x): accept() failed: %d\n" ); + addrAddr = (LPSOCKADDR)&(mem->sock[event_i].addr); + addrPeer = (LPSOCKADDR)&(mem->sock[event_i].peer); + lpfnGetAcceptExSockaddrs(mem->sock[event_i].buf, /*bufferwith data*/ + 0, /*no data recieved*/ + sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 16, + &addrAddr, /* local addr */ + &size, /* size */ + &addrPeer, /* connection peer */ + &size ); /*size */ + mem->sock[event_i].addr = *(struct sockaddr_in*)addrAddr; /*I can't figure out how to do this */ + mem->sock[event_i].peer = *(struct sockaddr_in*)addrPeer; /*any other way then written */ + ok ( mem->sock[event_i].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ), + "overlapped_server (%x): strange peer address\n", id ); + + /* add to list of open connections */ + FD_SET ( mem->sock[event_i].s, &fds_openrecv ); + FD_SET ( mem->sock[event_i].s, &fds_opensend ); + n_connections++; + } + + /* handle open requests */ + + for ( i = 0; i < min ( gen->n_clients, MAX_CLIENTS ); i++ ) + { + if ( FD_ISSET( mem->sock[i].s, &fds_recv ) ) { + n_set += 1; + if ( mem->sock[i].n_recvd < n_expected ) { + /* Receive data & check it */ + n_recvd = recv ( mem->sock[i].s, mem->sock[i].buf + mem->sock[i].n_recvd, min ( n_expected - mem->sock[i].n_recvd, par->buflen ), 0 ); + ok ( n_recvd != SOCKET_ERROR, "overlapped_server (%x): error in recv(): %d\n", id, WSAGetLastError() ); + mem->sock[i].n_recvd += n_recvd; + + if ( mem->sock[i].n_recvd == n_expected ) { + p = test_buffer ( mem->sock[i].buf, gen->chunk_size, gen->n_chunks ); + ok ( p == NULL, "overlapped_server (%x): test pattern error: %d\n", id, p - mem->sock[i].buf ); + FD_CLR ( mem->sock[i].s, &fds_openrecv ); + } + + ok ( mem->sock[i].n_recvd <= n_expected, "overlapped_server (%x): received too many bytes: %d\n", id, mem->sock[i].n_recvd ); + } + } + + /* only echo back what we've received */ + delta = mem->sock[i].n_recvd - mem->sock[i].n_sent; + + if ( FD_ISSET ( mem->sock[i].s, &fds_send ) ) { + n_set += 1; + + if ( ( delta > 0 ) && ( mem->sock[i].n_sent < n_expected ) ) { + /* Echo data back */ + n_sent = send ( mem->sock[i].s, mem->sock[i].buf + mem->sock[i].n_sent, min ( delta, par->buflen ), 0 ); + ok ( n_sent != SOCKET_ERROR, "overlapped_server (%x): error in send(): %d\n", id, WSAGetLastError() ); + mem->sock[i].n_sent += n_sent; + + if ( mem->sock[i].n_sent == n_expected ) { + FD_CLR ( mem->sock[i].s, &fds_opensend ); + } + + ok ( mem->sock[i].n_sent <= n_expected, "overlapped_server (%x): sent too many bytes: %d\n", id, mem->sock[i].n_sent ); + } + } + } + + /* check if all clients are done */ + if ( ( fds_opensend.fd_count == 0 ) + && ( fds_openrecv.fd_count == 1 ) /* initial socket that accepts clients */ + && ( n_connections == min ( gen->n_clients, MAX_CLIENTS ) ) ) { + break; + } + } + + for ( i = 0; i < min ( gen->n_clients, MAX_CLIENTS ); i++ ) + { + /* cleanup */ + read_zero_bytes ( mem->sock[i].s ); + wsa_ok ( closesocket ( mem->sock[i].s ), 0 ==, "overlapped_server (%x): closesocket error: %d\n" ); + mem->sock[i].s = INVALID_SOCKET; + } + trace ( "overlapped_server (%x) exiting\n", id ); + server_stop (); +} + /**************** Clients ***************/ /* @@ -600,7 +805,6 @@ static VOID WINAPI simple_client ( client_params *par ) /* wait here because we want to call set_so_opentype before creating a socket */ WaitForSingleObject ( server_ready, INFINITE ); trace ( "simple_client (%x): server ready\n", id ); - check_so_opentype (); set_so_opentype ( FALSE ); /* non-overlapped */ client_start ( par ); @@ -612,24 +816,19 @@ static VOID WINAPI simple_client ( client_params *par ) ok ( set_blocking ( mem->s, TRUE ) == 0, "simple_client (%x): failed to set blocking mode\n", id ); trace ( "simple_client (%x) connected\n", id ); - /* send data to server */ n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); - /* shutdown send direction */ wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d\n" ); - /* Receive data echoed back & check it */ n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); - /* check data */ p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); ok ( p == NULL, "simple_client (%x): test pattern error: %d\n", id, p - mem->recv_buf); - /* cleanup */ read_zero_bytes ( mem->s ); trace ( "simple_client (%x) exiting\n", id ); @@ -681,20 +880,20 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) /* Receive data echoed back & check it */ n_recvd = do_synchronous_recvfrom ( mem->s, - mem->recv_buf, - n_expected, - 0, - (struct sockaddr *)&test, - &fromLen, - par->buflen ); + mem->recv_buf, + n_expected, + 0, + (struct sockaddr *)&test, + &fromLen, + par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); /* check that lpFrom was not updated */ ok(0 == strcmp( - inet_ntoa(((struct sockaddr_in*)&test)->sin_addr), - "0.0.0.0"), "lpFrom shouldn't be updated on connection oriented sockets\n"); + inet_ntoa(((struct sockaddr_in*)&test)->sin_addr), + "0.0.0.0"), "lpFrom shouldn't be updated on connection oriented sockets\n"); /* check data */ p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); @@ -791,7 +990,7 @@ static void WINAPI event_client ( client_params *par ) err = wsa_events.iErrorCode[ FD_READ_BIT ]; ok ( err == 0, "event_client (%x): FD_READ error code: %d\n", id, err ); if ( err != 0 ) break; - + /* First read must succeed */ n = recv ( mem->s, recv_p, min ( recv_last - recv_p, par->buflen ), 0 ); wsa_ok ( n, 0 <=, "event_client (%x): recv error: %d\n" ); @@ -808,9 +1007,9 @@ static void WINAPI event_client ( client_params *par ) n = recv ( mem->s, recv_p, min ( recv_last - recv_p, par->buflen ), 0 ); if ( n < 0 && ( err = WSAGetLastError()) != WSAEWOULDBLOCK ) ok ( 0, "event_client (%x): read error: %d\n", id, err ); - + } - } + } if ( wsa_events.lNetworkEvents & FD_CLOSE ) { trace ( "event_client (%x): close event\n", id ); @@ -917,14 +1116,14 @@ static void do_test( test_setup *test ) /* optname = SO_LINGER */ LINGER linger_testvals[] = { {0,0}, - {0,73}, + {0,73}, {1,0}, {5,189} }; /* optname = SO_RCVTIMEO, SOSNDTIMEO */ #define SOCKTIMEOUT1 63000 /* 63 seconds. Do not test fractional part because of a - bug in the linux kernel (fixed in 2.6.8) */ + bug in the linux kernel (fixed in 2.6.8) */ #define SOCKTIMEOUT2 997000 /* 997 seconds */ static void test_set_getsockopt(void) @@ -941,31 +1140,31 @@ static void test_set_getsockopt(void) /* SO_RCVTIMEO */ timeout = SOCKTIMEOUT1; size = sizeof(timeout); - err = setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *) &timeout, size); + err = setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *) &timeout, size); if( !err) - err = getsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *) &timeout, &size); + err = getsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *) &timeout, &size); ok( !err, "get/setsockopt(SO_RCVTIMEO) failed error: %d\n", WSAGetLastError()); ok( timeout == SOCKTIMEOUT1, "getsockopt(SO_RCVTIMEO) returned wrong value %d\n", timeout); /* SO_SNDTIMEO */ - timeout = SOCKTIMEOUT2; /* 54 seconds. See remark above */ + timeout = SOCKTIMEOUT2; /* 54 seconds. See remark above */ size = sizeof(timeout); - err = setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (char *) &timeout, size); + err = setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (char *) &timeout, size); if( !err) - err = getsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (char *) &timeout, &size); + err = getsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (char *) &timeout, &size); ok( !err, "get/setsockopt(SO_SNDTIMEO) failed error: %d\n", WSAGetLastError()); ok( timeout == SOCKTIMEOUT2, "getsockopt(SO_SNDTIMEO) returned wrong value %d\n", timeout); /* SO_LINGER */ for( i = 0; i < sizeof(linger_testvals)/sizeof(LINGER);i++) { size = sizeof(lingval); lingval = linger_testvals[i]; - err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, size); + err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, size); if( !err) - err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, &size); + err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, &size); ok( !err, "get/setsockopt(SO_LINGER) failed error: %d\n", WSAGetLastError()); ok( !lingval.l_onoff == !linger_testvals[i].l_onoff && (lingval.l_linger == linger_testvals[i].l_linger || (!lingval.l_linger && !linger_testvals[i].l_onoff)) - , "getsockopt(SO_LINGER #%d) returned wrong value %d,%d not %d,%d\n", i, + , "getsockopt(SO_LINGER #%d) returned wrong value %d,%d not %d,%d\n", i, lingval.l_onoff, lingval.l_linger, linger_testvals[i].l_onoff, linger_testvals[i].l_linger); } @@ -1114,6 +1313,48 @@ static test_setup tests [NUM_TESTS] = 0, 128 } + }, + /* Test 4: simple client and overlapped server */ + { + { + STD_STREAM_SOCKET, + 2048, + 16, + 2 + }, + overlapped_server, + { + NULL, + 0, + 64 + }, + simple_client, + { + NULL, + 0, + 128 + } + }, + /* Test 5: mixed client and overlapped server */ + { + { + STD_STREAM_SOCKET, + 2048, + 16, + 2 + }, + overlapped_server, + { + NULL, + 0, + 64 + }, + simple_mixed_client, + { + NULL, + 0, + 128 + } } }; @@ -1283,7 +1524,7 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, address, &len ); GLE = WSAGetLastError(); - ok( (ret == SOCKET_ERROR && GLE == WSAEFAULT) || (ret == 0), + ok( (ret == SOCKET_ERROR && GLE == WSAEFAULT) || (ret == 0), "WSAAddressToStringA() failed unexpectedly: WSAGetLastError()=%d, ret=%d\n", GLE, ret ); @@ -1354,7 +1595,7 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr, sizeof(sockaddr), NULL, address, &len ); GLE = WSAGetLastError(); - ok( (ret == SOCKET_ERROR && GLE == WSAEFAULT) || (ret == 0), + ok( (ret == SOCKET_ERROR && GLE == WSAEFAULT) || (ret == 0), "WSAAddressToStringW() failed unexpectedly: WSAGetLastError()=%d, ret=%d\n", GLE, ret ); @@ -1448,7 +1689,7 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address3, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || + ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); @@ -1466,7 +1707,7 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address5, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || + ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); @@ -1550,7 +1791,7 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address3, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || + ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); @@ -1567,7 +1808,7 @@ static void test_WSAStringToAddressW(void) sockaddr.sin_addr.s_addr = 0; ret = WSAStringToAddressW( address5, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); - ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || + ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); @@ -1642,7 +1883,7 @@ static void test_select(void) ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); fdWrite = socket(AF_INET, SOCK_STREAM, 0); ok( (fdWrite != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); - + FD_ZERO(&readfds); FD_ZERO(&writefds); FD_ZERO(&exceptfds); @@ -1656,7 +1897,7 @@ static void test_select(void) maxfd = fdRead; if (fdWrite > maxfd) maxfd = fdWrite; - + todo_wine { ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ok ( (ret == 0), "select should not return any socket handles\n"); @@ -1666,7 +1907,7 @@ static void test_select(void) ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); - + todo_wine { ok ((listen(fdWrite, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); } @@ -2225,31 +2466,23 @@ START_TEST( sock ) do_test ( &tests[i] ); trace ( " **** TEST %d COMPLETE ****\n", i ); } - test_UDP(); test_getservbyname(); test_WSASocket(); - test_WSAAddressToStringA(); test_WSAAddressToStringW(); - test_WSAStringToAddressA(); test_WSAStringToAddressW(); - test_select(); test_accept(); test_getsockname(); test_inet_addr(); test_dns(); test_gethostbyname_hack(); - test_send(); test_write_events(); - test_WSASendTo(); - test_ipv6only(); - Exit(); } -- 1.5.4.3