server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.

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

server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.
15aceec0 · Zebediah Figura · Alexandre Julliard · 0f9d9a03 · 15aceec0 · 15aceec0
Commit 15aceec0 authored May 05, 2021 by Zebediah Figura Committed by Alexandre Julliard May 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

sock.c server/sock.c +2 -2

trace.c server/trace.c +0 -1

No files found.
--- a/server/sock.c
+++ b/server/sock.c
@@ -1221,8 +1221,8 @@ static unsigned int sock_get_error( int err )
        case EFAULT:            return WSAEFAULT;
        case EINVAL:            return WSAEINVAL;
        case EMFILE:            return WSAEMFILE;
+        case EINPROGRESS:
        case EWOULDBLOCK:       return WSAEWOULDBLOCK;
-        case EINPROGRESS:       return WSAEINPROGRESS;
        case EALREADY:          return WSAEALREADY;
        case ENOTSOCK:          return WSAENOTSOCK;
        case EDESTADDRREQ:      return WSAEDESTADDRREQ;
@@ -1290,8 +1290,8 @@ static int sock_get_ntstatus( int err )
        case EINVAL:            return STATUS_INVALID_PARAMETER;
        case ENFILE:
        case EMFILE:            return STATUS_TOO_MANY_OPENED_FILES;
+        case EINPROGRESS:
        case EWOULDBLOCK:       return STATUS_DEVICE_NOT_READY;
-        case EINPROGRESS:       return STATUS_PENDING;
        case EALREADY:          return STATUS_NETWORK_BUSY;
        case ENOTSOCK:          return STATUS_OBJECT_TYPE_MISMATCH;
        case EDESTADDRREQ:      return STATUS_INVALID_PARAMETER;

--- a/server/trace.c
+++ b/server/trace.c
@@ -5424,7 +5424,6 @@ static const struct
    { "WSAEFAULT",                   0xc0010000 | WSAEFAULT },
    { "WSAEHOSTDOWN",                0xc0010000 | WSAEHOSTDOWN },
    { "WSAEHOSTUNREACH",             0xc0010000 | WSAEHOSTUNREACH },
-    { "WSAEINPROGRESS",              0xc0010000 | WSAEINPROGRESS },
    { "WSAEINTR",                    0xc0010000 | WSAEINTR },
    { "WSAEINVAL",                   0xc0010000 | WSAEINVAL },
    { "WSAEISCONN",                  0xc0010000 | WSAEISCONN },