Changeset 769 for trunk/src/network/socket/qlocalsocket_win.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qlocalsocket_win.cpp (modified) (5 diffs)

trunk/src/network/socket/qlocalsocket_win.cpp

@@ -40 +40 @@
 ****************************************************************************/
 
-#include "qlocalsocket.h"
 #include "qlocalsocket_p.h"
 
@@ -109 +108 @@
        state(QLocalSocket::UnconnectedState)
 {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -389 +402 @@
     d->pendingReadyRead = false;
     d->pipeClosed = false;
-    DisconnectNamedPipe(d->handle);
-    CloseHandle(d->handle);
+    d->destroyPipeHandles();
     d->handle = INVALID_HANDLE_VALUE;
     ResetEvent(d->overlapped.hEvent);
@@ -413 +425 @@
 {
     Q_D(QLocalSocket);
+
+
+
+
+
+
+
+
+
     flush();
     if (d->pipeWriter && d->pipeWriter->bytesToWrite() != 0) {
@@ -525 +546 @@
 {
     Q_D(const QLocalSocket);
-    return (d->handle != INVALID_HANDLE_VALUE);
+    if (d->handle == INVALID_HANDLE_VALUE)
+        return false;
+
+    return PeekNamedPipe(d->handle, NULL, 0, NULL, NULL, NULL);
 }