[PATCH 1/4] ws2_32/tests: Rewrite the CF_DEFER test in test_AcceptEx().

[Zebediah Figura]

The previous test in fact regularly failed on Windows, hidden by the presence of
broken(), since both sockets could be connected before the listener was
signaled.

Signed-off-by: Zebediah Figura 
---
 dlls/ws2_32/tests/sock.c | 92 +++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 58 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index ba03e16ebb1..834cca71960 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -7413,18 +7413,14 @@ static void test_ConnectEx(void)

static void test_AcceptEx(void)
 {
-    SOCKET listener = INVALID_SOCKET;
-    SOCKET acceptor = INVALID_SOCKET;
-    SOCKET connector = INVALID_SOCKET;
-    SOCKET connector2 = INVALID_SOCKET;
+    SOCKET listener, acceptor, acceptor2, connector, connector2;
     struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress;
     int socklen, optlen;
     GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS;
     LPFN_ACCEPTEX pAcceptEx = NULL;
     LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL;
     fd_set fds_accept, fds_send;
-    struct timeval timeout = {0,10}; /* wait for 10 milliseconds */
-    int got, conn1, i;
+    static const struct timeval timeout = {1, 0};
     DWORD bytesReturned, connect_time;
     char buffer[1024], ipbuffer[32];
     OVERLAPPED overlapped;
@@ -7703,66 +7699,47 @@ todo_wine
     iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress));
     ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

-    FD_ZERO ( &fds_accept );
-    FD_ZERO ( &fds_send );
+    buffer[0] = '0';

-    FD_SET ( listener, &fds_accept );
-    FD_SET ( connector, &fds_send );
+    FD_ZERO(&fds_accept);
+    FD_SET(listener, &fds_accept);
+    iret = select(0, &fds_accept, NULL, NULL, &timeout);
+    ok(iret == 1, "wait timed out\n");

-    buffer[0] = '0';
-    got = 0;
-    conn1 = 0;
+    acceptor2 = WSAAccept(listener, NULL, NULL, AlwaysDeferConditionFunc, 0);
+    ok(acceptor2 == INVALID_SOCKET, "expected failure\n");
+    ok(WSAGetLastError() == WSATRY_AGAIN, "got error %u\n", WSAGetLastError());
+    bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16,
+            sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped);
+    ok(!bret, "expected failure\n");
+    ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError());

-    for (i = 0; i < 4000; ++i)
-    {
-        fd_set fds_openaccept = fds_accept, fds_opensend = fds_send;
+    FD_ZERO(&fds_send);
+    FD_SET(connector, &fds_send);
+    iret = select(0, NULL, &fds_send, NULL, &timeout);
+    ok(iret == 1, "wait timed out\n");

-        wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=,
-            "acceptex test(%d): could not select on socket, errno %d\n" );
+    iret = send(connector, "1", 1, 0);
+    ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError());

-        /* check for incoming requests */
-        if ( FD_ISSET ( listener, &fds_openaccept ) ) {
-            got++;
-            if (got == 1) {
-                SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0);
-                ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError());
-                bret = pAcceptEx(listener, acceptor, buffer, 0,
-                                    sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16,
-                                    &bytesReturned, &overlapped);
-                ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError());
-            }
-            else if (got == 2) {
-                /* this should be socket #2 */
-                SOCKET tmp = accept(listener, NULL, NULL);
-                ok(tmp != INVALID_SOCKET, "accept failed %d\n", WSAGetLastError());
-                closesocket(tmp);
-            }
-            else {
-                ok(FALSE, "Got more than 2 connections?\n");
-            }
-        }
-        if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) {
-            /* Send data on second socket, and stop */
-            send(connector2, "2", 1, 0);
-            FD_CLR ( connector2, &fds_send );
+    iret = connect(connector2, (struct sockaddr *)&bindAddress, sizeof(bindAddress));
+    ok(iret == SOCKET_ERROR, "expected failure\n");
+    ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError());

-            break;
-        }
-        if ( FD_ISSET ( connector, &fds_opensend ) ) {
-            /* Once #1 is connected, allow #2 to connect */
-            conn1 = 1;
+    iret = select(0, &fds_accept, NULL, NULL, &timeout);
+    ok(iret == 1, "wait timed out\n");

-            send(connector, "1", 1, 0);
-            FD_CLR ( connector, &fds_send );
+    acceptor2 = accept(listener, NULL, NULL);
+    ok(acceptor2 != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError());
+    closesocket(acceptor2);

-            iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress));
-            ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError());
-            FD_SET ( connector2, &fds_send );
-        }
-    }
+    FD_ZERO(&fds_send);
+    FD_SET(connector2, &fds_send);
+    iret = select(0, NULL, &fds_send, NULL, &timeout);
+    ok(iret == 1, "wait timed out\n");

-    ok (got == 2 || broken(got == 1) /* NT4 */,
-            "Did not get both connections, got %d\n", got);
+    iret = send(connector2, "2", 1, 0);
+    ok(iret == 1, "got ret %d, error %u\n", iret, WSAGetLastError());

dwret = WaitForSingleObject(overlapped.hEvent, 0);
     ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError());
@@ -7774,7 +7751,6 @@ todo_wine
     set_blocking(acceptor, TRUE);
     iret = recv( acceptor, buffer, 2, 0);
     ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError());
-
     ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]);

closesocket(connector);

[PATCH 2/4] ws2_32/tests: Remove some workarounds for no longer supported versions of Windows.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/ws2_32/tests/sock.c | 82 +++++++++++++---------------------------
 1 file changed, 27 insertions(+), 55 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 834cca71960..0acf64725db 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -1048,8 +1048,8 @@ static void WINAPI event_client ( client_params *par )
                     break;
                 }
                 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 );
+                ok(n >= 0 || WSAGetLastError() == WSAEWOULDBLOCK,
+                        "event_client (%x): got error %u\n", id, WSAGetLastError());

}
         }   
@@ -1364,16 +1364,15 @@ static void test_set_getsockopt(void)
     for( i = 0; i < ARRAY_SIZE(linger_testvals);i++) {
         size =  sizeof(lingval);
         lingval = linger_testvals[i];
-        err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *) &lingval, size); 
-        if( !err)
-            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, 
-                 lingval.l_onoff, lingval.l_linger,
-                 linger_testvals[i].l_onoff, linger_testvals[i].l_linger);
+        err = setsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&lingval, size);
+        ok(!err, "Test %u: failed to set SO_LINGER, error %u\n", i, WSAGetLastError());
+        err = getsockopt(s, SOL_SOCKET, SO_LINGER, (char *)&lingval, &size);
+        ok(!err, "Test %u: failed to get SO_LINGER, error %u\n", i, WSAGetLastError());
+        ok(!lingval.l_onoff == !linger_testvals[i].l_onoff, "Test %u: expected %d, got %d\n",
+                i, linger_testvals[i].l_onoff, lingval.l_onoff);
+        if (lingval.l_onoff)
+            ok(lingval.l_linger == linger_testvals[i].l_linger, "Test %u: expected %d, got %d\n",
+                    i, linger_testvals[i].l_linger, lingval.l_linger);
     }

size =  sizeof(lingval);
@@ -2583,8 +2582,7 @@ static void test_WSASocket(void)
     sock = WSASocketA(AF_IPX, SOCK_DGRAM, NSPROTO_IPX, NULL, 0, 0);
     if (sock == INVALID_SOCKET)
     {
-        err = WSAGetLastError();
-        ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err);
+        ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError());
         skip("IPX is not supported\n");
     }
     else
@@ -3752,11 +3750,7 @@ static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len, BOOL non
     if (!nonblock)
         ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError());
     else if (ret == SOCKET_ERROR)
-    {
-        DWORD error = WSAGetLastError();
-        ok(error == WSAEWOULDBLOCK || error == WSAEINPROGRESS,
-           "expected 10035 or 10036, got %d\n", error);
-    }
+        ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError());

return connector;
 }
@@ -4648,13 +4642,11 @@ static void test_ioctlsocket(void)

ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL);
     ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n");
-    ret = WSAGetLastError();
-    ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret);
+    ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError());

ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL);
     ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n");
-    ret = WSAGetLastError();
-    ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret);
+    ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError());

make_keepalive(kalive, 0, 0, 0);
     ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL);
@@ -4835,8 +4827,8 @@ static void test_send(void)
     bytes_sent = 0;
     WSASetLastError(12345);
     ret = WSASend(dst, &buf, 1, &bytes_sent, 0, &ov, NULL);
-    ok((ret == SOCKET_ERROR && WSAGetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen),
-       "Failed to start overlapped send %d - %d - %d/%d\n", ret, WSAGetLastError(), bytes_sent, buflen);
+    ok(ret == SOCKET_ERROR, "expected failure\n");
+    ok(WSAGetLastError() == ERROR_IO_PENDING, "wrong error %u\n", WSAGetLastError());

/* don't check for completion yet, we may need to drain the buffer while still sending */
     set_blocking(src, FALSE);
@@ -6087,8 +6079,8 @@ static void test_WSARecv(void)
     ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %d + errno %d\n", dwret, GetLastError());

bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE);
-    todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */),
-        "Did not get disconnect event: %d, error %d\n", bret, GetLastError());
+    todo_wine ok(!bret, "expected failure\n");
+    todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %u\n", GetLastError());
     ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned);
     closesocket(dest);
     dest = INVALID_SOCKET;
@@ -6105,17 +6097,17 @@ static void test_WSARecv(void)
     addr.sin_family = AF_INET;
     addr.sin_addr.s_addr = inet_addr("127.0.0.1");
     iret = bind(server, (struct sockaddr *)&addr, sizeof(addr));
-    if (iret) goto end;
+    ok(!iret, "failed to bind, error %u\n", WSAGetLastError());

len = sizeof(addr);
     iret = getsockname(server, (struct sockaddr *)&addr, &len);
-    if (iret) goto end;
+    ok(!iret, "failed to get address, error %u\n", WSAGetLastError());

iret = listen(server, 1);
-    if (iret) goto end;
+    ok(!iret, "failed to listen, error %u\n", WSAGetLastError());

iret = connect(src, (struct sockaddr *)&addr, sizeof(addr));
-    if (iret) goto end;
+    ok(!iret, "failed to connect, error %u\n", WSAGetLastError());

len = sizeof(addr);
     dest = accept(server, (struct sockaddr *)&addr, &len);
@@ -6772,7 +6764,7 @@ static void test_GetAddrInfoW(void)

result2 = NULL;
     ret = GetAddrInfoW(idn_domain, NULL, NULL, &result2);
-    if (ret == WSAHOST_NOT_FOUND && broken(1))
+    if (broken(ret == WSAHOST_NOT_FOUND))
     {
         FreeAddrInfoW(result);
         win_skip("IDN resolution not supported in Win <= 7\n");
@@ -8590,9 +8582,6 @@ static void test_WSAAsyncGetServByPort(void)
     HANDLE ret;
     char buffer[MAXGETHOSTSTRUCT];

-    if (!hwnd)
-        return;
-
     /* FIXME: The asynchronous window messages should be tested. */

/* Parameters are not checked when initiating the asynchronous operation.  */
@@ -8620,9 +8609,6 @@ static void test_WSAAsyncGetServByName(void)
     HANDLE ret;
     char buffer[MAXGETHOSTSTRUCT];

-    if (!hwnd)
-        return;
-
     /* FIXME: The asynchronous window messages should be tested. */

/* Parameters are not checked when initiating the asynchronous operation.  */
@@ -9391,19 +9377,11 @@ static void test_completion_port(void)

bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100);
     ok(bret == FALSE, "failed to get completion status %u\n", bret);
-    todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED ||
-                 GetLastError() == ERROR_OPERATION_ABORTED ||
-                 GetLastError() == ERROR_CONNECTION_ABORTED ||
-                 GetLastError() == ERROR_PIPE_NOT_CONNECTED /* win 2000 */,
-                 "Last error was %d\n", GetLastError());
+    todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "got error %u\n", GetLastError());
     ok(key == 125, "Key is %lu\n", key);
     ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes);
     ok(olp == &ov, "Overlapped structure is at %p\n", olp);
-    todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT ||
-                         olp->Internal == (ULONG)STATUS_CANCELLED ||
-                         olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED ||
-                         olp->Internal == (ULONG)STATUS_PIPE_DISCONNECTED /* win 2000 */),
-                         "Internal status is %lx\n", olp ? olp->Internal : 0);
+    todo_wine ok(olp->Internal == STATUS_CANCELLED, "got status %#lx\n", olp->Internal);

SetLastError(0xdeadbeef);
     key = 0xdeadbeef;
@@ -9550,14 +9528,8 @@ todo_wine
     ok(error == WSAEFAULT, "expected 10014, got %d\n", error);

ret = WSALookupServiceBeginW(qs, 0, &hnd);
-    error = WSAGetLastError();
     ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n");
-todo_wine
-    ok(error == WSAEINVAL
-       || broken(error == ERROR_INVALID_PARAMETER) /* == XP */
-       || broken(error == WSAEFAULT) /* == NT */
-       || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */,
-       "expected 10022, got %d\n", error);
+    todo_wine ok(WSAGetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", WSAGetLastError());

ret = WSALookupServiceEnd(NULL);
     error = WSAGetLastError();

[PATCH 2/4] ws2_32/tests: Remove some workarounds for no longer supported versions of Windows.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=80498

Your paranoid android.

=== w8 (32 bit report) ===

ws2_32:
sock.c:9380: Test failed: got error 1236
sock.c:9384: Test failed: got status 0xc0000241

=== w8adm (32 bit report) ===

ws2_32:
sock.c:9380: Test failed: got error 1236
sock.c:9384: Test failed: got status 0xc0000241

=== w1064v1809 (32 bit report) ===

ws2_32:
sock.c:9532: Test failed: got error 10108

=== w10pro64 (32 bit report) ===

ws2_32:
sock.c:9380: Test failed: got error 1236
sock.c:9384: Test failed: got status 0xc0000241

=== w2008s64 (64 bit report) ===

ws2_32:
sock.c:9384: Test failed: got status 0xc0000120

=== w864 (64 bit report) ===

ws2_32:
sock.c:9380: Test failed: got error 1236
sock.c:9384: Test failed: got status 0xc0000241

=== w1064v1507 (64 bit report) ===

ws2_32:
sock.c:9384: Test failed: got status 0xc0000120

=== w1064v1809 (64 bit report) ===

ws2_32:
sock.c:9532: Test failed: got error 10108
sock.c:9384: Test failed: got status 0xc0000120

=== w10pro64 (64 bit report) ===

ws2_32:
sock.c:9384: Test failed: got status 0xc0000120

=== w10pro64_2scr (64 bit report) ===

ws2_32:
sock.c:9384: Test failed: got status 0xc0000120

=== w10pro64_ar (64 bit report) ===

ws2_32:
sock.c:9384: Test failed: got status 0xc0000120

=== w10pro64_he (64 bit report) ===

ws2_32:
sock.c:9384: Test failed: got status 0xc0000120

=== w10pro64_ja (64 bit report) ===

ws2_32:
sock.c:9384: Test failed: got status 0xc0000120

=== w10pro64_zh_CN (64 bit report) ===

ws2_32:
sock.c:9384: Test failed: got status 0xc0000120

[PATCH 3/4] ws2_32/tests: Remove workarounds from test_events().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/ws2_32/tests/sock.c | 182 +++++++++++----------------------------
 1 file changed, 48 insertions(+), 134 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 0acf64725db..90766873489 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -4956,25 +4956,6 @@ static void get_event_details(int event, int *bit, char *name)
     }
 }

-static const char *dbgstr_event_seq(const LPARAM *seq)
-{
-    static char message[1024];
-    char name[12];
-    int len = 1;
-
-    message[0] = '[';
-    message[1] = 0;
-    while (*seq)
-    {
-        get_event_details(WSAGETSELECTEVENT(*seq), NULL, name);
-        len += sprintf(message + len, "%s(%d) ", name, WSAGETSELECTERROR(*seq));
-        seq++;
-    }
-    if (len > 1) len--;
-    strcpy( message + len, "]" );
-    return message;
-}
-
 static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents)
 {
     static char message[1024];
@@ -5105,7 +5086,7 @@ static int match_event_sequence(SOCKET s, WSANETWORKEVENTS *netEvents, const LPA
 }

/* checks for a sequence of events, (order only checked if window is used) */
-static void ok_event_sequence(SOCKET s, HANDLE hEvent, const LPARAM *seq, const LPARAM **broken_seqs, int completelyBroken)
+static void ok_event_sequence(SOCKET s, HANDLE hEvent, const LPARAM *seq)
 {
     MSG msg;
     WSANETWORKEVENTS events, *netEvents = NULL;
@@ -5139,28 +5120,7 @@ static void ok_event_sequence(SOCKET s, HANDLE hEvent, const LPARAM *seq, const
         }
     }

-    if (match_event_sequence(s, netEvents, seq))
-    {
-        winetest_ok(1, "Sequence matches expected: %s\n", dbgstr_event_seq(seq));
-        flush_events(s, hEvent);
-        return;
-    }
-
-    if (broken_seqs)
-    {
-        for (; *broken_seqs; broken_seqs++)
-        {
-            if (match_event_sequence(s, netEvents, *broken_seqs))
-            {
-                winetest_ok(broken(1), "Sequence matches broken: %s, expected %s\n", dbgstr_event_seq_result(s, netEvents), dbgstr_event_seq(seq));
-                flush_events(s, hEvent);
-                return;
-            }
-        }
-    }
-
-    winetest_ok(broken(completelyBroken), "Expected event sequence %s, got %s\n", dbgstr_event_seq(seq),
-                dbgstr_event_seq_result(s, netEvents));
+    winetest_ok(match_event_sequence(s, netEvents, seq), "Got sequence %s\n", dbgstr_event_seq_result(s, netEvents));
     flush_events(s, hEvent);
 }

@@ -5188,18 +5148,12 @@ static void test_events(int useMessages)
     DWORD dwRet;
     BOOL bret;
     static char szClassName[] = "wstestclass";
-    const LPARAM *broken_seq[3];
     static const LPARAM empty_seq[] = { 0 };
-    static const LPARAM close_seq[] = { WSAMAKESELECTREPLY(FD_CLOSE, 0), 0 };
     static const LPARAM write_seq[] = { WSAMAKESELECTREPLY(FD_WRITE, 0), 0 };
     static const LPARAM read_seq[] = { WSAMAKESELECTREPLY(FD_READ, 0), 0 };
     static const LPARAM oob_seq[] = { WSAMAKESELECTREPLY(FD_OOB, 0), 0 };
     static const LPARAM connect_seq[] = { WSAMAKESELECTREPLY(FD_CONNECT, 0),
                                           WSAMAKESELECTREPLY(FD_WRITE, 0), 0 };
-    static const LPARAM read_read_seq[] = { WSAMAKESELECTREPLY(FD_READ, 0),
-                                            WSAMAKESELECTREPLY(FD_READ, 0), 0 };
-    static const LPARAM read_write_seq[] = { WSAMAKESELECTREPLY(FD_READ, 0),
-                                             WSAMAKESELECTREPLY(FD_WRITE, 0), 0 };
     static const LPARAM read_close_seq[] = { WSAMAKESELECTREPLY(FD_READ, 0),
                                              WSAMAKESELECTREPLY(FD_CLOSE, 0), 0 };

@@ -5328,55 +5282,51 @@ static void test_events(int useMessages)
     ov2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL);

/* FD_WRITE should be set initially, and allow us to send at least 1 byte */
-    ok_event_seq(src, hEvent, connect_seq, NULL, 1);
-    ok_event_seq(src2, hEvent2, connect_seq, NULL, 1);
-    /* broken on all windows - FD_CONNECT error is garbage */
+    ok_event_seq(src, hEvent, connect_seq);
+    ok_event_seq(src2, hEvent2, connect_seq);

/* Test simple send/recv */
     SetLastError(0xdeadbeef);
     ret = send(dst, buffer, 100, 0);
     ok(ret == 100, "Failed to send buffer %d err %d\n", ret, GetLastError());
     ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
-    ok_event_seq(src, hEvent, read_seq, NULL, 0);
+    ok_event_seq(src, hEvent, read_seq);

SetLastError(0xdeadbeef);
     ret = recv(src, buffer, 1, MSG_PEEK);
     ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError());
     ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
-    ok_event_seq(src, hEvent, read_seq, NULL, 0);
+    ok_event_seq(src, hEvent, read_seq);

SetLastError(0xdeadbeef);
     ret = recv(src, buffer, 50, 0);
     ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError());
     ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
-    ok_event_seq(src, hEvent, read_seq, NULL, 0);
+    ok_event_seq(src, hEvent, read_seq);

ret = recv(src, buffer, 50, 0);
     ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError());
-    ok_event_seq(src, hEvent, empty_seq, NULL, 0);
+    ok_event_seq(src, hEvent, empty_seq);

/* fun fact - events are re-enabled even on failure, but only for messages */
     ret = send(dst, "1", 1, 0);
     ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError());
-    ok_event_seq(src, hEvent, read_seq, NULL, 0);
+    ok_event_seq(src, hEvent, read_seq);

ret = recv(src, buffer, -1, 0);
-    ok(ret == SOCKET_ERROR && (GetLastError() == WSAEFAULT || GetLastError() == WSAENOBUFS),
-       "Failed to recv buffer %d err %d\n", ret, GetLastError());
+    ok(ret == SOCKET_ERROR, "expected failure\n");
+    ok(WSAGetLastError() == WSAEFAULT || WSAGetLastError() == WSAENOBUFS /* < 7 */,
+            "got error %u\n", WSAGetLastError());
     if (useMessages)
-    {
-        broken_seq[0] = empty_seq; /* win9x */
-        broken_seq[1] = NULL;
-        todo_wine ok_event_seq(src, hEvent, read_seq, broken_seq, 0);
-    }
+        todo_wine ok_event_seq(src, hEvent, read_seq);
     else
-        ok_event_seq(src, hEvent, empty_seq, NULL, 0);
+        ok_event_seq(src, hEvent, empty_seq);

SetLastError(0xdeadbeef);
     ret = recv(src, buffer, 1, 0);
     ok(ret == 1, "Failed to recv buffer %d err %d\n", ret, GetLastError());
     ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
-    ok_event_seq(src, hEvent, empty_seq, NULL, 0);
+    ok_event_seq(src, hEvent, empty_seq);

/* Interaction with overlapped */
     bufs.len = sizeof(char);
@@ -5393,39 +5343,31 @@ static void test_events(int useMessages)

ret = send(dst, "12", 2, 0);
     ok(ret == 2, "Failed to send buffer %d err %d\n", ret, GetLastError());
-    broken_seq[0] = read_read_seq; /* win9x */
-    broken_seq[1] = NULL;
-    ok_event_seq(src, hEvent, empty_seq, broken_seq, 0);
+    ok_event_seq(src, hEvent, empty_seq);

dwRet = WaitForSingleObject(ov.hEvent, 100);
-    ok(dwRet == WAIT_OBJECT_0, "Failed to wait for recv message: %d - %d\n", dwRet, GetLastError());
-    if (dwRet == WAIT_OBJECT_0)
-    {
-        bret = GetOverlappedResult((HANDLE)src, &ov, &bytesReturned, FALSE);
-        ok((bret && bytesReturned == 1) || broken(!bret && GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */,
-           "Got %d instead of 1 (%d - %d)\n", bytesReturned, bret, GetLastError());
-        ok(buffer[0] == '1', "Got %c instead of 1\n", buffer[0]);
-    }
+    ok(!dwRet, "got %u\n", dwRet);
+    bret = GetOverlappedResult((HANDLE)src, &ov, &bytesReturned, FALSE);
+    ok(bret, "got error %u\n", GetLastError());
+    ok(bytesReturned == 1, "got %u bytes\n", bytesReturned);
+    ok(buffer[0] == '1', "Got %c instead of 2\n", buffer[0]);

dwRet = WaitForSingleObject(ov2.hEvent, 100);
-    ok(dwRet == WAIT_OBJECT_0, "Failed to wait for recv message: %d - %d\n", dwRet, GetLastError());
-    if (dwRet == WAIT_OBJECT_0)
-    {
-        bret = GetOverlappedResult((HANDLE)src, &ov2, &bytesReturned, FALSE);
-        ok((bret && bytesReturned == 1) || broken(!bret && GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */,
-           "Got %d instead of 1 (%d - %d)\n", bytesReturned, bret, GetLastError());
-        ok(buffer[1] == '2', "Got %c instead of 2\n", buffer[1]);
-    }
+    ok(!dwRet, "got %u\n", dwRet);
+    bret = GetOverlappedResult((HANDLE)src, &ov2, &bytesReturned, FALSE);
+    ok(bret, "got error %u\n", GetLastError());
+    ok(bytesReturned == 1, "got %u bytes\n", bytesReturned);
+    ok(buffer[1] == '2', "Got %c instead of 2\n", buffer[0]);

SetLastError(0xdeadbeef);
     ret = send(dst, "1", 1, 0);
     ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError());
     ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
-    ok_event_seq(src, hEvent, read_seq, NULL, 0);
+    ok_event_seq(src, hEvent, read_seq);

ret = recv(src, buffer, 1, 0);
     ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError());
-    ok_event_seq(src, hEvent, empty_seq, NULL, 0);
+    ok_event_seq(src, hEvent, empty_seq);

/* Notifications are delivered as soon as possible, blocked only on
      * async requests on the same type */
@@ -5435,44 +5377,33 @@ static void test_events(int useMessages)
     ok(ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING,
        "WSARecv failed - %d error %d\n", ret, GetLastError());

-    if (0) {
     ret = send(dst, "1", 1, MSG_OOB);
     ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError());
-    ok_event_seq(src, hEvent, oob_seq, NULL, 0);
-    }
+    todo_wine ok_event_seq(src, hEvent, oob_seq);

dwRet = WaitForSingleObject(ov.hEvent, 100);
     ok(dwRet == WAIT_TIMEOUT, "OOB message activated read?: %d - %d\n", dwRet, GetLastError());

ret = send(dst, "2", 1, 0);
     ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError());
-    broken_seq[0] = read_seq;  /* win98 */
-    broken_seq[1] = NULL;
-    ok_event_seq(src, hEvent, empty_seq, broken_seq, 0);
+    ok_event_seq(src, hEvent, empty_seq);

dwRet = WaitForSingleObject(ov.hEvent, 100);
-    ok(dwRet == WAIT_OBJECT_0 || broken(dwRet == WAIT_TIMEOUT),
-       "Failed to wait for recv message: %d - %d\n", dwRet, GetLastError());
-    if (dwRet == WAIT_OBJECT_0)
-    {
-        bret = GetOverlappedResult((HANDLE)src, &ov, &bytesReturned, FALSE);
-        ok((bret && bytesReturned == 1) || broken(!bret && GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */,
-           "Got %d instead of 1 (%d - %d)\n", bytesReturned, bret, GetLastError());
-        ok(buffer[0] == '2', "Got %c instead of 2\n", buffer[0]);
-    }
+    ok(!dwRet, "got %u\n", dwRet);
+    bret = GetOverlappedResult((HANDLE)src, &ov, &bytesReturned, FALSE);
+    ok(bret, "got error %u\n", GetLastError());
+    ok(bytesReturned == 1, "got %u bytes\n", bytesReturned);
+    ok(buffer[0] == '2', "Got %c instead of 2\n", buffer[0]);

-    if (0) {
     ret = recv(src, buffer, 1, MSG_OOB);
     todo_wine ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError());
-    /* We get OOB notification, but no data on wine */
-    ok_event_seq(src, hEvent, empty_seq, NULL, 0);
-    }
+    ok_event_seq(src, hEvent, empty_seq);

/* Flood the send queue */
     hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id);

/* Now FD_WRITE should not be set, because the socket send buffer isn't full yet */
-    ok_event_seq(src, hEvent, empty_seq, NULL, 0);
+    ok_event_seq(src, hEvent, empty_seq);

/* Now if we send a ton of data and the 'server' does not drain it fast
      * enough (set drain_pause to be sure), the socket send buffer will only
@@ -5486,10 +5417,7 @@ static void test_events(int useMessages)
     } while (ret == bufferSize);
     drain_pause = FALSE;
     ok(ret >= 0 || WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError());
-    Sleep(400); /* win9x */
-    broken_seq[0] = read_write_seq;
-    broken_seq[1] = NULL;
-    ok_event_seq(src, hEvent, write_seq, broken_seq, 0);
+    ok_event_seq(src, hEvent, write_seq);

/* Test how FD_CLOSE is handled */
     ret = send(dst, "12", 2, 0);
@@ -5502,21 +5430,16 @@ static void test_events(int useMessages)

/* We can never implement this in wine, best we can hope for is
        sending FD_CLOSE after the reads complete */
-    broken_seq[0] = read_seq;  /* win9x */
-    broken_seq[1] = NULL;
-    todo_wine ok_event_seq(src, hEvent, read_close_seq, broken_seq, 0);
+    todo_wine ok_event_seq(src, hEvent, read_close_seq);

ret = recv(src, buffer, 1, 0);
     ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError());
-    ok_event_seq(src, hEvent, read_seq, NULL, 0);
+    ok_event_seq(src, hEvent, read_seq);

ret = recv(src, buffer, 1, 0);
     ok(ret == 1, "Failed to empty buffer: %d - %d\n", ret, GetLastError());
     /* want it? it's here, but you can't have it */
-    broken_seq[0] = close_seq;  /* win9x */
-    broken_seq[1] = NULL;
-    todo_wine ok_event_seq(src, hEvent, empty_seq, /* wine sends FD_CLOSE here */
-                           broken_seq, 0);
+    todo_wine ok_event_seq(src, hEvent, empty_seq);

/* Test how FD_CLOSE is handled */
     ret = send(dst2, "12", 2, 0);
@@ -5526,32 +5449,23 @@ static void test_events(int useMessages)
     shutdown(dst2, SD_SEND);
     Sleep(200);

-    /* Some of the below are technically todo_wine, but our event sequence is still valid, so to prevent
-       regressions, don't mark them as todo_wine, and mark windows as broken */
-    broken_seq[0] = read_close_seq;
-    broken_seq[1] = close_seq;
-    broken_seq[2] = NULL;
-    ok_event_seq(src2, hEvent2, read_seq, broken_seq, 0);
+    todo_wine ok_event_seq(src2, hEvent2, read_close_seq);

ret = recv(src2, buffer, 1, 0);
-    ok(ret == 1 || broken(!ret), "Failed to empty buffer: %d - %d\n", ret, GetLastError());
-    broken_seq[0] = close_seq;  /* win98 */
-    broken_seq[1] = NULL;
-    ok_event_seq(src2, hEvent2, read_seq, broken_seq, 0);
+    ok(ret == 1, "got ret %d, error %u\n", ret, WSAGetLastError());
+    ok_event_seq(src2, hEvent2, read_seq);

ret = recv(src2, buffer, 1, 0);
-    ok(ret == 1 || broken(!ret), "Failed to empty buffer: %d - %d\n", ret, GetLastError());
-    broken_seq[0] = empty_seq;
-    broken_seq[1] = NULL;
-    ok_event_seq(src2, hEvent2, close_seq, broken_seq, 0);
+    ok(ret == 1, "got ret %d, error %u\n", ret, WSAGetLastError());
+    todo_wine ok_event_seq(src2, hEvent2, empty_seq);

ret = send(src2, "1", 1, 0);
     ok(ret == 1, "Sending to half-closed socket failed %d err %d\n", ret, GetLastError());
-    ok_event_seq(src2, hEvent2, empty_seq, NULL, 0);
+    ok_event_seq(src2, hEvent2, empty_seq);

ret = send(src2, "1", 1, 0);
     ok(ret == 1, "Sending to half-closed socket failed %d err %d\n", ret, GetLastError());
-    ok_event_seq(src2, hEvent2, empty_seq, NULL, 0);
+    ok_event_seq(src2, hEvent2, empty_seq);

if (useMessages)
     {

[PATCH 3/4] ws2_32/tests: Remove workarounds from test_events().

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=80499

Your paranoid android.

=== w8 (32 bit report) ===

ws2_32:
sock.c:9294: Test failed: got error 1236
sock.c:9298: Test failed: got status 0xc0000241

=== w1064v1809 (32 bit report) ===

ws2_32:
sock.c:9446: Test failed: got error 10108
sock.c:9294: Test failed: got error 1236
sock.c:9298: Test failed: got status 0xc0000241

=== w2008s64 (64 bit report) ===

ws2_32:
sock.c:9298: Test failed: got status 0xc0000120

=== w864 (64 bit report) ===

ws2_32:
sock.c:9294: Test failed: got error 1236
sock.c:9298: Test failed: got status 0xc0000241

=== w1064v1507 (64 bit report) ===

ws2_32:
sock.c:9294: Test failed: got error 1236
sock.c:9298: Test failed: got status 0xc0000241

=== w1064v1809 (64 bit report) ===

ws2_32:
sock.c:9446: Test failed: got error 10108
sock.c:9294: Test failed: got error 1236
sock.c:9298: Test failed: got status 0xc0000241

=== w10pro64 (64 bit report) ===

ws2_32:
sock.c:9298: Test failed: got status 0xc0000120

=== w10pro64_2scr (64 bit report) ===

ws2_32:
sock.c:9298: Test failed: got status 0xc0000120

=== w10pro64_ar (64 bit report) ===

ws2_32:
sock.c:9294: Test failed: got error 1236
sock.c:9298: Test failed: got status 0xc0000241

=== w10pro64_he (64 bit report) ===

ws2_32:
sock.c:9298: Test failed: got status 0xc0000120

=== w10pro64_ja (64 bit report) ===

ws2_32:
sock.c:9298: Test failed: got status 0xc0000120

=== w10pro64_zh_CN (64 bit report) ===

ws2_32:
sock.c:9298: Test failed: got status 0xc0000120

=== debiant (32 bit WoW report) ===

ws2_32:
sock.c:2852: Test succeeded inside todo block: Test[2]: expected 0, got 0

[PATCH 4/4] ws2_32/tests: Add more tests for passing short buffers to AcceptEx().

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/ws2_32/tests/sock.c | 105 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 98 insertions(+), 7 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 90766873489..be0ece9fc1b 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -7335,6 +7335,7 @@ static void test_AcceptEx(void)
     DWORD dwret;

memset(&overlapped, 0, sizeof(overlapped));
+    overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL);

listener = socket(AF_INET, SOCK_STREAM, 0);
     ok(listener != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError());
@@ -7342,9 +7343,6 @@ static void test_AcceptEx(void)
     acceptor = socket(AF_INET, SOCK_STREAM, 0);
     ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError());

-    connector = socket(AF_INET, SOCK_STREAM, 0);
-    ok(connector != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError());
-
     memset(&bindAddress, 0, sizeof(bindAddress));
     bindAddress.sin_family = AF_INET;
     bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1");
@@ -7409,8 +7407,101 @@ todo_wine
         "AcceptEx on too small local address size returned %d + errno %d\n",
         bret, WSAGetLastError());
     ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal);
-    bret = CancelIo((HANDLE) listener);
-    ok(bret, "Failed to cancel pending accept socket\n");
+
+    connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError());
+    iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress));
+    ok(!iret, "failed to connect, error %u\n", WSAGetLastError());
+    iret = getsockname(connector, (struct sockaddr *)&peerAddress, &remoteSize);
+    ok(!iret, "getsockname failed, error %u\n", WSAGetLastError());
+
+    dwret = WaitForSingleObject(overlapped.hEvent, 1000);
+    ok(!dwret, "wait failed\n");
+    bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE);
+    ok(bret, "got error %u\n", GetLastError());
+    ok(!overlapped.Internal, "got %#lx\n", overlapped.Internal);
+    ok(!bytesReturned, "got size %u\n", bytesReturned);
+
+    readBindAddress = readRemoteAddress = (struct sockaddr_in *)0xdeadbeef;
+    localSize = remoteSize = 0xdeadbeef;
+    pGetAcceptExSockaddrs(buffer, 0, 0, sizeof(struct sockaddr_in) + 16,
+            (struct sockaddr **)&readBindAddress, &localSize, (struct sockaddr **)&readRemoteAddress, &remoteSize);
+    todo_wine ok(readBindAddress == (struct sockaddr_in *)0xdeadbeef, "got local addr %p\n", readBindAddress);
+    ok(!memcmp(readRemoteAddress, &peerAddress, sizeof(peerAddress)), "remote addr didn't match\n");
+    todo_wine ok(localSize == 0xdeadbeef, "got local size %u\n", localSize);
+    ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize);
+
+    closesocket(connector);
+    closesocket(acceptor);
+
+    acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError());
+
+    overlapped.Internal = 0xdeadbeef;
+    bret = pAcceptEx(listener, acceptor, buffer, 0, 3,
+            sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped);
+    ok(!bret && WSAGetLastError() == ERROR_IO_PENDING, "got %d, error %u\n", bret, WSAGetLastError());
+    ok(overlapped.Internal == STATUS_PENDING, "got %#lx\n", overlapped.Internal);
+
+    connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError());
+    iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress));
+    ok(!iret, "failed to connect, error %u\n", WSAGetLastError());
+
+    dwret = WaitForSingleObject(overlapped.hEvent, 1000);
+    ok(!dwret, "wait failed\n");
+    bytesReturned = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE);
+    todo_wine ok(!bret, "expected failure\n");
+    todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError());
+    todo_wine ok(overlapped.Internal == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", overlapped.Internal);
+    ok(!bytesReturned, "got size %u\n", bytesReturned);
+
+    closesocket(acceptor);
+
+    /* The above connection request is not accepted. */
+    acceptor = accept(listener, NULL, NULL);
+    todo_wine ok(acceptor != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError());
+    closesocket(acceptor);
+
+    closesocket(connector);
+
+    acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError());
+
+    overlapped.Internal = 0xdeadbeef;
+    bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 4,
+            sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped);
+    ok(!bret && WSAGetLastError() == ERROR_IO_PENDING, "got %d, error %u\n", bret, WSAGetLastError());
+    ok(overlapped.Internal == STATUS_PENDING, "got %#lx\n", overlapped.Internal);
+
+    connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError());
+    iret = connect(connector, (struct sockaddr *)&bindAddress, sizeof(bindAddress));
+    ok(!iret, "failed to connect, error %u\n", WSAGetLastError());
+
+    dwret = WaitForSingleObject(overlapped.hEvent, 1000);
+    ok(!dwret, "wait failed\n");
+    bytesReturned = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE);
+    todo_wine ok(!bret, "expected failure\n");
+    todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError());
+    todo_wine ok(overlapped.Internal == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", overlapped.Internal);
+    ok(!bytesReturned, "got size %u\n", bytesReturned);
+
+    closesocket(acceptor);
+
+    /* The above connection request is not accepted. */
+    acceptor = accept(listener, NULL, NULL);
+    todo_wine ok(acceptor != INVALID_SOCKET, "failed to accept, error %u\n", WSAGetLastError());
+    closesocket(acceptor);
+
+    closesocket(connector);
+
+    acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError());

overlapped.Internal = 0xdeadbeef;
     bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15,
@@ -7448,8 +7539,6 @@ todo_wine
     ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped "
         "returned %d + errno %d\n", bret, WSAGetLastError());

-    overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL);
-
     overlapped.Internal = 0xdeadbeef;
     bret = pAcceptEx(listener, acceptor, buffer, 0,
         sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16,
@@ -7500,6 +7589,8 @@ todo_wine
         ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal);
     }

+    connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError());
     overlapped.Internal = 0xdeadbeef;
     iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress));
     ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

[PATCH 4/4] ws2_32/tests: Add more tests for passing short buffers to AcceptEx().

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=80500

Your paranoid android.

=== w8 (32 bit report) ===

ws2_32:
sock.c:9385: Test failed: got error 1236
sock.c:9389: Test failed: got status 0xc0000241

=== w8adm (32 bit report) ===

ws2_32:
sock.c:9385: Test failed: got error 1236
sock.c:9389: Test failed: got status 0xc0000241

=== w1064v1507 (32 bit report) ===

ws2_32:
sock.c:5291: Test failed: Failed to send buffer -1 err 10014
sock.c:5292: Test failed: Expected 0, got 10014
sock.c:5293: Test failed: Got sequence []
sock.c:5297: Test failed: Failed to peek at recv buffer -1 err 10014
sock.c:5298: Test failed: Expected 0, got 10014
sock.c:5299: Test failed: Got sequence []
sock.c:5303: Test failed: Failed to recv buffer -1 err 10035
sock.c:5304: Test failed: Expected 0, got 10035
sock.c:5305: Test failed: Got sequence []
sock.c:5308: Test failed: Failed to recv buffer -1 err 10035
sock.c:5327: Test failed: Failed to recv buffer -1 err 10053
sock.c:5328: Test failed: Expected 0, got 10053
sock.c:5329: Test failed: Got sequence [FD_CLOSE(10053)]
sock.c:5335: Test failed: WSARecv failed - -1 error 10053
sock.c:5341: Test failed: WSARecv failed - -1 error 10053
sock.c:5345: Test failed: Failed to send buffer -1 err 10054
sock.c:5349: Test failed: got 258
sock.c:5351: Test failed: got error 996
05a8:sock: unhandled exception c0000005 at 0042881C

=== w1064v1809 (32 bit report) ===

ws2_32:
sock.c:9537: Test failed: got error 10108

=== w10pro64 (32 bit report) ===

ws2_32:
sock.c:9385: Test failed: got error 1236
sock.c:9389: Test failed: got status 0xc0000241

=== w10pro64_2scr (32 bit report) ===

ws2_32:
sock.c:9385: Test failed: got error 1236
sock.c:9389: Test failed: got status 0xc0000241

=== w10pro64_zh_CN (32 bit report) ===

ws2_32:
sock.c:9385: Test failed: got error 1236
sock.c:9389: Test failed: got status 0xc0000241

=== w2008s64 (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== w864 (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== w1064v1507 (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== w1064v1809 (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9537: Test failed: got error 10108
sock.c:9389: Test failed: got status 0xc0000120

=== w10pro64 (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== w10pro64_2scr (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== w10pro64_ar (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== w10pro64_he (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== w10pro64_ja (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== w10pro64_zh_CN (64 bit report) ===

ws2_32:
sock.c:7458: Test failed: got 0xc0000023
sock.c:7491: Test failed: got 0xc0000023
sock.c:9389: Test failed: got status 0xc0000120

=== debiant (32 bit WoW report) ===

ws2_32:
sock.c:2852: Test succeeded inside todo block: Test[2]: expected 0, got 0