From f2e90eca34e929e7f975e8573fb0d417f7536694 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 16 Sep 2024 14:11:39 +0200 Subject: [PATCH] [windows,32bit] fix VCAPITYPE consistency Fixes #10581 --- channels/printer/client/printer_main.c | 2 +- channels/rdpecam/client/camera.h | 2 +- channels/tsmf/client/tsmf_audio.h | 2 +- channels/tsmf/client/tsmf_decoder.h | 2 +- channels/urbdrc/client/urbdrc_main.h | 3 ++- include/freerdp/channels/rdpdr.h | 2 +- include/freerdp/client/audin.h | 3 ++- include/freerdp/client/rdpsnd.h | 3 ++- include/freerdp/dvc.h | 2 +- libfreerdp/core/client.c | 4 ++-- 10 files changed, 14 insertions(+), 11 deletions(-) diff --git a/channels/printer/client/printer_main.c b/channels/printer/client/printer_main.c index fda39541f..6f434f5d4 100644 --- a/channels/printer/client/printer_main.c +++ b/channels/printer/client/printer_main.c @@ -1048,7 +1048,7 @@ error_out: static rdpPrinterDriver* printer_load_backend(const char* backend) { - typedef UINT (*backend_load_t)(rdpPrinterDriver**); + typedef UINT(VCAPITYPE * backend_load_t)(rdpPrinterDriver**); PVIRTUALCHANNELENTRY entry = freerdp_load_channel_addin_entry("printer", backend, NULL, 0); backend_load_t func = WINPR_FUNC_PTR_CAST(entry, backend_load_t); if (!func) diff --git a/channels/rdpecam/client/camera.h b/channels/rdpecam/client/camera.h index 1b671d993..76bceb767 100644 --- a/channels/rdpecam/client/camera.h +++ b/channels/rdpecam/client/camera.h @@ -160,7 +160,7 @@ typedef struct typedef FREERDP_CAMERA_HAL_ENTRY_POINTS* PFREERDP_CAMERA_HAL_ENTRY_POINTS; /* entry point called by addin manager */ -typedef UINT (*PFREERDP_CAMERA_HAL_ENTRY)(PFREERDP_CAMERA_HAL_ENTRY_POINTS pEntryPoints); +typedef UINT(VCAPITYPE* PFREERDP_CAMERA_HAL_ENTRY)(PFREERDP_CAMERA_HAL_ENTRY_POINTS pEntryPoints); /* common functions */ UINT ecam_channel_send_generic_msg(CameraPlugin* ecam, GENERIC_CHANNEL_CALLBACK* hchannel, diff --git a/channels/tsmf/client/tsmf_audio.h b/channels/tsmf/client/tsmf_audio.h index 2ad462b88..a3a5be0a2 100644 --- a/channels/tsmf/client/tsmf_audio.h +++ b/channels/tsmf/client/tsmf_audio.h @@ -44,7 +44,7 @@ struct s_ITSMFAudioDevice }; #define TSMF_AUDIO_DEVICE_EXPORT_FUNC_NAME "TSMFAudioDeviceEntry" -typedef UINT (*TSMF_AUDIO_DEVICE_ENTRY)(ITSMFAudioDevice** dev); +typedef UINT(VCAPITYPE* TSMF_AUDIO_DEVICE_ENTRY)(ITSMFAudioDevice** dev); ITSMFAudioDevice* tsmf_load_audio_device(const char* name, const char* device); diff --git a/channels/tsmf/client/tsmf_decoder.h b/channels/tsmf/client/tsmf_decoder.h index 93d2c7d34..aa4778078 100644 --- a/channels/tsmf/client/tsmf_decoder.h +++ b/channels/tsmf/client/tsmf_decoder.h @@ -70,7 +70,7 @@ struct s_ITSMFDecoder }; #define TSMF_DECODER_EXPORT_FUNC_NAME "TSMFDecoderEntry" -typedef UINT (*TSMF_DECODER_ENTRY)(ITSMFDecoder** decoder); +typedef UINT(VCAPITYPE* TSMF_DECODER_ENTRY)(ITSMFDecoder** decoder); ITSMFDecoder* tsmf_load_decoder(const char* name, TS_AM_MEDIA_TYPE* media_type); BOOL tsmf_check_decoder_available(const char* name); diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h index 210e29c21..caf40edad 100644 --- a/channels/urbdrc/client/urbdrc_main.h +++ b/channels/urbdrc/client/urbdrc_main.h @@ -75,7 +75,8 @@ typedef struct } FREERDP_URBDRC_SERVICE_ENTRY_POINTS; typedef FREERDP_URBDRC_SERVICE_ENTRY_POINTS* PFREERDP_URBDRC_SERVICE_ENTRY_POINTS; -typedef int (*PFREERDP_URBDRC_DEVICE_ENTRY)(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints); +typedef UINT(VCAPITYPE* PFREERDP_URBDRC_DEVICE_ENTRY)( + PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints); typedef struct { diff --git a/include/freerdp/channels/rdpdr.h b/include/freerdp/channels/rdpdr.h index f97aea6d8..d50f088d1 100644 --- a/include/freerdp/channels/rdpdr.h +++ b/include/freerdp/channels/rdpdr.h @@ -387,7 +387,7 @@ typedef struct } DEVICE_SERVICE_ENTRY_POINTS; typedef DEVICE_SERVICE_ENTRY_POINTS* PDEVICE_SERVICE_ENTRY_POINTS; -typedef UINT (*PDEVICE_SERVICE_ENTRY)(PDEVICE_SERVICE_ENTRY_POINTS); +typedef UINT(VCAPITYPE* PDEVICE_SERVICE_ENTRY)(PDEVICE_SERVICE_ENTRY_POINTS); #ifdef __cplusplus } diff --git a/include/freerdp/client/audin.h b/include/freerdp/client/audin.h index 604b60e0e..21b6c09f1 100644 --- a/include/freerdp/client/audin.h +++ b/include/freerdp/client/audin.h @@ -64,7 +64,8 @@ typedef struct } FREERDP_AUDIN_DEVICE_ENTRY_POINTS; typedef FREERDP_AUDIN_DEVICE_ENTRY_POINTS* PFREERDP_AUDIN_DEVICE_ENTRY_POINTS; -typedef UINT (*PFREERDP_AUDIN_DEVICE_ENTRY)(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints); +typedef UINT(VCAPITYPE* PFREERDP_AUDIN_DEVICE_ENTRY)( + PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints); #ifdef __cplusplus } diff --git a/include/freerdp/client/rdpsnd.h b/include/freerdp/client/rdpsnd.h index 7a77a2c31..437f256b7 100644 --- a/include/freerdp/client/rdpsnd.h +++ b/include/freerdp/client/rdpsnd.h @@ -80,7 +80,8 @@ typedef struct } FREERDP_RDPSND_DEVICE_ENTRY_POINTS; typedef FREERDP_RDPSND_DEVICE_ENTRY_POINTS* PFREERDP_RDPSND_DEVICE_ENTRY_POINTS; -typedef UINT (*PFREERDP_RDPSND_DEVICE_ENTRY)(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints); +typedef UINT(VCAPITYPE* PFREERDP_RDPSND_DEVICE_ENTRY)( + PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints); FREERDP_API rdpContext* freerdp_rdpsnd_get_context(rdpsndPlugin* plugin); diff --git a/include/freerdp/dvc.h b/include/freerdp/dvc.h index 427d08668..c43a641ff 100644 --- a/include/freerdp/dvc.h +++ b/include/freerdp/dvc.h @@ -167,7 +167,7 @@ extern "C" rdpContext* (*GetRdpContext)(IDRDYNVC_ENTRY_POINTS* pEntryPoints); }; - typedef UINT (*PDVC_PLUGIN_ENTRY)(IDRDYNVC_ENTRY_POINTS*); + typedef UINT(VCAPITYPE* PDVC_PLUGIN_ENTRY)(IDRDYNVC_ENTRY_POINTS*); void* get_callback_by_name(const char* name, void** context); void add_callback_by_name(const char* name, void* fkt, void* context); diff --git a/libfreerdp/core/client.c b/libfreerdp/core/client.c index d3b1f4ab5..47f91b7a7 100644 --- a/libfreerdp/core/client.c +++ b/libfreerdp/core/client.c @@ -1391,8 +1391,8 @@ int freerdp_channels_client_load_ex(rdpChannels* channels, rdpSettings* settings int freerdp_channels_load_plugin(rdpChannels* channels, rdpSettings* settings, const char* name, void* data) { - PVIRTUALCHANNELENTRY entry = NULL; - entry = freerdp_load_channel_addin_entry(name, NULL, NULL, FREERDP_ADDIN_CHANNEL_STATIC); + PVIRTUALCHANNELENTRY entry = + freerdp_load_channel_addin_entry(name, NULL, NULL, FREERDP_ADDIN_CHANNEL_STATIC); if (!entry) return 1;