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

[windows,32bit] fix VCAPITYPE consistency

Browse Source 
Fixes #10581
This commit is contained in:
akallabeth 2024-09-16 14:11:39 +02:00
parent 073f1ee642
commit f2e90eca34
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
10 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/printer/client/printer_main.c
View File

@ -1048,7 +1048,7 @@ error_out:
static rdpPrinterDriver* printer_load_backend(const char* backend) 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); PVIRTUALCHANNELENTRY entry = freerdp_load_channel_addin_entry("printer", backend, NULL, 0);
backend_load_t func = WINPR_FUNC_PTR_CAST(entry, backend_load_t); backend_load_t func = WINPR_FUNC_PTR_CAST(entry, backend_load_t);
if (!func) if (!func)

2
channels/rdpecam/client/camera.h
View File

@ -160,7 +160,7 @@ typedef struct
typedef FREERDP_CAMERA_HAL_ENTRY_POINTS* PFREERDP_CAMERA_HAL_ENTRY_POINTS; typedef FREERDP_CAMERA_HAL_ENTRY_POINTS* PFREERDP_CAMERA_HAL_ENTRY_POINTS;
/* entry point called by addin manager */ /* 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 */ /* common functions */
UINT ecam_channel_send_generic_msg(CameraPlugin* ecam, GENERIC_CHANNEL_CALLBACK* hchannel, UINT ecam_channel_send_generic_msg(CameraPlugin* ecam, GENERIC_CHANNEL_CALLBACK* hchannel,

2
channels/tsmf/client/tsmf_audio.h
View File

@ -44,7 +44,7 @@ struct s_ITSMFAudioDevice
}; };
#define TSMF_AUDIO_DEVICE_EXPORT_FUNC_NAME "TSMFAudioDeviceEntry" #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); ITSMFAudioDevice* tsmf_load_audio_device(const char* name, const char* device);

2
channels/tsmf/client/tsmf_decoder.h
View File

@ -70,7 +70,7 @@ struct s_ITSMFDecoder
}; };
#define TSMF_DECODER_EXPORT_FUNC_NAME "TSMFDecoderEntry" #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); ITSMFDecoder* tsmf_load_decoder(const char* name, TS_AM_MEDIA_TYPE* media_type);
BOOL tsmf_check_decoder_available(const char* name); BOOL tsmf_check_decoder_available(const char* name);

3
channels/urbdrc/client/urbdrc_main.h
View File

@ -75,7 +75,8 @@ typedef struct
} FREERDP_URBDRC_SERVICE_ENTRY_POINTS; } FREERDP_URBDRC_SERVICE_ENTRY_POINTS;
typedef FREERDP_URBDRC_SERVICE_ENTRY_POINTS* PFREERDP_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 typedef struct
{ {

2
include/freerdp/channels/rdpdr.h
View File

@ -387,7 +387,7 @@ typedef struct
} DEVICE_SERVICE_ENTRY_POINTS; } DEVICE_SERVICE_ENTRY_POINTS;
typedef DEVICE_SERVICE_ENTRY_POINTS* PDEVICE_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 #ifdef __cplusplus
} }

3
include/freerdp/client/audin.h
View File

@ -64,7 +64,8 @@ typedef struct
} FREERDP_AUDIN_DEVICE_ENTRY_POINTS; } FREERDP_AUDIN_DEVICE_ENTRY_POINTS;
typedef FREERDP_AUDIN_DEVICE_ENTRY_POINTS* PFREERDP_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 #ifdef __cplusplus
} }

3
include/freerdp/client/rdpsnd.h
View File

@ -80,7 +80,8 @@ typedef struct
} FREERDP_RDPSND_DEVICE_ENTRY_POINTS; } FREERDP_RDPSND_DEVICE_ENTRY_POINTS;
typedef FREERDP_RDPSND_DEVICE_ENTRY_POINTS* PFREERDP_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); FREERDP_API rdpContext* freerdp_rdpsnd_get_context(rdpsndPlugin* plugin);

2
include/freerdp/dvc.h
View File

@ -167,7 +167,7 @@ extern "C"
rdpContext* (*GetRdpContext)(IDRDYNVC_ENTRY_POINTS* pEntryPoints); 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* get_callback_by_name(const char* name, void** context);
void add_callback_by_name(const char* name, void* fkt, void* context); void add_callback_by_name(const char* name, void* fkt, void* context);

4
libfreerdp/core/client.c
View File

@ -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, int freerdp_channels_load_plugin(rdpChannels* channels, rdpSettings* settings, const char* name,
void* data) void* data)
{ {
PVIRTUALCHANNELENTRY entry = NULL; PVIRTUALCHANNELENTRY entry =
entry = freerdp_load_channel_addin_entry(name, NULL, NULL, FREERDP_ADDIN_CHANNEL_STATIC); freerdp_load_channel_addin_entry(name, NULL, NULL, FREERDP_ADDIN_CHANNEL_STATIC);
if (!entry) if (!entry)
return 1; return 1;