From 66cc038c9397e6b87e7de4f56a070966b5d86d6f Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 7 Mar 2018 12:42:17 +0100 Subject: [PATCH] Fixed threadpool work function return and arguments. --- libfreerdp/codec/rfx.c | 6 +++--- libfreerdp/codec/yuv.c | 2 +- winpr/libwinpr/pool/test/TestPoolWork.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c index cd0af77..c95ad85 100644 --- a/libfreerdp/codec/rfx.c +++ b/libfreerdp/codec/rfx.c @@ -949,7 +949,7 @@ static BOOL rfx_process_message_tileset(RFX_CONTEXT* context, params[i].context = context; params[i].tile = message->tiles[i]; - if (!(work_objects[i] = CreateThreadpoolWork((PTP_WORK_CALLBACK) + if (!(work_objects[i] = CreateThreadpoolWork( rfx_process_message_tile_work_callback, (void*) ¶ms[i], &context->priv->ThreadPoolEnv))) { @@ -1367,7 +1367,7 @@ struct _RFX_TILE_COMPOSE_WORK_PARAM RFX_CONTEXT* context; }; -void CALLBACK rfx_compose_message_tile_work_callback(PTP_CALLBACK_INSTANCE +static void CALLBACK rfx_compose_message_tile_work_callback(PTP_CALLBACK_INSTANCE instance, void* context, PTP_WORK work) { RFX_TILE_COMPOSE_WORK_PARAM* param = (RFX_TILE_COMPOSE_WORK_PARAM*) context; @@ -1580,7 +1580,7 @@ RFX_MESSAGE* rfx_encode_message(RFX_CONTEXT* context, const RFX_RECT* rects, workParam->tile = tile; if (!(*workObject = CreateThreadpoolWork( - (PTP_WORK_CALLBACK)rfx_compose_message_tile_work_callback, + rfx_compose_message_tile_work_callback, (void*) workParam, &context->priv->ThreadPoolEnv))) { diff --git a/libfreerdp/codec/yuv.c b/libfreerdp/codec/yuv.c index eae47d8..357781c 100644 --- a/libfreerdp/codec/yuv.c +++ b/libfreerdp/codec/yuv.c @@ -159,7 +159,7 @@ BOOL yuv_context_decode(YUV_CONTEXT* context, const BYTE* pYUVData[3], UINT32 iS else params[i].height = context->height % context->heightStep; - work_objects[i] = CreateThreadpoolWork((PTP_WORK_CALLBACK)yuv_process_work_callback, + work_objects[i] = CreateThreadpoolWork(yuv_process_work_callback, (void*) ¶ms[i], &context->ThreadPoolEnv); if (!work_objects[i]) { diff --git a/winpr/libwinpr/pool/test/TestPoolWork.c b/winpr/libwinpr/pool/test/TestPoolWork.c index 10837f9..74ef711 100644 --- a/winpr/libwinpr/pool/test/TestPoolWork.c +++ b/winpr/libwinpr/pool/test/TestPoolWork.c @@ -31,7 +31,7 @@ static BOOL test1(void) int index; PTP_WORK work; printf("Global Thread Pool\n"); - work = CreateThreadpoolWork((PTP_WORK_CALLBACK) test_WorkCallback, "world", NULL); + work = CreateThreadpoolWork(test_WorkCallback, "world", NULL); if (!work) { @@ -86,7 +86,7 @@ static BOOL test2(void) } SetThreadpoolCallbackCleanupGroup(&environment, cleanupGroup, NULL); - work = CreateThreadpoolWork((PTP_WORK_CALLBACK) test_WorkCallback, "world", &environment); + work = CreateThreadpoolWork(test_WorkCallback, "world", &environment); if (!work) { -- 2.7.4