mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[channels] Abort event wain on abortEvent

Browse Source
This commit is contained in:
Armin Novak 2022-12-06 10:32:08 +01:00 committed by akallabeth
parent ef5f51ba04
commit b25234da66
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
channels/rdp2tcp/client/rdp2tcp_main.c
View File

@ -132,11 +132,14 @@ static void dumpData(char* data, unsigned length)
static DWORD WINAPI copyThread(void* data)
{
DWORD status = WAIT_OBJECT_0;
Plugin* plugin = (Plugin*)data;
size_t const bufsize = 16 * 1024;
while (1)
while (status == WAIT_OBJECT_0)
{
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
DWORD dwRead;
char* buffer = malloc(bufsize);
@ -168,7 +171,9 @@ static DWORD WINAPI copyThread(void* data)
goto fail;
}
WaitForSingleObject(plugin->writeComplete, INFINITE);
handles[0] = plugin->writeComplete;
handles[1] = freerdp_abort_event(plugin->channelEntryPoints.context);
status = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
ResetEvent(plugin->writeComplete);
}

16
channels/rdpsnd/client/rdpsnd_main.c
View File

@ -1353,8 +1353,20 @@ static DWORD WINAPI play_thread(LPVOID arg)
int rc;
wMessage message;
wStream* s;
HANDLE handle = MessageQueue_Event(rdpsnd->queue);
WaitForSingleObject(handle, INFINITE);
DWORD status;
DWORD nCount = 0;
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
handles[nCount++] = MessageQueue_Event(rdpsnd->queue);
handles[nCount++] = freerdp_abort_event(rdpsnd->rdpcontext);
status = WaitForMultipleObjects(nCount, handles, FALSE, INFINITE);
switch (status)
{
case WAIT_OBJECT_0:
break;
default:
return ERROR_TIMEOUT;
}
rc = MessageQueue_Peek(rdpsnd->queue, &message, TRUE);
if (rc < 1)

1
channels/serial/client/serial_main.c
View File

@ -676,7 +676,6 @@ static void terminate_pending_irp_threads(SERIAL_DEVICE* serial)
ULONG_PTR id = ids[i];
irpThread = ListDictionary_GetItemValue(serial->IrpThreads, (void*)id);
TerminateThread(irpThread, 0);
if (WaitForSingleObject(irpThread, INFINITE) == WAIT_FAILED)
{
WLog_ERR(TAG, "WaitForSingleObject failed!");

19
server/Sample/sfreerdp.c
View File

@ -585,10 +585,21 @@ static DWORD WINAPI tf_debug_channel_thread_func(LPVOID arg)
while (1)
{
WaitForSingleObject(context->event, INFINITE);
DWORD status;
DWORD nCount = 0;
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
if (WaitForSingleObject(context->stopEvent, 0) == WAIT_OBJECT_0)
break;
handles[nCount++] = context->event;
handles[nCount++] = freerdp_abort_event(&context->_p);
handles[nCount++] = context->stopEvent;
status = WaitForMultipleObjects(nCount, handles, FALSE, INFINITE);
switch (status)
{
case WAIT_OBJECT_0:
break;
default:
goto fail;
}
Stream_SetPosition(s, 0);
@ -611,7 +622,7 @@ static DWORD WINAPI tf_debug_channel_thread_func(LPVOID arg)
Stream_SetPosition(s, BytesReturned);
WLog_DBG(TAG, "got %" PRIu32 " bytes", BytesReturned);
}
fail:
Stream_Free(s, TRUE);
return 0;
}