feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't read single bytes in native mode.

Browse Source
This commit is contained in:
con
2009-07-28 15:54:17 +02:00
parent 86366ada9a
commit cf6ed08c98
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/manual/trk/adapter.cpp
View File

@@ -41,6 +41,25 @@
#if USE_NATIVE #if USE_NATIVE
#include <windows.h> #include <windows.h>
// Non-blocking replacement for win-api ReadFile function
BOOL WINAPI TryReadFile(HANDLE hFile,
LPVOID lpBuffer,
DWORD nNumberOfBytesToRead,
LPDWORD lpNumberOfBytesRead,
LPOVERLAPPED lpOverlapped)
{
COMSTAT comStat;
if(!ClearCommError(hFile, NULL, &comStat)){
qDebug() << "ClearCommError() failed";
return FALSE;
}
return ReadFile(hFile,
lpBuffer,
qMin(comStat.cbInQue, nNumberOfBytesToRead),
lpNumberOfBytesRead,
lpOverlapped);
}
#endif #endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
@@ -873,11 +892,11 @@ void Adapter::tryTrkRead()
// << stringFromArray(m_trkReadQueue); // << stringFromArray(m_trkReadQueue);
#if USE_NATIVE #if USE_NATIVE
const DWORD BUFFERSIZE = 1; const DWORD BUFFERSIZE = 1024;
char buffer[BUFFERSIZE]; char buffer[BUFFERSIZE];
DWORD charsRead; DWORD charsRead;
while (ReadFile(m_hdevice, buffer, BUFFERSIZE, &charsRead, NULL)) { while (TryReadFile(m_hdevice, buffer, BUFFERSIZE, &charsRead, NULL)) {
m_trkReadQueue.append(buffer, charsRead); m_trkReadQueue.append(buffer, charsRead);
if (isValidTrkResult(m_trkReadQueue)) if (isValidTrkResult(m_trkReadQueue))
break; break;

23
tests/manual/trk/launcher.cpp
View File

@@ -41,6 +41,25 @@
#if USE_NATIVE #if USE_NATIVE
#include <windows.h> #include <windows.h>
// Non-blocking replacement for win-api ReadFile function
BOOL WINAPI TryReadFile(HANDLE hFile,
LPVOID lpBuffer,
DWORD nNumberOfBytesToRead,
LPDWORD lpNumberOfBytesRead,
LPOVERLAPPED lpOverlapped)
{
COMSTAT comStat;
if(!ClearCommError(hFile, NULL, &comStat)){
qDebug() << "ClearCommError() failed";
return FALSE;
}
return ReadFile(hFile,
lpBuffer,
qMin(comStat.cbInQue, nNumberOfBytesToRead),
lpNumberOfBytesRead,
lpOverlapped);
}
#endif #endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
@@ -342,11 +361,11 @@ void Adapter::trkWrite(const TrkMessage &msg)
void Adapter::tryTrkRead() void Adapter::tryTrkRead()
{ {
#if USE_NATIVE #if USE_NATIVE
const DWORD BUFFERSIZE = 1; const DWORD BUFFERSIZE = 1024;
char buffer[BUFFERSIZE]; char buffer[BUFFERSIZE];
DWORD charsRead; DWORD charsRead;
while (ReadFile(m_hdevice, buffer, BUFFERSIZE, &charsRead, NULL)) { while (TryReadFile(m_hdevice, buffer, BUFFERSIZE, &charsRead, NULL)) {
m_trkReadQueue.append(buffer, charsRead); m_trkReadQueue.append(buffer, charsRead);
if (isValidTrkResult(m_trkReadQueue)) if (isValidTrkResult(m_trkReadQueue))
break; break;