1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MinGW-Warnings in tst_qwinoverlappedionotifier.

Browse Source 
Change-Id: I66c4e274c8b686d8a69476ad10751008f256e5a2
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Friedemann Kleint 2013-01-25 14:53:10 +01:00 committed by The Qt Project
parent 2b3ed64951
commit ff31462e73
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/corelib/io/qwinoverlappedionotifier/tst_qwinoverlappedionotifier.cpp
View File

@ -251,21 +251,24 @@ void tst_QWinOverlappedIoNotifier::multipleOperations()
// start async read on client // start async read on client
QByteArray clientReadBuffer(377, Qt::Uninitialized); QByteArray clientReadBuffer(377, Qt::Uninitialized);
OVERLAPPED clientReadOverlapped = {0}; OVERLAPPED clientReadOverlapped;
ZeroMemory(&clientReadOverlapped, sizeof(clientReadOverlapped));
BOOL readSuccess = ReadFile(hClient, clientReadBuffer.data(), clientReadBuffer.size(), BOOL readSuccess = ReadFile(hClient, clientReadBuffer.data(), clientReadBuffer.size(),
NULL, &clientReadOverlapped); NULL, &clientReadOverlapped);
QVERIFY(readSuccess || GetLastError() == ERROR_IO_PENDING); QVERIFY(readSuccess || GetLastError() == ERROR_IO_PENDING);
// start async write client -> server // start async write client -> server
QByteArray clientDataToWrite(233, 'B'); QByteArray clientDataToWrite(233, 'B');
OVERLAPPED clientWriteOverlapped = {0}; OVERLAPPED clientWriteOverlapped;
ZeroMemory(&clientWriteOverlapped, sizeof(clientWriteOverlapped));
BOOL writeSuccess = WriteFile(hClient, clientDataToWrite.data(), clientDataToWrite.size(), BOOL writeSuccess = WriteFile(hClient, clientDataToWrite.data(), clientDataToWrite.size(),
NULL, &clientWriteOverlapped); NULL, &clientWriteOverlapped);
QVERIFY(writeSuccess || GetLastError() == ERROR_IO_PENDING); QVERIFY(writeSuccess || GetLastError() == ERROR_IO_PENDING);
// start async write server -> client // start async write server -> client
QByteArray serverDataToWrite(144, 'A'); QByteArray serverDataToWrite(144, 'A');
OVERLAPPED serverOverlapped = {0}; OVERLAPPED serverOverlapped;
ZeroMemory(&serverOverlapped, sizeof(serverOverlapped));
writeSuccess = WriteFile(hServer, serverDataToWrite.data(), serverDataToWrite.size(), writeSuccess = WriteFile(hServer, serverDataToWrite.data(), serverDataToWrite.size(),
NULL, &serverOverlapped); NULL, &serverOverlapped);
QVERIFY(writeSuccess || GetLastError() == ERROR_IO_PENDING); QVERIFY(writeSuccess || GetLastError() == ERROR_IO_PENDING);
@ -284,9 +287,9 @@ void tst_QWinOverlappedIoNotifier::multipleOperations()
QTRY_COMPARE(sink.notifications.count(), 2); QTRY_COMPARE(sink.notifications.count(), 2);
foreach (const NotifierSink::IOResult &r, sink.notifications) { foreach (const NotifierSink::IOResult &r, sink.notifications) {
QCOMPARE(r.errorCode, DWORD(ERROR_SUCCESS)); QCOMPARE(r.errorCode, DWORD(ERROR_SUCCESS));
if (r.bytes == serverDataToWrite.count()) if (r.bytes == DWORD(serverDataToWrite.count()))
QCOMPARE(r.overlapped, &clientReadOverlapped); QCOMPARE(r.overlapped, &clientReadOverlapped);
else if (r.bytes == clientDataToWrite.count()) else if (r.bytes == DWORD(clientDataToWrite.count()))
QCOMPARE(r.overlapped, &clientWriteOverlapped); QCOMPARE(r.overlapped, &clientWriteOverlapped);
else else
QVERIFY2(false, "Unexpected number of bytes received."); QVERIFY2(false, "Unexpected number of bytes received.");