Changeset 26:46f4e06241c7 in xplcommon for src/xplcommon/win32/LocalServerSocketBase.cc

Timestamp:

01/02/13 08:04:37 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Further cleanup

File:

• src/xplcommon/win32/LocalServerSocketBase.cc (modified) (1 diff)

src/xplcommon/win32/LocalServerSocketBase.cc

@@ -60 +60 @@
 {
     if (overlapped!=0) overlapped->reset();
-    bool result = LocalSocket::connectNamedPipe(handle, overlapped);
-    if (!result && overlapped==0) {
-        setErrorCode(GetLastError());
+    bool result = ConnectNamedPipe(handle,
+                                   (overlapped==0) ? 0 : overlapped->get());
+    DWORD error = GetLastError();
+    if (!result &&
+        (overlapped==0 ||
+         (error!=ERROR_IO_PENDING && error!=ERROR_IO_INCOMPLETE)))
+    {
+        setErrorCode(error);
+        return false;
+    } else if (overlapped==0) {
+        return result;
+    } else {
+        DWORD dummy = 0;
+        return overlapped->getResult(dummy, handle);
     }
-    return result;
 }