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

Merge pull request #4951 from nfedera/nf-fix-fnobjnew-fnstylecasts

Browse Source 
fix issue with fnObjectFree and related casts
This commit is contained in:
akallabeth 2018-10-19 14:00:14 +02:00 committed by GitHub
commit b8ff18f37f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
channels/drive/client/drive_main.c
View File

@ -864,6 +864,14 @@ static UINT drive_free(DEVICE* device)
return drive_free_int(drive); return drive_free_int(drive);
} }
/**
* Helper function used for freeing list dictionary value object
*/
static void drive_file_objfree(void* obj)
{
drive_file_free((DRIVE_FILE*) obj);
}
/** /**
* Function description * Function description
* *
@ -925,7 +933,7 @@ static UINT drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints,
goto out_error; goto out_error;
} }
ListDictionary_ValueObject(drive->files)->fnObjectFree = (OBJECT_FREE_FN) drive_file_free; ListDictionary_ValueObject(drive->files)->fnObjectFree = drive_file_objfree;
drive->IrpQueue = MessageQueue_New(NULL); drive->IrpQueue = MessageQueue_New(NULL);
if (!drive->IrpQueue) if (!drive->IrpQueue)

7
channels/rdpdr/client/devman.c
View File

@ -41,8 +41,10 @@
#include "devman.h" #include "devman.h"
void devman_device_free(DEVICE* device) static void devman_device_free(void* obj)
{ {
DEVICE* device = (DEVICE*) obj;
if (!device) if (!device)
return; return;
@ -75,8 +77,7 @@ DEVMAN* devman_new(rdpdrPlugin* rdpdr)
return NULL; return NULL;
} }
ListDictionary_ValueObject(devman->devices)->fnObjectFree = ListDictionary_ValueObject(devman->devices)->fnObjectFree = devman_device_free;
(OBJECT_FREE_FN) devman_device_free;
return devman; return devman;
} }

29
libfreerdp/codec/rfx.c
View File

@ -145,8 +145,9 @@ static void rfx_profiler_print(RFX_CONTEXT* context)
PROFILER_PRINT_FOOTER PROFILER_PRINT_FOOTER
} }
static void rfx_tile_init(RFX_TILE* tile) static void rfx_tile_init(void* obj)
{ {
RFX_TILE* tile = (RFX_TILE*)obj;
if (tile) if (tile)
{ {
tile->x = 0; tile->x = 0;
@ -160,9 +161,10 @@ static void rfx_tile_init(RFX_TILE* tile)
} }
} }
static RFX_TILE* rfx_decoder_tile_new(void) static void* rfx_decoder_tile_new(void* val)
{ {
RFX_TILE* tile = NULL; RFX_TILE* tile = NULL;
WINPR_UNUSED(val);
if (!(tile = (RFX_TILE*) calloc(1, sizeof(RFX_TILE)))) if (!(tile = (RFX_TILE*) calloc(1, sizeof(RFX_TILE))))
return NULL; return NULL;
@ -177,8 +179,10 @@ static RFX_TILE* rfx_decoder_tile_new(void)
return tile; return tile;
} }
static void rfx_decoder_tile_free(RFX_TILE* tile) static void rfx_decoder_tile_free(void* obj)
{ {
RFX_TILE* tile = (RFX_TILE*)obj;
if (tile) if (tile)
{ {
if (tile->allocated) if (tile->allocated)
@ -188,14 +192,15 @@ static void rfx_decoder_tile_free(RFX_TILE* tile)
} }
} }
static RFX_TILE* rfx_encoder_tile_new(void) static void* rfx_encoder_tile_new(void* val)
{ {
return (RFX_TILE*)calloc(1, sizeof(RFX_TILE)); WINPR_UNUSED(val);
return calloc(1, sizeof(RFX_TILE));
} }
static void rfx_encoder_tile_free(RFX_TILE* tile) static void rfx_encoder_tile_free(void* obj)
{ {
free(tile); free(obj);
} }
RFX_CONTEXT* rfx_context_new(BOOL encoder) RFX_CONTEXT* rfx_context_new(BOOL encoder)
@ -231,17 +236,17 @@ RFX_CONTEXT* rfx_context_new(BOOL encoder)
goto error_tilePool; goto error_tilePool;
pool = ObjectPool_Object(priv->TilePool); pool = ObjectPool_Object(priv->TilePool);
pool->fnObjectInit = (OBJECT_INIT_FN) rfx_tile_init; pool->fnObjectInit = rfx_tile_init;
if (context->encoder) if (context->encoder)
{ {
pool->fnObjectNew = (OBJECT_NEW_FN) rfx_encoder_tile_new; pool->fnObjectNew = rfx_encoder_tile_new;
pool->fnObjectFree = (OBJECT_FREE_FN) rfx_encoder_tile_free; pool->fnObjectFree = rfx_encoder_tile_free;
} }
else else
{ {
pool->fnObjectNew = (OBJECT_NEW_FN) rfx_decoder_tile_new; pool->fnObjectNew = rfx_decoder_tile_new;
pool->fnObjectFree = (OBJECT_FREE_FN) rfx_decoder_tile_free; pool->fnObjectFree = rfx_decoder_tile_free;
} }
/* /*

4
winpr/include/winpr/collections.h
View File

@ -35,9 +35,7 @@
extern "C" { extern "C" {
#endif #endif
/* We don't know if the new function will require an argument. typedef void* (*OBJECT_NEW_FN)(void* val);
* Leave the braces empty, C defines that as variable arguments. */
typedef void* (*OBJECT_NEW_FN)();
typedef void (*OBJECT_INIT_FN)(void* obj); typedef void (*OBJECT_INIT_FN)(void* obj);
typedef void (*OBJECT_UNINIT_FN)(void* obj); typedef void (*OBJECT_UNINIT_FN)(void* obj);
typedef void (*OBJECT_FREE_FN)(void* obj); typedef void (*OBJECT_FREE_FN)(void* obj);

2
winpr/libwinpr/utils/collections/ObjectPool.c
View File

@ -51,7 +51,7 @@ void* ObjectPool_Take(wObjectPool* pool)
if (!obj) if (!obj)
{ {
if (pool->object.fnObjectNew) if (pool->object.fnObjectNew)
obj = pool->object.fnObjectNew(); obj = pool->object.fnObjectNew(NULL);
} }
if (pool->object.fnObjectInit) if (pool->object.fnObjectInit)