[includes] improved c++ guards

include/freerdp/addin.h

@@ -38,6 +38,11 @@
 #define FREERDP_ADDIN_CHANNEL_DEVICE 0x00004000
 #define FREERDP_ADDIN_CHANNEL_ENTRYEX 0x00008000
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		DWORD dwFlags;
@@ -48,12 +53,8 @@ typedef struct
 
 	typedef PVIRTUALCHANNELENTRY (*FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN)(LPCSTR pszName,
 	                                                                    LPCSTR pszSubsystem,
-                                                                    LPCSTR pszType, DWORD dwFlags);
+	                                                                    LPCSTR pszType,
-
+	                                                                    DWORD dwFlags);
-#ifdef __cplusplus
-extern "C"
-{
-#endif
 
 	FREERDP_API LPSTR freerdp_get_library_install_path(void);
 	FREERDP_API LPSTR freerdp_get_dynamic_addin_install_path(void);

include/freerdp/altsec.h

@@ -36,6 +36,11 @@
 #define STREAM_BITMAP_COMPRESSED 0x02
 #define STREAM_BITMAP_V2 0x04
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		UINT32 sIndices;
@@ -154,8 +159,8 @@ typedef struct
 	typedef BOOL (*pCreateOffscreenBitmap)(
 	    rdpContext* context, const CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap);
 	typedef BOOL (*pSwitchSurface)(rdpContext* context, const SWITCH_SURFACE_ORDER* switch_surface);
-typedef BOOL (*pCreateNineGridBitmap)(rdpContext* context,
+	typedef BOOL (*pCreateNineGridBitmap)(
-                                      const CREATE_NINE_GRID_BITMAP_ORDER* create_nine_grid_bitmap);
+	    rdpContext* context, const CREATE_NINE_GRID_BITMAP_ORDER* create_nine_grid_bitmap);
 	typedef BOOL (*pFrameMarker)(rdpContext* context, const FRAME_MARKER_ORDER* frame_marker);
 	typedef BOOL (*pStreamBitmapFirst)(rdpContext* context,
 	                                   const STREAM_BITMAP_FIRST_ORDER* stream_bitmap_first);
@@ -169,10 +174,10 @@ typedef BOOL (*pDrawGdiPlusEnd)(rdpContext* context,
 	                                const DRAW_GDIPLUS_END_ORDER* draw_gdiplus_end);
 	typedef BOOL (*pDrawGdiPlusCacheFirst)(
 	    rdpContext* context, const DRAW_GDIPLUS_CACHE_FIRST_ORDER* draw_gdiplus_cache_first);
-typedef BOOL (*pDrawGdiPlusCacheNext)(rdpContext* context,
+	typedef BOOL (*pDrawGdiPlusCacheNext)(
-                                      const DRAW_GDIPLUS_CACHE_NEXT_ORDER* draw_gdiplus_cache_next);
+	    rdpContext* context, const DRAW_GDIPLUS_CACHE_NEXT_ORDER* draw_gdiplus_cache_next);
-typedef BOOL (*pDrawGdiPlusCacheEnd)(rdpContext* context,
+	typedef BOOL (*pDrawGdiPlusCacheEnd)(
-                                     const DRAW_GDIPLUS_CACHE_END_ORDER* draw_gdiplus_cache_end);
+	    rdpContext* context, const DRAW_GDIPLUS_CACHE_END_ORDER* draw_gdiplus_cache_end);
 	typedef BOOL (*pDrawOrderInfo)(rdpContext* context, UINT8 orderType, const char* orderName);
 
 	struct rdp_altsec_update
@@ -198,4 +203,8 @@ struct rdp_altsec_update
 	};
 	typedef struct rdp_altsec_update rdpAltSecUpdate;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_UPDATE_ALTSEC_H */

include/freerdp/assistance.h

@@ -23,13 +23,13 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 
-typedef struct rdp_assistance_file rdpAssistanceFile;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct rdp_assistance_file rdpAssistanceFile;
+
 	FREERDP_API BYTE* freerdp_assistance_hex_string_to_bin(const void* str, size_t* size);
 	FREERDP_API char* freerdp_assistance_bin_to_hex_string(const void* data, size_t size);
 

include/freerdp/cache/persistent.h

@@ -28,6 +28,11 @@
 #include <winpr/crt.h>
 #include <winpr/stream.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct rdp_persistent_cache rdpPersistentCache;
 
 #pragma pack(push, 1)
@@ -76,11 +81,6 @@ struct _PERSISTENT_CACHE_ENTRY
 };
 typedef struct _PERSISTENT_CACHE_ENTRY PERSISTENT_CACHE_ENTRY;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API int persistent_cache_get_version(rdpPersistentCache* persistent);
 	FREERDP_API int persistent_cache_get_count(rdpPersistentCache* persistent);
 

include/freerdp/channels/ainput.h

@@ -28,6 +28,11 @@
 #define AINPUT_CHANNEL_NAME "ainput"
 #define AINPUT_DVC_CHANNEL_NAME "FreeRDP::Advanced::Input"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef enum
 	{
 		MSG_AINPUT_VERSION = 0x01,
@@ -58,4 +63,8 @@ typedef struct ainput_client_context AInputClientContext;
 #define AINPUT_VERSION_MAJOR 1
 #define AINPUT_VERSION_MINOR 0
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_AINPUT_H */

include/freerdp/channels/disp.h

@@ -50,6 +50,11 @@
 #define DISPLAY_CONTROL_MIN_PHYSICAL_MONITOR_HEIGHT 10
 #define DISPLAY_CONTROL_MAX_PHYSICAL_MONITOR_HEIGHT 10000
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		UINT32 type;
@@ -77,4 +82,8 @@ typedef struct
 		DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors;
 	} DISPLAY_CONTROL_MONITOR_LAYOUT_PDU;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_DISP_H */

include/freerdp/channels/drdynvc.h

@@ -27,6 +27,11 @@
 
 #define DRDYNVC_SVC_CHANNEL_NAME "drdynvc"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/* defined in MS-RDPEDYC 2.2.5.1 Soft-Sync Request PDU (DYNVC_SOFT_SYNC_REQUEST) */
 	enum
 	{
@@ -55,4 +60,8 @@ typedef enum
 		SOFT_SYNC_RESPONSE_PDU = 0x09
 	} DynamicChannelPDU;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_DRDYNVC_H */

include/freerdp/channels/encomsp.h

@@ -23,6 +23,11 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define ENCOMSP_SVC_CHANNEL_NAME "encomsp"
 
 typedef struct
@@ -169,4 +174,8 @@ typedef struct
 	DEFINE_ENCOMSP_HEADER_COMMON();
 } ENCOMSP_GRAPHICS_STREAM_RESUMED_PDU;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_ENCOMSP_H */

include/freerdp/channels/geometry.h

@@ -25,6 +25,11 @@
 
 #define GEOMETRY_DVC_CHANNEL_NAME "Microsoft::Windows::RDS::Geometry::v08.01"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	enum
 	{
 		GEOMETRY_UPDATE = 1,
@@ -56,4 +61,8 @@ typedef struct
 		FREERDP_RGNDATA geometry;
 	} MAPPED_GEOMETRY_PACKET;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_GEOMETRY_H */

include/freerdp/channels/gfxredir.h

@@ -23,6 +23,11 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define GFXREDIR_DVC_CHANNEL_NAME "Microsoft::Windows::RDS::RemoteAppGraphicsRedirection"
 
 /* GFXREDIR_LEGACY_CAPS_PDU.version */
@@ -153,4 +158,8 @@ typedef struct
 	UINT64 presentId;
 } GFXREDIR_PRESENT_BUFFER_ACK_PDU;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_GFXREDIR_H */

include/freerdp/channels/rdpdr.h

@@ -35,6 +35,11 @@
 
 #include <freerdp/freerdp.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define RDPDR_SVC_CHANNEL_NAME "rdpdr"
 
 #define RDPDR_DEVICE_IO_REQUEST_LENGTH 24
@@ -377,4 +382,8 @@ typedef DEVICE_SERVICE_ENTRY_POINTS* PDEVICE_SERVICE_ENTRY_POINTS;
 
 typedef UINT (*PDEVICE_SERVICE_ENTRY)(PDEVICE_SERVICE_ENTRY_POINTS);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_RDPDR_H */

include/freerdp/channels/rdpei.h

@@ -24,6 +24,11 @@
 
 #include <winpr/wtypes.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define RDPINPUT_HEADER_LENGTH 6
 
 #define RDPEI_DVC_CHANNEL_NAME "Microsoft::Windows::RDS::Input"
@@ -153,4 +158,8 @@ typedef struct
 	RDPINPUT_PEN_FRAME* frames;
 } RDPINPUT_PEN_EVENT;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_RDPEI_H */

include/freerdp/channels/remdesk.h

@@ -23,6 +23,11 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define REMDESK_SVC_CHANNEL_NAME "remdesk"
 
 #define REMDESK_ERROR_NOERROR 0
@@ -148,4 +153,8 @@ typedef struct
 	UINT32 EncryptedPasswordLength;
 } REMDESK_CTL_EXPERT_ON_VISTA_PDU;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_REMDESK_H */

include/freerdp/channels/scard.h

@@ -24,6 +24,11 @@
 #include <winpr/crt.h>
 #include <winpr/smartcard.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define RDP_SCARD_CTL_CODE(code) \
 	CTL_CODE(FILE_DEVICE_FILE_SYSTEM, (code), METHOD_BUFFERED, FILE_ANY_ACCESS)
 
@@ -488,4 +493,8 @@ typedef struct
 	/* [string] */ WCHAR* szLookupName;
 } WriteCacheW_Call;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_SCARD_H */

include/freerdp/channels/telemetry.h

@@ -26,6 +26,11 @@
 
 #define TELEMETRY_DVC_CHANNEL_NAME "Microsoft::Windows::RDS::Telemetry"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	struct _TELEMETRY_RDP_TELEMETRY_PDU
 	{
 		UINT32 PromptForCredentialsMillis;
@@ -35,4 +40,8 @@ struct _TELEMETRY_RDP_TELEMETRY_PDU
 	};
 	typedef struct _TELEMETRY_RDP_TELEMETRY_PDU TELEMETRY_RDP_TELEMETRY_PDU;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_TELEMETRY_H */

include/freerdp/channels/video.h

@@ -26,6 +26,11 @@
 #define VIDEO_CONTROL_DVC_CHANNEL_NAME "Microsoft::Windows::RDS::Video::Control::v08.01"
 #define VIDEO_DATA_DVC_CHANNEL_NAME "Microsoft::Windows::RDS::Video::Data::v08.01"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/** @brief TSNM packet type */
 	enum
 	{
@@ -109,4 +114,8 @@ typedef struct
 		TSMM_CLIENT_NOTIFICATION_FRAMERATE_OVERRIDE FramerateOverride;
 	} TSMM_CLIENT_NOTIFICATION;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_VIDEO_H */

include/freerdp/client/ainput.h

@@ -25,6 +25,11 @@
 #include <winpr/assert.h>
 #include <freerdp/channels/ainput.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef UINT (*pcAInputSendInputEvent)(AInputClientContext* context, UINT64 flags, INT32 x,
 	                                       INT32 y);
 
@@ -36,4 +41,8 @@ struct ainput_client_context
 		pcAInputSendInputEvent AInputSendInputEvent;
 	};
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_AINPUT_CLIENT_AINPUT_H */

include/freerdp/client/audin.h

@@ -26,6 +26,11 @@
 #include <freerdp/freerdp.h>
 #include <freerdp/codec/audio.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Subsystem Interface
 	 */
@@ -38,7 +43,8 @@ struct s_IAudinDevice
 	{
 		UINT (*Open)(IAudinDevice* devplugin, AudinReceive receive, void* userData);
 		BOOL (*FormatSupported)(IAudinDevice* devplugin, const AUDIO_FORMAT* format);
-	UINT (*SetFormat)(IAudinDevice* devplugin, const AUDIO_FORMAT* format, UINT32 FramesPerPacket);
+		UINT(*SetFormat)
+		(IAudinDevice* devplugin, const AUDIO_FORMAT* format, UINT32 FramesPerPacket);
 		UINT (*Close)(IAudinDevice* devplugin);
 		UINT (*Free)(IAudinDevice* devplugin);
 	};
@@ -58,4 +64,8 @@ typedef FREERDP_AUDIN_DEVICE_ENTRY_POINTS* PFREERDP_AUDIN_DEVICE_ENTRY_POINTS;
 
 typedef UINT (*PFREERDP_AUDIN_DEVICE_ENTRY)(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_AUDIN_CLIENT_AUDIN_H */

include/freerdp/client/channels.h

@@ -25,6 +25,11 @@
 #include <freerdp/addin.h>
 #include <freerdp/channels/channels.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		IWTSVirtualChannelCallback iface;
@@ -61,11 +66,6 @@ struct GENERIC_DYNVC_PLUGIN
 		DYNVC_PLUGIN_TERMINATE_FN terminatePluginFn;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #if defined(WITH_CHANNELS)
 	FREERDP_API void* freerdp_channels_client_find_static_entry(const char* name,
 	                                                            const char* identifier);

include/freerdp/client/cliprdr.h

@@ -28,6 +28,11 @@
 #include <freerdp/channels/cliprdr.h>
 #include <freerdp/freerdp.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Client Interface
 	 */
@@ -189,4 +194,8 @@ typedef struct
 		char dirname[520];
 	} RDP_CB_TEMPDIR_EVENT;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_CLIPRDR_CLIENT_CLIPRDR_H */

include/freerdp/client/disp.h

@@ -24,6 +24,11 @@
 
 #include <freerdp/channels/disp.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct s_disp_client_context DispClientContext;
 
 	typedef UINT (*pcDispCaps)(DispClientContext* context, UINT32 MaxNumMonitors,
@@ -40,4 +45,8 @@ struct s_disp_client_context
 		pcDispSendMonitorLayout SendMonitorLayout;
 	};
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_DISP_CLIENT_DISP_H */

include/freerdp/client/drdynvc.h

@@ -22,6 +22,11 @@
 #ifndef FREERDP_CHANNEL_DRDYNVC_CLIENT_DRDYNVC_H
 #define FREERDP_CHANNEL_DRDYNVC_CLIENT_DRDYNVC_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Client Interface
 	 */
@@ -50,4 +55,8 @@ struct s_drdynvc_client_context
 		pcDrdynvcOnChannelDetached OnChannelDetached;
 	};
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_DRDYNVC_CLIENT_DRDYNVC_H */

include/freerdp/client/encomsp.h

@@ -24,6 +24,11 @@
 
 #include <freerdp/channels/encomsp.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Client Interface
 	 */
@@ -50,7 +55,8 @@ typedef UINT (*pcEncomspChangeParticipantControlLevel)(
 	    EncomspClientContext* context,
 	    const ENCOMSP_CHANGE_PARTICIPANT_CONTROL_LEVEL_PDU* changeParticipantControlLevel);
 	typedef UINT (*pcEncomspGraphicsStreamPaused)(
-    EncomspClientContext* context, const ENCOMSP_GRAPHICS_STREAM_PAUSED_PDU* graphicsStreamPaused);
+	    EncomspClientContext* context,
+	    const ENCOMSP_GRAPHICS_STREAM_PAUSED_PDU* graphicsStreamPaused);
 	typedef UINT (*pcEncomspGraphicsStreamResumed)(
 	    EncomspClientContext* context,
 	    const ENCOMSP_GRAPHICS_STREAM_RESUMED_PDU* graphicsStreamResumed);
@@ -75,4 +81,8 @@ struct s_encomsp_client_context
 		UINT32 participantId;
 	};
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_ENCOMSP_CLIENT_ENCOMSP_H */

include/freerdp/client/file.h

@@ -26,14 +26,15 @@
 /* Ignore invalid integer values */
 #define RDP_FILE_FLAG_PARSE_INT_RELAXED 1
 
-typedef struct rdp_file rdpFile;
-typedef BOOL (*rdp_file_fkt_parse)(void* context, const char* key, char type, const char* value);
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct rdp_file rdpFile;
+	typedef BOOL (*rdp_file_fkt_parse)(void* context, const char* key, char type,
+	                                   const char* value);
+
 	/* When using freerdp_client_parse_rdp_file_ex or freerdp_client_parse_rdp_file_buffer_ex
 	 * set the context for the callback with this function. */
 	FREERDP_API void freerdp_client_rdp_file_set_callback_context(rdpFile* file, void* context);

include/freerdp/client/geometry.h

@@ -24,13 +24,19 @@
 #include <freerdp/api.h>
 #include <freerdp/channels/geometry.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Client Interface
 	 */
 	typedef struct s_geometry_client_context GeometryClientContext;
 
 	typedef struct S_MAPPED_GEOMETRY MAPPED_GEOMETRY;
-typedef BOOL (*pcMappedGeometryAdded)(GeometryClientContext* context, MAPPED_GEOMETRY* geometry);
+	typedef BOOL (*pcMappedGeometryAdded)(GeometryClientContext* context,
+	                                      MAPPED_GEOMETRY* geometry);
 	typedef BOOL (*pcMappedGeometryUpdate)(MAPPED_GEOMETRY* geometry);
 	typedef BOOL (*pcMappedGeometryClear)(MAPPED_GEOMETRY* geometry);
 
@@ -60,11 +66,6 @@ struct s_geometry_client_context
 		UINT32 remoteVersion;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API void mappedGeometryRef(MAPPED_GEOMETRY* g);
 	FREERDP_API void mappedGeometryUnref(MAPPED_GEOMETRY* g);
 

include/freerdp/client/printer.h

@@ -25,6 +25,11 @@
 
 #include <freerdp/channels/rdpdr.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct rdp_printer_driver rdpPrinterDriver;
 	typedef struct rdp_printer rdpPrinter;
 	typedef struct rdp_print_job rdpPrintJob;
@@ -77,4 +82,8 @@ struct rdp_print_job
 		pcClosePrintJob Close;
 	};
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_PRINTER_CLIENT_PRINTER_H */

include/freerdp/client/rdpei.h

@@ -24,6 +24,11 @@
 
 #include <freerdp/channels/rdpei.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Client Interface
 	 */
@@ -36,8 +41,8 @@ typedef UINT32 (*pcRdpeiGetFeatures)(RdpeiClientContext* context);
 	typedef UINT (*pcRdpeiAddContact)(RdpeiClientContext* context,
 	                                  const RDPINPUT_CONTACT_DATA* contact);
 
-typedef UINT (*pcRdpeiTouchEvent)(RdpeiClientContext* context, INT32 externalId, INT32 x, INT32 y,
+	typedef UINT (*pcRdpeiTouchEvent)(RdpeiClientContext* context, INT32 externalId, INT32 x,
-                                  INT32* contactId);
+	                                  INT32 y, INT32* contactId);
 	typedef UINT (*pcRdpeiTouchRawEvent)(RdpeiClientContext* context, INT32 externalId, INT32 x,
 	                                     INT32 y, INT32* contactId, UINT32 contactFlags,
 	                                     UINT32 fieldFlags, ...);
@@ -48,7 +53,8 @@ typedef UINT (*pcRdpeiAddPen)(RdpeiClientContext* context, INT32 externalId,
 	typedef UINT (*pcRdpeiPen)(RdpeiClientContext* context, INT32 externalId, UINT32 fieldFlags,
 	                           INT32 x, INT32 y, ...);
 	typedef UINT (*pcRdpeiPenRawEvent)(RdpeiClientContext* context, INT32 externalId,
-                                   UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y, ...);
+	                                   UINT32 contactFlags, UINT32 fieldFlags, INT32 x, INT32 y,
+	                                   ...);
 
 	typedef UINT (*pcRdpeiSuspendTouch)(RdpeiClientContext* context);
 	typedef UINT (*pcRdpeiResumeTouch)(RdpeiClientContext* context);
@@ -85,4 +91,8 @@ struct s_rdpei_client_context
 		UINT32 clientFeaturesMask;
 	};
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_RDPEI_CLIENT_RDPEI_H */

include/freerdp/client/rdpgfx.h

@@ -28,6 +28,11 @@
 
 #include <freerdp/cache/persistent.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Client Interface
 	 */
@@ -43,7 +48,8 @@ typedef UINT (*pcRdpgfxEndFrame)(RdpgfxClientContext* context,
 	typedef UINT (*pcRdpgfxSurfaceCommand)(RdpgfxClientContext* context,
 	                                       const RDPGFX_SURFACE_COMMAND* cmd);
 	typedef UINT (*pcRdpgfxDeleteEncodingContext)(
-    RdpgfxClientContext* context, const RDPGFX_DELETE_ENCODING_CONTEXT_PDU* deleteEncodingContext);
+	    RdpgfxClientContext* context,
+	    const RDPGFX_DELETE_ENCODING_CONTEXT_PDU* deleteEncodingContext);
 	typedef UINT (*pcRdpgfxCreateSurface)(RdpgfxClientContext* context,
 	                                      const RDPGFX_CREATE_SURFACE_PDU* createSurface);
 	typedef UINT (*pcRdpgfxDeleteSurface)(RdpgfxClientContext* context,
@@ -66,15 +72,18 @@ typedef UINT (*pcRdpgfxImportCacheEntry)(RdpgfxClientContext* context, UINT16 ca
 	                                         PERSISTENT_CACHE_ENTRY* importCacheEntry);
 	typedef UINT (*pcRdpgfxExportCacheEntry)(RdpgfxClientContext* context, UINT16 cacheSlot,
 	                                         PERSISTENT_CACHE_ENTRY* importCacheEntry);
-typedef UINT (*pcRdpgfxMapSurfaceToOutput)(RdpgfxClientContext* context,
+	typedef UINT (*pcRdpgfxMapSurfaceToOutput)(
-                                           const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput);
+	    RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput);
 	typedef UINT (*pcRdpgfxMapSurfaceToScaledOutput)(
-    RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* surfaceToOutput);
+	    RdpgfxClientContext* context,
-typedef UINT (*pcRdpgfxMapSurfaceToWindow)(RdpgfxClientContext* context,
+	    const RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* surfaceToOutput);
-                                           const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow);
+	typedef UINT (*pcRdpgfxMapSurfaceToWindow)(
+	    RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow);
 	typedef UINT (*pcRdpgfxMapSurfaceToScaledWindow)(
-    RdpgfxClientContext* context, const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* surfaceToWindow);
+	    RdpgfxClientContext* context,
-typedef UINT (*pcRdpgfxSetSurfaceData)(RdpgfxClientContext* context, UINT16 surfaceId, void* pData);
+	    const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* surfaceToWindow);
+	typedef UINT (*pcRdpgfxSetSurfaceData)(RdpgfxClientContext* context, UINT16 surfaceId,
+	                                       void* pData);
 	typedef void* (*pcRdpgfxGetSurfaceData)(RdpgfxClientContext* context, UINT16 surfaceId);
 	typedef UINT (*pcRdpgfxGetSurfaceIds)(RdpgfxClientContext* context, UINT16** ppSurfaceIds,
 	                                      UINT16* count);
@@ -164,11 +173,6 @@ struct s_rdpgfx_client_context
 		PROFILER_DEFINE(SurfaceProfiler)
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API RdpgfxClientContext* rdpgfx_client_context_new(rdpContext* context);
 	FREERDP_API void rdpgfx_client_context_free(RdpgfxClientContext* context);
 

include/freerdp/client/remdesk.h

@@ -22,6 +22,11 @@
 
 #include <freerdp/channels/remdesk.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Client Interface
 	 */
@@ -32,4 +37,8 @@ typedef struct
 		void* custom;
 	} RemdeskClientContext;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_REMDESK_CLIENT_REMDESK_H */

include/freerdp/client/sshagent.h

@@ -26,6 +26,11 @@
 #include <freerdp/channels/cliprdr.h>
 #include <freerdp/freerdp.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		int ProtocolVersion;
@@ -83,4 +88,8 @@ typedef struct
 	 *    INT32  Connection id (0, ..., SSHAGENT_MAX_CONNECTIONS - 1)
 	 */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_CLIENT_SSHAGENT_H */

include/freerdp/client/tsmf.h

@@ -36,6 +36,11 @@
 #define RDP_PIXFMT_I420 0x30323449
 #define RDP_PIXFMT_YV12 0x32315659
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		BYTE* frameData;
@@ -67,4 +72,8 @@ struct s_tsmf_client_context
 		pcTsmfFrameEvent FrameEvent;
 	};
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_CHANNEL_TSMF_CLIENT_TSMF_H */

include/freerdp/codec/audio.h

@@ -25,8 +25,9 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
-#ifdef _WIN32
+#ifdef __cplusplus
-#include <mmreg.h>
+extern "C"
+{
 #endif
 
 struct AUDIO_FORMAT
@@ -191,11 +192,6 @@ typedef struct AUDIO_FORMAT AUDIO_FORMAT;
  * Audio Format Functions
  */
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API UINT32 audio_format_compute_time_length(const AUDIO_FORMAT* format, size_t size);
 
 	FREERDP_API char* audio_format_get_tag_string(UINT16 wFormatTag);

include/freerdp/codec/clear.h

@@ -26,13 +26,13 @@
 #include <freerdp/codec/nsc.h>
 #include <freerdp/codec/color.h>
 
-typedef struct S_CLEAR_CONTEXT CLEAR_CONTEXT;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct S_CLEAR_CONTEXT CLEAR_CONTEXT;
+
 	FREERDP_API int clear_compress(CLEAR_CONTEXT* clear, const BYTE* pSrcData, UINT32 SrcSize,
 	                               BYTE** ppDstData, UINT32* pDstSize);
 

include/freerdp/codec/color.h

@@ -24,6 +24,11 @@
 
 #include <freerdp/api.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define FREERDP_PIXEL_FORMAT_TYPE_A 0
 #define FREERDP_PIXEL_FORMAT_TYPE_ARGB 1
 #define FREERDP_PIXEL_FORMAT_TYPE_ABGR 2
@@ -102,11 +107,6 @@ struct gdi_palette
 };
 typedef struct gdi_palette gdiPalette;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	/* Compare two color formats but ignore differences in alpha channel.
 	 */
 	FREERDP_API DWORD FreeRDPAreColorFormatsEqualNoAlpha(DWORD first, DWORD second);

include/freerdp/codec/dsp.h

@@ -25,13 +25,13 @@
 #include <freerdp/api.h>
 #include <freerdp/codec/audio.h>
 
-typedef struct S_FREERDP_DSP_CONTEXT FREERDP_DSP_CONTEXT;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct S_FREERDP_DSP_CONTEXT FREERDP_DSP_CONTEXT;
+
 	FREERDP_API FREERDP_DSP_CONTEXT* freerdp_dsp_context_new(BOOL encoder);
 	FREERDP_API BOOL freerdp_dsp_supports_format(const AUDIO_FORMAT* format, BOOL encode);
 	FREERDP_API BOOL freerdp_dsp_encode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT* srcFormat,

include/freerdp/codec/h264.h

@@ -26,6 +26,11 @@
 #include <freerdp/types.h>
 #include <freerdp/channels/rdpgfx.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct S_H264_CONTEXT_SUBSYSTEM H264_CONTEXT_SUBSYSTEM;
 	typedef struct S_YUV_CONTEXT YUV_CONTEXT;
 
@@ -70,11 +75,6 @@ typedef struct
 		wLog* log;
 	} H264_CONTEXT;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	static INLINE void free_h264_metablock(RDPGFX_H264_METABLOCK* meta)
 	{
 		RDPGFX_H264_METABLOCK m = { 0 };

include/freerdp/codec/interleaved.h

@@ -26,13 +26,13 @@
 #include <freerdp/codec/color.h>
 #include <freerdp/codec/bitmap.h>
 
-typedef struct S_BITMAP_INTERLEAVED_CONTEXT BITMAP_INTERLEAVED_CONTEXT;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct S_BITMAP_INTERLEAVED_CONTEXT BITMAP_INTERLEAVED_CONTEXT;
+
 	FREERDP_API BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* interleaved,
 	                                        const BYTE* pSrcData, UINT32 SrcSize, UINT32 nSrcWidth,
 	                                        UINT32 nSrcHeight, UINT32 bpp, BYTE* pDstData,

include/freerdp/codec/planar.h

@@ -24,8 +24,6 @@
 
 #include <winpr/crt.h>
 
-typedef struct S_BITMAP_PLANAR_CONTEXT BITMAP_PLANAR_CONTEXT;
-
 #include <freerdp/codec/color.h>
 #include <freerdp/codec/bitmap.h>
 
@@ -40,6 +38,13 @@ typedef struct S_BITMAP_PLANAR_CONTEXT BITMAP_PLANAR_CONTEXT;
 #define PLANAR_CONTROL_BYTE_RUN_LENGTH(_controlByte) (_controlByte & 0x0F)
 #define PLANAR_CONTROL_BYTE_RAW_BYTES(_controlByte) ((_controlByte >> 4) & 0x0F)
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+	typedef struct S_BITMAP_PLANAR_CONTEXT BITMAP_PLANAR_CONTEXT;
+
 	typedef struct
 	{
 		/**
@@ -99,11 +104,6 @@ struct S_BITMAP_PLANAR_CONTEXT
 		BOOL topdown;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API BYTE* freerdp_bitmap_compress_planar(BITMAP_PLANAR_CONTEXT* context,
 	                                                 const BYTE* data, UINT32 format, UINT32 width,
 	                                                 UINT32 height, UINT32 scanline, BYTE* dstData,

include/freerdp/codec/progressive.h

@@ -20,8 +20,6 @@
 #ifndef FREERDP_CODEC_PROGRESSIVE_H
 #define FREERDP_CODEC_PROGRESSIVE_H
 
-typedef struct S_PROGRESSIVE_CONTEXT PROGRESSIVE_CONTEXT;
-
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
@@ -37,6 +35,8 @@ extern "C"
 {
 #endif
 
+	typedef struct S_PROGRESSIVE_CONTEXT PROGRESSIVE_CONTEXT;
+
 	FREERDP_API int progressive_compress(PROGRESSIVE_CONTEXT* progressive, const BYTE* pSrcData,
 	                                     UINT32 SrcSize, UINT32 SrcFormat, UINT32 Width,
 	                                     UINT32 Height, UINT32 ScanLine,

include/freerdp/codec/yuv.h

@@ -20,8 +20,6 @@
 #ifndef FREERDP_CODEC_YUV_H
 #define FREERDP_CODEC_YUV_H
 
-typedef struct S_YUV_CONTEXT YUV_CONTEXT;
-
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/freerdp.h>
@@ -32,6 +30,8 @@ extern "C"
 {
 #endif
 
+	typedef struct S_YUV_CONTEXT YUV_CONTEXT;
+
 	FREERDP_API BOOL yuv420_context_decode(YUV_CONTEXT* context, const BYTE* pYUVData[3],
 	                                       const UINT32 iStride[3], UINT32 yuvHeight,
 	                                       DWORD DstFormat, BYTE* dest, UINT32 nDstStep,

include/freerdp/codec/zgfx.h

@@ -32,13 +32,13 @@
 
 #define ZGFX_SEGMENTED_MAXSIZE 65535
 
-typedef struct S_ZGFX_CONTEXT ZGFX_CONTEXT;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct S_ZGFX_CONTEXT ZGFX_CONTEXT;
+
 	FREERDP_API int zgfx_decompress(ZGFX_CONTEXT* zgfx, const BYTE* pSrcData, UINT32 SrcSize,
 	                                BYTE** ppDstData, UINT32* pDstSize, UINT32 flags);
 	FREERDP_API int zgfx_compress(ZGFX_CONTEXT* zgfx, const BYTE* pSrcData, UINT32 SrcSize,

include/freerdp/codecs.h

@@ -45,6 +45,11 @@
 #define FREERDP_CODEC_AVC444 0x00000100
 #define FREERDP_CODEC_ALL 0xFFFFFFFF
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	struct rdp_codecs
 	{
 		rdpContext* context;
@@ -58,11 +63,6 @@ struct rdp_codecs
 		BITMAP_INTERLEAVED_CONTEXT* interleaved;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API BOOL freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags, UINT32 width,
 	                                               UINT32 height);
 	FREERDP_API BOOL freerdp_client_codecs_reset(rdpCodecs* codecs, UINT32 flags, UINT32 width,

include/freerdp/crypto/certificate_data.h

@@ -22,8 +22,6 @@
 #ifndef FREERDP_CRYPTO_CERTIFICATE_DATA_H
 #define FREERDP_CRYPTO_CERTIFICATE_DATA_H
 
-typedef struct rdp_certificate_data rdpCertificateData;
-
 #include <freerdp/api.h>
 #include <freerdp/settings.h>
 #include <freerdp/crypto/certificate.h>
@@ -32,6 +30,9 @@ typedef struct rdp_certificate_data rdpCertificateData;
 extern "C"
 {
 #endif
+
+	typedef struct rdp_certificate_data rdpCertificateData;
+
 	FREERDP_API char* freerdp_certificate_data_hash(const char* hostname, UINT16 port);
 
 	FREERDP_API rdpCertificateData* freerdp_certificate_data_new(const char* hostname, UINT16 port,

include/freerdp/crypto/certificate_store.h

@@ -22,8 +22,6 @@
 #ifndef FREERDP_CRYPTO_CERTIFICATE_STORE_H
 #define FREERDP_CRYPTO_CERTIFICATE_STORE_H
 
-typedef struct rdp_certificate_store rdpCertificateStore;
-
 #include <freerdp/api.h>
 #include <freerdp/settings.h>
 #include <freerdp/crypto/certificate_data.h>
@@ -33,6 +31,8 @@ extern "C"
 {
 #endif
 
+	typedef struct rdp_certificate_store rdpCertificateStore;
+
 	typedef enum
 	{
 		CERT_STORE_NOT_FOUND = 1,

include/freerdp/dvc.h

@@ -56,6 +56,11 @@
 #include <freerdp/types.h>
 #include <freerdp/addin.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct s_IWTSVirtualChannelManager IWTSVirtualChannelManager;
 	typedef struct s_IWTSListener IWTSListener;
 	typedef struct s_IWTSVirtualChannel IWTSVirtualChannel;
@@ -75,7 +80,8 @@ struct s_IWTSListener
 	struct s_IWTSVirtualChannel
 	{
 		/* Starts a write request on the channel. */
-	UINT (*Write)(IWTSVirtualChannel* pChannel, ULONG cbSize, const BYTE* pBuffer, void* pReserved);
+		UINT(*Write)
+		(IWTSVirtualChannel* pChannel, ULONG cbSize, const BYTE* pBuffer, void* pReserved);
 		/* Closes the channel. */
 		UINT (*Close)(IWTSVirtualChannel* pChannel);
 	};
@@ -162,4 +168,8 @@ void* get_callback_by_name(const char* name, void** context);
 	void add_callback_by_name(const char* name, void* fkt, void* context);
 	void remove_callback_by_name(const char* name, void* context);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_DVC_H */

include/freerdp/emulate/scard/smartcard_emulate.h

@@ -27,6 +27,11 @@
 #include <freerdp/api.h>
 #include <freerdp/settings.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct smartcard_emulation_context SmartcardEmulationContext;
 
 	FREERDP_API SmartcardEmulationContext* Emulate_New(const rdpSettings* settings);
@@ -63,13 +68,15 @@ FREERDP_API LONG WINAPI Emulate_SCardListReadersW(SmartcardEmulationContext* sma
 
 	FREERDP_API LONG WINAPI Emulate_SCardListCardsA(SmartcardEmulationContext* smartcard,
 	                                                SCARDCONTEXT hContext, LPCBYTE pbAtr,
-                                                LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount,
+	                                                LPCGUID rgquidInterfaces,
-                                                CHAR* mszCards, LPDWORD pcchCards);
+	                                                DWORD cguidInterfaceCount, CHAR* mszCards,
+	                                                LPDWORD pcchCards);
 
 	FREERDP_API LONG WINAPI Emulate_SCardListCardsW(SmartcardEmulationContext* smartcard,
 	                                                SCARDCONTEXT hContext, LPCBYTE pbAtr,
-                                                LPCGUID rgquidInterfaces, DWORD cguidInterfaceCount,
+	                                                LPCGUID rgquidInterfaces,
-                                                WCHAR* mszCards, LPDWORD pcchCards);
+	                                                DWORD cguidInterfaceCount, WCHAR* mszCards,
+	                                                LPDWORD pcchCards);
 
 	FREERDP_API LONG WINAPI Emulate_SCardListInterfacesA(SmartcardEmulationContext* smartcard,
 	                                                     SCARDCONTEXT hContext, LPCSTR szCard,
@@ -89,17 +96,13 @@ FREERDP_API LONG WINAPI Emulate_SCardGetProviderIdW(SmartcardEmulationContext* s
 	                                                    SCARDCONTEXT hContext, LPCWSTR szCard,
 	                                                    LPGUID pguidProviderId);
 
-FREERDP_API LONG WINAPI Emulate_SCardGetCardTypeProviderNameA(SmartcardEmulationContext* smartcard,
+	FREERDP_API LONG WINAPI Emulate_SCardGetCardTypeProviderNameA(
-                                                              SCARDCONTEXT hContext,
+	    SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext, LPCSTR szCardName,
-                                                              LPCSTR szCardName, DWORD dwProviderId,
+	    DWORD dwProviderId, CHAR* szProvider, LPDWORD pcchProvider);
-                                                              CHAR* szProvider,
-                                                              LPDWORD pcchProvider);
 
-FREERDP_API LONG WINAPI Emulate_SCardGetCardTypeProviderNameW(SmartcardEmulationContext* smartcard,
+	FREERDP_API LONG WINAPI Emulate_SCardGetCardTypeProviderNameW(
-                                                              SCARDCONTEXT hContext,
+	    SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext, LPCWSTR szCardName,
-                                                              LPCWSTR szCardName,
+	    DWORD dwProviderId, WCHAR* szProvider, LPDWORD pcchProvider);
-                                                              DWORD dwProviderId, WCHAR* szProvider,
-                                                              LPDWORD pcchProvider);
 
 	FREERDP_API LONG WINAPI Emulate_SCardIntroduceReaderGroupA(SmartcardEmulationContext* smartcard,
 	                                                           SCARDCONTEXT hContext,
@@ -110,17 +113,20 @@ FREERDP_API LONG WINAPI Emulate_SCardIntroduceReaderGroupW(SmartcardEmulationCon
 	                                                           LPCWSTR szGroupName);
 
 	FREERDP_API LONG WINAPI Emulate_SCardForgetReaderGroupA(SmartcardEmulationContext* smartcard,
-                                                        SCARDCONTEXT hContext, LPCSTR szGroupName);
+	                                                        SCARDCONTEXT hContext,
+	                                                        LPCSTR szGroupName);
 
 	FREERDP_API LONG WINAPI Emulate_SCardForgetReaderGroupW(SmartcardEmulationContext* smartcard,
-                                                        SCARDCONTEXT hContext, LPCWSTR szGroupName);
+	                                                        SCARDCONTEXT hContext,
+	                                                        LPCWSTR szGroupName);
 
 	FREERDP_API LONG WINAPI Emulate_SCardIntroduceReaderA(SmartcardEmulationContext* smartcard,
-                                                      SCARDCONTEXT hContext, LPCSTR szReaderName,
+	                                                      SCARDCONTEXT hContext,
-                                                      LPCSTR szDeviceName);
+	                                                      LPCSTR szReaderName, LPCSTR szDeviceName);
 
 	FREERDP_API LONG WINAPI Emulate_SCardIntroduceReaderW(SmartcardEmulationContext* smartcard,
-                                                      SCARDCONTEXT hContext, LPCWSTR szReaderName,
+	                                                      SCARDCONTEXT hContext,
+	                                                      LPCWSTR szReaderName,
 	                                                      LPCWSTR szDeviceName);
 
 	FREERDP_API LONG WINAPI Emulate_SCardForgetReaderA(SmartcardEmulationContext* smartcard,
@@ -130,47 +136,39 @@ FREERDP_API LONG WINAPI Emulate_SCardForgetReaderW(SmartcardEmulationContext* sm
 	                                                   SCARDCONTEXT hContext, LPCWSTR szReaderName);
 
 	FREERDP_API LONG WINAPI Emulate_SCardAddReaderToGroupA(SmartcardEmulationContext* smartcard,
-                                                       SCARDCONTEXT hContext, LPCSTR szReaderName,
+	                                                       SCARDCONTEXT hContext,
-                                                       LPCSTR szGroupName);
+	                                                       LPCSTR szReaderName, LPCSTR szGroupName);
 
 	FREERDP_API LONG WINAPI Emulate_SCardAddReaderToGroupW(SmartcardEmulationContext* smartcard,
-                                                       SCARDCONTEXT hContext, LPCWSTR szReaderName,
-                                                       LPCWSTR szGroupName);
-
-FREERDP_API LONG WINAPI Emulate_SCardRemoveReaderFromGroupA(SmartcardEmulationContext* smartcard,
-                                                            SCARDCONTEXT hContext,
-                                                            LPCSTR szReaderName,
-                                                            LPCSTR szGroupName);
-
-FREERDP_API LONG WINAPI Emulate_SCardRemoveReaderFromGroupW(SmartcardEmulationContext* smartcard,
 	                                                       SCARDCONTEXT hContext,
 	                                                       LPCWSTR szReaderName,
 	                                                       LPCWSTR szGroupName);
 
-FREERDP_API LONG WINAPI Emulate_SCardIntroduceCardTypeA(SmartcardEmulationContext* smartcard,
+	FREERDP_API LONG WINAPI
-                                                        SCARDCONTEXT hContext, LPCSTR szCardName,
+	Emulate_SCardRemoveReaderFromGroupA(SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext,
-                                                        LPCGUID pguidPrimaryProvider,
+	                                    LPCSTR szReaderName, LPCSTR szGroupName);
-                                                        LPCGUID rgguidInterfaces,
-                                                        DWORD dwInterfaceCount, LPCBYTE pbAtr,
-                                                        LPCBYTE pbAtrMask, DWORD cbAtrLen);
 
-FREERDP_API LONG WINAPI Emulate_SCardIntroduceCardTypeW(SmartcardEmulationContext* smartcard,
+	FREERDP_API LONG WINAPI
-                                                        SCARDCONTEXT hContext, LPCWSTR szCardName,
+	Emulate_SCardRemoveReaderFromGroupW(SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext,
-                                                        LPCGUID pguidPrimaryProvider,
+	                                    LPCWSTR szReaderName, LPCWSTR szGroupName);
-                                                        LPCGUID rgguidInterfaces,
-                                                        DWORD dwInterfaceCount, LPCBYTE pbAtr,
-                                                        LPCBYTE pbAtrMask, DWORD cbAtrLen);
 
-FREERDP_API LONG WINAPI Emulate_SCardSetCardTypeProviderNameA(SmartcardEmulationContext* smartcard,
+	FREERDP_API LONG WINAPI Emulate_SCardIntroduceCardTypeA(
-                                                              SCARDCONTEXT hContext,
+	    SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext, LPCSTR szCardName,
-                                                              LPCSTR szCardName, DWORD dwProviderId,
+	    LPCGUID pguidPrimaryProvider, LPCGUID rgguidInterfaces, DWORD dwInterfaceCount,
-                                                              LPCSTR szProvider);
+	    LPCBYTE pbAtr, LPCBYTE pbAtrMask, DWORD cbAtrLen);
 
-FREERDP_API LONG WINAPI Emulate_SCardSetCardTypeProviderNameW(SmartcardEmulationContext* smartcard,
+	FREERDP_API LONG WINAPI Emulate_SCardIntroduceCardTypeW(
-                                                              SCARDCONTEXT hContext,
+	    SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext, LPCWSTR szCardName,
-                                                              LPCWSTR szCardName,
+	    LPCGUID pguidPrimaryProvider, LPCGUID rgguidInterfaces, DWORD dwInterfaceCount,
-                                                              DWORD dwProviderId,
+	    LPCBYTE pbAtr, LPCBYTE pbAtrMask, DWORD cbAtrLen);
-                                                              LPCWSTR szProvider);
+
+	FREERDP_API LONG WINAPI Emulate_SCardSetCardTypeProviderNameA(
+	    SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext, LPCSTR szCardName,
+	    DWORD dwProviderId, LPCSTR szProvider);
+
+	FREERDP_API LONG WINAPI Emulate_SCardSetCardTypeProviderNameW(
+	    SmartcardEmulationContext* smartcard, SCARDCONTEXT hContext, LPCWSTR szCardName,
+	    DWORD dwProviderId, LPCWSTR szProvider);
 
 	FREERDP_API LONG WINAPI Emulate_SCardForgetCardTypeA(SmartcardEmulationContext* smartcard,
 	                                                     SCARDCONTEXT hContext, LPCSTR szCardName);
@@ -232,7 +230,8 @@ FREERDP_API LONG WINAPI Emulate_SCardConnectW(SmartcardEmulationContext* smartca
 
 	FREERDP_API LONG WINAPI Emulate_SCardReconnect(SmartcardEmulationContext* smartcard,
 	                                               SCARDHANDLE hCard, DWORD dwShareMode,
-                                               DWORD dwPreferredProtocols, DWORD dwInitialization,
+	                                               DWORD dwPreferredProtocols,
+	                                               DWORD dwInitialization,
 	                                               LPDWORD pdwActiveProtocol);
 
 	FREERDP_API LONG WINAPI Emulate_SCardDisconnect(SmartcardEmulationContext* smartcard,
@@ -247,28 +246,32 @@ FREERDP_API LONG WINAPI Emulate_SCardEndTransaction(SmartcardEmulationContext* s
 	FREERDP_API LONG WINAPI Emulate_SCardCancelTransaction(SmartcardEmulationContext* smartcard,
 	                                                       SCARDHANDLE hCard);
 
-FREERDP_API LONG WINAPI Emulate_SCardState(SmartcardEmulationContext* smartcard, SCARDHANDLE hCard,
+	FREERDP_API LONG WINAPI Emulate_SCardState(SmartcardEmulationContext* smartcard,
-                                           LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr,
+	                                           SCARDHANDLE hCard, LPDWORD pdwState,
+	                                           LPDWORD pdwProtocol, LPBYTE pbAtr,
 	                                           LPDWORD pcbAtrLen);
 
 	FREERDP_API LONG WINAPI Emulate_SCardStatusA(SmartcardEmulationContext* smartcard,
 	                                             SCARDHANDLE hCard, LPSTR mszReaderNames,
 	                                             LPDWORD pcchReaderLen, LPDWORD pdwState,
-                                             LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen);
+	                                             LPDWORD pdwProtocol, LPBYTE pbAtr,
+	                                             LPDWORD pcbAtrLen);
 
 	FREERDP_API LONG WINAPI Emulate_SCardStatusW(SmartcardEmulationContext* smartcard,
 	                                             SCARDHANDLE hCard, LPWSTR mszReaderNames,
 	                                             LPDWORD pcchReaderLen, LPDWORD pdwState,
-                                             LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen);
+	                                             LPDWORD pdwProtocol, LPBYTE pbAtr,
+	                                             LPDWORD pcbAtrLen);
 
 	FREERDP_API LONG WINAPI Emulate_SCardTransmit(SmartcardEmulationContext* smartcard,
 	                                              SCARDHANDLE hCard, LPCSCARD_IO_REQUEST pioSendPci,
 	                                              LPCBYTE pbSendBuffer, DWORD cbSendLength,
-                                              LPSCARD_IO_REQUEST pioRecvPci, LPBYTE pbRecvBuffer,
+	                                              LPSCARD_IO_REQUEST pioRecvPci,
-                                              LPDWORD pcbRecvLength);
+	                                              LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength);
 
 	FREERDP_API LONG WINAPI Emulate_SCardGetTransmitCount(SmartcardEmulationContext* smartcard,
-                                                      SCARDHANDLE hCard, LPDWORD pcTransmitCount);
+	                                                      SCARDHANDLE hCard,
+	                                                      LPDWORD pcTransmitCount);
 
 	FREERDP_API LONG WINAPI Emulate_SCardControl(SmartcardEmulationContext* smartcard,
 	                                             SCARDHANDLE hCard, DWORD dwControlCode,
@@ -281,8 +284,8 @@ FREERDP_API LONG WINAPI Emulate_SCardGetAttrib(SmartcardEmulationContext* smartc
 	                                               LPDWORD pcbAttrLen);
 
 	FREERDP_API LONG WINAPI Emulate_SCardSetAttrib(SmartcardEmulationContext* smartcard,
-                                               SCARDHANDLE hCard, DWORD dwAttrId, LPCBYTE pbAttr,
+	                                               SCARDHANDLE hCard, DWORD dwAttrId,
-                                               DWORD cbAttrLen);
+	                                               LPCBYTE pbAttr, DWORD cbAttrLen);
 
 	FREERDP_API LONG WINAPI Emulate_SCardUIDlgSelectCardA(SmartcardEmulationContext* smartcard,
 	                                                      LPOPENCARDNAMEA_EX pDlgStruc);
@@ -327,10 +330,12 @@ FREERDP_API LONG WINAPI Emulate_SCardGetReaderIconW(SmartcardEmulationContext* s
 	                                                    LPBYTE pbIcon, LPDWORD pcbIcon);
 
 	FREERDP_API LONG WINAPI Emulate_SCardGetDeviceTypeIdA(SmartcardEmulationContext* smartcard,
-                                                      SCARDCONTEXT hContext, LPCSTR szReaderName,
+	                                                      SCARDCONTEXT hContext,
+	                                                      LPCSTR szReaderName,
 	                                                      LPDWORD pdwDeviceTypeId);
 	FREERDP_API LONG WINAPI Emulate_SCardGetDeviceTypeIdW(SmartcardEmulationContext* smartcard,
-                                                      SCARDCONTEXT hContext, LPCWSTR szReaderName,
+	                                                      SCARDCONTEXT hContext,
+	                                                      LPCWSTR szReaderName,
 	                                                      LPDWORD pdwDeviceTypeId);
 
 	FREERDP_API LONG WINAPI Emulate_SCardGetReaderDeviceInstanceIdA(
@@ -349,4 +354,8 @@ FREERDP_API LONG WINAPI Emulate_SCardListReadersWithDeviceInstanceIdW(
 	FREERDP_API LONG WINAPI Emulate_SCardAudit(SmartcardEmulationContext* smartcard,
 	                                           SCARDCONTEXT hContext, DWORD dwEvent);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* WINPR_SMARTCARD_EMULATE_PRIVATE_H */

include/freerdp/extension.h

@@ -26,6 +26,11 @@
 
 #define FREERDP_EXT_EXPORT_FUNC_NAME "FreeRDPExtensionEntry"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct rdp_ext_plugin rdpExtPlugin;
 
 	struct rdp_ext_plugin
@@ -55,4 +60,8 @@ typedef FREERDP_EXTENSION_ENTRY_POINTS* PFREERDP_EXTENSION_ENTRY_POINTS;
 
 	typedef int(FREERDP_CC* PFREERDP_EXTENSION_ENTRY)(PFREERDP_EXTENSION_ENTRY_POINTS pEntryPoints);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_EXTENSION_H */

include/freerdp/freerdp.h

@@ -22,24 +22,6 @@
 #ifndef FREERDP_H
 #define FREERDP_H
 
-typedef struct rdp_rdp rdpRdp;
-typedef struct rdp_gdi rdpGdi;
-typedef struct rdp_rail rdpRail;
-typedef struct rdp_cache rdpCache;
-typedef struct rdp_channels rdpChannels;
-typedef struct rdp_graphics rdpGraphics;
-typedef struct rdp_metrics rdpMetrics;
-typedef struct rdp_codecs rdpCodecs;
-typedef struct rdp_transport rdpTransport; /* Opaque */
-
-typedef struct rdp_freerdp freerdp;
-typedef struct rdp_context rdpContext;
-typedef struct rdp_freerdp_peer freerdp_peer;
-
-typedef struct rdp_client_context rdpClientContext;
-typedef struct rdp_client_entry_points_v1 RDP_CLIENT_ENTRY_POINTS_V1;
-typedef RDP_CLIENT_ENTRY_POINTS_V1 RDP_CLIENT_ENTRY_POINTS;
-
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/error.h>
@@ -57,14 +39,32 @@ typedef RDP_CLIENT_ENTRY_POINTS_V1 RDP_CLIENT_ENTRY_POINTS;
 #include <freerdp/autodetect.h>
 #include <freerdp/heartbeat.h>
 
-typedef struct stream_dump_context rdpStreamDumpContext;
-typedef struct SmartcardCertInfo_st SmartcardCertInfo;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct stream_dump_context rdpStreamDumpContext;
+	typedef struct SmartcardCertInfo_st SmartcardCertInfo;
+
+	typedef struct rdp_rdp rdpRdp;
+	typedef struct rdp_gdi rdpGdi;
+	typedef struct rdp_rail rdpRail;
+	typedef struct rdp_cache rdpCache;
+	typedef struct rdp_channels rdpChannels;
+	typedef struct rdp_graphics rdpGraphics;
+	typedef struct rdp_metrics rdpMetrics;
+	typedef struct rdp_codecs rdpCodecs;
+	typedef struct rdp_transport rdpTransport; /* Opaque */
+
+	typedef struct rdp_freerdp freerdp;
+	typedef struct rdp_context rdpContext;
+	typedef struct rdp_freerdp_peer freerdp_peer;
+
+	typedef struct rdp_client_context rdpClientContext;
+	typedef struct rdp_client_entry_points_v1 RDP_CLIENT_ENTRY_POINTS_V1;
+	typedef RDP_CLIENT_ENTRY_POINTS_V1 RDP_CLIENT_ENTRY_POINTS;
+
 #define MCS_BASE_CHANNEL_ID 1001
 #define MCS_GLOBAL_CHANNEL_ID 1003
 

include/freerdp/gdi/gdi.h

@@ -353,6 +353,11 @@
 #define NULLREGION 0x01
 #define SIMPLEREGION 0x02
 #define COMPLEXREGION 0x03
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
 #endif
 
 	typedef struct
@@ -516,11 +521,6 @@ struct rdp_gdi
 		wLog* log;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API DWORD gdi_rop3_code(BYTE code);
 	FREERDP_API const char* gdi_rop3_code_string(BYTE code);
 	FREERDP_API const char* gdi_rop3_string(DWORD rop);

include/freerdp/gdi/gfx.h

@@ -23,6 +23,11 @@
 #include <freerdp/api.h>
 #include <freerdp/gdi/gdi.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	struct gdi_gfx_surface
 	{
 		UINT16 surfaceId;
@@ -58,11 +63,6 @@ struct gdi_gfx_cache_entry
 	};
 	typedef struct gdi_gfx_cache_entry gdiGfxCacheEntry;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API BOOL gdi_graphics_pipeline_init(rdpGdi* gdi, RdpgfxClientContext* gfx);
 	FREERDP_API BOOL gdi_graphics_pipeline_init_ex(rdpGdi* gdi, RdpgfxClientContext* gfx,
 	                                               pcRdpgfxMapWindowForSurface map,

include/freerdp/graphics.h

@@ -22,10 +22,6 @@
 #ifndef FREERDP_GRAPHICS_H
 #define FREERDP_GRAPHICS_H
 
-typedef struct rdp_bitmap rdpBitmap;
-typedef struct rdp_pointer rdpPointer;
-typedef struct rdp_glyph rdpGlyph;
-
 #include <stdlib.h>
 #include <freerdp/api.h>
 #include <freerdp/types.h>
@@ -36,6 +32,10 @@ extern "C"
 {
 #endif
 
+	typedef struct rdp_bitmap rdpBitmap;
+	typedef struct rdp_pointer rdpPointer;
+	typedef struct rdp_glyph rdpGlyph;
+
 	/* Bitmap Class */
 	typedef BOOL (*pBitmap_New)(rdpContext* context, rdpBitmap* bitmap);
 	typedef void (*pBitmap_Free)(rdpContext* context, rdpBitmap* bitmap);

include/freerdp/heartbeat.h

@@ -22,6 +22,11 @@
 
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct rdp_heartbeat rdpHeartbeat;
 
 	typedef BOOL (*pServerHeartbeat)(freerdp* instance, BYTE period, BYTE count1, BYTE count2);
@@ -31,11 +36,6 @@ struct rdp_heartbeat
 		pServerHeartbeat ServerHeartbeat;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API BOOL freerdp_heartbeat_send_heartbeat_pdu(freerdp_peer* peer, BYTE period,
 	                                                      BYTE count1, BYTE count2);
 

include/freerdp/input.h

@@ -20,8 +20,6 @@
 #ifndef FREERDP_INPUT_H
 #define FREERDP_INPUT_H
 
-typedef struct rdp_input rdpInput;
-
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/scancode.h>
@@ -61,6 +59,13 @@ typedef struct rdp_input rdpInput;
 
 #define RDP_CLIENT_INPUT_PDU_HEADER_LENGTH 4
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+	typedef struct rdp_input rdpInput;
+
 	/* defined inside libfreerdp-core */
 	typedef struct rdp_input_proxy rdpInputProxy;
 
@@ -91,11 +96,6 @@ struct rdp_input
 		UINT32 paddingB[32 - 23]; /* 23 */
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API BOOL freerdp_input_send_synchronize_event(rdpInput* input, UINT32 flags);
 	FREERDP_API BOOL freerdp_input_send_keyboard_event(rdpInput* input, UINT16 flags, UINT8 code);
 	FREERDP_API BOOL freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, BOOL repeat,

include/freerdp/listener.h

@@ -20,8 +20,6 @@
 #ifndef FREERDP_LISTENER_H
 #define FREERDP_LISTENER_H
 
-typedef struct rdp_freerdp_listener freerdp_listener;
-
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
@@ -32,6 +30,8 @@ extern "C"
 {
 #endif
 
+	typedef struct rdp_freerdp_listener freerdp_listener;
+
 	typedef BOOL (*psListenerOpen)(freerdp_listener* instance, const char* bind_address,
 	                               UINT16 port);
 	typedef BOOL (*psListenerOpenLocal)(freerdp_listener* instance, const char* path);

include/freerdp/locale/keyboard.h

@@ -26,6 +26,11 @@
 #include <freerdp/types.h>
 #include <freerdp/scancode.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define RDP_KEYBOARD_LAYOUT_TYPE_STANDARD 1
 #define RDP_KEYBOARD_LAYOUT_TYPE_VARIANT 2
 #define RDP_KEYBOARD_LAYOUT_TYPE_IME 4
@@ -219,11 +224,6 @@ typedef struct
 #define KBD_TYPE_NOKIA_9140 0x00000006   /* Nokia 9140 and similar keyboards */
 #define KBD_TYPE_JAPANESE 0x00000007     /* Japanese keyboard */
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API DWORD freerdp_keyboard_init(DWORD keyboardLayoutId);
 	FREERDP_API DWORD freerdp_keyboard_init_ex(DWORD keyboardLayoutId,
 	                                           const char* keyboardRemappingList);

include/freerdp/message.h

@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#ifndef FREERDP_CORE_MESSAGE_H
+#ifndef FREERDP_MESSAGE_H
-#define FREERDP_CORE_MESSAGE_H
+#define FREERDP_MESSAGE_H
 
 #define GetMessageType(_id) (_id & 0xFF)
 #define GetMessageClass(_id) ((_id >> 16) & 0xFF)
@@ -373,4 +373,4 @@
 #define FREERDP_RDPEI_CHANNEL_DISMISS_HOVERING_CONTACT \
 	MakeMessageId(RdpeiChannel, DismissHoveringContact)
 
-#endif /* FREERDP_CORE_MESSAGE_H */
+#endif /* FREERDP_MESSAGE_H */

include/freerdp/metrics.h

@@ -22,6 +22,11 @@
 
 #include <freerdp/api.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	struct rdp_metrics
 	{
 		rdpContext* context;
@@ -31,11 +36,6 @@ struct rdp_metrics
 		double TotalCompressionRatio;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API double metrics_write_bytes(rdpMetrics* metrics, UINT32 UncompressedBytes,
 	                                       UINT32 CompressedBytes);
 

include/freerdp/peer.h

@@ -32,6 +32,11 @@
 #include <winpr/ntlm.h>
 #include <winpr/winsock.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef BOOL (*psPeerContextNew)(freerdp_peer* peer, rdpContext* context);
 	typedef void (*psPeerContextFree)(freerdp_peer* peer, rdpContext* context);
 
@@ -178,11 +183,6 @@ struct rdp_freerdp_peer
 	ALIGN64 psSspiNtlmHashCallback SspiNtlmHashCallback;
 };
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API BOOL freerdp_peer_context_new(freerdp_peer* client);
 	FREERDP_API BOOL freerdp_peer_context_new_ex(freerdp_peer* client, const rdpSettings* settings);
 	FREERDP_API void freerdp_peer_context_free(freerdp_peer* client);

include/freerdp/pointer.h

@@ -32,6 +32,11 @@
 #define SYSPTR_NULL 0x00000000
 #define SYSPTR_DEFAULT 0x00007F00
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		UINT32 xPos;
@@ -83,10 +88,12 @@ typedef struct
 
 	typedef BOOL (*pPointerPosition)(rdpContext* context,
 	                                 const POINTER_POSITION_UPDATE* pointer_position);
-typedef BOOL (*pPointerSystem)(rdpContext* context, const POINTER_SYSTEM_UPDATE* pointer_system);
+	typedef BOOL (*pPointerSystem)(rdpContext* context,
+	                               const POINTER_SYSTEM_UPDATE* pointer_system);
 	typedef BOOL (*pPointerColor)(rdpContext* context, const POINTER_COLOR_UPDATE* pointer_color);
 	typedef BOOL (*pPointerNew)(rdpContext* context, const POINTER_NEW_UPDATE* pointer_new);
-typedef BOOL (*pPointerCached)(rdpContext* context, const POINTER_CACHED_UPDATE* pointer_cached);
+	typedef BOOL (*pPointerCached)(rdpContext* context,
+	                               const POINTER_CACHED_UPDATE* pointer_cached);
 	typedef BOOL (*pPointerLarge)(rdpContext* context, const POINTER_LARGE_UPDATE* pointer_large);
 
 	struct rdp_pointer_update
@@ -104,4 +111,8 @@ struct rdp_pointer_update
 	};
 	typedef struct rdp_pointer_update rdpPointerUpdate;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_UPDATE_POINTER_H */

include/freerdp/primary.h

@@ -22,6 +22,11 @@
 
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		UINT32 cacheIndex;
@@ -469,4 +474,8 @@ struct rdp_primary_update
 };
 typedef struct rdp_primary_update rdpPrimaryUpdate;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_UPDATE_PRIMARY_H */

include/freerdp/primitives.h

@@ -26,6 +26,11 @@
 
 #include <winpr/platform.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef INT32 pstatus_t;   /* match IppStatus. */
 #define PRIMITIVES_SUCCESS (0) /* match ippStsNoErr */
 
@@ -198,11 +203,6 @@ typedef enum
 	PRIMITIVES_AUTODETECT /** detect the best routines */
 } primitive_hints;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API primitives_t* primitives_get(void);
 	FREERDP_API void primitives_set_hints(primitive_hints hints);
 	FREERDP_API primitive_hints primitives_get_hints(void);

include/freerdp/rail.h

@@ -25,6 +25,11 @@
 
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define RAIL_SVC_CHANNEL_NAME "rail"
 
 /* DEPRECATED: RAIL PDU flags use the spec conformant naming with TS_ prefix */
@@ -573,11 +578,6 @@ typedef enum
 	TS_RAIL_ORDER_EXEC_RESULT = 0x0080
 } ORDER_TYPE;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API BOOL rail_read_unicode_string(wStream* s, RAIL_UNICODE_STRING* unicode_string);
 	FREERDP_API BOOL utf8_string_to_rail_string(const char* string,
 	                                            RAIL_UNICODE_STRING* unicode_string);

include/freerdp/secondary.h

@@ -23,6 +23,11 @@
 #include <freerdp/types.h>
 #include <freerdp/primary.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define GLYPH_FRAGMENT_NOP 0x00
 #define GLYPH_FRAGMENT_USE 0xFE
 #define GLYPH_FRAGMENT_ADD 0xFF
@@ -185,4 +190,8 @@ struct rdp_secondary_update
 };
 typedef struct rdp_secondary_update rdpSecondaryUpdate;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_UPDATE_SECONDARY_H */

include/freerdp/server/ainput.h

@@ -24,6 +24,11 @@
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/channels/ainput.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef enum AINPUT_SERVER_OPEN_RESULT
 	{
 		AINPUT_SERVER_OPEN_RESULT_OK = 0,
@@ -107,11 +112,6 @@ struct _ainput_server_context
 		psAInputChannelIdAssigned ChannelIdAssigned;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API ainput_server_context* ainput_server_context_new(HANDLE vcm);
 	FREERDP_API void ainput_server_context_free(ainput_server_context* context);
 

include/freerdp/server/audin.h

@@ -28,6 +28,11 @@
 
 #if !defined(CHANNEL_AUDIN_SERVER)
 #error "This header must not be included if CHANNEL_AUDIN_SERVER is not defined"
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
 #endif
 
 	typedef struct s_audin_server_context audin_server_context;
@@ -112,11 +117,6 @@ struct s_audin_server_context
 		psAudinServerChannelIdAssigned ChannelIdAssigned;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API audin_server_context* audin_server_context_new(HANDLE vcm);
 	FREERDP_API void audin_server_context_free(audin_server_context* context);
 

include/freerdp/server/cliprdr.h

@@ -29,6 +29,11 @@
 #include <freerdp/channels/cliprdr.h>
 #include <freerdp/client/cliprdr.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Server Interface
 	 */
@@ -129,11 +134,6 @@ struct s_cliprdr_server_context
 		BOOL hasHugeFileSupport;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API CliprdrServerContext* cliprdr_server_context_new(HANDLE vcm);
 	FREERDP_API void cliprdr_server_context_free(CliprdrServerContext* context);
 

include/freerdp/server/disp.h

@@ -26,6 +26,11 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct s_disp_server_private DispServerPrivate;
 	typedef struct s_disp_server_context DispServerContext;
 
@@ -62,11 +67,6 @@ struct s_disp_server_context
 		psDispChannelIdAssigned ChannelIdAssigned;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API DispServerContext* disp_server_context_new(HANDLE vcm);
 	FREERDP_API void disp_server_context_free(DispServerContext* context);
 

include/freerdp/server/drdynvc.h

@@ -26,6 +26,11 @@
 #include <freerdp/types.h>
 #include <freerdp/channels/wtsvc.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Server Interface
 	 */
@@ -46,11 +51,6 @@ struct s_drdynvc_server_context
 		DrdynvcServerPrivate* priv;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API DrdynvcServerContext* drdynvc_server_context_new(HANDLE vcm);
 	FREERDP_API void drdynvc_server_context_free(DrdynvcServerContext* context);
 

include/freerdp/server/echo.h

@@ -24,6 +24,11 @@
 
 #include <freerdp/channels/wtsvc.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef enum ECHO_SERVER_OPEN_RESULT
 	{
 		ECHO_SERVER_OPEN_RESULT_OK = 0,
@@ -85,11 +90,6 @@ struct s_echo_server_context
 		psEchoServerChannelIdAssigned ChannelIdAssigned;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API echo_server_context* echo_server_context_new(HANDLE vcm);
 	FREERDP_API void echo_server_context_free(echo_server_context* context);
 

include/freerdp/server/encomsp.h

@@ -28,6 +28,11 @@
 
 #include <freerdp/channels/encomsp.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Server Interface
 	 */
@@ -40,20 +45,20 @@ typedef UINT (*psEncomspStop)(EncomspServerContext* context);
 
 	typedef UINT (*psEncomspFilterUpdated)(EncomspServerContext* context,
 	                                       ENCOMSP_FILTER_UPDATED_PDU* filterUpdated);
-typedef UINT (*psEncomspApplicationCreated)(EncomspServerContext* context,
+	typedef UINT (*psEncomspApplicationCreated)(
-                                            ENCOMSP_APPLICATION_CREATED_PDU* applicationCreated);
+	    EncomspServerContext* context, ENCOMSP_APPLICATION_CREATED_PDU* applicationCreated);
-typedef UINT (*psEncomspApplicationRemoved)(EncomspServerContext* context,
+	typedef UINT (*psEncomspApplicationRemoved)(
-                                            ENCOMSP_APPLICATION_REMOVED_PDU* applicationRemoved);
+	    EncomspServerContext* context, ENCOMSP_APPLICATION_REMOVED_PDU* applicationRemoved);
 	typedef UINT (*psEncomspWindowCreated)(EncomspServerContext* context,
 	                                       ENCOMSP_WINDOW_CREATED_PDU* windowCreated);
 	typedef UINT (*psEncomspWindowRemoved)(EncomspServerContext* context,
 	                                       ENCOMSP_WINDOW_REMOVED_PDU* windowRemoved);
 	typedef UINT (*psEncomspShowWindow)(EncomspServerContext* context,
 	                                    ENCOMSP_SHOW_WINDOW_PDU* showWindow);
-typedef UINT (*psEncomspParticipantCreated)(EncomspServerContext* context,
+	typedef UINT (*psEncomspParticipantCreated)(
-                                            ENCOMSP_PARTICIPANT_CREATED_PDU* participantCreated);
+	    EncomspServerContext* context, ENCOMSP_PARTICIPANT_CREATED_PDU* participantCreated);
-typedef UINT (*psEncomspParticipantRemoved)(EncomspServerContext* context,
+	typedef UINT (*psEncomspParticipantRemoved)(
-                                            ENCOMSP_PARTICIPANT_REMOVED_PDU* participantRemoved);
+	    EncomspServerContext* context, ENCOMSP_PARTICIPANT_REMOVED_PDU* participantRemoved);
 	typedef UINT (*psEncomspChangeParticipantControlLevel)(
 	    EncomspServerContext* context,
 	    ENCOMSP_CHANGE_PARTICIPANT_CONTROL_LEVEL_PDU* changeParticipantControlLevel);
@@ -87,11 +92,6 @@ struct s_encomsp_server_context
 		rdpContext* rdpcontext;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API EncomspServerContext* encomsp_server_context_new(HANDLE vcm);
 	FREERDP_API void encomsp_server_context_free(EncomspServerContext* context);
 

include/freerdp/server/gfxredir.h

@@ -26,13 +26,19 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct s_gfxredir_server_private GfxRedirServerPrivate;
 	typedef struct s_gfxredir_server_context GfxRedirServerContext;
 
 	typedef UINT (*psGfxRedirOpen)(GfxRedirServerContext* context);
 	typedef UINT (*psGfxRedirClose)(GfxRedirServerContext* context);
 
-typedef UINT (*psGfxRedirError)(GfxRedirServerContext* context, const GFXREDIR_ERROR_PDU* error);
+	typedef UINT (*psGfxRedirError)(GfxRedirServerContext* context,
+	                                const GFXREDIR_ERROR_PDU* error);
 
 	typedef UINT (*psGfxRedirGraphicsRedirectionLegacyCaps)(
 	    GfxRedirServerContext* context, const GFXREDIR_LEGACY_CAPS_PDU* graphicsCaps);
@@ -54,8 +60,8 @@ typedef UINT (*psGfxRedirDestroyBuffer)(GfxRedirServerContext* context,
 
 	typedef UINT (*psGfxRedirPresentBuffer)(GfxRedirServerContext* context,
 	                                        const GFXREDIR_PRESENT_BUFFER_PDU* presentBuffer);
-typedef UINT (*psGfxRedirPresentBufferAck)(GfxRedirServerContext* context,
+	typedef UINT (*psGfxRedirPresentBufferAck)(
-                                           const GFXREDIR_PRESENT_BUFFER_ACK_PDU* presentBufferAck);
+	    GfxRedirServerContext* context, const GFXREDIR_PRESENT_BUFFER_ACK_PDU* presentBufferAck);
 
 	struct s_gfxredir_server_context
 	{
@@ -87,11 +93,6 @@ struct s_gfxredir_server_context
 		UINT32 confirmedCapsVersion;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API GfxRedirServerContext* gfxredir_server_context_new(HANDLE vcm);
 	FREERDP_API void gfxredir_server_context_free(GfxRedirServerContext* context);
 

include/freerdp/server/proxy/proxy_config.h

@@ -26,6 +26,11 @@
 #include <freerdp/api.h>
 #include <freerdp/server/proxy/proxy_modules_api.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct proxy_config proxyConfig;
 
 	struct proxy_config
@@ -104,11 +109,6 @@ struct proxy_config
 		size_t PrivateKeyPEMLength;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	/**
 	 * @brief pf_server_config_dump Dumps a default INI configuration file
 	 * @param file The file to write to. Existing files are truncated.

include/freerdp/server/proxy/proxy_server.h

@@ -24,13 +24,13 @@
 #include <freerdp/server/proxy/proxy_config.h>
 #include <freerdp/server/proxy/proxy_modules_api.h>
 
-typedef struct proxy_server proxyServer;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct proxy_server proxyServer;
+
 	/**
 	 * @brief pf_server_new Creates a new proxy server instance
 	 *

include/freerdp/server/proxy/proxy_types.h

@@ -21,6 +21,11 @@
 #ifndef FREERDP_SERVER_PROXY_TYPES_H
 #define FREERDP_SERVER_PROXY_TYPES_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/** @brief how is handled a channel */
 	typedef enum
 	{
@@ -45,4 +50,8 @@ typedef enum
 		PROXY_FETCH_TARGET_USE_CUSTOM_ADDR
 	} ProxyFetchTargetMethod;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_SERVER_PROXY_TYPES_H */

include/freerdp/server/rail.h

@@ -27,6 +27,11 @@
 #include <freerdp/rail.h>
 #include <freerdp/channels/rail.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct s_rail_server_context RailServerContext;
 	typedef struct s_rail_server_private RailServerPrivate;
 
@@ -43,7 +48,8 @@ typedef UINT (*psRailClientSysparam)(RailServerContext* context,
 	                                     const RAIL_SYSPARAM_ORDER* sysparam);
 	typedef UINT (*psRailClientActivate)(RailServerContext* context,
 	                                     const RAIL_ACTIVATE_ORDER* activate);
-typedef UINT (*psRailClientSysmenu)(RailServerContext* context, const RAIL_SYSMENU_ORDER* sysmenu);
+	typedef UINT (*psRailClientSysmenu)(RailServerContext* context,
+	                                    const RAIL_SYSMENU_ORDER* sysmenu);
 	typedef UINT (*psRailClientSyscommand)(RailServerContext* context,
 	                                       const RAIL_SYSCOMMAND_ORDER* syscommand);
 	typedef UINT (*psRailClientNotifyEvent)(RailServerContext* context,
@@ -133,11 +139,6 @@ struct s_rail_server_context
 		rdpContext* rdpcontext;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API RailServerContext* rail_server_context_new(HANDLE vcm);
 	FREERDP_API void rail_server_context_free(RailServerContext* context);
 	FREERDP_API UINT rail_server_handle_messages(RailServerContext* context);

include/freerdp/server/rdpdr.h

@@ -29,6 +29,11 @@
 #include <freerdp/channels/rdpdr.h>
 #include <freerdp/utils/rdpdr_utils.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Server Interface
 	 */
@@ -210,11 +215,6 @@ struct s_rdpdr_server_context
 	rdpContext* rdpcontext;
 };
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API RdpdrServerContext* rdpdr_server_context_new(HANDLE vcm);
 	FREERDP_API void rdpdr_server_context_free(RdpdrServerContext* context);
 

include/freerdp/server/rdpecam-enumerator.h

@@ -23,6 +23,11 @@
 #include <freerdp/channels/rdpecam.h>
 #include <freerdp/channels/wtsvc.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct _cam_dev_enum_server_context CamDevEnumServerContext;
 
 	typedef UINT (*psCamDevEnumServerServerOpen)(CamDevEnumServerContext* context);
@@ -43,7 +48,8 @@ typedef UINT (*psCamDevEnumServerServerSelectVersionResponse)(
 	    CamDevEnumServerContext* context, const CAM_SELECT_VERSION_RESPONSE* selectVersionResponse);
 
 	typedef UINT (*psCamDevEnumServerServerDeviceAddedNotification)(
-    CamDevEnumServerContext* context, const CAM_DEVICE_ADDED_NOTIFICATION* deviceAddedNotification);
+	    CamDevEnumServerContext* context,
+	    const CAM_DEVICE_ADDED_NOTIFICATION* deviceAddedNotification);
 	typedef UINT (*psCamDevEnumServerServerDeviceRemovedNotification)(
 	    CamDevEnumServerContext* context,
 	    const CAM_DEVICE_REMOVED_NOTIFICATION* deviceRemovedNotification);
@@ -119,11 +125,6 @@ struct _cam_dev_enum_server_context
 		rdpContext* rdpcontext;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API CamDevEnumServerContext* cam_dev_enum_server_context_new(HANDLE vcm);
 	FREERDP_API void cam_dev_enum_server_context_free(CamDevEnumServerContext* context);
 

include/freerdp/server/rdpecam.h

@@ -23,6 +23,11 @@
 #include <freerdp/channels/rdpecam.h>
 #include <freerdp/channels/wtsvc.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct camera_device_server_context CameraDeviceServerContext;
 
 	typedef UINT (*psCameraDeviceServerOpen)(CameraDeviceServerContext* context);
@@ -37,13 +42,14 @@ typedef UINT (*psCameraDeviceServerPoll)(CameraDeviceServerContext* context);
 	typedef BOOL (*psCameraDeviceServerChannelHandle)(CameraDeviceServerContext* context,
 	                                                  HANDLE* handle);
 
-typedef UINT (*psCameraDeviceServerSuccessResponse)(CameraDeviceServerContext* context,
+	typedef UINT (*psCameraDeviceServerSuccessResponse)(
-                                                    const CAM_SUCCESS_RESPONSE* successResponse);
+	    CameraDeviceServerContext* context, const CAM_SUCCESS_RESPONSE* successResponse);
 	typedef UINT (*psCameraDeviceServerErrorResponse)(CameraDeviceServerContext* context,
 	                                                  const CAM_ERROR_RESPONSE* errorResponse);
 
 	typedef UINT (*psCameraDeviceServerActivateDeviceRequest)(
-    CameraDeviceServerContext* context, const CAM_ACTIVATE_DEVICE_REQUEST* activateDeviceRequest);
+	    CameraDeviceServerContext* context,
+	    const CAM_ACTIVATE_DEVICE_REQUEST* activateDeviceRequest);
 	typedef UINT (*psCameraDeviceServerDeactivateDeviceRequest)(
 	    CameraDeviceServerContext* context,
 	    const CAM_DEACTIVATE_DEVICE_REQUEST* deactivateDeviceRequest);
@@ -54,9 +60,11 @@ typedef UINT (*psCameraDeviceServerStreamListResponse)(
 	    CameraDeviceServerContext* context, const CAM_STREAM_LIST_RESPONSE* streamListResponse);
 
 	typedef UINT (*psCameraDeviceServerMediaTypeListRequest)(
-    CameraDeviceServerContext* context, const CAM_MEDIA_TYPE_LIST_REQUEST* mediaTypeListRequest);
+	    CameraDeviceServerContext* context,
+	    const CAM_MEDIA_TYPE_LIST_REQUEST* mediaTypeListRequest);
 	typedef UINT (*psCameraDeviceServerMediaTypeListResponse)(
-    CameraDeviceServerContext* context, const CAM_MEDIA_TYPE_LIST_RESPONSE* mediaTypeListResponse);
+	    CameraDeviceServerContext* context,
+	    const CAM_MEDIA_TYPE_LIST_RESPONSE* mediaTypeListResponse);
 
 	typedef UINT (*psCameraDeviceServerCurrentMediaTypeRequest)(
 	    CameraDeviceServerContext* context,
@@ -85,7 +93,8 @@ typedef UINT (*psCameraDeviceServerPropertyListResponse)(
 	typedef UINT (*psCameraDeviceServerPropertyValueRequest)(
 	    CameraDeviceServerContext* context, const CAM_PROPERTY_VALUE_REQUEST* propertyValueRequest);
 	typedef UINT (*psCameraDeviceServerPropertyValueResponse)(
-    CameraDeviceServerContext* context, const CAM_PROPERTY_VALUE_RESPONSE* propertyValueResponse);
+	    CameraDeviceServerContext* context,
+	    const CAM_PROPERTY_VALUE_RESPONSE* propertyValueResponse);
 
 	typedef UINT (*psCameraDeviceServerSetPropertyValueRequest)(
 	    CameraDeviceServerContext* context,
@@ -263,11 +272,6 @@ struct camera_device_server_context
 		rdpContext* rdpcontext;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API CameraDeviceServerContext* camera_device_server_context_new(HANDLE vcm);
 	FREERDP_API void camera_device_server_context_free(CameraDeviceServerContext* context);
 

include/freerdp/server/rdpei.h

@@ -26,6 +26,11 @@
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/channels/rdpei.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct s_rdpei_server_context RdpeiServerContext;
 	typedef struct s_rdpei_server_private RdpeiServerPrivate;
 
@@ -53,11 +58,6 @@ struct s_rdpei_server_context
 		BOOL (*onChannelIdAssigned)(RdpeiServerContext* context, UINT32 channelId);
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API RdpeiServerContext* rdpei_server_context_new(HANDLE vcm);
 	FREERDP_API void rdpei_server_context_reset(RdpeiServerContext* context);
 	FREERDP_API void rdpei_server_context_free(RdpeiServerContext* context);

include/freerdp/server/rdpgfx.h

@@ -23,6 +23,11 @@
 #include <freerdp/channels/rdpgfx.h>
 #include <freerdp/freerdp.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct s_rdpgfx_server_context RdpgfxServerContext;
 	typedef struct s_rdpgfx_server_private RdpgfxServerPrivate;
 
@@ -44,7 +49,8 @@ typedef UINT (*psRdpgfxSurfaceFrameCommand)(RdpgfxServerContext* context,
 	                                            const RDPGFX_START_FRAME_PDU* startFrame,
 	                                            const RDPGFX_END_FRAME_PDU* endFrame);
 	typedef UINT (*psRdpgfxDeleteEncodingContext)(
-    RdpgfxServerContext* context, const RDPGFX_DELETE_ENCODING_CONTEXT_PDU* deleteEncodingContext);
+	    RdpgfxServerContext* context,
+	    const RDPGFX_DELETE_ENCODING_CONTEXT_PDU* deleteEncodingContext);
 	typedef UINT (*psRdpgfxCreateSurface)(RdpgfxServerContext* context,
 	                                      const RDPGFX_CREATE_SURFACE_PDU* createSurface);
 	typedef UINT (*psRdpgfxDeleteSurface)(RdpgfxServerContext* context,
@@ -63,14 +69,16 @@ typedef UINT (*psRdpgfxCacheImportReply)(RdpgfxServerContext* context,
 	                                         const RDPGFX_CACHE_IMPORT_REPLY_PDU* cacheImportReply);
 	typedef UINT (*psRdpgfxEvictCacheEntry)(RdpgfxServerContext* context,
 	                                        const RDPGFX_EVICT_CACHE_ENTRY_PDU* evictCacheEntry);
-typedef UINT (*psRdpgfxMapSurfaceToOutput)(RdpgfxServerContext* context,
+	typedef UINT (*psRdpgfxMapSurfaceToOutput)(
-                                           const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput);
+	    RdpgfxServerContext* context, const RDPGFX_MAP_SURFACE_TO_OUTPUT_PDU* surfaceToOutput);
-typedef UINT (*psRdpgfxMapSurfaceToWindow)(RdpgfxServerContext* context,
+	typedef UINT (*psRdpgfxMapSurfaceToWindow)(
-                                           const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow);
+	    RdpgfxServerContext* context, const RDPGFX_MAP_SURFACE_TO_WINDOW_PDU* surfaceToWindow);
 	typedef UINT (*psRdpgfxMapSurfaceToScaledOutput)(
-    RdpgfxServerContext* context, const RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* surfaceToOutput);
+	    RdpgfxServerContext* context,
+	    const RDPGFX_MAP_SURFACE_TO_SCALED_OUTPUT_PDU* surfaceToOutput);
 	typedef UINT (*psRdpgfxMapSurfaceToScaledWindow)(
-    RdpgfxServerContext* context, const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* surfaceToWindow);
+	    RdpgfxServerContext* context,
+	    const RDPGFX_MAP_SURFACE_TO_SCALED_WINDOW_PDU* surfaceToWindow);
 	typedef UINT (*psRdpgfxCapsAdvertise)(RdpgfxServerContext* context,
 	                                      const RDPGFX_CAPS_ADVERTISE_PDU* capsAdvertise);
 	typedef UINT (*psRdpgfxCapsConfirm)(RdpgfxServerContext* context,
@@ -121,11 +129,6 @@ struct s_rdpgfx_server_context
 		psRdpgfxServerChannelIdAssigned ChannelIdAssigned;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API RdpgfxServerContext* rdpgfx_server_context_new(HANDLE vcm);
 	FREERDP_API void rdpgfx_server_context_free(RdpgfxServerContext* context);
 	FREERDP_API HANDLE rdpgfx_server_get_event_handle(RdpgfxServerContext* context);

include/freerdp/server/rdpsnd.h

@@ -25,6 +25,11 @@
 #include <freerdp/channels/wtsvc.h>
 #include <freerdp/channels/rdpsnd.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct s_rdpsnd_server_context RdpsndServerContext;
 	typedef struct s_rdpsnd_server_context rdpsnd_server_context;
 	typedef struct s_rdpsnd_server_private RdpsndServerPrivate;
@@ -49,7 +54,8 @@ typedef UINT (*psRdpsndServerSendSamples2)(RdpsndServerContext* context, UINT16
 	                                           UINT32 audioTimeStamp);
 	typedef UINT (*psRdpsndServerConfirmBlock)(RdpsndServerContext* context, BYTE confirmBlockNum,
 	                                           UINT16 wtimestamp);
-typedef UINT (*psRdpsndServerSetVolume)(RdpsndServerContext* context, UINT16 left, UINT16 right);
+	typedef UINT (*psRdpsndServerSetVolume)(RdpsndServerContext* context, UINT16 left,
+	                                        UINT16 right);
 	typedef UINT (*psRdpsndServerClose)(RdpsndServerContext* context);
 
 	typedef void (*psRdpsndServerActivated)(RdpsndServerContext* context);
@@ -173,11 +179,6 @@ struct s_rdpsnd_server_context
 		psRdpsndChannelIdAssigned ChannelIdAssigned;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API RdpsndServerContext* rdpsnd_server_context_new(HANDLE vcm);
 	FREERDP_API void rdpsnd_server_context_reset(RdpsndServerContext*);
 	FREERDP_API void rdpsnd_server_context_free(RdpsndServerContext* context);

include/freerdp/server/remdesk.h

@@ -28,6 +28,11 @@
 
 #include <freerdp/client/remdesk.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/**
 	 * Server Interface
 	 */
@@ -50,11 +55,6 @@ struct s_remdesk_server_context
 		rdpContext* rdpcontext;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API RemdeskServerContext* remdesk_server_context_new(HANDLE vcm);
 	FREERDP_API void remdesk_server_context_free(RemdeskServerContext* context);
 

include/freerdp/server/server-common.h

@@ -29,8 +29,10 @@
 extern "C"
 {
 #endif
+
 	FREERDP_API size_t server_audin_get_formats(AUDIO_FORMAT** dst_formats);
 	FREERDP_API size_t server_rdpsnd_get_formats(AUDIO_FORMAT** dst_formats);
+
 #ifdef __cplusplus
 }
 #endif

include/freerdp/server/shadow.h

@@ -45,6 +45,11 @@
 #include <winpr/collections.h>
 #include <winpr/cmdline.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct rdp_shadow_client rdpShadowClient;
 	typedef struct rdp_shadow_server rdpShadowServer;
 	typedef struct rdp_shadow_screen rdpShadowScreen;
@@ -69,26 +74,31 @@ typedef int (*pfnShadowSubsystemStop)(rdpShadowSubsystem* subsystem);
 	typedef UINT32 (*pfnShadowEnumMonitors)(MONITOR_DEF* monitors, UINT32 maxMonitors);
 
 	typedef int (*pfnShadowAuthenticate)(rdpShadowSubsystem* subsystem, rdpShadowClient* client,
-                                     const char* user, const char* domain, const char* password);
+	                                     const char* user, const char* domain,
+	                                     const char* password);
 	typedef BOOL (*pfnShadowClientConnect)(rdpShadowSubsystem* subsystem, rdpShadowClient* client);
-typedef void (*pfnShadowClientDisconnect)(rdpShadowSubsystem* subsystem, rdpShadowClient* client);
+	typedef void (*pfnShadowClientDisconnect)(rdpShadowSubsystem* subsystem,
-typedef BOOL (*pfnShadowClientCapabilities)(rdpShadowSubsystem* subsystem, rdpShadowClient* client);
+	                                          rdpShadowClient* client);
+	typedef BOOL (*pfnShadowClientCapabilities)(rdpShadowSubsystem* subsystem,
+	                                            rdpShadowClient* client);
 
-typedef BOOL (*pfnShadowSynchronizeEvent)(rdpShadowSubsystem* subsystem, rdpShadowClient* client,
+	typedef BOOL (*pfnShadowSynchronizeEvent)(rdpShadowSubsystem* subsystem,
-                                          UINT32 flags);
+	                                          rdpShadowClient* client, UINT32 flags);
 	typedef BOOL (*pfnShadowKeyboardEvent)(rdpShadowSubsystem* subsystem, rdpShadowClient* client,
 	                                       UINT16 flags, UINT8 code);
 	typedef BOOL (*pfnShadowUnicodeKeyboardEvent)(rdpShadowSubsystem* subsystem,
-                                              rdpShadowClient* client, UINT16 flags, UINT16 code);
+	                                              rdpShadowClient* client, UINT16 flags,
+	                                              UINT16 code);
 	typedef BOOL (*pfnShadowMouseEvent)(rdpShadowSubsystem* subsystem, rdpShadowClient* client,
 	                                    UINT16 flags, UINT16 x, UINT16 y);
-typedef BOOL (*pfnShadowExtendedMouseEvent)(rdpShadowSubsystem* subsystem, rdpShadowClient* client,
+	typedef BOOL (*pfnShadowExtendedMouseEvent)(rdpShadowSubsystem* subsystem,
-                                            UINT16 flags, UINT16 x, UINT16 y);
+	                                            rdpShadowClient* client, UINT16 flags, UINT16 x,
+	                                            UINT16 y);
 
 	typedef BOOL (*pfnShadowChannelAudinServerReceiveSamples)(rdpShadowSubsystem* subsystem,
 	                                                          rdpShadowClient* client,
-                                                          const AUDIO_FORMAT* format, wStream* buf,
+	                                                          const AUDIO_FORMAT* format,
-                                                          size_t nframes);
+	                                                          wStream* buf, size_t nframes);
 
 	struct rdp_shadow_client
 	{
@@ -285,11 +295,6 @@ typedef struct
 	UINT16 right;
 } SHADOW_MSG_OUT_AUDIO_OUT_VOLUME;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API void shadow_subsystem_set_entry_builtin(const char* name);
 	FREERDP_API void shadow_subsystem_set_entry(pfnShadowSubsystemEntry pEntry);
 

include/freerdp/server/telemetry.h

@@ -23,6 +23,11 @@
 #include <freerdp/channels/telemetry.h>
 #include <freerdp/channels/wtsvc.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct _telemetry_server_context TelemetryServerContext;
 
 	typedef UINT (*psTelemetryServerOpen)(TelemetryServerContext* context);
@@ -31,7 +36,8 @@ typedef UINT (*psTelemetryServerClose)(TelemetryServerContext* context);
 	typedef BOOL (*psTelemetryServerChannelIdAssigned)(TelemetryServerContext* context,
 	                                                   UINT32 channelId);
 
-typedef UINT (*psTelemetryServerInitialize)(TelemetryServerContext* context, BOOL externalThread);
+	typedef UINT (*psTelemetryServerInitialize)(TelemetryServerContext* context,
+	                                            BOOL externalThread);
 	typedef UINT (*psTelemetryServerPoll)(TelemetryServerContext* context);
 	typedef BOOL (*psTelemetryServerChannelHandle)(TelemetryServerContext* context, HANDLE* handle);
 
@@ -93,11 +99,6 @@ struct _telemetry_server_context
 		rdpContext* rdpcontext;
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API TelemetryServerContext* telemetry_server_context_new(HANDLE vcm);
 	FREERDP_API void telemetry_server_context_free(TelemetryServerContext* context);
 

include/freerdp/session.h

@@ -27,6 +27,11 @@
 #define INFO_TYPE_LOGON_PLAIN_NOTIFY 0x00000002
 #define INFO_TYPE_LOGON_EXTENDED_INF 0x00000003
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	struct rdp_logon_info
 	{
 		UINT32 sessionId;
@@ -47,4 +52,8 @@ struct rdp_logon_info_ex
 	};
 	typedef struct rdp_logon_info_ex logon_info_ex;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_SESSION_H */

include/freerdp/settings.h

@@ -34,6 +34,11 @@
 #include <freerdp/crypto/certificate.h>
 #include <freerdp/crypto/privatekey.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /** \file
  * \brief This is the FreeRDP settings module.
  *
@@ -1671,11 +1676,6 @@ enum rdp_settings_type
 	RDP_SETTINGS_TYPE_POINTER
 };
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 /**
  * rdpSettings creation flags
  */

include/freerdp/streamdump.h

@@ -27,13 +27,13 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 
-typedef struct stream_dump_context rdpStreamDumpContext;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct stream_dump_context rdpStreamDumpContext;
+
 	typedef enum
 	{
 		STREAM_MSG_SRV_RX = 1,

include/freerdp/svc.h

@@ -35,6 +35,11 @@
 
 #define FREERDP_CHANNEL_MAGIC_NUMBER 0x46524450
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		UINT32 cbSize;
@@ -69,4 +74,8 @@ typedef struct
 	} CHANNEL_ENTRY_POINTS_FREERDP_EX;
 	typedef CHANNEL_ENTRY_POINTS_FREERDP_EX* PCHANNEL_ENTRY_POINTS_FREERDP_EX;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_SVC_H */

include/freerdp/transport_io.h

@@ -22,8 +22,6 @@
 #ifndef FREERDP_TRANSPORT_IO_H
 #define FREERDP_TRANSPORT_IO_H
 
-typedef struct rdp_transport_io rdpTransportIo;
-
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
@@ -35,6 +33,8 @@ extern "C"
 {
 #endif
 
+	typedef struct rdp_transport_io rdpTransportIo;
+
 	typedef int (*pTCPConnect)(rdpContext* context, rdpSettings* settings, const char* hostname,
 	                           int port, DWORD timeout);
 	typedef BOOL (*pTransportFkt)(rdpTransport* transport);

include/freerdp/types.h

@@ -30,6 +30,11 @@
 
 #ifndef MAX
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
 #endif
 
 	typedef struct
@@ -85,6 +90,10 @@ typedef enum
 	RDP_TRANSPORT_UDP_L
 } RDP_TRANSPORT_TYPE;
 
+#ifdef __cplusplus
+}
+#endif
+
 /* Plugin events */
 
 #include <freerdp/message.h>

include/freerdp/update.h

@@ -20,8 +20,6 @@
 #ifndef FREERDP_UPDATE_H
 #define FREERDP_UPDATE_H
 
-typedef struct rdp_update rdpUpdate;
-
 #include <winpr/crt.h>
 #include <winpr/wlog.h>
 #include <winpr/synch.h>
@@ -44,6 +42,13 @@ typedef struct rdp_update rdpUpdate;
 /* Bitmap Updates */
 #define EX_COMPRESSED_BITMAP_HEADER_PRESENT 0x01
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+	typedef struct rdp_update rdpUpdate;
+
 	typedef struct
 	{
 		UINT32 destLeft;
@@ -179,11 +184,12 @@ typedef BOOL (*pSuppressOutput)(rdpContext* context, BYTE allow, const RECTANGLE
 	typedef BOOL (*pRemoteMonitors)(rdpContext* context, UINT32 count, const MONITOR_DEF* monitors);
 
 	typedef BOOL (*pSurfaceCommand)(rdpContext* context, wStream* s);
-typedef BOOL (*pSurfaceBits)(rdpContext* context, const SURFACE_BITS_COMMAND* surfaceBitsCommand);
+	typedef BOOL (*pSurfaceBits)(rdpContext* context,
+	                             const SURFACE_BITS_COMMAND* surfaceBitsCommand);
 	typedef BOOL (*pSurfaceFrameMarker)(rdpContext* context,
 	                                    const SURFACE_FRAME_MARKER* surfaceFrameMarker);
-typedef BOOL (*pSurfaceFrameBits)(rdpContext* context, const SURFACE_BITS_COMMAND* cmd, BOOL first,
+	typedef BOOL (*pSurfaceFrameBits)(rdpContext* context, const SURFACE_BITS_COMMAND* cmd,
-                                  BOOL last, UINT32 frameId);
+	                                  BOOL first, BOOL last, UINT32 frameId);
 	typedef BOOL (*pSurfaceFrameAcknowledge)(rdpContext* context, UINT32 frameId);
 
 	typedef BOOL (*pSaveSessionInfo)(rdpContext* context, UINT32 type, void* data);
@@ -234,11 +240,6 @@ struct rdp_update
 		UINT32 paddingE[80 - 72];     /* 72 */
 	};
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API void rdp_update_lock(rdpUpdate* update);
 	FREERDP_API void rdp_update_unlock(rdpUpdate* update);
 

include/freerdp/utils/pcap.h

@@ -23,6 +23,11 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		UINT32 magic_number;  /* magic number */
@@ -58,11 +63,6 @@ struct s_pcap_record
 
 	typedef struct rdp_pcap rdpPcap;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API rdpPcap* pcap_open(const char* name, BOOL write);
 	FREERDP_API void pcap_close(rdpPcap* pcap);
 

include/freerdp/utils/pod_arrays.h

@@ -22,6 +22,11 @@
 #include <winpr/wtypes.h>
 #include <winpr/assert.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #define POD_ARRAYS_IMPL(T, TLOWER)                                                        \
 	typedef struct                                                                        \
 	{                                                                                     \
@@ -124,11 +129,6 @@
 		a->nvalues = 0;                                                                   \
 	}
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	POD_ARRAYS_IMPL(UINT16, uint16)
 	POD_ARRAYS_IMPL(UINT32, uint32)
 	POD_ARRAYS_IMPL(UINT64, uint64)

include/freerdp/utils/profiler.h

@@ -23,13 +23,13 @@
 #include <freerdp/api.h>
 #include <freerdp/utils/stopwatch.h>
 
-typedef struct S_PROFILER PROFILER;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+	typedef struct S_PROFILER PROFILER;
+
 	FREERDP_API PROFILER* profiler_create(const char* name);
 	FREERDP_API void profiler_free(PROFILER* profiler);
 
@@ -40,10 +40,6 @@ extern "C"
 	FREERDP_API void profiler_print(PROFILER* profiler);
 	FREERDP_API void profiler_print_footer(void);
 
-#ifdef __cplusplus
-}
-#endif
-
 #ifdef WITH_PROFILER
 #define PROFILER_RENAME(prof, name)   \
 	do                                \
@@ -96,4 +92,8 @@ extern "C"
 	} while (0);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_UTILS_PROFILER_H */

include/freerdp/utils/ringbuffer.h

@@ -23,6 +23,11 @@
 #include <winpr/wtypes.h>
 #include <freerdp/api.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	/** @brief ring buffer meta data */
 	typedef struct
 	{
@@ -41,11 +46,6 @@ typedef struct
 		const BYTE* data;
 	} DataChunk;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	/**
 	 * initialise a ringbuffer
 	 *

include/freerdp/utils/signal.h

@@ -23,11 +23,6 @@
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 
-#ifndef _WIN32
-#include <signal.h>
-#include <termios.h>
-#endif
-
 #ifdef __cplusplus
 extern "C"
 {

include/freerdp/utils/smartcard_call.h

@@ -31,12 +31,13 @@
 #include <freerdp/channels/scard.h>
 #include <freerdp/utils/smartcard_operations.h>
 
-typedef struct s_scard_call_context scard_call_context;
-
 #ifdef __cplusplus
 extern "C"
 {
 #endif
+
+	typedef struct s_scard_call_context scard_call_context;
+
 	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 BOOL smartcard_call_context_signal_stop(scard_call_context* ctx, BOOL reset);

include/freerdp/utils/smartcardlogon.h

@@ -16,8 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef LIBFREERDP_CORE_SMARTCARDLOGON_H
+#ifndef FREERDP_UTILS_SMARTCARDLOGON_H
-#define LIBFREERDP_CORE_SMARTCARDLOGON_H
+#define FREERDP_UTILS_SMARTCARDLOGON_H
 
 #include <freerdp/freerdp.h>
 #include <freerdp/settings.h>
@@ -59,4 +59,4 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif
-#endif /* LIBFREERDP_CORE_SMARTCARDLOGON_H */
+#endif /* FREERDP_UTILS_SMARTCARDLOGON_H */

include/freerdp/utils/stopwatch.h

@@ -23,6 +23,11 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 	typedef struct
 	{
 		UINT64 start;
@@ -31,11 +36,6 @@ typedef struct
 		UINT32 count;
 	} STOPWATCH;
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 	FREERDP_API STOPWATCH* stopwatch_create(void);
 	FREERDP_API void stopwatch_free(STOPWATCH* stopwatch);