Changeset 846 for trunk/src/network/socket/qlocalserver_win.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qlocalserver_win.cpp (modified) (4 diffs)

trunk/src/network/socket/qlocalserver_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -66 +66 @@
                  (const wchar_t *)fullServerName.utf16(), // pipe name
                  PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,       // read/write access
-                 PIPE_TYPE_MESSAGE |       // message type pipe
-                 PIPE_READMODE_MESSAGE |   // message-read mode
+                 PIPE_TYPE_e type pipe
+                 PIPE_READMODE_e-read mode
                  PIPE_WAIT,                // blocking mode
                  PIPE_UNLIMITED_INSTANCES, // max. instances
@@ -86 +86 @@
         switch (GetLastError()) {
         case ERROR_IO_PENDING:
+
             break;
         case ERROR_PIPE_CONNECTED:
+
             SetEvent(eventHandle);
             break;
@@ -156 +158 @@
     for (int i = 0; i < listeners.size(); ) {
         HANDLE handle = listeners[i].handle;
-        if (GetOverlappedResult(handle, &listeners[i].overlapped, &dummy, FALSE)) {
+        if (listeners[i].connected
+            || GetOverlappedResult(handle, &listeners[i].overlapped, &dummy, FALSE))
+        {
             listeners.removeAt(i);