ws2_32/tests: Don't test functions directly when reporting WSAGetLastError()
André Hentschel
nerv at dawncrow.de
Sat Jun 8 07:41:22 CDT 2013
---
dlls/ws2_32/tests/sock.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index ff0d538..758fa7e 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3571,7 +3571,8 @@ static void test_events(int useMessages)
goto end;
}
- ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError());
+ ret = set_blocking(src, TRUE);
+ ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError());
src2 = socket(AF_INET, SOCK_STREAM, 0);
if (src2 == INVALID_SOCKET)
@@ -3580,7 +3581,8 @@ static void test_events(int useMessages)
goto end;
}
- ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError());
+ ret = set_blocking(src2, TRUE);
+ ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError());
len = sizeof(BOOL);
if (getsockopt(src, SOL_SOCKET, SO_OOBINLINE, (void *)&bret, &len) == SOCKET_ERROR)
@@ -4013,7 +4015,8 @@ static void test_events(int useMessages)
goto end;
}
- ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError());
+ ret = set_blocking(src, TRUE);
+ ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError());
ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, 0);
if (ret)
@@ -4022,7 +4025,8 @@ static void test_events(int useMessages)
goto end;
}
- ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError());
+ ret = set_blocking(src2, TRUE);
+ ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError());
}
else
{
@@ -4033,7 +4037,8 @@ static void test_events(int useMessages)
goto end;
}
- ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError());
+ ret = set_blocking(src, TRUE);
+ ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError());
ret = WSAEventSelect(src2, hEvent2, 0);
if (ret)
@@ -4042,7 +4047,8 @@ static void test_events(int useMessages)
goto end;
}
- ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError());
+ ret = set_blocking(src2, TRUE);
+ ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError());
}
end:
--
1.8.1.2
More information about the wine-patches
mailing list