mirror of
https://github.com/FreeRDP/FreeRDP.git
synced 2025-06-03 00:00:20 +00:00
[client,xfreerdp] remove SetWaitableTimer use
This commit is contained in:
parent
06e9ceff4c
commit
8e3e163fd4
@ -1553,11 +1553,7 @@ static DWORD WINAPI xf_client_thread(LPVOID param)
|
|||||||
DWORD exit_code = 0;
|
DWORD exit_code = 0;
|
||||||
DWORD waitStatus = 0;
|
DWORD waitStatus = 0;
|
||||||
HANDLE inputEvent = NULL;
|
HANDLE inputEvent = NULL;
|
||||||
HANDLE timer = NULL;
|
|
||||||
LARGE_INTEGER due = { 0 };
|
|
||||||
TimerEventArgs timerEvent = { 0 };
|
|
||||||
|
|
||||||
EventArgsInit(&timerEvent, "xfreerdp");
|
|
||||||
freerdp* instance = (freerdp*)param;
|
freerdp* instance = (freerdp*)param;
|
||||||
WINPR_ASSERT(instance);
|
WINPR_ASSERT(instance);
|
||||||
|
|
||||||
@ -1601,27 +1597,12 @@ static DWORD WINAPI xf_client_thread(LPVOID param)
|
|||||||
goto disconnect;
|
goto disconnect;
|
||||||
}
|
}
|
||||||
|
|
||||||
timer = CreateWaitableTimerA(NULL, FALSE, "mainloop-periodic-timer");
|
|
||||||
|
|
||||||
if (!timer)
|
|
||||||
{
|
|
||||||
WLog_ERR(TAG, "failed to create timer");
|
|
||||||
goto disconnect;
|
|
||||||
}
|
|
||||||
|
|
||||||
due.QuadPart = 0;
|
|
||||||
|
|
||||||
if (!SetWaitableTimer(timer, &due, 20, NULL, NULL, FALSE))
|
|
||||||
{
|
|
||||||
goto disconnect;
|
|
||||||
}
|
|
||||||
inputEvent = xfc->x11event;
|
inputEvent = xfc->x11event;
|
||||||
|
|
||||||
while (!freerdp_shall_disconnect_context(instance->context))
|
while (!freerdp_shall_disconnect_context(instance->context))
|
||||||
{
|
{
|
||||||
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
|
HANDLE handles[MAXIMUM_WAIT_OBJECTS] = { 0 };
|
||||||
DWORD nCount = 0;
|
DWORD nCount = 0;
|
||||||
handles[nCount++] = timer;
|
|
||||||
handles[nCount++] = inputEvent;
|
handles[nCount++] = inputEvent;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1682,12 +1663,6 @@ static DWORD WINAPI xf_client_thread(LPVOID param)
|
|||||||
|
|
||||||
if (!handle_window_events(instance))
|
if (!handle_window_events(instance))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if ((waitStatus != WAIT_TIMEOUT) && (waitStatus == WAIT_OBJECT_0))
|
|
||||||
{
|
|
||||||
timerEvent.now = GetTickCount64();
|
|
||||||
PubSub_OnTimer(context->pubSub, context, &timerEvent);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!exit_code)
|
if (!exit_code)
|
||||||
@ -1706,9 +1681,6 @@ static DWORD WINAPI xf_client_thread(LPVOID param)
|
|||||||
|
|
||||||
disconnect:
|
disconnect:
|
||||||
|
|
||||||
if (timer)
|
|
||||||
(void)CloseHandle(timer);
|
|
||||||
|
|
||||||
freerdp_disconnect(instance);
|
freerdp_disconnect(instance);
|
||||||
end:
|
end:
|
||||||
ExitThread(exit_code);
|
ExitThread(exit_code);
|
||||||
|
Loading…
Reference in New Issue
Block a user