github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[includes] add missing c++ guards

Browse Source
This commit is contained in:
akallabeth 2023-02-07 16:56:07 +01:00 committed by akallabeth
parent adce7378c3
commit b342194d4b
10 changed files with 308 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/freerdp/channels/echo.h
View File

@ -27,4 +27,11 @@
#define ECHO_DVC_CHANNEL_NAME "ECHO" #define ECHO_DVC_CHANNEL_NAME "ECHO"
#ifdef __cplusplus
extern "C"
{
#endif
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_CHANNEL_ECHO_H */ #endif /* FREERDP_CHANNEL_ECHO_H */

7
include/freerdp/channels/log.h
View File

@ -25,4 +25,11 @@
#define CHANNELS_TAG(tag) FREERDP_TAG("channels.") tag #define CHANNELS_TAG(tag) FREERDP_TAG("channels.") tag
#ifdef __cplusplus
extern "C"
{
#endif
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_UTILS_DEBUG_H */ #endif /* FREERDP_UTILS_DEBUG_H */

8
include/freerdp/channels/rdp2tcp.h
View File

@ -27,4 +27,12 @@
#define RDP2TCP_DVC_CHANNEL_NAME "rdp2tcp" #define RDP2TCP_DVC_CHANNEL_NAME "rdp2tcp"
#ifdef __cplusplus
extern "C"
{
#endif
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_CHANNEL_RDP2TCP_H */ #endif /* FREERDP_CHANNEL_RDP2TCP_H */

8
include/freerdp/channels/rdpecam.h
View File

@ -27,6 +27,11 @@
#define RDPECAM_DVC_CHANNEL_NAME "rdpecam" #define RDPECAM_DVC_CHANNEL_NAME "rdpecam"
#define RDPECAM_CONTROL_DVC_CHANNEL_NAME "RDCamera_Device_Enumerator" #define RDPECAM_CONTROL_DVC_CHANNEL_NAME "RDCamera_Device_Enumerator"
#ifdef __cplusplus
extern "C"
{
#endif
typedef enum typedef enum
{ {
CAM_MSG_ID_SuccessResponse = 0x01, CAM_MSG_ID_SuccessResponse = 0x01,
@ -333,4 +338,7 @@ typedef struct
CAM_PROPERTY_VALUE PropertyValue; CAM_PROPERTY_VALUE PropertyValue;
} CAM_SET_PROPERTY_VALUE_REQUEST; } CAM_SET_PROPERTY_VALUE_REQUEST;
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_CHANNEL_RDPECAM_H */ #endif /* FREERDP_CHANNEL_RDPECAM_H */

7
include/freerdp/channels/rdpgfx.h
View File

@ -26,6 +26,10 @@
#define RDPGFX_DVC_CHANNEL_NAME "Microsoft::Windows::RDS::Graphics" #define RDPGFX_DVC_CHANNEL_NAME "Microsoft::Windows::RDS::Graphics"
#ifdef __cplusplus
extern "C"
{
#endif
/** /**
* Common Data Types * Common Data Types
*/ */
@ -398,4 +402,7 @@ typedef struct
UINT16 timeDiffEDR; UINT16 timeDiffEDR;
} RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU; } RDPGFX_QOE_FRAME_ACKNOWLEDGE_PDU;
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_CHANNEL_RDPGFX_H */ #endif /* FREERDP_CHANNEL_RDPGFX_H */

9
include/freerdp/gdi/video.h
View File

@ -24,6 +24,11 @@
#include <freerdp/client/geometry.h> #include <freerdp/client/geometry.h>
#include <freerdp/client/video.h> #include <freerdp/client/video.h>
#ifdef __cplusplus
extern "C"
{
#endif
typedef struct s_gdiVideoContext gdiVideoContext; typedef struct s_gdiVideoContext gdiVideoContext;
FREERDP_API void gdi_video_geometry_init(rdpGdi* gdi, GeometryClientContext* geom); FREERDP_API void gdi_video_geometry_init(rdpGdi* gdi, GeometryClientContext* geom);
@ -38,4 +43,8 @@ FREERDP_API void gdi_video_data_uninit(rdpGdi* gdi, VideoClientContext* context)
FREERDP_API gdiVideoContext* gdi_video_new(rdpGdi* gdi); FREERDP_API gdiVideoContext* gdi_video_new(rdpGdi* gdi);
FREERDP_API void gdi_video_free(gdiVideoContext* context); FREERDP_API void gdi_video_free(gdiVideoContext* context);
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_GDI_VIDEO_H_ */ #endif /* FREERDP_GDI_VIDEO_H_ */

7
include/freerdp/utils/smartcard_call.h
View File

@ -33,6 +33,10 @@
typedef struct s_scard_call_context scard_call_context; typedef struct s_scard_call_context scard_call_context;
#ifdef __cplusplus
extern "C"
{
#endif
FREERDP_API scard_call_context* smartcard_call_context_new(const rdpSettings* settings); FREERDP_API scard_call_context* smartcard_call_context_new(const rdpSettings* settings);
FREERDP_API void smartcard_call_context_free(scard_call_context* ctx); FREERDP_API void smartcard_call_context_free(scard_call_context* ctx);
FREERDP_API BOOL smartcard_call_context_signal_stop(scard_call_context* ctx, BOOL reset); FREERDP_API BOOL smartcard_call_context_signal_stop(scard_call_context* ctx, BOOL reset);
@ -51,4 +55,7 @@ FREERDP_API LONG smartcard_irp_device_control_call(scard_call_context* context,
UINT32* pIoStatus, UINT32* pIoStatus,
SMARTCARD_OPERATION* operation); SMARTCARD_OPERATION* operation);
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_CHANNEL_SMARTCARD_CALL_H */ #endif /* FREERDP_CHANNEL_SMARTCARD_CALL_H */

10
include/freerdp/utils/smartcard_operations.h
View File

@ -30,6 +30,10 @@
#include <freerdp/api.h> #include <freerdp/api.h>
#include <freerdp/channels/scard.h> #include <freerdp/channels/scard.h>
#ifdef __cplusplus
extern "C"
{
#endif
typedef struct typedef struct
{ {
union union
@ -81,8 +85,12 @@ typedef struct
const char* ioControlCodeName; const char* ioControlCodeName;
} SMARTCARD_OPERATION; } SMARTCARD_OPERATION;
FREERDP_API LONG smartcard_irp_device_control_decode(wStream* s, UINT32 CompletionId, UINT32 FileId, FREERDP_API LONG smartcard_irp_device_control_decode(wStream* s, UINT32 CompletionId,
UINT32 FileId,
SMARTCARD_OPERATION* operation); SMARTCARD_OPERATION* operation);
FREERDP_API void smartcard_operation_free(SMARTCARD_OPERATION* op, BOOL allocated); FREERDP_API void smartcard_operation_free(SMARTCARD_OPERATION* op, BOOL allocated);
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_CHANNEL_SMARTCARD_CLIENT_OPERATIONS_H */ #endif /* FREERDP_CHANNEL_SMARTCARD_CLIENT_OPERATIONS_H */

44
include/freerdp/utils/smartcard_pack.h
View File

@ -34,6 +34,11 @@
#define SMARTCARD_COMMON_TYPE_HEADER_LENGTH 8 #define SMARTCARD_COMMON_TYPE_HEADER_LENGTH 8
#define SMARTCARD_PRIVATE_TYPE_HEADER_LENGTH 8 #define SMARTCARD_PRIVATE_TYPE_HEADER_LENGTH 8
#ifdef __cplusplus
extern "C"
{
#endif
FREERDP_API LONG smartcard_pack_write_size_align(wStream* s, size_t size, UINT32 alignment); FREERDP_API LONG smartcard_pack_write_size_align(wStream* s, size_t size, UINT32 alignment);
FREERDP_API LONG smartcard_unpack_read_size_align(wStream* s, size_t size, UINT32 alignment); FREERDP_API LONG smartcard_unpack_read_size_align(wStream* s, size_t size, UINT32 alignment);
@ -51,16 +56,19 @@ FREERDP_API void smartcard_pack_common_type_header(wStream* s);
FREERDP_API LONG smartcard_unpack_private_type_header(wStream* s); FREERDP_API LONG smartcard_unpack_private_type_header(wStream* s);
FREERDP_API void smartcard_pack_private_type_header(wStream* s, UINT32 objectBufferLength); FREERDP_API void smartcard_pack_private_type_header(wStream* s, UINT32 objectBufferLength);
FREERDP_API LONG smartcard_unpack_establish_context_call(wStream* s, EstablishContext_Call* call); FREERDP_API LONG smartcard_unpack_establish_context_call(wStream* s,
EstablishContext_Call* call);
FREERDP_API LONG smartcard_pack_establish_context_return(wStream* s, FREERDP_API LONG smartcard_pack_establish_context_return(wStream* s,
const EstablishContext_Return* ret); const EstablishContext_Return* ret);
FREERDP_API LONG smartcard_unpack_context_call(wStream* s, Context_Call* call, const char* name); FREERDP_API LONG smartcard_unpack_context_call(wStream* s, Context_Call* call,
const char* name);
FREERDP_API void smartcard_trace_long_return(const Long_Return* ret, const char* name); FREERDP_API void smartcard_trace_long_return(const Long_Return* ret, const char* name);
FREERDP_API LONG smartcard_unpack_list_reader_groups_call(wStream* s, ListReaderGroups_Call* call, FREERDP_API LONG smartcard_unpack_list_reader_groups_call(wStream* s,
ListReaderGroups_Call* call,
BOOL unicode); BOOL unicode);
FREERDP_API LONG smartcard_pack_list_reader_groups_return(wStream* s, FREERDP_API LONG smartcard_pack_list_reader_groups_return(wStream* s,
@ -73,11 +81,11 @@ FREERDP_API LONG smartcard_unpack_list_readers_call(wStream* s, ListReaders_Call
FREERDP_API LONG smartcard_pack_list_readers_return(wStream* s, const ListReaders_Return* ret, FREERDP_API LONG smartcard_pack_list_readers_return(wStream* s, const ListReaders_Return* ret,
BOOL unicode); BOOL unicode);
FREERDP_API LONG smartcard_unpack_context_and_two_strings_a_call(wStream* s, FREERDP_API LONG
ContextAndTwoStringA_Call* call); smartcard_unpack_context_and_two_strings_a_call(wStream* s, ContextAndTwoStringA_Call* call);
FREERDP_API LONG smartcard_unpack_context_and_two_strings_w_call(wStream* s, FREERDP_API LONG
ContextAndTwoStringW_Call* call); smartcard_unpack_context_and_two_strings_w_call(wStream* s, ContextAndTwoStringW_Call* call);
FREERDP_API LONG smartcard_unpack_context_and_string_a_call(wStream* s, FREERDP_API LONG smartcard_unpack_context_and_string_a_call(wStream* s,
ContextAndStringA_Call* call); ContextAndStringA_Call* call);
@ -107,9 +115,11 @@ FREERDP_API LONG smartcard_unpack_hcard_and_disposition_call(wStream* s,
HCardAndDisposition_Call* call, HCardAndDisposition_Call* call,
const char* name); const char* name);
FREERDP_API LONG smartcard_unpack_get_status_change_a_call(wStream* s, GetStatusChangeA_Call* call); FREERDP_API LONG smartcard_unpack_get_status_change_a_call(wStream* s,
GetStatusChangeA_Call* call);
FREERDP_API LONG smartcard_unpack_get_status_change_w_call(wStream* s, GetStatusChangeW_Call* call); FREERDP_API LONG smartcard_unpack_get_status_change_w_call(wStream* s,
GetStatusChangeW_Call* call);
FREERDP_API LONG smartcard_pack_get_status_change_return(wStream* s, FREERDP_API LONG smartcard_pack_get_status_change_return(wStream* s,
const GetStatusChange_Return* ret, const GetStatusChange_Return* ret,
@ -120,7 +130,8 @@ FREERDP_API LONG smartcard_pack_state_return(wStream* s, const State_Return* ret
FREERDP_API LONG smartcard_unpack_status_call(wStream* s, Status_Call* call, BOOL unicode); FREERDP_API LONG smartcard_unpack_status_call(wStream* s, Status_Call* call, BOOL unicode);
FREERDP_API LONG smartcard_pack_status_return(wStream* s, const Status_Return* ret, BOOL unicode); FREERDP_API LONG smartcard_pack_status_return(wStream* s, const Status_Return* ret,
BOOL unicode);
FREERDP_API LONG smartcard_unpack_get_attrib_call(wStream* s, GetAttrib_Call* call); FREERDP_API LONG smartcard_unpack_get_attrib_call(wStream* s, GetAttrib_Call* call);
@ -153,16 +164,23 @@ FREERDP_API LONG smartcard_unpack_write_cache_a_call(wStream* s, WriteCacheA_Cal
FREERDP_API LONG smartcard_unpack_write_cache_w_call(wStream* s, WriteCacheW_Call* call); FREERDP_API LONG smartcard_unpack_write_cache_w_call(wStream* s, WriteCacheW_Call* call);
FREERDP_API LONG smartcard_unpack_get_transmit_count_call(wStream* s, GetTransmitCount_Call* call); FREERDP_API LONG smartcard_unpack_get_transmit_count_call(wStream* s,
GetTransmitCount_Call* call);
FREERDP_API LONG smartcard_pack_get_transmit_count_return(wStream* s, FREERDP_API LONG smartcard_pack_get_transmit_count_return(wStream* s,
const GetTransmitCount_Return* call); const GetTransmitCount_Return* call);
FREERDP_API LONG smartcard_unpack_get_reader_icon_call(wStream* s, GetReaderIcon_Call* call); FREERDP_API LONG smartcard_unpack_get_reader_icon_call(wStream* s, GetReaderIcon_Call* call);
FREERDP_API LONG smartcard_pack_get_reader_icon_return(wStream* s, const GetReaderIcon_Return* ret); FREERDP_API LONG smartcard_pack_get_reader_icon_return(wStream* s,
const GetReaderIcon_Return* ret);
FREERDP_API LONG smartcard_unpack_get_device_type_id_call(wStream* s, GetDeviceTypeId_Call* call); FREERDP_API LONG smartcard_unpack_get_device_type_id_call(wStream* s,
GetDeviceTypeId_Call* call);
FREERDP_API LONG smartcard_pack_device_type_id_return(wStream* s, FREERDP_API LONG smartcard_pack_device_type_id_return(wStream* s,
const GetDeviceTypeId_Return* ret); const GetDeviceTypeId_Return* ret);
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_CHANNEL_SMARTCARD_CLIENT_PACK_H */ #endif /* FREERDP_CHANNEL_SMARTCARD_CLIENT_PACK_H */

13
include/freerdp/utils/smartcardlogon.h
View File

@ -23,6 +23,11 @@
#include <freerdp/settings.h> #include <freerdp/settings.h>
#include <freerdp/crypto/certificate.h> #include <freerdp/crypto/certificate.h>
#ifdef __cplusplus
extern "C"
{
#endif
typedef struct SmartcardKeyInfo_st SmartcardKeyInfo; typedef struct SmartcardKeyInfo_st SmartcardKeyInfo;
typedef struct SmartcardCertInfo_st typedef struct SmartcardCertInfo_st
@ -43,11 +48,15 @@ typedef struct SmartcardCertInfo_st
SmartcardKeyInfo* key_info; SmartcardKeyInfo* key_info;
} SmartcardCertInfo; } SmartcardCertInfo;
FREERDP_API BOOL smartcard_enumerateCerts(const rdpSettings* settings, SmartcardCertInfo*** scCerts, FREERDP_API BOOL smartcard_enumerateCerts(const rdpSettings* settings,
size_t* retCount, BOOL gateway); SmartcardCertInfo*** scCerts, size_t* retCount,
BOOL gateway);
FREERDP_API BOOL smartcard_getCert(const rdpContext* context, SmartcardCertInfo** cert, FREERDP_API BOOL smartcard_getCert(const rdpContext* context, SmartcardCertInfo** cert,
BOOL gateway); BOOL gateway);
FREERDP_API void smartcardCertInfo_Free(SmartcardCertInfo* pscCert); FREERDP_API void smartcardCertInfo_Free(SmartcardCertInfo* pscCert);
FREERDP_API void smartcardCertList_Free(SmartcardCertInfo** pscCert, size_t count); FREERDP_API void smartcardCertList_Free(SmartcardCertInfo** pscCert, size_t count);
#ifdef __cplusplus
}
#endif
#endif /* LIBFREERDP_CORE_SMARTCARDLOGON_H */ #endif /* LIBFREERDP_CORE_SMARTCARDLOGON_H */