1 files changed, 28 insertions, 44 deletions

diff --git a/src/corelib/io/qwindowspipereader.cpp b/src/corelib/io/qwindowspipereader.cpp
index 5415ad7830..31d0dc1417 100644
--- a/src/corelib/io/qwindowspipereader.cpp
+++ b/src/corelib/io/qwindowspipereader.cpp
@@ -1,42 +1,6 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2021 Alex Trotsenko <alex1973tr@gmail.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// Copyright (C) 2021 Alex Trotsenko <alex1973tr@gmail.com>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qwindowspipereader_p.h"
 #include <qcoreapplication.h>
@@ -45,6 +9,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static const DWORD minReadBufferSize = 4096;
 
 QWindowsPipeReader::QWindowsPipeReader(QObject *parent)
@@ -104,6 +70,7 @@ void QWindowsPipeReader::setHandle(HANDLE hPipeReadEnd)
 void QWindowsPipeReader::stop()
 {
     cancelAsyncRead(Stopped);
+    pipeBroken = true;
 }
 
 /*!
@@ -113,6 +80,22 @@ void QWindowsPipeReader::stop()
 void QWindowsPipeReader::drainAndStop()
 {
     cancelAsyncRead(Draining);
+    pipeBroken = true;
+}
+
+/*!
+    Stops the asynchronous read sequence.
+    Clears the internal buffer and discards any pending data.
+ */
+void QWindowsPipeReader::stopAndClear()
+{
+    cancelAsyncRead(Stopped);
+    readBuffer.clear();
+    actualReadBufferSize = 0;
+    // QLocalSocket is supposed to write data in the 'Closing'
+    // state, so we don't set 'pipeBroken' flag here. Also, avoid
+    // setting this flag in checkForReadyRead().
+    lastError = ERROR_SUCCESS;
 }
 
 /*!
@@ -120,7 +103,6 @@ void QWindowsPipeReader::drainAndStop()
  */
 void QWindowsPipeReader::cancelAsyncRead(State newState)
 {
-    pipeBroken = true;
     if (state != Running)
         return;
 
@@ -147,9 +129,9 @@ void QWindowsPipeReader::cancelAsyncRead(State newState)
     }
     mutex.unlock();
 
-    // Because pipeBroken was set earlier, finish reading to keep the class
-    // state consistent. Note that signals are not emitted in the call
-    // below, as the caller is expected to do that synchronously.
+    // Finish reading to keep the class state consistent. Note that
+    // signals are not emitted in the call below, as the caller is
+    // expected to do that synchronously.
     consumePending();
 }
 
@@ -477,7 +459,7 @@ bool QWindowsPipeReader::consumePendingAndEmit(bool allowWinActPosting)
         if (emitReadyRead)
             emit readyRead();
         if (alive && dwError != ERROR_BROKEN_PIPE && dwError != ERROR_PIPE_NOT_CONNECTED)
-            emit winError(dwError, QLatin1String("QWindowsPipeReader::consumePendingAndEmit"));
+            emit winError(dwError, "QWindowsPipeReader::consumePendingAndEmit"_L1);
         if (alive)
             emit pipeClosed();
     }
@@ -529,3 +511,5 @@ bool QWindowsPipeReader::waitForNotification()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qwindowspipereader_p.cpp"