ws2_32: Only set error codes for triggered events in WSAEnumNetworkEvents().

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

ws2_32: Only set error codes for triggered events in WSAEnumNetworkEvents().
80677440 · Zebediah Figura · Alexandre Julliard · ea52b552 · 80677440 · 80677440
Commit 80677440 authored Feb 19, 2018 by Zebediah Figura Committed by Alexandre Julliard Feb 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

socket.c dlls/ws2_32/socket.c +4 -1

sock.c dlls/ws2_32/tests/sock.c +1 -2

No files found.
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -7218,7 +7218,10 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp
    if (!ret)
    {
        for (i = 0; i < FD_MAX_EVENTS; i++)
-            lpEvent->iErrorCode[i] = NtStatusToWSAError(errors[i]);
+        {
+            if (lpEvent->lNetworkEvents & (1 << i))
+                lpEvent->iErrorCode[i] = NtStatusToWSAError(errors[i]);
+        }
        return 0;
    }
    SetLastError(WSAEINVAL);

--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -2995,7 +2995,7 @@ static void test_WSAEnumNetworkEvents(void)
                }
                for (k = 0; k < FD_MAX_EVENTS; k++)
                {
-                    if (i >= 1 && j == 0 && k == 1) /* first UDP and connected TCP test, FD_WRITE bit no error*/
+                    if (net_events.lNetworkEvents & (1 << k))
                    {
                        ok (net_events.iErrorCode[k] == 0x0, "Test[%d][%d]: expected 0x0, got 0x%x\n",
                            i, k, net_events.iErrorCode[k]);
@@ -3003,7 +3003,6 @@ static void test_WSAEnumNetworkEvents(void)
                    else
                    {
                        /* Bits that are not set in lNetworkEvents MUST not be changed */
-                        todo_wine
                        ok (net_events.iErrorCode[k] == 0xABABABAB, "Test[%d][%d]: expected 0xABABABAB, got 0x%x\n",
                            i, k, net_events.iErrorCode[k]);
                    }