Changeset 846 for trunk/src/corelib/io/qwindowspipewriter.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/corelib/io/qwindowspipewriter.cpp (modified) (4 diffs)

trunk/src/corelib/io/qwindowspipewriter.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])
@@ -41 +41 @@
 
 #include "qwindowspipewriter_p.h"
+
 
 QT_BEGIN_NAMESPACE
@@ -101 +102 @@
 void QWindowsPipeWriter::run()
 {
-    OVERLAPPED overl = {0, 0, 0, 0, NULL};
+    OVERLAPPED overl;
+    memset(&overl, 0, sizeof overl);
     overl.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
     forever {
@@ -127 +129 @@
         while ((!quitNow) && totalWritten < maxlen) {
             DWORD written = 0;
-            // Write 2k at a time to prevent flooding the pipe. If you
-            // write too much (4k-8k), the pipe can close
-            // unexpectedly.
             if (!WriteFile(writePipe, ptrData + totalWritten,
-                    qMin<int>(2048, maxlen - totalWritten), &written, &overl)) {
+                           maxlen - totalWritten, &written, &overl)) {
+
                 if (GetLastError() == 0xE8/*NT_STATUS_INVALID_USER_BUFFER*/) {
                     // give the os a rest