[PATCH 0/1] MR3973: winsock: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION.

[Paul Gofman (＠gofman)]

Fixes Nascar Heat 5 not being able to connect to multiplayer lobby.

[PATCH 1/1] ntdll: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION.

[Paul Gofman]

From: Paul Gofman

---
 dlls/ntdll/unix/socket.c | 2 +-
 dlls/ws2_32/tests/sock.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index e09bf34b07d..3f0ac8cb84e 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -169,7 +169,7 @@ static NTSTATUS sock_errno_to_status( int err )
         case EWOULDBLOCK:       return STATUS_DEVICE_NOT_READY;
         case EALREADY:          return STATUS_NETWORK_BUSY;
         case ENOTSOCK:          return STATUS_OBJECT_TYPE_MISMATCH;
-        case EDESTADDRREQ:      return STATUS_INVALID_PARAMETER;
+        case EDESTADDRREQ:      return STATUS_INVALID_CONNECTION;
         case EMSGSIZE:          return STATUS_BUFFER_OVERFLOW;
         case EPROTONOSUPPORT:
         case ESOCKTNOSUPPORT:
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index eddef24048c..fcf4da3851e 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -13901,7 +13901,7 @@ static void test_connect_udp(void)
     SetLastError(0xdeadbeef);
     ret = send(client, "data", 4, 0);
     ok(ret == -1, "got %d\n", ret);
-    todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError());
+    ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError());

SetLastError(0xdeadbeef);
     ret = recv(server, buffer, sizeof(buffer), 0);
@@ -13949,7 +13949,7 @@ static void test_connect_udp(void)
     SetLastError(0xdeadbeef);
     ret = send(server, "data", 4, 0);
     ok(ret == -1, "got %d\n", ret);
-    todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError());
+    ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError());

ret = connect(client, (struct sockaddr *)&addr, sizeof(addr));
     ok(!ret, "got error %lu\n", GetLastError());

[PATCH 1/1] ntdll: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=138007

Your paranoid android.

=== w1064_2qxl (64 bit report) ===

ws2_32:
sock.c:13021: Test failed: wait timed out
sock.c:13037: Test failed: wait timed out
sock.c:13050: Test failed: got size 5
sock.c:13051: Test failed: got "datad"
sock.c:12885: Test failed: got size 0
sock.c:12886: Test failed: got ""
sock.c:12885: Test failed: got size 0
sock.c:12886: Test failed: got ""

[PATCH 0/1] MR3973: winsock: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.