From e114ee44e4217fa0122d0f3f4dcb33e3075320be Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Thu, 18 Oct 2018 14:32:08 +0200 Subject: [PATCH] new [cache/pointer]: don't require pointer functions to be set This as cleanup/rework of PR #4581. --- libfreerdp/cache/pointer.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libfreerdp/cache/pointer.c b/libfreerdp/cache/pointer.c index a96df36..0ef57ad 100644 --- a/libfreerdp/cache/pointer.c +++ b/libfreerdp/cache/pointer.c @@ -71,7 +71,7 @@ static BOOL update_pointer_position(rdpContext* context, return FALSE; pointer = context->graphics->Pointer_Prototype; - return pointer->SetPosition(context, pointer_position->xPos, + return IFCALLRESULT(TRUE, pointer->SetPosition, context, pointer_position->xPos, pointer_position->yPos); } @@ -89,17 +89,14 @@ static BOOL update_pointer_system(rdpContext* context, switch (pointer_system->type) { case SYSPTR_NULL: - IFCALL(pointer->SetNull, context); - break; + return IFCALLRESULT(TRUE, pointer->SetNull, context); case SYSPTR_DEFAULT: - IFCALL(pointer->SetDefault, context); - break; + return IFCALLRESULT(TRUE, pointer->SetDefault, context); default: WLog_ERR(TAG, "Unknown system pointer type (0x%08"PRIX32")", pointer_system->type); } - return TRUE; } @@ -148,7 +145,7 @@ static BOOL update_pointer_color(rdpContext* context, if (!pointer_cache_put(cache->pointer, pointer_color->cacheIndex, pointer)) goto out_fail; - return pointer->Set(context, pointer); + return IFCALLRESULT(TRUE, pointer->Set, context, pointer); } return FALSE; @@ -209,7 +206,7 @@ static BOOL update_pointer_new(rdpContext* context, pointer)) goto out_fail; - return pointer->Set(context, pointer); + return IFCALLRESULT(TRUE, pointer->Set, context, pointer); out_fail: pointer_free(context, pointer); return FALSE; @@ -223,10 +220,7 @@ static BOOL update_pointer_cached(rdpContext* context, pointer = pointer_cache_get(cache->pointer, pointer_cached->cacheIndex); if (pointer != NULL) - { - pointer->Set(context, pointer); - return TRUE; - } + return IFCALLRESULT(TRUE, pointer->Set, context, pointer); return FALSE; } -- 2.7.4