Alexandre Julliard : ws2_32/tests: Fix test failures on Vista.

Alexandre Julliard julliard at winehq.org
Fri Aug 28 10:17:39 CDT 2009


Module: wine
Branch: master
Commit: 19c572f3dc771ffe5a5ccb8659024eeeb6a6ad43
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=19c572f3dc771ffe5a5ccb8659024eeeb6a6ad43

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Aug 27 20:45:18 2009 +0200

ws2_32/tests: Fix test failures on Vista.

---

 dlls/ws2_32/tests/sock.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 82c53e2..2127954 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -2062,6 +2062,7 @@ static void test_extendedSocketOptions(void)
     /* IE 3 use 0xffffffff instead of SOL_SOCKET (0xffff) */
     SetLastError(0xdeadbeef);
     optval = 0xdeadbeef;
+    optlen = sizeof(int);
     ret = getsockopt(sock, 0xffffffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen);
     ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL),
         "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n",
@@ -2070,6 +2071,7 @@ static void test_extendedSocketOptions(void)
     /* more invalid values for level */
     SetLastError(0xdeadbeef);
     optval = 0xdeadbeef;
+    optlen = sizeof(int);
     ret = getsockopt(sock, 0x1234ffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen);
     ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL),
         "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n",
@@ -2077,6 +2079,7 @@ static void test_extendedSocketOptions(void)
 
     SetLastError(0xdeadbeef);
     optval = 0xdeadbeef;
+    optlen = sizeof(int);
     ret = getsockopt(sock, 0x8000ffff, SO_MAX_MSG_SIZE, (char *)&optval, &optlen);
     ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL),
         "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n",
@@ -2084,6 +2087,7 @@ static void test_extendedSocketOptions(void)
 
     SetLastError(0xdeadbeef);
     optval = 0xdeadbeef;
+    optlen = sizeof(int);
     ret = getsockopt(sock, 0x00008000, SO_MAX_MSG_SIZE, (char *)&optval, &optlen);
     ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL),
         "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n",
@@ -2091,6 +2095,7 @@ static void test_extendedSocketOptions(void)
 
     SetLastError(0xdeadbeef);
     optval = 0xdeadbeef;
+    optlen = sizeof(int);
     ret = getsockopt(sock, 0x00000800, SO_MAX_MSG_SIZE, (char *)&optval, &optlen);
     ok( (ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL),
         "got %d with %d and optval: 0x%x/%d (expected SOCKET_ERROR with WSAEINVAL)\n",




More information about the wine-cvs mailing list