jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

ClientMessageHandler added, and changed to wstring in some places.

Browse source
This commit is contained in:
Stefan Persson 2010-10-07 15:35:11 +00:00
parent 07a7046a63
commit 08d838ba8d
7 changed files with 69 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
telldus-core/common/Socket_win.cpp
View file

@ -7,6 +7,8 @@
#define BUFSIZE 512
//TODO: using namespace TelldusCore;
class Socket::PrivateData {
public:
HANDLE hPipe;
@ -23,8 +25,8 @@ Socket::~Socket(void){
delete d;
}
std::string Socket::read() {
char buf[BUFSIZE];
std::wstring Socket::read() {
wchar_t buf[BUFSIZE];
int result;
DWORD cbBytesRead = 0;
OVERLAPPED oOverlap;
@ -34,12 +36,12 @@ std::string Socket::read() {
memset(&buf, 0, BUFSIZE);
ReadFile( d->hPipe, &buf, sizeof(char)*BUFSIZE, &cbBytesRead, &oOverlap);
ReadFile( d->hPipe, &buf, sizeof(wchar_t)*BUFSIZE, &cbBytesRead, &oOverlap);
result = WaitForSingleObject(oOverlap.hEvent, 10000);
if (result == WAIT_TIMEOUT) {
CloseHandle(readEvent);
return "";
return L"";
}
fSuccess = GetOverlappedResult(d->hPipe, &oOverlap, &cbBytesRead, false);
if (!fSuccess) {