AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove qt_cancelIo helper function

Browse Source 
We can now directly use CancelIoEx. The fallback to CancelIo
was needed for supporting Windows XP.

Change-Id: I24a53a774caf695e6006f24a914abaa5ab204035
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Joerg Bornemann 2016-05-17 16:17:29 +02:00
parent af6b700bb8
commit fade295814
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/io/qwindowspipereader.cpp
View File

@ -71,21 +71,6 @@ QWindowsPipeReader::QWindowsPipeReader(QObject *parent)
this, &QWindowsPipeReader::emitPendingReadyRead, Qt::QueuedConnection); this, &QWindowsPipeReader::emitPendingReadyRead, Qt::QueuedConnection);
} }
bool qt_cancelIo(HANDLE handle, OVERLAPPED *overlapped)
{
typedef BOOL (WINAPI *PtrCancelIoEx)(HANDLE, LPOVERLAPPED);
static PtrCancelIoEx ptrCancelIoEx = 0;
if (!ptrCancelIoEx) {
HMODULE kernel32 = GetModuleHandleA("kernel32");
if (kernel32)
ptrCancelIoEx = PtrCancelIoEx(GetProcAddress(kernel32, "CancelIoEx"));
}
if (ptrCancelIoEx)
return ptrCancelIoEx(handle, overlapped);
else
return CancelIo(handle);
}
QWindowsPipeReader::~QWindowsPipeReader() QWindowsPipeReader::~QWindowsPipeReader()
{ {
stop(); stop();
@ -110,7 +95,7 @@ void QWindowsPipeReader::stop()
{ {
stopped = true; stopped = true;
if (readSequenceStarted) { if (readSequenceStarted) {
if (!qt_cancelIo(handle, &overlapped)) { if (!CancelIoEx(handle, &overlapped)) {
const DWORD dwError = GetLastError(); const DWORD dwError = GetLastError();
if (dwError != ERROR_NOT_FOUND) { if (dwError != ERROR_NOT_FOUND) {
qErrnoWarning(dwError, "QWindowsPipeReader: qt_cancelIo on handle %x failed.", qErrnoWarning(dwError, "QWindowsPipeReader: qt_cancelIo on handle %x failed.",

5
src/corelib/io/qwindowspipewriter.cpp
View File

@ -42,9 +42,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
extern bool qt_cancelIo(HANDLE handle, OVERLAPPED *overlapped); // from qwindowspipereader.cpp
QWindowsPipeWriter::Overlapped::Overlapped(QWindowsPipeWriter *pipeWriter) QWindowsPipeWriter::Overlapped::Overlapped(QWindowsPipeWriter *pipeWriter)
: pipeWriter(pipeWriter) : pipeWriter(pipeWriter)
{ {
@ -209,7 +206,7 @@ void QWindowsPipeWriter::stop()
{ {
stopped = true; stopped = true;
if (writeSequenceStarted) { if (writeSequenceStarted) {
if (!qt_cancelIo(handle, &overlapped)) { if (!CancelIoEx(handle, &overlapped)) {
const DWORD dwError = GetLastError(); const DWORD dwError = GetLastError();
if (dwError != ERROR_NOT_FOUND) { if (dwError != ERROR_NOT_FOUND) {
qErrnoWarning(dwError, "QWindowsPipeWriter: qt_cancelIo on handle %x failed.", qErrnoWarning(dwError, "QWindowsPipeWriter: qt_cancelIo on handle %x failed.",