Zebediah Figura : server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.
Alexandre Julliard
julliard at winehq.org
Thu May 6 14:56:18 CDT 2021
Module: wine
Branch: master
Commit: 15aceec06730ec0307ad63a233cd71cb2eb15232
URL: https://source.winehq.org/git/wine.git/?a=commit;h=15aceec06730ec0307ad63a233cd71cb2eb15232
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed May 5 21:41:49 2021 -0500
server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/sock.c | 4 ++--
server/trace.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/sock.c b/server/sock.c
index 08399644a07..36fda31f9c1 100644
--- 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;
diff --git a/server/trace.c b/server/trace.c
index cd41d63d8c9..0fccf47d16a 100644
--- 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 },
More information about the wine-cvs
mailing list