WINSOCK/tests: small fix for XP SP1

Saulius Krasuckas saulius2 at ar.fi.lt
Mon Nov 7 17:32:18 CST 2005


Seems like my room-mate' XP box doesn't reflect a behaviour of the rest of 
XP boxes around.

Log message:
	Saulius Krasuckas <saulius.krasuckas at ieee.org>
	Added last error code for XP SP1.


--- dlls/winsock/tests/sock.c	2005-11-07 08:48:07.000000000 +0200
+++ /mnt/vcd2/wine/dlls/winsock/tests/sock.c	2005-11-07 20:18:52.000000000 +0200
@@ -1223,7 +1223,7 @@ static void test_WSAStringToAddressA(voi
     ret = WSAStringToAddressA( address3, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len );
     GLE = WSAGetLastError();
     ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || 
-        (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER),
+        (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)),
         "WSAStringToAddressA() failed unexpectedly: %d\n", GLE );
 
     len = sizeof(sockaddr);
@@ -1241,7 +1241,7 @@ static void test_WSAStringToAddressA(voi
     ret = WSAStringToAddressA( address5, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len );
     GLE = WSAGetLastError();
     ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff && sockaddr.sin_port == 0xffff) || 
-        (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER),
+        (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)),
         "WSAStringToAddressA() failed unexpectedly: %d\n", GLE );
 }
 
@@ -1289,7 +1289,7 @@ static void test_WSAStringToAddressW(voi
     ret = WSAStringToAddressW( address3, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len );
     GLE = WSAGetLastError();
     ok( (ret == 0 && sockaddr.sin_addr.s_addr == 0xffffffff) || 
-        (ret == SOCKET_ERROR && GLE == ERROR_INVALID_PARAMETER),
+        (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)),
         "WSAStringToAddressW() failed unexpectedly: %d\n", GLE );
 
     len = sizeof(sockaddr);



More information about the wine-patches mailing list