morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[core,timer] fix use on platforms not supported

Browse Source 
If a platform does not support the freerdp_timer_* API let it fail
silently.
This commit is contained in:
akallabeth
2025-06-13 09:36:48 +02:00
parent c66139112a
commit b57281ec99
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libfreerdp/core/timer.c
View File

@@ -22,10 +22,17 @@
#include <winpr/collections.h>
#include <freerdp/timer.h>
#include <freerdp/log.h>
#include "rdp.h"
#include "utils.h"
#include "timer.h"
#define TAG FREERDP_TAG("timer")
#if !defined(EMSCRIPTEN)
#define FREERDP_TIMER_SUPPORTED
#endif
typedef ALIGN64 struct
{
FreeRDP_TimerID id;
@@ -54,6 +61,15 @@ FreeRDP_TimerID freerdp_timer_add(rdpContext* context, uint64_t intervalNS,
WINPR_ASSERT(context);
WINPR_ASSERT(context->rdp);
#if !defined(FREERDP_TIMER_SUPPORTED)
WINPR_UNUSED(context);
WINPR_UNUSED(intervalNS);
WINPR_UNUSED(callback);
WINPR_UNUSED(userdata);
WINPR_UNUSED(mainloop);
WLog_WARN(TAG, "Platform does not support freerdp_timer_* API");
return 0;
#else
FreeRDPTimer* timer = context->rdp->timer;
WINPR_ASSERT(timer);
@@ -73,6 +89,7 @@ FreeRDP_TimerID freerdp_timer_add(rdpContext* context, uint64_t intervalNS,
return 0;
(void)SetEvent(timer->event);
return entry.id;
#endif
}
static BOOL foreach_entry(void* data, WINPR_ATTR_UNUSED size_t index, va_list ap)
@@ -143,6 +160,7 @@ static BOOL runExpiredTimer(void* data, WINPR_ATTR_UNUSED size_t index,
return TRUE;
}
#if defined(FREERDP_TIMER_SUPPORTED)
static uint64_t expire_and_reschedule(FreeRDPTimer* timer)
{
WINPR_ASSERT(timer);
@@ -206,6 +224,7 @@ static DWORD WINAPI timer_thread(LPVOID arg)
}
return 0;
}
#endif
void freerdp_timer_free(FreeRDPTimer* timer)
{
@@ -266,10 +285,12 @@ FreeRDPTimer* freerdp_timer_new(rdpRdp* rdp)
if (!timer->mainevent)
goto fail;
#if defined(FREERDP_TIMER_SUPPORTED)
timer->running = true;
timer->thread = CreateThread(NULL, 0, timer_thread, timer, 0, NULL);
if (!timer->thread)
goto fail;
#endif
return timer;
fail: