mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-23 14:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[host] don't assume the capture was successful

Browse source
This commit is contained in:
Geoffrey McRae 2018-05-24 17:05:49 +10:00
parent eef18dd655
commit 213c220d83
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
host/Service.cpp
View file

@ -214,7 +214,9 @@ bool Service::Process()
} }
struct FrameInfo frame; struct FrameInfo frame;
ZeroMemory(&frame, sizeof(FrameInfo)); struct CursorInfo cursor;
ZeroMemory(&frame , sizeof(struct FrameInfo ));
ZeroMemory(&cursor, sizeof(struct CursorInfo));
frame.buffer = m_frame[m_frameIndex]; frame.buffer = m_frame[m_frameIndex];
frame.bufferSize = m_frameSize; frame.bufferSize = m_frameSize;
@ -222,19 +224,8 @@ bool Service::Process()
bool cursorOnly = false; bool cursorOnly = false;
for(int i = 0; i < 2; ++i) for(int i = 0; i < 2; ++i)
{ {
CursorInfo ci;
GrabStatus status = m_capture->GrabFrame(frame, ci);
if (ci.hasPos || ci.hasShape)
{
EnterCriticalSection(&m_cursorCS);
memcpy(&m_cursorInfo, &ci, sizeof(ci));
LeaveCriticalSection(&m_cursorCS);
SetEvent(m_cursorEvent);
}
// capture a frame of data // capture a frame of data
switch (status) switch (m_capture->GrabFrame(frame, cursor))
{ {
case GRAB_STATUS_OK: case GRAB_STATUS_OK:
ok = true; ok = true;
@ -284,6 +275,21 @@ bool Service::Process()
return false; return false;
} }
if (cursor.hasPos || cursor.hasShape)
{
EnterCriticalSection(&m_cursorCS);
// bool hasPos = m_cursorInfo.hasPos || cursor.hasPos;
// bool hasShape = m_cursorInfo.hasShape || cursor.hasShape;
memcpy(&m_cursorInfo, &cursor, sizeof(struct CursorInfo));
// m_cursorInfo.hasPos = hasPos;
// m_cursorInfo.hasShape = hasShape;
LeaveCriticalSection(&m_cursorCS);
SetEvent(m_cursorEvent);
}
if (!cursorOnly) if (!cursorOnly)
{ {
KVMFRFrame * fi = &m_shmHeader->frame; KVMFRFrame * fi = &m_shmHeader->frame;
@ -327,8 +333,6 @@ DWORD Service::CursorThread()
EnterCriticalSection(&m_cursorCS); EnterCriticalSection(&m_cursorCS);
if (m_cursorInfo.hasPos) if (m_cursorInfo.hasPos)
{ {
m_cursorInfo.hasPos = false;
// tell the client where the cursor is // tell the client where the cursor is
cursor->flags |= KVMFR_CURSOR_FLAG_POS; cursor->flags |= KVMFR_CURSOR_FLAG_POS;
cursor->x = m_cursorInfo.x; cursor->x = m_cursorInfo.x;
@ -342,8 +346,6 @@ DWORD Service::CursorThread()
if (m_cursorInfo.hasShape) if (m_cursorInfo.hasShape)
{ {
m_cursorInfo.hasShape = false;
if (m_cursorInfo.dataSize > m_cursorDataSize) if (m_cursorInfo.dataSize > m_cursorDataSize)
DEBUG_ERROR("Cursor size exceeds allocated space"); DEBUG_ERROR("Cursor size exceeds allocated space");
else else