diff --git a/buildflags.h.in b/buildflags.h.in index 0b8b31092..0cc4a64a5 100644 --- a/buildflags.h.in +++ b/buildflags.h.in @@ -1,5 +1,5 @@ -#ifndef _FREERDP_BUILD_FLAGS_H -#define _FREERDP_BUILD_FLAGS_H +#ifndef FREERDP_BUILD_FLAGS_H +#define FREERDP_BUILD_FLAGS_H #define CFLAGS "${CMAKE_C_FLAGS}" #define COMPILER_ID "${CMAKE_C_COMPILER_ID}" @@ -8,4 +8,4 @@ #define BUILD_CONFIG "${FREERDP_BUILD_CONFIG}" #define BUILD_TYPE "${CMAKE_BUILD_TYPE}" -#endif /*_FREERDP_BUILD_FLAGS_H */ +#endif /* FREERDP_BUILD_FLAGS_H */ diff --git a/channels/audin/client/audin_main.h b/channels/audin/client/audin_main.h index 50a0b6c12..419986c03 100644 --- a/channels/audin/client/audin_main.h +++ b/channels/audin/client/audin_main.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_AUDIN_CLIENT_MAIN_H -#define FREERDP_AUDIN_CLIENT_MAIN_H +#ifndef FREERDP_CHANNEL_AUDIN_CLIENT_MAIN_H +#define FREERDP_CHANNEL_AUDIN_CLIENT_MAIN_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,5 +38,5 @@ #define DEBUG_DVC(...) do { } while (0) #endif -#endif /* FREERDP_AUDIN_CLIENT_MAIN_H */ +#endif /* FREERDP_CHANNEL_AUDIN_CLIENT_MAIN_H */ diff --git a/channels/audin/client/opensles/opensl_io.h b/channels/audin/client/opensles/opensl_io.h index 7d8d33f22..259b55a81 100644 --- a/channels/audin/client/opensles/opensl_io.h +++ b/channels/audin/client/opensles/opensl_io.h @@ -27,8 +27,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef OPENSL_IO -#define OPENSL_IO +#ifndef FREERDP_CHANNEL_AUDIN_CLIENT_OPENSL_IO_H +#define FREERDP_CHANNEL_AUDIN_CLIENT_OPENSL_IO_H #include #include @@ -93,4 +93,4 @@ FREERDP_LOCAL int android_RecIn(OPENSL_STREAM* p, short* buffer, int size); }; #endif -#endif // #ifndef OPENSL_IO +#endif /* FREERDP_CHANNEL_AUDIN_CLIENT_OPENSL_IO_H */ diff --git a/channels/cliprdr/client/cliprdr_format.h b/channels/cliprdr/client/cliprdr_format.h index 11fb1bebf..dfe6965bb 100644 --- a/channels/cliprdr/client/cliprdr_format.h +++ b/channels/cliprdr/client/cliprdr_format.h @@ -20,12 +20,12 @@ * limitations under the License. */ -#ifndef __CLIPRDR_FORMAT_H -#define __CLIPRDR_FORMAT_H +#ifndef FREERDP_CHANNEL_CLIPRDR_CLIENT_FORMAT_H +#define FREERDP_CHANNEL_CLIPRDR_CLIENT_FORMAT_H UINT cliprdr_process_format_list(cliprdrPlugin* cliprdr, wStream* s, UINT32 dataLen, UINT16 msgFlags); UINT cliprdr_process_format_list_response(cliprdrPlugin* cliprdr, wStream* s, UINT32 dataLen, UINT16 msgFlags); UINT cliprdr_process_format_data_request(cliprdrPlugin* cliprdr, wStream* s, UINT32 dataLen, UINT16 msgFlags); UINT cliprdr_process_format_data_response(cliprdrPlugin* cliprdr, wStream* s, UINT32 dataLen, UINT16 msgFlags); -#endif /* __CLIPRDR_FORMAT_H */ +#endif /* FREERDP_CHANNEL_CLIPRDR_CLIENT_FORMAT_H */ diff --git a/channels/cliprdr/client/cliprdr_main.h b/channels/cliprdr/client/cliprdr_main.h index e994f38fe..25bad1828 100644 --- a/channels/cliprdr/client/cliprdr_main.h +++ b/channels/cliprdr/client/cliprdr_main.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __CLIPRDR_MAIN_H -#define __CLIPRDR_MAIN_H +#ifndef FREERDP_CHANNEL_CLIPRDR_CLIENT_MAIN_H +#define FREERDP_CHANNEL_CLIPRDR_CLIENT_MAIN_H #include @@ -60,4 +60,4 @@ CliprdrClientContext* cliprdr_get_client_interface(cliprdrPlugin* cliprdr); #define DEBUG_CLIPRDR(...) do { } while (0) #endif -#endif /* __CLIPRDR_MAIN_H */ +#endif /* FREERDP_CHANNEL_CLIPRDR_CLIENT_MAIN_H */ diff --git a/channels/cliprdr/server/cliprdr_main.h b/channels/cliprdr/server/cliprdr_main.h index 362d85a83..248f34109 100644 --- a/channels/cliprdr/server/cliprdr_main.h +++ b/channels/cliprdr/server/cliprdr_main.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_CLIPRDR_MAIN_H -#define FREERDP_CHANNEL_SERVER_CLIPRDR_MAIN_H +#ifndef FREERDP_CHANNEL_CLIPRDR_SERVER_MAIN_H +#define FREERDP_CHANNEL_CLIPRDR_SERVER_MAIN_H #include #include @@ -45,4 +45,4 @@ struct _cliprdr_server_private }; typedef struct _cliprdr_server_private CliprdrServerPrivate; -#endif /* FREERDP_CHANNEL_SERVER_CLIPRDR_MAIN_H */ +#endif /* FREERDP_CHANNEL_CLIPRDR_SERVER_MAIN_H */ diff --git a/channels/drdynvc/client/drdynvc_main.h b/channels/drdynvc/client/drdynvc_main.h index 261fcd86e..1d83582bc 100644 --- a/channels/drdynvc/client/drdynvc_main.h +++ b/channels/drdynvc/client/drdynvc_main.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __DRDYNVC_MAIN_H -#define __DRDYNVC_MAIN_H +#ifndef FREERDP_CHANNEL_DRDYNVC_CLIENT_MAIN_H +#define FREERDP_CHANNEL_DRDYNVC_CLIENT_MAIN_H #include #include @@ -137,4 +137,4 @@ struct drdynvc_plugin IWTSVirtualChannelManager* channel_mgr; }; -#endif +#endif /* FREERDP_CHANNEL_DRDYNVC_CLIENT_MAIN_H */ diff --git a/channels/drdynvc/server/drdynvc_main.h b/channels/drdynvc/server/drdynvc_main.h index aa69b5706..8e17f89c2 100644 --- a/channels/drdynvc/server/drdynvc_main.h +++ b/channels/drdynvc/server/drdynvc_main.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_DRDYNVC_MAIN_H -#define FREERDP_CHANNEL_SERVER_DRDYNVC_MAIN_H +#ifndef FREERDP_CHANNEL_DRDYNVC_SERVER_MAIN_H +#define FREERDP_CHANNEL_DRDYNVC_SERVER_MAIN_H #include #include @@ -34,4 +34,4 @@ struct _drdynvc_server_private void* ChannelHandle; }; -#endif /* FREERDP_CHANNEL_SERVER_DRDYNVC_MAIN_H */ +#endif /* FREERDP_CHANNEL_DRDYNVC_SERVER_MAIN_H */ diff --git a/channels/drive/client/drive_file.h b/channels/drive/client/drive_file.h index 3cc914562..9b2eed4cc 100644 --- a/channels/drive/client/drive_file.h +++ b/channels/drive/client/drive_file.h @@ -23,8 +23,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_DRIVE_FILE_H -#define FREERDP_CHANNEL_DRIVE_FILE_H +#ifndef FREERDP_CHANNEL_DRIVE_CLIENT_FILE_H +#define FREERDP_CHANNEL_DRIVE_CLIENT_FILE_H #include #include @@ -68,4 +68,4 @@ BOOL drive_file_query_directory(DRIVE_FILE* file, UINT32 FsInformationClass, BYT extern UINT sys_code_page; -#endif /* FREERDP_CHANNEL_DRIVE_FILE_H */ +#endif /* FREERDP_CHANNEL_DRIVE_CLIENT_FILE_H */ diff --git a/channels/echo/client/echo_main.h b/channels/echo/client/echo_main.h index 565142fd5..04cda415a 100644 --- a/channels/echo/client/echo_main.h +++ b/channels/echo/client/echo_main.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __ECHO_MAIN_H -#define __ECHO_MAIN_H +#ifndef FREERDP_CHANNEL_ECHO_CLIENT_MAIN_H +#define FREERDP_CHANNEL_ECHO_CLIENT_MAIN_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -36,5 +36,5 @@ #define DEBUG_DVC(...) do { } while (0) #endif -#endif /* __ECHO_MAIN_H */ +#endif /* FREERDP_CHANNEL_ECHO_CLIENT_MAIN_H */ diff --git a/channels/encomsp/server/encomsp_main.h b/channels/encomsp/server/encomsp_main.h index 1338f6ee0..18daf72ef 100644 --- a/channels/encomsp/server/encomsp_main.h +++ b/channels/encomsp/server/encomsp_main.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_ENCOMSP_MAIN_H -#define FREERDP_CHANNEL_SERVER_ENCOMSP_MAIN_H +#ifndef FREERDP_CHANNEL_ENCOMSP_SERVER_MAIN_H +#define FREERDP_CHANNEL_ENCOMSP_SERVER_MAIN_H #include #include @@ -33,4 +33,4 @@ struct _encomsp_server_private void* ChannelHandle; }; -#endif /* FREERDP_CHANNEL_SERVER_ENCOMSP_MAIN_H */ +#endif /* FREERDP_CHANNEL_ENCOMSP_SERVER_MAIN_H */ diff --git a/channels/printer/client/printer_cups.h b/channels/printer/client/printer_cups.h index 434d64aba..876cb47d7 100644 --- a/channels/printer/client/printer_cups.h +++ b/channels/printer/client/printer_cups.h @@ -17,12 +17,12 @@ * limitations under the License. */ -#ifndef __PRINTER_CUPS_H -#define __PRINTER_CUPS_H +#ifndef FREERDP_CHANNEL_PRINTER_CLIENT_CUPS_H +#define FREERDP_CHANNEL_PRINTER_CLIENT_CUPS_H #include "printer_main.h" rdpPrinterDriver* printer_cups_get_driver(void); -#endif +#endif /* FREERDP_CHANNEL_PRINTER_CLIENT_CUPS_H */ diff --git a/channels/printer/client/printer_main.h b/channels/printer/client/printer_main.h index 3d9b75a9d..dfb56d8e0 100644 --- a/channels/printer/client/printer_main.h +++ b/channels/printer/client/printer_main.h @@ -20,8 +20,8 @@ * limitations under the License. */ -#ifndef __PRINTER_MAIN_H -#define __PRINTER_MAIN_H +#ifndef FREERDP_CHANNEL_PRINTER_CLIENT_MAIN_H +#define FREERDP_CHANNEL_PRINTER_CLIENT_MAIN_H #include @@ -66,4 +66,4 @@ struct rdp_print_job pcClosePrintJob Close; }; -#endif +#endif /* FREERDP_CHANNEL_PRINTER_CLIENT_MAIN_H */ diff --git a/channels/printer/client/printer_win.h b/channels/printer/client/printer_win.h index c0a0420f2..22777d0af 100644 --- a/channels/printer/client/printer_win.h +++ b/channels/printer/client/printer_win.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __PRINTER_WIN_H -#define __PRINTER_WIN_H +#ifndef FREERDP_CHANNEL_PRINTER_CLIENT_WIN_H +#define FREERDP_CHANNEL_PRINTER_CLIENT_WIN_H #include @@ -31,5 +31,5 @@ rdpPrinterDriver* printer_win_get_driver(void); #define DEBUG_WINPR(...) do { } while (0) #endif -#endif +#endif /* FREERDP_CHANNEL_PRINTER_CLIENT_WIN_H */ diff --git a/channels/printer/printer.h b/channels/printer/printer.h index 237313009..5ce8f5e45 100644 --- a/channels/printer/printer.h +++ b/channels/printer/printer.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __CHANNELS_PRINTER_PRINTER_H_ -#define __CHANNELS_PRINTER_PRINTER_H_ +#ifndef FREERDP_CHANNEL_PRINTER_PRINTER_H +#define FREERDP_CHANNEL_PRINTER_PRINTER_H /* SERVER_PRINTER_CACHE_EVENT.cachedata */ #define RDPDR_ADD_PRINTER_EVENT 0x00000001 @@ -34,4 +34,4 @@ #define RDPDR_PRINTER_ANNOUNCE_FLAG_XPSFORMAT 0x00000010 -#endif /* __CHANNELS_PRINTER_PRINTER_H_ */ +#endif /* FREERDP_CHANNEL_PRINTER_PRINTER_H */ diff --git a/channels/rail/client/rail_main.h b/channels/rail/client/rail_main.h index e581a3842..86e752fa4 100644 --- a/channels/rail/client/rail_main.h +++ b/channels/rail/client/rail_main.h @@ -21,8 +21,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_RAIL_MAIN_H -#define FREERDP_CHANNEL_CLIENT_RAIL_MAIN_H +#ifndef FREERDP_CHANNEL_RAIL_CLIENT_MAIN_H +#define FREERDP_CHANNEL_RAIL_CLIENT_MAIN_H #include #include @@ -56,4 +56,4 @@ typedef struct rail_plugin railPlugin; RailClientContext* rail_get_client_interface(railPlugin* rail); UINT rail_send_channel_data(railPlugin* rail, void* data, size_t length); -#endif /* FREERDP_CHANNEL_CLIENT_RAIL_MAIN_H */ +#endif /* FREERDP_CHANNEL_RAIL_CLIENT_MAIN_H */ diff --git a/channels/rail/client/rail_orders.h b/channels/rail/client/rail_orders.h index d7e807b9e..dab414b08 100644 --- a/channels/rail/client/rail_orders.h +++ b/channels/rail/client/rail_orders.h @@ -20,8 +20,8 @@ * limitations under the License. */ -#ifndef __RAIL_ORDERS_H -#define __RAIL_ORDERS_H +#ifndef FREERDP_CHANNEL_RAIL_CLIENT_ORDERS_H +#define FREERDP_CHANNEL_RAIL_CLIENT_ORDERS_H #include @@ -64,4 +64,4 @@ UINT rail_send_client_window_move_order(railPlugin* rail, RAIL_WINDOW_MOVE_ORDER UINT rail_send_client_get_appid_req_order(railPlugin* rail, RAIL_GET_APPID_REQ_ORDER* getAppIdReq); UINT rail_send_client_langbar_info_order(railPlugin* rail, RAIL_LANGBAR_INFO_ORDER* langBarInfo); -#endif /* __RAIL_ORDERS_H */ +#endif /* FREERDP_CHANNEL_RAIL_CLIENT_ORDERS_H */ diff --git a/channels/rdpdr/server/rdpdr_main.h b/channels/rdpdr/server/rdpdr_main.h index dc09aadf3..035ff7d70 100644 --- a/channels/rdpdr/server/rdpdr_main.h +++ b/channels/rdpdr/server/rdpdr_main.h @@ -20,8 +20,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_RDPDR_MAIN_H -#define FREERDP_CHANNEL_SERVER_RDPDR_MAIN_H +#ifndef FREERDP_CHANNEL_RDPDR_SERVER_MAIN_H +#define FREERDP_CHANNEL_RDPDR_SERVER_MAIN_H #include #include @@ -86,4 +86,4 @@ struct _RDPDR_IRP }; typedef struct _RDPDR_IRP RDPDR_IRP; -#endif /* FREERDP_CHANNEL_SERVER_RDPDR_MAIN_H */ +#endif /* FREERDP_CHANNEL_RDPDR_SERVER_MAIN_H */ diff --git a/channels/rdpei/server/rdpei_main.h b/channels/rdpei/server/rdpei_main.h index 81ad29396..f6505f54d 100644 --- a/channels/rdpei/server/rdpei_main.h +++ b/channels/rdpei/server/rdpei_main.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __FREERDP_CHANNEL_SERVER_RDPEI_MAIN_H_ -#define __FREERDP_CHANNEL_SERVER_RDPEI_MAIN_H_ +#ifndef FREERDP_CHANNEL_RDPEI_SERVER_MAIN_H +#define FREERDP_CHANNEL_RDPEI_SERVER_MAIN_H #include #include @@ -31,5 +31,5 @@ -#endif /* FREERDP_CHANNEL_SERVER_RDPEI_MAIN_H_ */ +#endif /* FREERDP_CHANNEL_RDPEI_SERVER_MAIN_H */ diff --git a/channels/rdpgfx/rdpgfx_common.h b/channels/rdpgfx/rdpgfx_common.h index 161a1e256..d9d7270c0 100644 --- a/channels/rdpgfx/rdpgfx_common.h +++ b/channels/rdpgfx/rdpgfx_common.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_RDPGFX_CLIENT_COMMON_H -#define FREERDP_CHANNEL_RDPGFX_CLIENT_COMMON_H +#ifndef FREERDP_CHANNEL_RDPGFX_COMMON_H +#define FREERDP_CHANNEL_RDPGFX_COMMON_H #include #include @@ -43,5 +43,5 @@ FREERDP_LOCAL UINT rdpgfx_write_rect16(wStream* s, RECTANGLE_16* rect16); FREERDP_LOCAL UINT rdpgfx_read_color32(wStream* s, RDPGFX_COLOR32* color32); FREERDP_LOCAL UINT rdpgfx_write_color32(wStream* s, RDPGFX_COLOR32* color32); -#endif /* FREERDP_CHANNEL_RDPGFX_CLIENT_COMMON_H */ +#endif /* FREERDP_CHANNEL_RDPGFX_COMMON_H */ diff --git a/channels/rdpsnd/client/opensles/opensl_io.h b/channels/rdpsnd/client/opensles/opensl_io.h index 00e4f12c1..0bb121a53 100644 --- a/channels/rdpsnd/client/opensles/opensl_io.h +++ b/channels/rdpsnd/client/opensles/opensl_io.h @@ -27,8 +27,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef OPENSL_IO -#define OPENSL_IO +#ifndef FREERDP_CHANNEL_RDPSND_CLIENT_OPENSL_IO_H +#define FREERDP_CHANNEL_RDPSND_CLIENT_OPENSL_IO_H #include #include @@ -108,4 +108,4 @@ FREERDP_LOCAL BOOL android_SetOutputVolume(OPENSL_STREAM* p, int level); }; #endif -#endif // #ifndef OPENSL_IO +#endif /* FREERDP_CHANNEL_RDPSND_CLIENT_OPENSL_IO_H */ diff --git a/channels/rdpsnd/client/rdpsnd_main.h b/channels/rdpsnd/client/rdpsnd_main.h index dcd976f45..81cb426be 100644 --- a/channels/rdpsnd/client/rdpsnd_main.h +++ b/channels/rdpsnd/client/rdpsnd_main.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __RDPSND_MAIN_H -#define __RDPSND_MAIN_H +#ifndef FREERDP_CHANNEL_RDPSND_CLIENT_MAIN_H +#define FREERDP_CHANNEL_RDPSND_CLIENT_MAIN_H #include #include @@ -37,4 +37,4 @@ UINT rdpsnd_virtual_channel_write(rdpsndPlugin* rdpsnd, wStream* s); -#endif /* __RDPSND_MAIN_H */ +#endif /* FREERDP_CHANNEL_RDPSND_CLIENT_MAIN_H */ diff --git a/channels/rdpsnd/server/rdpsnd_main.h b/channels/rdpsnd/server/rdpsnd_main.h index 797eaaf08..f058abbc7 100644 --- a/channels/rdpsnd/server/rdpsnd_main.h +++ b/channels/rdpsnd/server/rdpsnd_main.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_RDPSND_MAIN_H -#define FREERDP_CHANNEL_SERVER_RDPSND_MAIN_H +#ifndef FREERDP_CHANNEL_RDPSND_SERVER_MAIN_H +#define FREERDP_CHANNEL_RDPSND_SERVER_MAIN_H #include #include @@ -55,4 +55,4 @@ struct _rdpsnd_server_private CRITICAL_SECTION lock; /* Protect out_buffer and related parameters */ }; -#endif /* FREERDP_CHANNEL_SERVER_RDPSND_MAIN_H */ +#endif /* FREERDP_CHANNEL_RDPSND_SERVER_MAIN_H */ diff --git a/channels/remdesk/server/remdesk_main.h b/channels/remdesk/server/remdesk_main.h index 3c35b45a6..857376ae5 100644 --- a/channels/remdesk/server/remdesk_main.h +++ b/channels/remdesk/server/remdesk_main.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_REMDESK_MAIN_H -#define FREERDP_CHANNEL_SERVER_REMDESK_MAIN_H +#ifndef FREERDP_CHANNEL_REMDESK_SERVER_MAIN_H +#define FREERDP_CHANNEL_REMDESK_SERVER_MAIN_H #include #include @@ -38,5 +38,5 @@ struct _remdesk_server_private UINT32 Version; }; -#endif /* FREERDP_CHANNEL_SERVER_REMDESK_MAIN_H */ +#endif /* FREERDP_CHANNEL_REMDESK_SERVER_MAIN_H */ diff --git a/channels/server/channels.h b/channels/server/channels.h index 96a295da4..f054c919f 100644 --- a/channels/server/channels.h +++ b/channels/server/channels.h @@ -18,9 +18,9 @@ * limitations under the License. */ -#ifndef __WTSVC_H -#define __WTSVC_H +#ifndef FREERDP_CHANNEL_SERVER_CHANNELS_H +#define FREERDP_CHANNEL_SERVER_CHANNELS_H -#endif /* __WTSVC_H */ +#endif /* FREERDP_CHANNEL_SERVER_CHANNELS_H */ diff --git a/channels/tsmf/client/gstreamer/tsmf_platform.h b/channels/tsmf/client/gstreamer/tsmf_platform.h index 0d6fc5aa0..7fb6be1f7 100644 --- a/channels/tsmf/client/gstreamer/tsmf_platform.h +++ b/channels/tsmf/client/gstreamer/tsmf_platform.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef _TSMF_PLATFORM_H_ -#define _TSMF_PLATFORM_H_ +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_GST_PLATFORM_H +#define FREERDP_CHANNEL_TSMF_CLIENT_GST_PLATFORM_H #include #include @@ -84,4 +84,4 @@ int tsmf_window_unmap(TSMFGstreamerDecoder* decoder); BOOL tsmf_gstreamer_add_pad(TSMFGstreamerDecoder* mdecoder); void tsmf_gstreamer_remove_pad(TSMFGstreamerDecoder* mdecoder); -#endif +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_GST_PLATFORM_H */ diff --git a/channels/tsmf/client/tsmf_audio.h b/channels/tsmf/client/tsmf_audio.h index ac90ee289..a8c7a49be 100644 --- a/channels/tsmf/client/tsmf_audio.h +++ b/channels/tsmf/client/tsmf_audio.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __TSMF_AUDIO_H -#define __TSMF_AUDIO_H +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_AUDIO_H +#define FREERDP_CHANNEL_TSMF_CLIENT_AUDIO_H #include "tsmf_types.h" @@ -47,5 +47,4 @@ typedef ITSMFAudioDevice* (*TSMF_AUDIO_DEVICE_ENTRY) (void); ITSMFAudioDevice* tsmf_load_audio_device(const char* name, const char* device); -#endif - +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_AUDIO_H */ diff --git a/channels/tsmf/client/tsmf_codec.h b/channels/tsmf/client/tsmf_codec.h index 0dd419837..a678ea41c 100644 --- a/channels/tsmf/client/tsmf_codec.h +++ b/channels/tsmf/client/tsmf_codec.h @@ -17,13 +17,13 @@ * limitations under the License. */ -#ifndef __TSMF_CODEC -#define __TSMF_CODEC +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_CODEC_H +#define FREERDP_CHANNEL_TSMF_CLIENT_CODEC_H #include "tsmf_types.h" BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, wStream* s); BOOL tsmf_codec_check_media_type(const char* decoder_name, wStream* s); -#endif +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_CODEC_H */ diff --git a/channels/tsmf/client/tsmf_constants.h b/channels/tsmf/client/tsmf_constants.h index 3ca92f645..d84370a2a 100644 --- a/channels/tsmf/client/tsmf_constants.h +++ b/channels/tsmf/client/tsmf_constants.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __TSMF_CONSTANTS_H -#define __TSMF_CONSTANTS_H +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_CONSTANTS_H +#define FREERDP_CHANNEL_TSMF_CLIENT_CONSTANTS_H #define GUID_SIZE 16 #define TSMF_BUFFER_PADDING_SIZE 8 @@ -136,5 +136,4 @@ #define TSMF_FORMAT_TYPE_VIDEOINFO2 4 #define TSMF_FORMAT_TYPE_MPEG1VIDEOINFO 5 -#endif - +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_CONSTANTS_H */ diff --git a/channels/tsmf/client/tsmf_decoder.h b/channels/tsmf/client/tsmf_decoder.h index e4c71dac6..a12e8ceeb 100644 --- a/channels/tsmf/client/tsmf_decoder.h +++ b/channels/tsmf/client/tsmf_decoder.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __TSMF_DECODER_H -#define __TSMF_DECODER_H +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_DECODER_H +#define FREERDP_CHANNEL_TSMF_CLIENT_DECODER_H #include "tsmf_types.h" @@ -72,5 +72,4 @@ typedef ITSMFDecoder *(*TSMF_DECODER_ENTRY)(void); ITSMFDecoder *tsmf_load_decoder(const char *name, TS_AM_MEDIA_TYPE *media_type); BOOL tsmf_check_decoder_available(const char* name); -#endif - +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_DECODER_H */ diff --git a/channels/tsmf/client/tsmf_ifman.h b/channels/tsmf/client/tsmf_ifman.h index 84d0406bc..b6986205a 100644 --- a/channels/tsmf/client/tsmf_ifman.h +++ b/channels/tsmf/client/tsmf_ifman.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __TSMF_IFMAN_H -#define __TSMF_IFMAN_H +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_IFMAN_H +#define FREERDP_CHANNEL_TSMF_CLIENT_IFMAN_H #include @@ -66,5 +66,5 @@ UINT tsmf_ifman_on_playback_restarted(TSMF_IFMAN* ifman); UINT tsmf_ifman_on_playback_stopped(TSMF_IFMAN* ifman); UINT tsmf_ifman_on_playback_rate_changed(TSMF_IFMAN* ifman); -#endif +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_IFMAN_H */ diff --git a/channels/tsmf/client/tsmf_main.h b/channels/tsmf/client/tsmf_main.h index db3c94582..0143d29f3 100644 --- a/channels/tsmf/client/tsmf_main.h +++ b/channels/tsmf/client/tsmf_main.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __TSMF_MAIN_H -#define __TSMF_MAIN_H +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_MAIN_H +#define FREERDP_CHANNEL_TSMF_CLIENT_MAIN_H #include @@ -68,5 +68,4 @@ BOOL tsmf_send_eos_response(IWTSVirtualChannelCallback* pChannelCallback, UINT32 BOOL tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, UINT32 message_id, UINT64 duration, UINT32 data_size); -#endif - +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_MAIN_H */ diff --git a/channels/tsmf/client/tsmf_media.h b/channels/tsmf/client/tsmf_media.h index 3a08b1c6a..3ab21ddc5 100644 --- a/channels/tsmf/client/tsmf_media.h +++ b/channels/tsmf/client/tsmf_media.h @@ -25,8 +25,8 @@ * streams in each presentation. */ -#ifndef __TSMF_MEDIA_H -#define __TSMF_MEDIA_H +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_MEDIA_H +#define FREERDP_CHANNEL_TSMF_CLIENT_MEDIA_H #include @@ -69,5 +69,5 @@ BOOL tsmf_stream_push_sample(TSMF_STREAM* stream, IWTSVirtualChannelCallback* pC BOOL tsmf_media_init(void); void tsmf_stream_start_threads(TSMF_STREAM* stream); -#endif +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_MEDIA_H */ diff --git a/channels/tsmf/client/tsmf_types.h b/channels/tsmf/client/tsmf_types.h index cdda3371c..a6833f03f 100644 --- a/channels/tsmf/client/tsmf_types.h +++ b/channels/tsmf/client/tsmf_types.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __TSMF_TYPES_H -#define __TSMF_TYPES_H +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_TYPES_H +#define FREERDP_CHANNEL_TSMF_CLIENT_TYPES_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,5 +57,5 @@ typedef struct _TS_AM_MEDIA_TYPE UINT32 ExtraDataSize; } TS_AM_MEDIA_TYPE; -#endif +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_TYPES_H */ diff --git a/channels/urbdrc/client/data_transfer.h b/channels/urbdrc/client/data_transfer.h index e7bd8ac3f..bc3d70860 100644 --- a/channels/urbdrc/client/data_transfer.h +++ b/channels/urbdrc/client/data_transfer.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __DATA_TRANSFER_H -#define __DATA_TRANSFER_H +#ifndef FREERDP_CHANNEL_URBDRC_CLIENT_DATA_TRANSFER_H +#define FREERDP_CHANNEL_URBDRC_CLIENT_DATA_TRANSFER_H #include "urbdrc_main.h" @@ -31,5 +31,5 @@ void *urbdrc_process_udev_data_transfer(void* arg); -#endif +#endif /* FREERDP_CHANNEL_URBDRC_CLIENT_DATA_TRANSFER_H */ diff --git a/channels/urbdrc/client/isoch_queue.h b/channels/urbdrc/client/isoch_queue.h index 4a01cdc08..90ab1a162 100644 --- a/channels/urbdrc/client/isoch_queue.h +++ b/channels/urbdrc/client/isoch_queue.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __ISOCH_QUEUE_H -#define __ISOCH_QUEUE_H +#ifndef FREERDP_CHANNEL_URBDRC_CLIENT_ISOCH_QUEUE_H +#define FREERDP_CHANNEL_URBDRC_CLIENT_ISOCH_QUEUE_H #include "urbdrc_types.h" @@ -66,4 +66,4 @@ ISOCH_CALLBACK_QUEUE* isoch_queue_new(void); -#endif /* __ISOCH_QUEUE_H */ +#endif /* FREERDP_CHANNEL_URBDRC_CLIENT_ISOCH_QUEUE_H */ diff --git a/channels/urbdrc/client/libusb/libusb_udevice.h b/channels/urbdrc/client/libusb/libusb_udevice.h index d753039ce..c79dfcad5 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.h +++ b/channels/urbdrc/client/libusb/libusb_udevice.h @@ -20,8 +20,8 @@ -#ifndef __LIBUSB_UDEVICE_H -#define __LIBUSB_UDEVICE_H +#ifndef FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_UDEVICE_H +#define FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_UDEVICE_H #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #include @@ -82,4 +82,4 @@ IUDEVICE* udev_new_by_addr(int bus_number, int dev_number); extern int libusb_debug; -#endif /* __LIBUSB_UDEVICE_H */ +#endif /* FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_UDEVICE_H */ diff --git a/channels/urbdrc/client/libusb/request_queue.h b/channels/urbdrc/client/libusb/request_queue.h index e10e7ae70..35e80c5d1 100644 --- a/channels/urbdrc/client/libusb/request_queue.h +++ b/channels/urbdrc/client/libusb/request_queue.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __REQUEST_QUEUE_H -#define __REQUEST_QUEUE_H +#ifndef FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_REQUEST_QUEUE_H +#define FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_REQUEST_QUEUE_H #include "urbdrc_types.h" @@ -62,4 +62,4 @@ struct _REQUEST_QUEUE REQUEST_QUEUE* request_queue_new(void); -#endif /* __REQUEST_QUEUE_H */ +#endif /* FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_REQUEST_QUEUE_H */ diff --git a/channels/urbdrc/client/searchman.h b/channels/urbdrc/client/searchman.h index 483e7bc48..b449a989f 100644 --- a/channels/urbdrc/client/searchman.h +++ b/channels/urbdrc/client/searchman.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __SEACH_MAN_H -#define __SEACH_MAN_H +#ifndef FREERDP_CHANNEL_URBDRC_CLIENT_SEARCHMAN_H +#define FREERDP_CHANNEL_URBDRC_CLIENT_SEARCHMAN_H #include "urbdrc_types.h" @@ -74,5 +74,5 @@ struct _USB_SEARCHMAN USB_SEARCHMAN* searchman_new(void* urbdrc, UINT32 UsbDevice); -#endif +#endif /* FREERDP_CHANNEL_URBDRC_CLIENT_SEARCHMAN_H */ diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h index c51f17dce..129b84435 100644 --- a/channels/urbdrc/client/urbdrc_main.h +++ b/channels/urbdrc/client/urbdrc_main.h @@ -20,8 +20,8 @@ -#ifndef __URBDRC_MAIN_H -#define __URBDRC_MAIN_H +#ifndef FREERDP_CHANNEL_URBDRC_CLIENT_MAIN_H +#define FREERDP_CHANNEL_URBDRC_CLIENT_MAIN_H #include "searchman.h" #include "isoch_queue.h" @@ -224,4 +224,4 @@ struct _IUDEVMAN void (*wait_urb) (IUDEVMAN* idevman); }; -#endif /* __URBDRC_MAIN_H */ +#endif /* FREERDP_CHANNEL_URBDRC_CLIENT_MAIN_H */ diff --git a/channels/urbdrc/client/urbdrc_types.h b/channels/urbdrc/client/urbdrc_types.h index 78c550ea1..204cadec3 100644 --- a/channels/urbdrc/client/urbdrc_types.h +++ b/channels/urbdrc/client/urbdrc_types.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __URBDRC_TYPES_H -#define __URBDRC_TYPES_H +#ifndef FREERDP_CHANNEL_URBDRC_CLIENT_TYPES_H +#define FREERDP_CHANNEL_URBDRC_CLIENT_TYPES_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -330,4 +330,4 @@ enum device_descriptor_table _t = (_tp.tv_sec * 1000) + (_tp.tv_usec / 1000); \ } while (0) -#endif /* __URBDRC_TYPES_H */ +#endif /* FREERDP_CHANNEL_URBDRC_CLIENT_TYPES_H */ diff --git a/client/Android/android_cliprdr.h b/client/Android/android_cliprdr.h index f7fdd6006..af142c20b 100644 --- a/client/Android/android_cliprdr.h +++ b/client/Android/android_cliprdr.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __ANDROID_CLIPRDR_H__ -#define __ANDROID_CLIPRDR_H__ +#ifndef FREERDP_CLIENT_ANDROID_CLIPRDR_H +#define FREERDP_CLIENT_ANDROID_CLIPRDR_H #include #include @@ -33,4 +33,4 @@ FREERDP_LOCAL BOOL android_cliprdr_init(androidContext* afc, FREERDP_LOCAL BOOL android_cliprdr_uninit(androidContext* afc, CliprdrClientContext* cliprdr); -#endif /* __ANDROID_CLIPRDR_H__ */ +#endif /* FREERDP_CLIENT_ANDROID_CLIPRDR_H */ diff --git a/client/Android/android_event.h b/client/Android/android_event.h index 38e00f372..584d67206 100644 --- a/client/Android/android_event.h +++ b/client/Android/android_event.h @@ -9,8 +9,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef FREERDP_ANDROID_EVENT_H -#define FREERDP_ANDROID_EVENT_H +#ifndef FREERDP_CLIENT_ANDROID_EVENT_H +#define FREERDP_CLIENT_ANDROID_EVENT_H #include #include @@ -79,4 +79,4 @@ FREERDP_LOCAL void android_event_free(ANDROID_EVENT* event); FREERDP_LOCAL BOOL android_event_queue_init(freerdp* inst); FREERDP_LOCAL void android_event_queue_uninit(freerdp* inst); -#endif /* FREERDP_ANDROID_EVENT_H */ +#endif /* FREERDP_CLIENT_ANDROID_EVENT_H */ diff --git a/client/Android/android_freerdp.h b/client/Android/android_freerdp.h index 5c15ee72c..ac8ca897b 100644 --- a/client/Android/android_freerdp.h +++ b/client/Android/android_freerdp.h @@ -7,8 +7,8 @@ If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef __ANDROID_FREERDP_H -#define __ANDROID_FREERDP_H +#ifndef FREERDP_CLIENT_ANDROID_FREERDP_H +#define FREERDP_CLIENT_ANDROID_FREERDP_H #include @@ -40,6 +40,6 @@ struct android_context }; typedef struct android_context androidContext; -#endif /* __ANDROID_FREERDP_H */ +#endif /* FREERDP_CLIENT_ANDROID_FREERDP_H */ diff --git a/client/Android/android_freerdp_jni.h b/client/Android/android_freerdp_jni.h index bd949bdd5..5bf48a24f 100644 --- a/client/Android/android_freerdp_jni.h +++ b/client/Android/android_freerdp_jni.h @@ -17,12 +17,12 @@ limitations under the License. */ -#ifndef __ANDROID_FREERDP_JNI_H -#define __ANDROID_FREERDP_JNI_H +#ifndef FREERDP_CLIENT_ANDROID_FREERDP_JNI_H +#define FREERDP_CLIENT_ANDROID_FREERDP_JNI_H #define JAVA_LIBFREERDP_CLASS "com/freerdp/freerdpcore/services/LibFreeRDP" #define JAVA_CONTEXT_CLASS "android/content/Context" #define JAVA_FILE_CLASS "java/io/File" -#endif /* __ANDROID_FREERDP_JNI_H */ +#endif /* FREERDP_CLIENT_ANDROID_FREERDP_JNI_H */ diff --git a/client/Android/android_jni_callback.h b/client/Android/android_jni_callback.h index 98af6f78b..7f91306e3 100644 --- a/client/Android/android_jni_callback.h +++ b/client/Android/android_jni_callback.h @@ -10,8 +10,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef FREERDP_ANDROID_JNI_CALLBACK_H -#define FREERDP_ANDROID_JNI_CALLBACK_H +#ifndef FREERDP_CLIENT_ANDROID_JNI_CALLBACK_H +#define FREERDP_CLIENT_ANDROID_JNI_CALLBACK_H #include #include @@ -27,5 +27,5 @@ FREERDP_LOCAL jboolean freerdp_callback_bool_result(const char* callback, FREERDP_LOCAL jint freerdp_callback_int_result(const char* callback, const char* signature, ...); -#endif /* FREERDP_ANDROID_JNI_CALLBACK_H */ +#endif /* FREERDP_CLIENT_ANDROID_JNI_CALLBACK_H */ diff --git a/client/Android/android_jni_utils.h b/client/Android/android_jni_utils.h index 12816aeda..5414e3301 100644 --- a/client/Android/android_jni_utils.h +++ b/client/Android/android_jni_utils.h @@ -9,8 +9,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef _ANDROID_JNI_UTILS_H_ -#define _ANDROID_JNI_UTILS_H_ +#ifndef FREERDP_CLIENT_ANDROID_JNI_UTILS_H +#define FREERDP_CLIENT_ANDROID_JNI_UTILS_H #include #include @@ -34,4 +34,4 @@ FREERDP_LOCAL extern JavaVM* g_JavaVm; } #endif -#endif /* _ANDROID_JNI_UTILS_H_ */ +#endif /* FREERDP_CLIENT_ANDROID_JNI_UTILS_H */ diff --git a/client/DirectFB/df_event.h b/client/DirectFB/df_event.h index 8e4cc773b..fc00674f3 100644 --- a/client/DirectFB/df_event.h +++ b/client/DirectFB/df_event.h @@ -17,12 +17,12 @@ * limitations under the License. */ -#ifndef __DF_EVENT_H -#define __DF_EVENT_H +#ifndef FREERDP_CLIENT_DF_EVENT_H +#define FREERDP_CLIENT_DF_EVENT_H #include "dfreerdp.h" void df_keyboard_init(void); BOOL df_event_process(freerdp* instance, DFBEvent* event); -#endif /* __DF_EVENT_H */ +#endif /* FREERDP_CLIENT_DF_EVENT_H */ diff --git a/client/DirectFB/df_graphics.h b/client/DirectFB/df_graphics.h index 8185b948b..bf9066843 100644 --- a/client/DirectFB/df_graphics.h +++ b/client/DirectFB/df_graphics.h @@ -17,11 +17,11 @@ * limitations under the License. */ -#ifndef __DF_GRAPHICS_H -#define __DF_GRAPHICS_H +#ifndef FREERDP_CLIENT_DF_GRAPHICS_H +#define FREERDP_CLIENT_DF_GRAPHICS_H #include "dfreerdp.h" void df_register_graphics(rdpGraphics* graphics); -#endif /* __DF_GRAPHICS_H */ +#endif /* FREERDP_CLIENT_DF_GRAPHICS_H */ diff --git a/client/DirectFB/dfreerdp.h b/client/DirectFB/dfreerdp.h index 6b14bf997..544619bf8 100644 --- a/client/DirectFB/dfreerdp.h +++ b/client/DirectFB/dfreerdp.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __DFREERDP_H -#define __DFREERDP_H +#ifndef FREERDP_CLIENT_DF_FREERDP_H +#define FREERDP_CLIENT_DF_FREERDP_H #include "config.h" #include @@ -67,4 +67,4 @@ struct df_info IDirectFBEventBuffer* event_buffer; }; -#endif /* __DFREERDP_H */ +#endif /* FREERDP_CLIENT_DF_FREERDP_H */ diff --git a/client/Mac/MRDPView.h b/client/Mac/MRDPView.h index 63cea7888..60e47d8f1 100644 --- a/client/Mac/MRDPView.h +++ b/client/Mac/MRDPView.h @@ -1,5 +1,5 @@ -#ifndef MRDPVIEW_H -#define MRDPVIEW_H +#ifndef FREERDP_CLIENT_MAC_MRDPVIEW_H +#define FREERDP_CLIENT_MAC_MRDPVIEW_H /** * FreeRDP: A Remote Desktop Protocol Implementation @@ -85,4 +85,4 @@ BOOL mac_post_connect(freerdp* instance); BOOL mac_authenticate(freerdp* instance, char** username, char** password, char** domain); -#endif // MRDPVIEW_H +#endif /* FREERDP_CLIENT_MAC_MRDPVIEW_H */ diff --git a/client/Mac/mf_client.h b/client/Mac/mf_client.h index 341fcacbc..79712cc55 100644 --- a/client/Mac/mf_client.h +++ b/client/Mac/mf_client.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __MF_CLIENT_H -#define __MF_CLIENT_H +#ifndef FREERDP_CLIENT_MAC_CLIENT_H +#define FREERDP_CLIENT_MAC_CLIENT_H #include @@ -40,4 +40,4 @@ FREERDP_API int RdpClientEntry(RDP_CLIENT_ENTRY_POINTS* pEntryPoints); } #endif -#endif +#endif /* FREERDP_CLIENT_MAC_CLIENT_H */ diff --git a/client/Mac/mfreerdp.h b/client/Mac/mfreerdp.h index c0b59d677..d263a0392 100644 --- a/client/Mac/mfreerdp.h +++ b/client/Mac/mfreerdp.h @@ -1,5 +1,5 @@ -#ifndef MFREERDP_H -#define MFREERDP_H +#ifndef FREERDP_CLIENT_MAC_FREERDP_H +#define FREERDP_CLIENT_MAC_FREERDP_H typedef struct mf_context mfContext; @@ -86,4 +86,4 @@ struct mf_context int yMaxScroll; // maximum vertical scroll value }; -#endif // MFREERDP_H +#endif /* FREERDP_CLIENT_MAC_FREERDP_H */ diff --git a/client/Wayland/wlf_channels.h b/client/Wayland/wlf_channels.h index b0e2ff19a..d3d47d25a 100644 --- a/client/Wayland/wlf_channels.h +++ b/client/Wayland/wlf_channels.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef WLF_CHANNELS_H -#define WLF_CHANNELS_H +#ifndef FREERDP_CLIENT_WAYLAND_CHANNELS_H +#define FREERDP_CLIENT_WAYLAND_CHANNELS_H #include #include @@ -39,4 +39,4 @@ void wlf_OnChannelConnectedEventHandler(rdpContext* context, void wlf_OnChannelDisconnectedEventHandler(rdpContext* context, ChannelDisconnectedEventArgs* e); -#endif +#endif /* FREERDP_CLIENT_WAYLAND_CHANNELS_H */ diff --git a/client/Wayland/wlf_input.h b/client/Wayland/wlf_input.h index 2e26ab89a..701edf582 100644 --- a/client/Wayland/wlf_input.h +++ b/client/Wayland/wlf_input.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __WLF_INPUT_H -#define __WLF_INPUT_H +#ifndef FREERDP_CLIENT_WAYLAND_INPUT_H +#define FREERDP_CLIENT_WAYLAND_INPUT_H #include #include @@ -35,4 +35,4 @@ BOOL wlf_handle_pointer_axis(freerdp* instance, UwacPointerAxisEvent* ev); BOOL wlf_handle_key(freerdp* instance, UwacKeyEvent* ev); BOOL wlf_keyboard_enter(freerdp* instance, UwacKeyboardEnterLeaveEvent* ev); -#endif /* __WLF_INPUT_H */ +#endif /* FREERDP_CLIENT_WAYLAND_INPUT_H */ diff --git a/client/Wayland/wlfreerdp.h b/client/Wayland/wlfreerdp.h index f9fe716a8..7605e4685 100644 --- a/client/Wayland/wlfreerdp.h +++ b/client/Wayland/wlfreerdp.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __WLFREERDP_H -#define __WLFREERDP_H +#ifndef FREERDP_CLIENT_WAYLAND_FREERDP_H +#define FREERDP_CLIENT_WAYLAND_FREERDP_H #include #include @@ -50,5 +50,5 @@ struct wlf_context EncomspClientContext* encomsp; }; -#endif /* __WLFREERDP_H */ +#endif /* FREERDP_CLIENT_WAYLAND_FREERDP_H */ diff --git a/client/Windows/cli/wfreerdp.h b/client/Windows/cli/wfreerdp.h index 913d5d6f5..2bb57bced 100644 --- a/client/Windows/cli/wfreerdp.h +++ b/client/Windows/cli/wfreerdp.h @@ -19,9 +19,9 @@ * limitations under the License. */ -#ifndef __WFREERDP_H -#define __WFREERDP_H +#ifndef FREERDP_CLIENT_WIN_FREERDP_H +#define FREERDP_CLIENT_WIN_FREERDP_H #include "wf_interface.h" -#endif +#endif /* FREERDP_CLIENT_WIN_FREERDP_H */ diff --git a/client/Windows/wf_channels.h b/client/Windows/wf_channels.h index 97ac2bb88..d80f24342 100644 --- a/client/Windows/wf_channels.h +++ b/client/Windows/wf_channels.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef __WF_CHANNELS_H -#define __WF_CHANNELS_H +#ifndef FREERDP_CLIENT_WIN_CHANNELS_H +#define FREERDP_CLIENT_WIN_CHANNELS_H #include #include @@ -33,4 +33,4 @@ void wf_OnChannelConnectedEventHandler(rdpContext* context, void wf_OnChannelDisconnectedEventHandler(rdpContext* context, ChannelDisconnectedEventArgs* e); -#endif +#endif /* FREERDP_CLIENT_WIN_CHANNELS_H */ diff --git a/client/Windows/wf_client.h b/client/Windows/wf_client.h index 1e4ac620b..708c1c10b 100644 --- a/client/Windows/wf_client.h +++ b/client/Windows/wf_client.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __WF_INTERFACE_H -#define __WF_INTERFACE_H +#ifndef FREERDP_CLIENT_WIN_INTERFACE_H +#define FREERDP_CLIENT_WIN_INTERFACE_H #include @@ -148,4 +148,4 @@ FREERDP_API void wf_size_scrollbars(wfContext* wfc, UINT32 client_width, } #endif -#endif +#endif /* FREERDP_CLIENT_WIN_INTERFACE_H */ diff --git a/client/Windows/wf_cliprdr.h b/client/Windows/wf_cliprdr.h index 69cd052b9..3a6b4a186 100644 --- a/client/Windows/wf_cliprdr.h +++ b/client/Windows/wf_cliprdr.h @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef __WF_CLIPRDR_H -#define __WF_CLIPRDR_H +#ifndef FREERDP_CLIENT_WIN_CLIPRDR_H +#define FREERDP_CLIENT_WIN_CLIPRDR_H #include "wf_client.h" BOOL wf_cliprdr_init(wfContext* wfc, CliprdrClientContext* cliprdr); BOOL wf_cliprdr_uninit(wfContext* wfc, CliprdrClientContext* cliprdr); -#endif /* __WF_CLIPRDR_H */ +#endif /* FREERDP_CLIENT_WIN_CLIPRDR_H */ diff --git a/client/Windows/wf_event.h b/client/Windows/wf_event.h index d7e4a55d3..a9d710851 100644 --- a/client/Windows/wf_event.h +++ b/client/Windows/wf_event.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __WF_EVENT_H -#define __WF_EVENT_H +#ifndef FREERDP_CLIENT_WIN_EVENT_H +#define FREERDP_CLIENT_WIN_EVENT_H #include "wf_client.h" #include @@ -38,4 +38,4 @@ void wf_event_focus_in(wfContext* wfc); #define DEBUG_KBD(...) do { } while (0) #endif -#endif /* __WF_EVENT_H */ +#endif /* FREERDP_CLIENT_WIN_EVENT_H */ diff --git a/client/Windows/wf_floatbar.h b/client/Windows/wf_floatbar.h index 7b6f67dd0..9867e9d5f 100644 --- a/client/Windows/wf_floatbar.h +++ b/client/Windows/wf_floatbar.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __WF_FLOATBAR_H__ -#define __WF_FLOATBAR_H__ +#ifndef FREERDP_CLIENT_WIN_FLOATBAR_H +#define FREERDP_CLIENT_WIN_FLOATBAR_H typedef struct _FloatBar FloatBar; typedef struct wf_context wfContext; @@ -27,4 +27,4 @@ void floatbar_window_create(wfContext* wfc); int floatbar_show(FloatBar* floatbar); int floatbar_hide(FloatBar* floatbar); -#endif +#endif /* FREERDP_CLIENT_WIN_FLOATBAR_H */ diff --git a/client/Windows/wf_gdi.h b/client/Windows/wf_gdi.h index 23b5ec41f..3ceec490f 100644 --- a/client/Windows/wf_gdi.h +++ b/client/Windows/wf_gdi.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __WF_GDI_H -#define __WF_GDI_H +#ifndef FREERDP_CLIENT_WIN_GDI_H +#define FREERDP_CLIENT_WIN_GDI_H #include "wf_client.h" @@ -37,4 +37,4 @@ void wf_gdi_register_update_callbacks(rdpUpdate* update); void wf_update_canvas_diff(wfContext* wfc); -#endif /* __WF_GDI_H */ +#endif /* FREERDP_CLIENT_WIN_GDI_H */ diff --git a/client/Windows/wf_graphics.h b/client/Windows/wf_graphics.h index 14508081a..da2e36eff 100644 --- a/client/Windows/wf_graphics.h +++ b/client/Windows/wf_graphics.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __WF_GRAPHICS_H -#define __WF_GRAPHICS_H +#ifndef FREERDP_CLIENT_WIN_GRAPHICS_H +#define FREERDP_CLIENT_WIN_GRAPHICS_H #include "wf_client.h" @@ -31,4 +31,4 @@ void wf_image_free(wfBitmap* image); BOOL wf_register_pointer(rdpGraphics* graphics); BOOL wf_register_graphics(rdpGraphics* graphics); -#endif /* WF_GRAPHICS */ +#endif /* FREERDP_CLIENT_WIN_GRAPHICS_H */ diff --git a/client/Windows/wf_rail.h b/client/Windows/wf_rail.h index 4fbeb74f5..1bf8c27a6 100644 --- a/client/Windows/wf_rail.h +++ b/client/Windows/wf_rail.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef __WF_RAIL_H -#define __WF_RAIL_H +#ifndef FREERDP_CLIENT_WIN_RAIL_H +#define FREERDP_CLIENT_WIN_RAIL_H typedef struct wf_rail_window wfRailWindow; @@ -46,4 +46,4 @@ void wf_rail_uninit(wfContext* wfc, RailClientContext* rail); void wf_rail_invalidate_region(wfContext* wfc, REGION16* invalidRegion); -#endif +#endif /* FREERDP_CLIENT_WIN_RAIL_H */ diff --git a/client/X11/xf_channels.h b/client/X11/xf_channels.h index 1be37c4d0..441ca99f6 100644 --- a/client/X11/xf_channels.h +++ b/client/X11/xf_channels.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_CHANNELS_H -#define __XF_CHANNELS_H +#ifndef FREERDP_CLIENT_X11_CHANNELS_H +#define FREERDP_CLIENT_X11_CHANNELS_H #include #include @@ -35,4 +35,4 @@ int xf_on_channel_disconnected(freerdp* instance, const char* name, void* pInter void xf_OnChannelConnectedEventHandler(rdpContext* context, ChannelConnectedEventArgs* e); void xf_OnChannelDisconnectedEventHandler(rdpContext* context, ChannelDisconnectedEventArgs* e); -#endif +#endif /* FREERDP_CLIENT_X11_CHANNELS_H */ diff --git a/client/X11/xf_client.h b/client/X11/xf_client.h index 1ac55e8cf..34535a1e1 100644 --- a/client/X11/xf_client.h +++ b/client/X11/xf_client.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_CLIENT_H -#define __XF_CLIENT_H +#ifndef FREERDP_CLIENT_X11_CLIENT_H +#define FREERDP_CLIENT_X11_CLIENT_H #include #include @@ -50,4 +50,4 @@ FREERDP_API int RdpClientEntry(RDP_CLIENT_ENTRY_POINTS* pEntryPoints); } #endif -#endif /* __XF_CLIENT_H */ +#endif /* FREERDP_CLIENT_X11_CLIENT_H */ diff --git a/client/X11/xf_cliprdr.h b/client/X11/xf_cliprdr.h index 7175b3a54..f9c3583da 100644 --- a/client/X11/xf_cliprdr.h +++ b/client/X11/xf_cliprdr.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_CLIPRDR_H -#define __XF_CLIPRDR_H +#ifndef FREERDP_CLIENT_X11_CLIPRDR_H +#define FREERDP_CLIENT_X11_CLIPRDR_H #include "xf_client.h" #include "xfreerdp.h" @@ -33,4 +33,4 @@ void xf_cliprdr_uninit(xfContext* xfc, CliprdrClientContext* cliprdr); void xf_cliprdr_handle_xevent(xfContext* xfc, XEvent* event); -#endif /* __XF_CLIPRDR_H */ +#endif /* FREERDP_CLIENT_X11_CLIPRDR_H */ diff --git a/client/X11/xf_event.h b/client/X11/xf_event.h index 8477b69b2..4e880aa03 100644 --- a/client/X11/xf_event.h +++ b/client/X11/xf_event.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_EVENT_H -#define __XF_EVENT_H +#ifndef FREERDP_CLIENT_X11_EVENT_H +#define FREERDP_CLIENT_X11_EVENT_H #include "xf_keyboard.h" @@ -37,4 +37,4 @@ BOOL xf_generic_MotionNotify(xfContext* xfc, int x, int y, int state, Window win BOOL xf_generic_ButtonPress(xfContext* xfc, int x, int y, int button, Window window, BOOL app); BOOL xf_generic_ButtonRelease(xfContext* xfc, int x, int y, int button, Window window, BOOL app); -#endif /* __XF_EVENT_H */ +#endif /* FREERDP_CLIENT_X11_EVENT_H */ diff --git a/client/X11/xf_gdi.h b/client/X11/xf_gdi.h index f11bd0bca..84dcfc447 100644 --- a/client/X11/xf_gdi.h +++ b/client/X11/xf_gdi.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __XF_GDI_H -#define __XF_GDI_H +#ifndef FREERDP_CLIENT_X11_GDI_H +#define FREERDP_CLIENT_X11_GDI_H #include @@ -29,4 +29,4 @@ void xf_gdi_register_update_callbacks(rdpUpdate* update); -#endif /* __XF_GDI_H */ +#endif /* FREERDP_CLIENT_X11_GDI_H */ diff --git a/client/X11/xf_gfx.h b/client/X11/xf_gfx.h index df0c8e21a..11c172004 100644 --- a/client/X11/xf_gfx.h +++ b/client/X11/xf_gfx.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __XF_GRAPHICS_PIPELINE_H -#define __XF_GRAPHICS_PIPELINE_H +#ifndef FREERDP_CLIENT_X11_GFX_H +#define FREERDP_CLIENT_X11_GFX_H #include "xf_client.h" #include "xfreerdp.h" @@ -53,4 +53,4 @@ UINT xf_OutputExpose(xfContext* xfc, UINT32 x, UINT32 y, void xf_graphics_pipeline_init(xfContext* xfc, RdpgfxClientContext* gfx); void xf_graphics_pipeline_uninit(xfContext* xfc, RdpgfxClientContext* gfx); -#endif /* __XF_GRAPHICS_PIPELINE_H */ +#endif /* FREERDP_CLIENT_X11_GFX_H */ diff --git a/client/X11/xf_graphics.h b/client/X11/xf_graphics.h index d185baace..303e116c1 100644 --- a/client/X11/xf_graphics.h +++ b/client/X11/xf_graphics.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_GRAPHICS_H -#define __XF_GRAPHICS_H +#ifndef FREERDP_CLIENT_X11_GRAPHICS_H +#define FREERDP_CLIENT_X11_GRAPHICS_H #include "xf_client.h" #include "xfreerdp.h" @@ -29,4 +29,4 @@ BOOL xf_register_graphics(rdpGraphics* graphics); BOOL xf_decode_color(xfContext* xfc, const UINT32 srcColor, XColor* color); UINT32 xf_get_local_color_format(xfContext* xfc, BOOL aligned); -#endif /* __XF_GRAPHICS_H */ +#endif /* FREERDP_CLIENT_X11_GRAPHICS_H */ diff --git a/client/X11/xf_input.h b/client/X11/xf_input.h index 6289fdb74..c08fea092 100644 --- a/client/X11/xf_input.h +++ b/client/X11/xf_input.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_INPUT_H -#define __XF_INPUT_H +#ifndef FREERDP_CLIENT_X11_INPUT_H +#define FREERDP_CLIENT_X11_INPUT_H #include "xf_client.h" #include "xfreerdp.h" @@ -30,4 +30,4 @@ int xf_input_init(xfContext* xfc, Window window); int xf_input_handle_event(xfContext* xfc, XEvent* event); -#endif +#endif /* FREERDP_CLIENT_X11_INPUT_H */ diff --git a/client/X11/xf_keyboard.h b/client/X11/xf_keyboard.h index cdd2d2162..c7e601b1b 100644 --- a/client/X11/xf_keyboard.h +++ b/client/X11/xf_keyboard.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef XF_KEYBOARD_H -#define XF_KEYBOARD_H +#ifndef FREERDP_CLIENT_X11_XF_KEYBOARD_H +#define FREERDP_CLIENT_X11_XF_KEYBOARD_H #include @@ -59,4 +59,4 @@ void xf_keyboard_handle_special_keys_release(xfContext* xfc, KeySym keysym); BOOL xf_keyboard_set_indicators(rdpContext* context, UINT16 led_flags); BOOL xf_keyboard_set_ime_status(rdpContext* context, UINT16 imeId, UINT32 imeState, UINT32 imeConvMode); -#endif /* __XF_KEYBOARD_H */ +#endif /* FREERDP_CLIENT_X11_XF_KEYBOARD_H */ diff --git a/client/X11/xf_monitor.h b/client/X11/xf_monitor.h index 8e15a3abe..2e3cd2f34 100644 --- a/client/X11/xf_monitor.h +++ b/client/X11/xf_monitor.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_MONITOR_H -#define __XF_MONITOR_H +#ifndef FREERDP_CLIENT_X11_MONITOR_H +#define FREERDP_CLIENT_X11_MONITOR_H #include #include @@ -47,4 +47,4 @@ FREERDP_API int xf_list_monitors(xfContext* xfc); FREERDP_API BOOL xf_detect_monitors(xfContext* xfc, UINT32* pWidth, UINT32* pHeight); FREERDP_API void xf_monitors_free(xfContext* xfc); -#endif /* __XF_MONITOR_H */ +#endif /* FREERDP_CLIENT_X11_MONITOR_H */ diff --git a/client/X11/xf_rail.h b/client/X11/xf_rail.h index d7a47ea01..2e1ea539c 100644 --- a/client/X11/xf_rail.h +++ b/client/X11/xf_rail.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_RAIL_H -#define __XF_RAIL_H +#ifndef FREERDP_CLIENT_X11_RAIL_H +#define FREERDP_CLIENT_X11_RAIL_H #include "xf_client.h" #include "xfreerdp.h" @@ -36,4 +36,4 @@ void xf_rail_disable_remoteapp_mode(xfContext* xfc); int xf_rail_init(xfContext* xfc, RailClientContext* rail); int xf_rail_uninit(xfContext* xfc, RailClientContext* rail); -#endif /* __XF_RAIL_H */ +#endif /* FREERDP_CLIENT_X11_RAIL_H */ diff --git a/client/X11/xf_tsmf.h b/client/X11/xf_tsmf.h index 0469d6860..63a973aa7 100644 --- a/client/X11/xf_tsmf.h +++ b/client/X11/xf_tsmf.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_TSMF_H -#define __XF_TSMF_H +#ifndef FREERDP_CLIENT_X11_TSMF_H +#define FREERDP_CLIENT_X11_TSMF_H #include "xf_client.h" #include "xfreerdp.h" @@ -26,4 +26,4 @@ int xf_tsmf_init(xfContext* xfc, TsmfClientContext* tsmf); int xf_tsmf_uninit(xfContext* xfc, TsmfClientContext* tsmf); -#endif /* __XF_TSMF_H */ +#endif /* FREERDP_CLIENT_X11_TSMF_H */ diff --git a/client/X11/xf_window.h b/client/X11/xf_window.h index 37c92aef3..44921cc99 100644 --- a/client/X11/xf_window.h +++ b/client/X11/xf_window.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __XF_WINDOW_H -#define __XF_WINDOW_H +#ifndef FREERDP_CLIENT_X11_WINDOW_H +#define FREERDP_CLIENT_X11_WINDOW_H #include @@ -174,4 +174,4 @@ void xf_StartLocalMoveSize(xfContext* xfc, xfAppWindow* appWindow, int direction void xf_EndLocalMoveSize(xfContext* xfc, xfAppWindow* appWindow); xfAppWindow* xf_AppWindowFromX11Window(xfContext* xfc, Window wnd); -#endif /* __XF_WINDOW_H */ +#endif /* FREERDP_CLIENT_X11_WINDOW_H */ diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h index 12b142d02..8cfcb246b 100644 --- a/client/X11/xfreerdp.h +++ b/client/X11/xfreerdp.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __XFREERDP_H -#define __XFREERDP_H +#ifndef FREERDP_CLIENT_X11_FREERDP_H +#define FREERDP_CLIENT_X11_FREERDP_H typedef struct xf_context xfContext; @@ -287,5 +287,5 @@ void xf_draw_screen(xfContext* xfc, int x, int y, int w, int h); FREERDP_API DWORD xf_exit_code_from_disconnect_reason(DWORD reason); -#endif /* __XFREERDP_H */ +#endif /* FREERDP_CLIENT_X11_FREERDP_H */ diff --git a/client/common/compatibility.h b/client/common/compatibility.h index 358587c93..1a5d3e061 100644 --- a/client/common/compatibility.h +++ b/client/common/compatibility.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CLIENT_COMPATIBILITY_H -#define FREERDP_CLIENT_COMPATIBILITY_H +#ifndef FREERDP_CLIENT_COMMON_COMPATIBILITY_H +#define FREERDP_CLIENT_COMMON_COMPATIBILITY_H #include #include @@ -26,5 +26,5 @@ FREERDP_API int freerdp_detect_old_command_line_syntax(int argc, char** argv, int* count); FREERDP_API int freerdp_client_parse_old_command_line_arguments(int argc, char** argv, rdpSettings* settings); -#endif /* FREERDP_CLIENT_COMPATIBILITY */ +#endif /* FREERDP_CLIENT_COMMON_COMPATIBILITY_H */ diff --git a/config.h.in b/config.h.in index 4e97ee121..b634b53ca 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,5 @@ -#ifndef __CONFIG_H -#define __CONFIG_H +#ifndef FREERDP_CONFIG_H +#define FREERDP_CONFIG_H /* Include files */ #cmakedefine HAVE_FCNTL_H @@ -90,4 +90,4 @@ #cmakedefine WITH_DEBUG_X11_LOCAL_MOVESIZE #cmakedefine WITH_DEBUG_XV #cmakedefine WITH_DEBUG_RINGBUFFER -#endif +#endif /* FREERDP_CONFIG_H */ diff --git a/include/freerdp/channels/rdpei.h b/include/freerdp/channels/rdpei.h index ac76bf364..375fa6099 100644 --- a/include/freerdp/channels/rdpei.h +++ b/include/freerdp/channels/rdpei.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __FREERDP_CHANNEL_RDPEI_H_ -#define __FREERDP_CHANNEL_RDPEI_H_ +#ifndef FREERDP_CHANNEL_RDPEI_H +#define FREERDP_CHANNEL_RDPEI_H #include @@ -87,5 +87,5 @@ struct _RDPINPUT_TOUCH_EVENT typedef struct _RDPINPUT_TOUCH_EVENT RDPINPUT_TOUCH_EVENT; -#endif /* __FREERDP_CHANNEL_RDPEI_H_ */ +#endif /* FREERDP_CHANNEL_RDPEI_H */ diff --git a/include/freerdp/client/audin.h b/include/freerdp/client/audin.h index 56a7f0046..e78e4b1ea 100644 --- a/include/freerdp/client/audin.h +++ b/include/freerdp/client/audin.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_AUDIN_H -#define FREERDP_CHANNEL_CLIENT_AUDIN_H +#ifndef FREERDP_CHANNEL_AUDIN_CLIENT_AUDIN_H +#define FREERDP_CHANNEL_AUDIN_CLIENT_AUDIN_H #include #include @@ -69,5 +69,5 @@ typedef FREERDP_AUDIN_DEVICE_ENTRY_POINTS* PFREERDP_AUDIN_DEVICE_ENTRY_POINTS; typedef UINT (*PFREERDP_AUDIN_DEVICE_ENTRY)(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEntryPoints); -#endif /* FREERDP_CHANNEL_CLIENT_AUDIN_H */ +#endif /* FREERDP_CHANNEL_AUDIN_CLIENT_AUDIN_H */ diff --git a/include/freerdp/client/channels.h b/include/freerdp/client/channels.h index 4e71fcc89..336ba5327 100644 --- a/include/freerdp/client/channels.h +++ b/include/freerdp/client/channels.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNELS_CLIENT -#define FREERDP_CHANNELS_CLIENT +#ifndef FREERDP_CHANNELS_CLIENT_H +#define FREERDP_CHANNELS_CLIENT_H #include #include @@ -38,5 +38,5 @@ FREERDP_API void freerdp_channels_addin_list_free(FREERDP_ADDIN** ppAddins); } #endif -#endif /* FREERDP_CHANNELS_CLIENT */ +#endif /* FREERDP_CHANNELS_CLIENT_H */ diff --git a/include/freerdp/client/cliprdr.h b/include/freerdp/client/cliprdr.h index cb4b69cdf..3fe40823a 100644 --- a/include/freerdp/client/cliprdr.h +++ b/include/freerdp/client/cliprdr.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_CLIPRDR_H -#define FREERDP_CHANNEL_CLIENT_CLIPRDR_H +#ifndef FREERDP_CHANNEL_CLIPRDR_CLIENT_CLIPRDR_H +#define FREERDP_CHANNEL_CLIPRDR_CLIENT_CLIPRDR_H #include @@ -180,4 +180,4 @@ struct _RDP_CB_TEMPDIR_EVENT }; typedef struct _RDP_CB_TEMPDIR_EVENT RDP_CB_TEMPDIR_EVENT; -#endif /* FREERDP_CHANNEL_CLIENT_CLIPRDR_H */ +#endif /* FREERDP_CHANNEL_CLIPRDR_CLIENT_CLIPRDR_H */ diff --git a/include/freerdp/client/disp.h b/include/freerdp/client/disp.h index be21164ed..d61644cab 100644 --- a/include/freerdp/client/disp.h +++ b/include/freerdp/client/disp.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_DISP_H -#define FREERDP_CHANNEL_CLIENT_DISP_H +#ifndef FREERDP_CHANNEL_DISP_CLIENT_DISP_H +#define FREERDP_CHANNEL_DISP_CLIENT_DISP_H #define ORIENTATION_LANDSCAPE 0 #define ORIENTATION_PORTRAIT 90 @@ -62,5 +62,5 @@ struct _disp_client_context pcDispSendMonitorLayout SendMonitorLayout; }; -#endif /* FREERDP_CHANNEL_CLIENT_DISP_H */ +#endif /* FREERDP_CHANNEL_DISP_CLIENT_DISP_H */ diff --git a/include/freerdp/client/drdynvc.h b/include/freerdp/client/drdynvc.h index 1bccd6462..332927cc4 100644 --- a/include/freerdp/client/drdynvc.h +++ b/include/freerdp/client/drdynvc.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_DRDYNVC_H -#define FREERDP_CHANNEL_CLIENT_DRDYNVC_H +#ifndef FREERDP_CHANNEL_DRDYNVC_CLIENT_DRDYNVC_H +#define FREERDP_CHANNEL_DRDYNVC_CLIENT_DRDYNVC_H /** * Client Interface @@ -50,4 +50,4 @@ struct _drdynvc_client_context pcDrdynvcOnChannelDetached OnChannelDetached; }; -#endif /* FREERDP_CHANNEL_CLIENT_DRDYNVC_H */ +#endif /* FREERDP_CHANNEL_DRDYNVC_CLIENT_DRDYNVC_H */ diff --git a/include/freerdp/client/encomsp.h b/include/freerdp/client/encomsp.h index 3be18cd74..0ac5a2d62 100644 --- a/include/freerdp/client/encomsp.h +++ b/include/freerdp/client/encomsp.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_ENCOMSP_H -#define FREERDP_CHANNEL_CLIENT_ENCOMSP_H +#ifndef FREERDP_CHANNEL_ENCOMSP_CLIENT_ENCOMSP_H +#define FREERDP_CHANNEL_ENCOMSP_CLIENT_ENCOMSP_H #include @@ -60,4 +60,4 @@ struct _encomsp_client_context pcEncomspGraphicsStreamResumed GraphicsStreamResumed; }; -#endif /* FREERDP_CHANNEL_CLIENT_ENCOMSP_H */ +#endif /* FREERDP_CHANNEL_ENCOMSP_CLIENT_ENCOMSP_H */ diff --git a/include/freerdp/client/rail.h b/include/freerdp/client/rail.h index f492f5f51..2284face0 100644 --- a/include/freerdp/client/rail.h +++ b/include/freerdp/client/rail.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_RAIL_H -#define FREERDP_CHANNEL_CLIENT_RAIL_H +#ifndef FREERDP_CHANNEL_RAIL_CLIENT_RAIL_H +#define FREERDP_CHANNEL_RAIL_CLIENT_RAIL_H #include #include @@ -83,5 +83,5 @@ struct _rail_client_context pcRailServerGetAppIdResponse ServerGetAppIdResponse; }; -#endif /* FREERDP_CHANNEL_CLIENT_RAIL_H */ +#endif /* FREERDP_CHANNEL_RAIL_CLIENT_RAIL_H */ diff --git a/include/freerdp/client/rdpei.h b/include/freerdp/client/rdpei.h index 30a011f24..3b8e961a7 100644 --- a/include/freerdp/client/rdpei.h +++ b/include/freerdp/client/rdpei.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_RDPEI_H -#define FREERDP_CHANNEL_CLIENT_RDPEI_H +#ifndef FREERDP_CHANNEL_RDPEI_CLIENT_RDPEI_H +#define FREERDP_CHANNEL_RDPEI_CLIENT_RDPEI_H #include @@ -57,4 +57,4 @@ struct _rdpei_client_context pcRdpeiResumeTouch ResumeTouch; }; -#endif /* FREERDP_CHANNEL_CLIENT_RDPEI_H */ +#endif /* FREERDP_CHANNEL_RDPEI_CLIENT_RDPEI_H */ diff --git a/include/freerdp/client/rdpgfx.h b/include/freerdp/client/rdpgfx.h index 333f30ec4..50b191452 100644 --- a/include/freerdp/client/rdpgfx.h +++ b/include/freerdp/client/rdpgfx.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_RDPGFX_H -#define FREERDP_CHANNEL_CLIENT_RDPGFX_H +#ifndef FREERDP_CHANNEL_RDPGFX_CLIENT_RDPGFX_H +#define FREERDP_CHANNEL_RDPGFX_CLIENT_RDPGFX_H #include #include @@ -114,4 +114,4 @@ struct _rdpgfx_client_context PROFILER_DEFINE(SurfaceProfiler); }; -#endif /* FREERDP_CHANNEL_CLIENT_RDPGFX_H */ +#endif /* FREERDP_CHANNEL_RDPGFX_CLIENT_RDPGFX_H */ diff --git a/include/freerdp/client/rdpsnd.h b/include/freerdp/client/rdpsnd.h index 6f4ba8b61..089046cd2 100644 --- a/include/freerdp/client/rdpsnd.h +++ b/include/freerdp/client/rdpsnd.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_RDPSND_H -#define FREERDP_CHANNEL_CLIENT_RDPSND_H +#ifndef FREERDP_CHANNEL_RDPSND_CLIENT_RDPSND_H +#define FREERDP_CHANNEL_RDPSND_CLIENT_RDPSND_H #include @@ -100,5 +100,5 @@ typedef FREERDP_RDPSND_DEVICE_ENTRY_POINTS* PFREERDP_RDPSND_DEVICE_ENTRY_POINTS; typedef UINT (*PFREERDP_RDPSND_DEVICE_ENTRY)(PFREERDP_RDPSND_DEVICE_ENTRY_POINTS pEntryPoints); -#endif /* FREERDP_CHANNEL_CLIENT_RDPSND_H */ +#endif /* FREERDP_CHANNEL_RDPSND_CLIENT_RDPSND_H */ diff --git a/include/freerdp/client/remdesk.h b/include/freerdp/client/remdesk.h index 600a421ce..dae72f8de 100644 --- a/include/freerdp/client/remdesk.h +++ b/include/freerdp/client/remdesk.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_REMDESK_H -#define FREERDP_CHANNEL_CLIENT_REMDESK_H +#ifndef FREERDP_CHANNEL_REMDESK_CLIENT_REMDESK_H +#define FREERDP_CHANNEL_REMDESK_CLIENT_REMDESK_H #include @@ -34,5 +34,5 @@ struct _remdesk_client_context void* custom; }; -#endif /* FREERDP_CHANNEL_CLIENT_REMDESK_H */ +#endif /* FREERDP_CHANNEL_REMDESK_CLIENT_REMDESK_H */ diff --git a/include/freerdp/client/tsmf.h b/include/freerdp/client/tsmf.h index 674a9c737..3730716ef 100644 --- a/include/freerdp/client/tsmf.h +++ b/include/freerdp/client/tsmf.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_CLIENT_TSMF_H -#define FREERDP_CHANNEL_CLIENT_TSMF_H +#ifndef FREERDP_CHANNEL_TSMF_CLIENT_TSMF_H +#define FREERDP_CHANNEL_TSMF_CLIENT_TSMF_H #include @@ -61,4 +61,4 @@ struct _tsmf_client_context pcTsmfFrameEvent FrameEvent; }; -#endif /* FREERDP_CHANNEL_CLIENT_TSMF_H */ +#endif /* FREERDP_CHANNEL_TSMF_CLIENT_TSMF_H */ diff --git a/include/freerdp/codec/region.h b/include/freerdp/codec/region.h index 5a6493505..c66705241 100644 --- a/include/freerdp/codec/region.h +++ b/include/freerdp/codec/region.h @@ -21,8 +21,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef __REGION_H___ -#define __REGION_H___ +#ifndef FREERDP_CODEC_REGION_H +#define FREERDP_CODEC_REGION_H #include #include @@ -153,4 +153,4 @@ FREERDP_API void region16_uninit(REGION16* region); } #endif -#endif /* __REGION_H___ */ +#endif /* FREERDP_CODEC_REGION_H */ diff --git a/include/freerdp/primitives.h b/include/freerdp/primitives.h index 14cdeeb5e..022da27b7 100644 --- a/include/freerdp/primitives.h +++ b/include/freerdp/primitives.h @@ -17,8 +17,8 @@ # pragma once #endif -#ifndef __PRIMITIVES_H_INCLUDED__ -#define __PRIMITIVES_H_INCLUDED__ +#ifndef FREERDP_PRIMITIVES_H +#define FREERDP_PRIMITIVES_H #include #include @@ -267,4 +267,4 @@ FREERDP_API primitives_t* primitives_get_generic(void); } #endif -#endif /* !__PRIMITIVES_H_INCLUDED__ */ +#endif /* FREERDP_PRIMITIVES_H */ diff --git a/include/freerdp/server/channels.h b/include/freerdp/server/channels.h index cd14831fa..b2bcb3696 100644 --- a/include/freerdp/server/channels.h +++ b/include/freerdp/server/channels.h @@ -17,10 +17,10 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNELS_SERVER -#define FREERDP_CHANNELS_SERVER +#ifndef FREERDP_CHANNELS_SERVER_H +#define FREERDP_CHANNELS_SERVER_H #include -#endif /* FREERDP_CHANNELS_SERVER */ +#endif /* FREERDP_CHANNELS_SERVER_H */ diff --git a/include/freerdp/server/cliprdr.h b/include/freerdp/server/cliprdr.h index 221d837b3..fe4bc2757 100644 --- a/include/freerdp/server/cliprdr.h +++ b/include/freerdp/server/cliprdr.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_CLIPRDR_H -#define FREERDP_CHANNEL_SERVER_CLIPRDR_H +#ifndef FREERDP_CHANNEL_CLIPRDR_SERVER_CLIPRDR_H +#define FREERDP_CHANNEL_CLIPRDR_SERVER_CLIPRDR_H #include #include @@ -116,4 +116,4 @@ FREERDP_API void cliprdr_server_context_free(CliprdrServerContext* context); } #endif -#endif /* FREERDP_CHANNEL_SERVER_CLIPRDR_H */ +#endif /* FREERDP_CHANNEL_CLIPRDR_SERVER_CLIPRDR_H */ diff --git a/include/freerdp/server/drdynvc.h b/include/freerdp/server/drdynvc.h index dd50cd27f..2b355c488 100644 --- a/include/freerdp/server/drdynvc.h +++ b/include/freerdp/server/drdynvc.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_DRDYNVC_H -#define FREERDP_CHANNEL_SERVER_DRDYNVC_H +#ifndef FREERDP_CHANNEL_DRDYNVC_SERVER_DRDYNVC_H +#define FREERDP_CHANNEL_DRDYNVC_SERVER_DRDYNVC_H #include #include @@ -57,4 +57,4 @@ FREERDP_API void drdynvc_server_context_free(DrdynvcServerContext* context); } #endif -#endif /* FREERDP_CHANNEL_SERVER_DRDYNVC_H */ +#endif /* FREERDP_CHANNEL_DRDYNVC_SERVER_DRDYNVC_H */ diff --git a/include/freerdp/server/encomsp.h b/include/freerdp/server/encomsp.h index f8485a434..111224060 100644 --- a/include/freerdp/server/encomsp.h +++ b/include/freerdp/server/encomsp.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_ENCOMSP_H -#define FREERDP_CHANNEL_SERVER_ENCOMSP_H +#ifndef FREERDP_CHANNEL_ENCOMSP_SERVER_ENCOMSP_H +#define FREERDP_CHANNEL_ENCOMSP_SERVER_ENCOMSP_H #include #include @@ -86,4 +86,4 @@ FREERDP_API void encomsp_server_context_free(EncomspServerContext* context); } #endif -#endif /* FREERDP_CHANNEL_SERVER_ENCOMSP_H */ +#endif /* FREERDP_CHANNEL_ENCOMSP_SERVER_ENCOMSP_H */ diff --git a/include/freerdp/server/rdpdr.h b/include/freerdp/server/rdpdr.h index 27c41e4ed..a533f61ae 100644 --- a/include/freerdp/server/rdpdr.h +++ b/include/freerdp/server/rdpdr.h @@ -20,8 +20,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_RDPDR_H -#define FREERDP_CHANNEL_SERVER_RDPDR_H +#ifndef FREERDP_CHANNEL_RDPDR_SERVER_RDPDR_H +#define FREERDP_CHANNEL_RDPDR_SERVER_RDPDR_H #include #include @@ -152,4 +152,4 @@ FREERDP_API void rdpdr_server_context_free(RdpdrServerContext* context); } #endif -#endif /* FREERDP_CHANNEL_SERVER_RDPDR_H */ +#endif /* FREERDP_CHANNEL_RDPDR_SERVER_RDPDR_H */ diff --git a/include/freerdp/server/rdpei.h b/include/freerdp/server/rdpei.h index 74af11f36..86db2b4a8 100644 --- a/include/freerdp/server/rdpei.h +++ b/include/freerdp/server/rdpei.h @@ -20,8 +20,8 @@ * limitations under the License. */ -#ifndef __FREERDP_CHANNEL_RDPEI_SERVER_H__ -#define __FREERDP_CHANNEL_RDPEI_SERVER_H__ +#ifndef FREERDP_CHANNEL_RDPEI_SERVER_H +#define FREERDP_CHANNEL_RDPEI_SERVER_H #include #include @@ -69,4 +69,4 @@ FREERDP_API UINT rdpei_server_resume(RdpeiServerContext *context); -#endif /* __FREERDP_CHANNEL_RDPEI_SERVER_H__ */ +#endif /* FREERDP_CHANNEL_RDPEI_SERVER_H */ diff --git a/include/freerdp/server/rdpgfx.h b/include/freerdp/server/rdpgfx.h index fad778935..dada58f93 100644 --- a/include/freerdp/server/rdpgfx.h +++ b/include/freerdp/server/rdpgfx.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_RDPGFX_H -#define FREERDP_CHANNEL_SERVER_RDPGFX_H +#ifndef FREERDP_CHANNEL_RDPGFX_SERVER_RDPGFX_H +#define FREERDP_CHANNEL_RDPGFX_SERVER_RDPGFX_H #include @@ -97,4 +97,4 @@ FREERDP_API UINT rdpgfx_server_handle_messages(RdpgfxServerContext* context); } #endif -#endif /* FREERDP_CHANNEL_SERVER_RDPGFX_H */ +#endif /* FREERDP_CHANNEL_RDPGFX_SERVER_RDPGFX_H */ diff --git a/include/freerdp/server/remdesk.h b/include/freerdp/server/remdesk.h index 181e36690..e8f531d27 100644 --- a/include/freerdp/server/remdesk.h +++ b/include/freerdp/server/remdesk.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CHANNEL_SERVER_REMDESK_H -#define FREERDP_CHANNEL_SERVER_REMDESK_H +#ifndef FREERDP_CHANNEL_REMDESK_SERVER_REMDESK_H +#define FREERDP_CHANNEL_REMDESK_SERVER_REMDESK_H #include #include @@ -61,5 +61,5 @@ FREERDP_API void remdesk_server_context_free(RemdeskServerContext* context); } #endif -#endif /* FREERDP_CHANNEL_SERVER_REMDESK_H */ +#endif /* FREERDP_CHANNEL_REMDESK_SERVER_REMDESK_H */ diff --git a/include/freerdp/server/shadow.h b/include/freerdp/server/shadow.h index 94bfc7a49..6cfc6a085 100644 --- a/include/freerdp/server/shadow.h +++ b/include/freerdp/server/shadow.h @@ -63,7 +63,7 @@ typedef int (*pfnShadowSubsystemUninit)(rdpShadowSubsystem* subsystem); typedef int (*pfnShadowSubsystemStart)(rdpShadowSubsystem* subsystem); typedef int (*pfnShadowSubsystemStop)(rdpShadowSubsystem* subsystem); -typedef int (*pfnShadowEnumMonitors)(MONITOR_DEF* monitors, int maxMonitors); +typedef UINT32 (*pfnShadowEnumMonitors)(MONITOR_DEF* monitors, UINT32 maxMonitors); typedef int (*pfnShadowAuthenticate)(rdpShadowSubsystem* subsystem, rdpShadowClient* client, @@ -311,15 +311,15 @@ FREERDP_API int shadow_server_stop(rdpShadowServer* server); FREERDP_API int shadow_server_init(rdpShadowServer* server); FREERDP_API int shadow_server_uninit(rdpShadowServer* server); -FREERDP_API int shadow_enum_monitors(MONITOR_DEF* monitors, int maxMonitors); +FREERDP_API UINT32 shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors); -FREERDP_API rdpShadowServer* shadow_server_new(); +FREERDP_API rdpShadowServer* shadow_server_new(void); FREERDP_API void shadow_server_free(rdpShadowServer* server); FREERDP_API int shadow_capture_align_clip_rect(RECTANGLE_16* rect, RECTANGLE_16* clip); -FREERDP_API int shadow_capture_compare(BYTE* pData1, int nStep1, int nWidth, - int nHeight, BYTE* pData2, int nStep2, RECTANGLE_16* rect); +FREERDP_API int shadow_capture_compare(BYTE* pData1, UINT32 nStep1, UINT32 nWidth, + UINT32 nHeight, BYTE* pData2, UINT32 nStep2, RECTANGLE_16* rect); FREERDP_API void shadow_subsystem_frame_update(rdpShadowSubsystem* subsystem); diff --git a/include/freerdp/session.h b/include/freerdp/session.h index 9d7ed5198..489453a92 100644 --- a/include/freerdp/session.h +++ b/include/freerdp/session.h @@ -16,8 +16,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef __FREERDP_SESSION_H__ -#define __FREERDP_SESSION_H__ +#ifndef FREERDP_SESSION_H +#define FREERDP_SESSION_H #include @@ -45,4 +45,4 @@ struct rdp_logon_info_ex { }; typedef struct rdp_logon_info_ex logon_info_ex; -#endif /* __FREERDP_SESSION_H__ */ +#endif /* FREERDP_SESSION_H */ diff --git a/include/freerdp/utils/ringbuffer.h b/include/freerdp/utils/ringbuffer.h index dfe9e8350..121578673 100644 --- a/include/freerdp/utils/ringbuffer.h +++ b/include/freerdp/utils/ringbuffer.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RINGBUFFER_H___ -#define __RINGBUFFER_H___ +#ifndef FREERDP_UTILS_RINGBUFFER_H +#define FREERDP_UTILS_RINGBUFFER_H #include #include @@ -125,4 +125,4 @@ FREERDP_API void ringbuffer_commit_read_bytes(RingBuffer *rb, size_t sz); } #endif -#endif /* __RINGBUFFER_H___ */ +#endif /* FREERDP_UTILS_RINGBUFFER_H */ diff --git a/include/freerdp/version.h.in b/include/freerdp/version.h.in index 74f07efcd..3930dc366 100644 --- a/include/freerdp/version.h.in +++ b/include/freerdp/version.h.in @@ -17,8 +17,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef _FREERDP_VERSION_H_ -#define _FREERDP_VERSION_H_ +#ifndef FREERDP_VERSION_H +#define FREERDP_VERSION_H #define FREERDP_VERSION_MAJOR ${FREERDP_VERSION_MAJOR} #define FREERDP_VERSION_MINOR ${FREERDP_VERSION_MINOR} @@ -29,4 +29,4 @@ #define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}" #define GIT_REVISION "${GIT_REVISION}" -#endif // _FREERDP_VERSION_H_ +#endif /* FREERDP_VERSION_H */ diff --git a/libfreerdp/codec/nsc_encode.h b/libfreerdp/codec/nsc_encode.h index 762fa00e0..e220de407 100644 --- a/libfreerdp/codec/nsc_encode.h +++ b/libfreerdp/codec/nsc_encode.h @@ -19,12 +19,12 @@ * limitations under the License. */ -#ifndef __NSC_ENCODE_H -#define __NSC_ENCODE_H +#ifndef FREERDP_LIB_CODEC_NSC_ENCODE_H +#define FREERDP_LIB_CODEC_NSC_ENCODE_H #include FREERDP_LOCAL void nsc_encode(NSC_CONTEXT* context, const BYTE* bmpdata, UINT32 rowstride); -#endif +#endif /* FREERDP_LIB_CODEC_NSC_ENCODE_H */ diff --git a/libfreerdp/codec/nsc_sse2.h b/libfreerdp/codec/nsc_sse2.h index 7c735578f..8b795d7bd 100644 --- a/libfreerdp/codec/nsc_sse2.h +++ b/libfreerdp/codec/nsc_sse2.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __NSC_SSE2_H -#define __NSC_SSE2_H +#ifndef FREERDP_LIB_CODEC_NSC_SSE2_H +#define FREERDP_LIB_CODEC_NSC_SSE2_H #include #include @@ -31,4 +31,4 @@ FREERDP_LOCAL void nsc_init_sse2(NSC_CONTEXT* context); #endif #endif -#endif /* __NSC_SSE2_H */ +#endif /* FREERDP_LIB_CODEC_NSC_SSE2_H */ diff --git a/libfreerdp/codec/nsc_types.h b/libfreerdp/codec/nsc_types.h index 28553b8c0..904500886 100644 --- a/libfreerdp/codec/nsc_types.h +++ b/libfreerdp/codec/nsc_types.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __NSC_TYPES_H -#define __NSC_TYPES_H +#ifndef FREERDP_LIB_CODEC_NSC_TYPES_H +#define FREERDP_LIB_CODEC_NSC_TYPES_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -51,4 +51,4 @@ struct _NSC_CONTEXT_PRIV PROFILER_DEFINE(prof_nsc_encode); }; -#endif /* __NSC_TYPES_H */ +#endif /* FREERDP_LIB_CODEC_NSC_TYPES_H */ diff --git a/libfreerdp/codec/rfx_bitstream.h b/libfreerdp/codec/rfx_bitstream.h index bb03d399f..14d06c0f7 100644 --- a/libfreerdp/codec/rfx_bitstream.h +++ b/libfreerdp/codec/rfx_bitstream.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RFX_BITSTREAM_H -#define __RFX_BITSTREAM_H +#ifndef FREERDP_LIB_CODEC_RFX_BITSTREAM_H +#define FREERDP_LIB_CODEC_RFX_BITSTREAM_H #include @@ -82,4 +82,4 @@ typedef struct _RFX_BITSTREAM RFX_BITSTREAM; #define rfx_bitstream_left(_bs) ((_bs)->byte_pos >= (_bs)->nbytes ? 0 : ((_bs)->nbytes - (_bs)->byte_pos - 1) * 8 + (_bs)->bits_left) #define rfx_bitstream_get_processed_bytes(_bs) ((_bs)->bits_left < 8 ? (_bs)->byte_pos + 1 : (_bs)->byte_pos) -#endif /* __RFX_BITSTREAM_H */ +#endif /* FREERDP_LIB_CODEC_RFX_BITSTREAM_H */ diff --git a/libfreerdp/codec/rfx_constants.h b/libfreerdp/codec/rfx_constants.h index 248210199..43ded828e 100644 --- a/libfreerdp/codec/rfx_constants.h +++ b/libfreerdp/codec/rfx_constants.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RFX_CONSTANTS_H -#define __RFX_CONSTANTS_H +#ifndef FREERDP_LIB_CODEC_RFX_CONSTANTS_H +#define FREERDP_LIB_CODEC_RFX_CONSTANTS_H /* sync */ #define WF_MAGIC 0xCACCACCA @@ -56,5 +56,5 @@ /* properties.qt */ #define SCALAR_QUANTIZATION 0x1 -#endif /* __RFX_CONSTANTS_H */ +#endif /* FREERDP_LIB_CODEC_RFX_CONSTANTS_H */ diff --git a/libfreerdp/codec/rfx_decode.h b/libfreerdp/codec/rfx_decode.h index 266dde0a1..9bf9cd94d 100644 --- a/libfreerdp/codec/rfx_decode.h +++ b/libfreerdp/codec/rfx_decode.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RFX_DECODE_H -#define __RFX_DECODE_H +#ifndef FREERDP_LIB_CODEC_RFX_DECODE_H +#define FREERDP_LIB_CODEC_RFX_DECODE_H #include #include @@ -27,5 +27,5 @@ FREERDP_LOCAL BOOL rfx_decode_rgb(RFX_CONTEXT* context, RFX_TILE* tile, BYTE* rgb_buffer, int stride); -#endif /* __RFX_DECODE_H */ +#endif /* FREERDP_LIB_CODEC_RFX_DECODE_H */ diff --git a/libfreerdp/codec/rfx_differential.h b/libfreerdp/codec/rfx_differential.h index 978ca8a7b..f77796991 100644 --- a/libfreerdp/codec/rfx_differential.h +++ b/libfreerdp/codec/rfx_differential.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RFX_DIFFERENTIAL_H -#define __RFX_DIFFERENTIAL_H +#ifndef FREERDP_LIB_CODEC_RFX_DIFFERENTIAL_H +#define FREERDP_LIB_CODEC_RFX_DIFFERENTIAL_H #include #include @@ -48,4 +48,4 @@ static INLINE void rfx_differential_encode(INT16* buffer, int size) } } -#endif /* __RFX_DIFFERENTIAL_H */ +#endif /* FREERDP_LIB_CODEC_RFX_DIFFERENTIAL_H */ diff --git a/libfreerdp/codec/rfx_dwt.h b/libfreerdp/codec/rfx_dwt.h index 4ba1d6ee7..f5b469284 100644 --- a/libfreerdp/codec/rfx_dwt.h +++ b/libfreerdp/codec/rfx_dwt.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RFX_DWT_H -#define __RFX_DWT_H +#ifndef FREERDP_LIB_CODEC_RFX_DWT_H +#define FREERDP_LIB_CODEC_RFX_DWT_H #include #include @@ -26,4 +26,4 @@ FREERDP_LOCAL void rfx_dwt_2d_decode(INT16* buffer, INT16* dwt_buffer); FREERDP_LOCAL void rfx_dwt_2d_encode(INT16* buffer, INT16* dwt_buffer); -#endif /* __RFX_DWT_H */ +#endif /* FREERDP_LIB_CODEC_RFX_DWT_H */ diff --git a/libfreerdp/codec/rfx_encode.h b/libfreerdp/codec/rfx_encode.h index 3f238c527..ad6ab0e06 100644 --- a/libfreerdp/codec/rfx_encode.h +++ b/libfreerdp/codec/rfx_encode.h @@ -17,13 +17,13 @@ * limitations under the License. */ -#ifndef __RFX_ENCODE_H -#define __RFX_ENCODE_H +#ifndef FREERDP_LIB_CODEC_RFX_ENCODE_H +#define FREERDP_LIB_CODEC_RFX_ENCODE_H #include #include FREERDP_LOCAL void rfx_encode_rgb(RFX_CONTEXT* context, RFX_TILE* tile); -#endif +#endif /* FREERDP_LIB_CODEC_RFX_ENCODE_H */ diff --git a/libfreerdp/codec/rfx_neon.h b/libfreerdp/codec/rfx_neon.h index 5ccade8cd..b6216c38a 100644 --- a/libfreerdp/codec/rfx_neon.h +++ b/libfreerdp/codec/rfx_neon.h @@ -17,8 +17,8 @@ limitations under the License. */ -#ifndef __RFX_NEON_H -#define __RFX_NEON_H +#ifndef FREERDP_LIB_CODEC_RFX_NEON_H +#define FREERDP_LIB_CODEC_RFX_NEON_H #include #include @@ -31,5 +31,5 @@ FREERDP_LOCAL void rfx_init_neon(RFX_CONTEXT* context); #endif #endif -#endif /* __RFX_NEON_H */ +#endif /* FREERDP_LIB_CODEC_RFX_NEON_H */ diff --git a/libfreerdp/codec/rfx_quantization.h b/libfreerdp/codec/rfx_quantization.h index 99ac86efd..9349c8976 100644 --- a/libfreerdp/codec/rfx_quantization.h +++ b/libfreerdp/codec/rfx_quantization.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RFX_QUANTIZATION_H -#define __RFX_QUANTIZATION_H +#ifndef FREERDP_LIB_CODEC_RFX_QUANTIZATION_H +#define FREERDP_LIB_CODEC_RFX_QUANTIZATION_H #include #include @@ -31,4 +31,4 @@ FREERDP_LOCAL void rfx_quantization_encode(INT16* buffer, FREERDP_LOCAL void rfx_quantization_decode_block(const primitives_t* prims, INT16* buffer, int buffer_size, UINT32 factor); -#endif /* __RFX_QUANTIZATION_H */ +#endif /* FREERDP_LIB_CODEC_RFX_QUANTIZATION_H */ diff --git a/libfreerdp/codec/rfx_rlgr.h b/libfreerdp/codec/rfx_rlgr.h index b3b6e3439..49c0d6241 100644 --- a/libfreerdp/codec/rfx_rlgr.h +++ b/libfreerdp/codec/rfx_rlgr.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RFX_RLGR_H -#define __RFX_RLGR_H +#ifndef FREERDP_LIB_CODEC_RFX_RLGR_H +#define FREERDP_LIB_CODEC_RFX_RLGR_H #include #include @@ -29,4 +29,4 @@ FREERDP_LOCAL int rfx_rlgr_encode(RLGR_MODE mode, const INT16* data, FREERDP_LOCAL int rfx_rlgr_decode(RLGR_MODE mode, const BYTE* pSrcData, UINT32 SrcSize, INT16* pDstData, UINT32 DstSize); -#endif /* __RFX_RLGR_H */ +#endif /* FREERDP_LIB_CODEC_RFX_RLGR_H */ diff --git a/libfreerdp/codec/rfx_sse2.h b/libfreerdp/codec/rfx_sse2.h index 03e40ba36..b0d3998e3 100644 --- a/libfreerdp/codec/rfx_sse2.h +++ b/libfreerdp/codec/rfx_sse2.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __RFX_SSE2_H -#define __RFX_SSE2_H +#ifndef FREERDP_LIB_CODEC_RFX_SSE2_H +#define FREERDP_LIB_CODEC_RFX_SSE2_H #include #include @@ -31,4 +31,4 @@ FREERDP_LOCAL void rfx_init_sse2(RFX_CONTEXT* context); #endif #endif -#endif /* __RFX_SSE2_H */ +#endif /* FREERDP_LIB_CODEC_RFX_SSE2_H */ diff --git a/libfreerdp/codec/rfx_types.h b/libfreerdp/codec/rfx_types.h index 082e14187..e42591f9b 100644 --- a/libfreerdp/codec/rfx_types.h +++ b/libfreerdp/codec/rfx_types.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef CODEC_RFX_TYPES_H -#define CODEC_RFX_TYPES_H +#ifndef FREERDP_LIB_CODEC_RFX_TYPES_H +#define FREERDP_LIB_CODEC_RFX_TYPES_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -77,4 +77,4 @@ struct _RFX_CONTEXT_PRIV PROFILER_DEFINE(prof_rfx_encode_format_rgb); }; -#endif /* __RFX_TYPES_H */ +#endif /* FREERDP_LIB_CODEC_RFX_TYPES_H */ diff --git a/libfreerdp/core/activation.h b/libfreerdp/core/activation.h index a6a02a182..31b72e851 100644 --- a/libfreerdp/core/activation.h +++ b/libfreerdp/core/activation.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __ACTIVATION_H -#define __ACTIVATION_H +#ifndef FREERDP_LIB_CORE_ACTIVATION_H +#define FREERDP_LIB_CORE_ACTIVATION_H #include "rdp.h" @@ -64,4 +64,4 @@ FREERDP_LOCAL BOOL rdp_server_accept_client_control_pdu(rdpRdp* rdp, FREERDP_LOCAL BOOL rdp_server_accept_client_font_list_pdu(rdpRdp* rdp, wStream* s); -#endif /* __ACTIVATION_H */ +#endif /* FREERDP_LIB_CORE_ACTIVATION_H */ diff --git a/libfreerdp/core/autodetect.h b/libfreerdp/core/autodetect.h index 923612248..cbe499e45 100644 --- a/libfreerdp/core/autodetect.h +++ b/libfreerdp/core/autodetect.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __AUTODETECT_H -#define __AUTODETECT_H +#ifndef FREERDP_LIB_CORE_AUTODETECT_H +#define FREERDP_LIB_CORE_AUTODETECT_H #include "rdp.h" @@ -52,4 +52,4 @@ FREERDP_LOCAL BOOL autodetect_send_connecttime_bandwidth_measure_stop( #define AUTODETECT_TAG FREERDP_TAG("core.autodetect") -#endif /* __AUTODETECT_H */ +#endif /* FREERDP_LIB_CORE_AUTODETECT_H */ diff --git a/libfreerdp/core/bulk.h b/libfreerdp/core/bulk.h index 0ce240af1..2151b1a0d 100644 --- a/libfreerdp/core/bulk.h +++ b/libfreerdp/core/bulk.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_BULK_H -#define FREERDP_CORE_BULK_H +#ifndef FREERDP_LIB_CORE_BULK_H +#define FREERDP_LIB_CORE_BULK_H typedef struct rdp_bulk rdpBulk; @@ -59,4 +59,4 @@ FREERDP_LOCAL void bulk_reset(rdpBulk* bulk); FREERDP_LOCAL rdpBulk* bulk_new(rdpContext* context); FREERDP_LOCAL void bulk_free(rdpBulk* bulk); -#endif /* FREERDP_CORE_BULK_H */ +#endif /* FREERDP_LIB_CORE_BULK_H */ diff --git a/libfreerdp/core/capabilities.h b/libfreerdp/core/capabilities.h index d40f49c57..b38d89771 100644 --- a/libfreerdp/core/capabilities.h +++ b/libfreerdp/core/capabilities.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __CAPABILITIES_H -#define __CAPABILITIES_H +#ifndef FREERDP_LIB_CORE_CAPABILITIES_H +#define FREERDP_LIB_CORE_CAPABILITIES_H #include "rdp.h" @@ -181,4 +181,4 @@ FREERDP_LOCAL BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s); FREERDP_LOCAL BOOL rdp_write_confirm_active(wStream* s, rdpSettings* settings); FREERDP_LOCAL BOOL rdp_send_confirm_active(rdpRdp* rdp); -#endif /* __CAPABILITIES_H */ +#endif /* FREERDP_LIB_CORE_CAPABILITIES_H */ diff --git a/libfreerdp/core/certificate.h b/libfreerdp/core/certificate.h index 990fd29c4..cfabda81b 100644 --- a/libfreerdp/core/certificate.h +++ b/libfreerdp/core/certificate.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __CERTIFICATE_H -#define __CERTIFICATE_H +#ifndef FREERDP_LIB_CORE_CERTIFICATE_H +#define FREERDP_LIB_CORE_CERTIFICATE_H #include "rdp.h" @@ -77,4 +77,4 @@ FREERDP_LOCAL void key_free(rdpRsaKey* key); #define DEBUG_CERTIFICATE(...) do { } while (0) #endif -#endif /* __CERTIFICATE_H */ +#endif /* FREERDP_LIB_CORE_CERTIFICATE_H */ diff --git a/libfreerdp/core/channels.h b/libfreerdp/core/channels.h index 43ee8beca..307533f4e 100644 --- a/libfreerdp/core/channels.h +++ b/libfreerdp/core/channels.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __CHANNEL_H -#define __CHANNEL_H +#ifndef FREERDP_LIB_CORE_CHANNELS_H +#define FREERDP_LIB_CORE_CHANNELS_H #include #include "client.h" @@ -30,4 +30,4 @@ FREERDP_LOCAL BOOL freerdp_channel_process(freerdp* instance, wStream* s, FREERDP_LOCAL BOOL freerdp_channel_peer_process(freerdp_peer* client, wStream* s, UINT16 channelId); -#endif /* __CHANNEL_H */ +#endif /* FREERDP_LIB_CORE_CHANNELS_H */ diff --git a/libfreerdp/core/client.h b/libfreerdp/core/client.h index 46900b73c..3f1e1f409 100644 --- a/libfreerdp/core/client.h +++ b/libfreerdp/core/client.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_CLIENT_H -#define FREERDP_CORE_CLIENT_H +#ifndef FREERDP_LIB_CORE_CLIENT_H +#define FREERDP_LIB_CORE_CLIENT_H #include #include @@ -124,4 +124,4 @@ FREERDP_LOCAL UINT freerdp_channels_pre_connect(rdpChannels* channels, freerdp* instance); FREERDP_LOCAL UINT freerdp_channels_post_connect(rdpChannels* channels, freerdp* instance); -#endif /* FREERDP_CORE_CLIENT_H */ +#endif /* FREERDP_LIB_CORE_CLIENT_H */ diff --git a/libfreerdp/core/connection.h b/libfreerdp/core/connection.h index 7313b67a0..7a6ebf59d 100644 --- a/libfreerdp/core/connection.h +++ b/libfreerdp/core/connection.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __CONNECTION_H -#define __CONNECTION_H +#ifndef FREERDP_LIB_CORE_CONNECTION_H +#define FREERDP_LIB_CORE_CONNECTION_H #include "rdp.h" #include "tpkt.h" @@ -75,4 +75,4 @@ FREERDP_LOCAL BOOL rdp_server_establish_keys(rdpRdp* rdp, wStream* s); FREERDP_LOCAL BOOL rdp_server_reactivate(rdpRdp* rdp); FREERDP_LOCAL int rdp_server_transition_to_state(rdpRdp* rdp, int state); -#endif /* __CONNECTION_H */ +#endif /* FREERDP_LIB_CORE_CONNECTION_H */ diff --git a/libfreerdp/core/errinfo.h b/libfreerdp/core/errinfo.h index 2fa2bc9ea..cc426f30e 100644 --- a/libfreerdp/core/errinfo.h +++ b/libfreerdp/core/errinfo.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __ERRINFO_H -#define __ERRINFO_H +#ifndef FREERDP_LIB_CORE_ERRINFO_H +#define FREERDP_LIB_CORE_ERRINFO_H #include #include @@ -33,4 +33,4 @@ typedef struct _ERRINFO ERRINFO; FREERDP_LOCAL void rdp_print_errinfo(UINT32 code); -#endif +#endif /* FREERDP_LIB_CORE_ERRINFO_H */ diff --git a/libfreerdp/core/fastpath.h b/libfreerdp/core/fastpath.h index 7b6f942af..970699415 100644 --- a/libfreerdp/core/fastpath.h +++ b/libfreerdp/core/fastpath.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __FASTPATH_H -#define __FASTPATH_H +#ifndef FREERDP_LIB_CORE_FASTPATH_H +#define FREERDP_LIB_CORE_FASTPATH_H /* * Fast-Path has 15 bits available for length information which would lead to a @@ -174,4 +174,4 @@ FREERDP_LOCAL BOOL fastpath_send_surfcmd_frame_marker(rdpFastPath* fastpath, FREERDP_LOCAL rdpFastPath* fastpath_new(rdpRdp* rdp); FREERDP_LOCAL void fastpath_free(rdpFastPath* fastpath); -#endif +#endif /* FREERDP_LIB_CORE_FASTPATH_H */ diff --git a/libfreerdp/core/gateway/http.h b/libfreerdp/core/gateway/http.h index 35f117448..543be7256 100644 --- a/libfreerdp/core/gateway/http.h +++ b/libfreerdp/core/gateway/http.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_HTTP_H -#define FREERDP_CORE_HTTP_H +#ifndef FREERDP_LIB_CORE_GATEWAY_HTTP_H +#define FREERDP_LIB_CORE_GATEWAY_HTTP_H typedef struct _http_context HttpContext; typedef struct _http_request HttpRequest; @@ -117,4 +117,4 @@ FREERDP_LOCAL HttpResponse* http_response_recv(rdpTls* tls); FREERDP_LOCAL HttpResponse* http_response_new(void); FREERDP_LOCAL void http_response_free(HttpResponse* response); -#endif /* FREERDP_CORE_HTTP_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_HTTP_H */ diff --git a/libfreerdp/core/gateway/ncacn_http.h b/libfreerdp/core/gateway/ncacn_http.h index 8f4b49cb9..228047646 100644 --- a/libfreerdp/core/gateway/ncacn_http.h +++ b/libfreerdp/core/gateway/ncacn_http.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_NCACN_HTTP_H -#define FREERDP_CORE_NCACN_HTTP_H +#ifndef FREERDP_LIB_CORE_GATEWAY_NCACN_HTTP_H +#define FREERDP_LIB_CORE_GATEWAY_NCACN_HTTP_H #include #include @@ -45,4 +45,4 @@ FREERDP_LOCAL int rpc_ncacn_http_send_out_channel_request(rdpRpc* rpc, FREERDP_LOCAL int rpc_ncacn_http_recv_out_channel_response(rdpRpc* rpc, RpcOutChannel* outChannel, HttpResponse* response); -#endif +#endif /* FREERDP_LIB_CORE_GATEWAY_NCACN_HTTP_H */ diff --git a/libfreerdp/core/gateway/ntlm.h b/libfreerdp/core/gateway/ntlm.h index 38b1f007c..f384378c0 100644 --- a/libfreerdp/core/gateway/ntlm.h +++ b/libfreerdp/core/gateway/ntlm.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_NTLM_H -#define FREERDP_CORE_NTLM_H +#ifndef FREERDP_LIB_CORE_GATEWAY_NTLM_H +#define FREERDP_LIB_CORE_GATEWAY_NTLM_H typedef struct rdp_ntlm rdpNtlm; @@ -78,4 +78,4 @@ FREERDP_LOCAL BOOL ntlm_client_make_spn(rdpNtlm* ntlm, LPCTSTR ServiceClass, FREERDP_LOCAL rdpNtlm* ntlm_new(void); FREERDP_LOCAL void ntlm_free(rdpNtlm* ntlm); -#endif /* FREERDP_CORE_NTLM_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_NTLM_H */ diff --git a/libfreerdp/core/gateway/rdg.h b/libfreerdp/core/gateway/rdg.h index 2fedd623e..8eca518e0 100644 --- a/libfreerdp/core/gateway/rdg.h +++ b/libfreerdp/core/gateway/rdg.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_RDG_H -#define FREERDP_CORE_RDG_H +#ifndef FREERDP_LIB_CORE_GATEWAY_RDG_H +#define FREERDP_LIB_CORE_GATEWAY_RDG_H #include @@ -153,4 +153,4 @@ FREERDP_LOCAL DWORD rdg_get_event_handles(rdpRdg* rdg, HANDLE* events, FREERDP_LOCAL BOOL rdg_check_event_handles(rdpRdg* rdg); -#endif /* FREERDP_CORE_RDG_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_RDG_H */ diff --git a/libfreerdp/core/gateway/rpc.h b/libfreerdp/core/gateway/rpc.h index 6702333f0..006b629d3 100644 --- a/libfreerdp/core/gateway/rpc.h +++ b/libfreerdp/core/gateway/rpc.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_RPC_H -#define FREERDP_CORE_RPC_H +#ifndef FREERDP_LIB_CORE_GATEWAY_RPC_H +#define FREERDP_LIB_CORE_GATEWAY_RPC_H #include #include @@ -803,4 +803,4 @@ FREERDP_LOCAL BOOL rpc_connect(rdpRpc* rpc, int timeout); FREERDP_LOCAL rdpRpc* rpc_new(rdpTransport* transport); FREERDP_LOCAL void rpc_free(rdpRpc* rpc); -#endif /* FREERDP_CORE_RPC_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_RPC_H */ diff --git a/libfreerdp/core/gateway/rpc_bind.h b/libfreerdp/core/gateway/rpc_bind.h index 2c370d4c6..f52e38465 100644 --- a/libfreerdp/core/gateway/rpc_bind.h +++ b/libfreerdp/core/gateway/rpc_bind.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_RPC_BIND_H -#define FREERDP_CORE_RPC_BIND_H +#ifndef FREERDP_LIB_CORE_GATEWAY_RPC_BIND_H +#define FREERDP_LIB_CORE_GATEWAY_RPC_BIND_H #include "rpc.h" @@ -39,4 +39,4 @@ FREERDP_LOCAL int rpc_recv_bind_ack_pdu(rdpRpc* rpc, BYTE* buffer, UINT32 length); FREERDP_LOCAL int rpc_send_rpc_auth_3_pdu(rdpRpc* rpc); -#endif /* FREERDP_CORE_RPC_BIND_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_RPC_BIND_H */ diff --git a/libfreerdp/core/gateway/rpc_client.h b/libfreerdp/core/gateway/rpc_client.h index 67ba6564d..a3c31fc4c 100644 --- a/libfreerdp/core/gateway/rpc_client.h +++ b/libfreerdp/core/gateway/rpc_client.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_RPC_CLIENT_H -#define FREERDP_CORE_RPC_CLIENT_H +#ifndef FREERDP_LIB_CORE_GATEWAY_RPC_CLIENT_H +#define FREERDP_LIB_CORE_GATEWAY_RPC_CLIENT_H #include @@ -45,4 +45,4 @@ FREERDP_LOCAL int rpc_client_write_call(rdpRpc* rpc, BYTE* data, int length, FREERDP_LOCAL int rpc_client_new(rdpRpc* rpc); FREERDP_LOCAL void rpc_client_free(rdpRpc* rpc); -#endif /* FREERDP_CORE_RPC_CLIENT_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_RPC_CLIENT_H */ diff --git a/libfreerdp/core/gateway/rpc_fault.h b/libfreerdp/core/gateway/rpc_fault.h index a408f6a52..aa55088c9 100644 --- a/libfreerdp/core/gateway/rpc_fault.h +++ b/libfreerdp/core/gateway/rpc_fault.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_RPC_FAULT_H -#define FREERDP_CORE_RPC_FAULT_H +#ifndef FREERDP_LIB_CORE_GATEWAY_RPC_FAULT_H +#define FREERDP_LIB_CORE_GATEWAY_RPC_FAULT_H #include "rpc.h" @@ -28,4 +28,4 @@ FREERDP_LOCAL int rpc_recv_fault_pdu(rpcconn_hdr_t* header); FREERDP_LOCAL UINT32 rpc_map_status_code_to_win32_error_code(UINT32 code); -#endif /* FREERDP_CORE_RPC_FAULT_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_RPC_FAULT_H */ diff --git a/libfreerdp/core/gateway/rts.h b/libfreerdp/core/gateway/rts.h index 4fe200319..2f1898b32 100644 --- a/libfreerdp/core/gateway/rts.h +++ b/libfreerdp/core/gateway/rts.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_RTS_H -#define FREERDP_CORE_RTS_H +#ifndef FREERDP_LIB_CORE_GATEWAY_RTS_H +#define FREERDP_LIB_CORE_GATEWAY_RTS_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -174,4 +174,4 @@ FREERDP_LOCAL int rts_recv_out_of_sequence_pdu(rdpRpc* rpc, BYTE* buffer, #include "rts_signature.h" -#endif /* FREERDP_CORE_RTS_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_RTS_H */ diff --git a/libfreerdp/core/gateway/rts_signature.h b/libfreerdp/core/gateway/rts_signature.h index ec1494c8d..cb1c96c77 100644 --- a/libfreerdp/core/gateway/rts_signature.h +++ b/libfreerdp/core/gateway/rts_signature.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_RTS_SIGNATURE_H -#define FREERDP_CORE_RTS_SIGNATURE_H +#ifndef FREERDP_LIB_CORE_GATEWAY_RTS_SIGNATURE_H +#define FREERDP_LIB_CORE_GATEWAY_RTS_SIGNATURE_H typedef struct rts_pdu_signature RtsPduSignature; typedef struct _RTS_PDU_SIGNATURE_ENTRY RTS_PDU_SIGNATURE_ENTRY; @@ -188,4 +188,4 @@ FREERDP_LOCAL UINT32 rts_identify_pdu_signature(rdpRpc* rpc, FREERDP_LOCAL int rts_print_pdu_signature(rdpRpc* rpc, RtsPduSignature* signature); -#endif +#endif /* FREERDP_LIB_CORE_GATEWAY_RTS_SIGNATURE_H */ diff --git a/libfreerdp/core/gateway/tsg.h b/libfreerdp/core/gateway/tsg.h index f6ad3416c..f1d61448a 100644 --- a/libfreerdp/core/gateway/tsg.h +++ b/libfreerdp/core/gateway/tsg.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_TSG_H -#define FREERDP_CORE_TSG_H +#ifndef FREERDP_LIB_CORE_GATEWAY_TSG_H +#define FREERDP_LIB_CORE_GATEWAY_TSG_H typedef struct rdp_tsg rdpTsg; @@ -332,4 +332,4 @@ FREERDP_LOCAL void tsg_free(rdpTsg* tsg); FREERDP_LOCAL BIO_METHOD* BIO_s_tsg(void); -#endif /* FREERDP_CORE_TSG_H */ +#endif /* FREERDP_LIB_CORE_GATEWAY_TSG_H */ diff --git a/libfreerdp/core/gcc.h b/libfreerdp/core/gcc.h index 500bd73f2..ca5350b4a 100644 --- a/libfreerdp/core/gcc.h +++ b/libfreerdp/core/gcc.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_GCC_H -#define FREERDP_CORE_GCC_H +#ifndef FREERDP_LIB_CORE_GCC_H +#define FREERDP_LIB_CORE_GCC_H #include "mcs.h" @@ -88,4 +88,4 @@ FREERDP_LOCAL BOOL gcc_read_server_multitransport_channel_data(wStream* s, FREERDP_LOCAL void gcc_write_server_multitransport_channel_data(wStream* s, rdpMcs* mcs); -#endif /* FREERDP_CORE_GCC_H */ +#endif /* FREERDP_LIB_CORE_GCC_H */ diff --git a/libfreerdp/core/graphics.h b/libfreerdp/core/graphics.h index 65b94441d..8738c0faa 100644 --- a/libfreerdp/core/graphics.h +++ b/libfreerdp/core/graphics.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_GRAPHICS_H -#define FREERDP_CORE_GRAPHICS_H +#ifndef FREERDP_LIB_CORE_GRAPHICS_H +#define FREERDP_LIB_CORE_GRAPHICS_H #include #include @@ -27,4 +27,4 @@ FREERDP_LOCAL void Bitmap_Free(rdpContext* context, rdpBitmap* bitmap); -#endif /* FREERDP_CORE_GRAPHICS_H */ +#endif /* FREERDP_LIB_CORE_GRAPHICS_H */ diff --git a/libfreerdp/core/heartbeat.h b/libfreerdp/core/heartbeat.h index 877c8f9da..53dfe63dc 100644 --- a/libfreerdp/core/heartbeat.h +++ b/libfreerdp/core/heartbeat.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __HEARTBEAT_H -#define __HEARTBEAT_H +#ifndef FREERDP_LIB_CORE_HEARTBEET_H +#define FREERDP_LIB_CORE_HEARTBEET_H typedef struct rdp_heartbeat rdpHeartbeat; @@ -42,4 +42,4 @@ FREERDP_LOCAL void heartbeat_free(rdpHeartbeat* heartbeat); #define HEARTBEAT_TAG FREERDP_TAG("core.heartbeat") -#endif /* __HEARTBEAT_H */ +#endif /* FREERDP_LIB_CORE_HEARTBEET_H */ diff --git a/libfreerdp/core/info.h b/libfreerdp/core/info.h index 6ed61d112..20980d57e 100644 --- a/libfreerdp/core/info.h +++ b/libfreerdp/core/info.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __INFO_H -#define __INFO_H +#ifndef FREERDP_LIB_CORE_INFO_H +#define FREERDP_LIB_CORE_INFO_H #include "rdp.h" @@ -65,4 +65,4 @@ FREERDP_LOCAL BOOL rdp_recv_save_session_info(rdpRdp* rdp, wStream* s); FREERDP_LOCAL BOOL rdp_send_save_session_info(rdpContext* context, UINT32 type, void* data); -#endif /* __INFO_H */ +#endif /* FREERDP_LIB_CORE_INFO_H */ diff --git a/libfreerdp/core/input.h b/libfreerdp/core/input.h index af49ce0be..a3bb6d586 100644 --- a/libfreerdp/core/input.h +++ b/libfreerdp/core/input.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __INPUT_H -#define __INPUT_H +#ifndef FREERDP_LIB_CORE_INPUT_H +#define FREERDP_LIB_CORE_INPUT_H #include "rdp.h" #include "fastpath.h" @@ -68,4 +68,4 @@ FREERDP_LOCAL BOOL input_register_client_callbacks(rdpInput* input); FREERDP_LOCAL rdpInput* input_new(rdpRdp* rdp); FREERDP_LOCAL void input_free(rdpInput* input); -#endif /* __INPUT_H */ +#endif /* FREERDP_LIB_CORE_INPUT_H */ diff --git a/libfreerdp/core/license.h b/libfreerdp/core/license.h index 760320687..bf4a351f6 100644 --- a/libfreerdp/core/license.h +++ b/libfreerdp/core/license.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_LICENSE_H -#define FREERDP_LICENSE_H +#ifndef FREERDP_LIB_CORE_LICENSE_H +#define FREERDP_LIB_CORE_LICENSE_H typedef struct rdp_license rdpLicense; @@ -216,4 +216,4 @@ FREERDP_LOCAL void license_free(rdpLicense* license); #define DEBUG_LICENSE(...) do { } while (0) #endif -#endif /* __LICENSE_H */ +#endif /* FREERDP_LIB_CORE_LICENSE_H */ diff --git a/libfreerdp/core/listener.h b/libfreerdp/core/listener.h index 1474bf7db..720d11877 100644 --- a/libfreerdp/core/listener.h +++ b/libfreerdp/core/listener.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __LISTENER_H -#define __LISTENER_H +#ifndef FREERDP_LIB_CORE_LISTENER_H +#define FREERDP_LIB_CORE_LISTENER_H typedef struct rdp_listener rdpListener; @@ -40,5 +40,5 @@ struct rdp_listener HANDLE events[MAX_LISTENER_HANDLES]; }; -#endif +#endif /* FREERDP_LIB_CORE_LISTENER_H */ diff --git a/libfreerdp/core/mcs.h b/libfreerdp/core/mcs.h index 8b94cbc04..a48b302be 100644 --- a/libfreerdp/core/mcs.h +++ b/libfreerdp/core/mcs.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __MCS_H -#define __MCS_H +#ifndef FREERDP_LIB_CORE_MCS_H +#define FREERDP_LIB_CORE_MCS_H typedef struct rdp_mcs rdpMcs; @@ -201,4 +201,4 @@ FREERDP_LOCAL BOOL mcs_client_begin(rdpMcs* mcs); FREERDP_LOCAL rdpMcs* mcs_new(rdpTransport* transport); FREERDP_LOCAL void mcs_free(rdpMcs* mcs); -#endif /* __MCS_H */ +#endif /* FREERDP_LIB_CORE_MCS_H */ diff --git a/libfreerdp/core/message.h b/libfreerdp/core/message.h index fe8ceb53a..26f78ad09 100644 --- a/libfreerdp/core/message.h +++ b/libfreerdp/core/message.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_MESSAGE_PRIVATE_H -#define FREERDP_CORE_MESSAGE_PRIVATE_H +#ifndef FREERDP_LIB_CORE_MESSAGE_H +#define FREERDP_LIB_CORE_MESSAGE_H #include #include @@ -166,4 +166,4 @@ FREERDP_LOCAL int input_message_queue_process_pending_messages(rdpInput* input); FREERDP_LOCAL rdpInputProxy* input_message_proxy_new(rdpInput* input); FREERDP_LOCAL void input_message_proxy_free(rdpInputProxy* proxy); -#endif /* FREERDP_CORE_MESSAGE_PRIVATE_H */ +#endif /* FREERDP_LIB_CORE_MESSAGE_H */ diff --git a/libfreerdp/core/multitransport.h b/libfreerdp/core/multitransport.h index fdc3c2fcb..631bc0af0 100644 --- a/libfreerdp/core/multitransport.h +++ b/libfreerdp/core/multitransport.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __MULTITRANSPORT_H -#define __MULTITRANSPORT_H +#ifndef FREERDP_LIB_CORE_MULTITRANSPORT_H +#define FREERDP_LIB_CORE_MULTITRANSPORT_H typedef struct rdp_multitransport rdpMultitransport; @@ -39,4 +39,4 @@ FREERDP_LOCAL int rdp_recv_multitransport_packet(rdpRdp* rdp, wStream* s); FREERDP_LOCAL rdpMultitransport* multitransport_new(void); FREERDP_LOCAL void multitransport_free(rdpMultitransport* multitransport); -#endif /* __MULTITRANSPORT_H */ +#endif /* FREERDP_LIB_CORE_MULTITRANSPORT_H */ diff --git a/libfreerdp/core/nego.h b/libfreerdp/core/nego.h index fdbce70ff..c03d68d86 100644 --- a/libfreerdp/core/nego.h +++ b/libfreerdp/core/nego.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_NEGO_H -#define FREERDP_CORE_NEGO_H +#ifndef FREERDP_LIB_CORE_NEGO_H +#define FREERDP_LIB_CORE_NEGO_H #include "transport.h" @@ -166,4 +166,4 @@ FREERDP_LOCAL void nego_set_preconnection_id(rdpNego* nego, FREERDP_LOCAL void nego_set_preconnection_blob(rdpNego* nego, char* PreconnectionBlob); -#endif /* __NEGO_H */ +#endif /* FREERDP_LIB_CORE_NEGO_H */ diff --git a/libfreerdp/core/nla.h b/libfreerdp/core/nla.h index 559add7fe..5039fb43c 100644 --- a/libfreerdp/core/nla.h +++ b/libfreerdp/core/nla.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_NLA_H -#define FREERDP_CORE_NLA_H +#ifndef FREERDP_LIB_CORE_NLA_H +#define FREERDP_LIB_CORE_NLA_H typedef struct rdp_nla rdpNla; @@ -97,4 +97,4 @@ FREERDP_LOCAL rdpNla* nla_new(freerdp* instance, rdpTransport* transport, rdpSettings* settings); FREERDP_LOCAL void nla_free(rdpNla* nla); -#endif /* FREERDP_CORE_NLA_H */ +#endif /* FREERDP_LIB_CORE_NLA_H */ diff --git a/libfreerdp/core/orders.h b/libfreerdp/core/orders.h index 69b0c4f5c..6692b7c75 100644 --- a/libfreerdp/core/orders.h +++ b/libfreerdp/core/orders.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __ORDERS_H -#define __ORDERS_H +#ifndef FREERDP_LIB_CORE_ORDERS_H +#define FREERDP_LIB_CORE_ORDERS_H #include "rdp.h" @@ -299,4 +299,4 @@ FREERDP_LOCAL BOOL update_write_switch_surface_order( wStream* s, const SWITCH_SURFACE_ORDER* switch_surface); -#endif /* __ORDERS_H */ +#endif /* FREERDP_LIB_CORE_ORDERS_H */ diff --git a/libfreerdp/core/peer.h b/libfreerdp/core/peer.h index e9cd03937..d9c3bc402 100644 --- a/libfreerdp/core/peer.h +++ b/libfreerdp/core/peer.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __PEER -#define __PEER +#ifndef FREERDP_LIB_CORE_PEER_H +#define FREERDP_LIB_CORE_PEER_H #include "rdp.h" #include "mcs.h" @@ -26,5 +26,5 @@ #include -#endif /* __PEER */ +#endif /* FREERDP_LIB_CORE_PEER_H */ diff --git a/libfreerdp/core/proxy.h b/libfreerdp/core/proxy.h index 9a2212577..1b337a3f1 100644 --- a/libfreerdp/core/proxy.h +++ b/libfreerdp/core/proxy.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __HTTP_PROXY_H -#define __HTTP_PROXY_H +#ifndef FREERDP_LIB_CORE_HTTP_PROXY_H +#define FREERDP_LIB_CORE_HTTP_PROXY_H #include "freerdp/settings.h" #include @@ -28,4 +28,4 @@ BOOL proxy_prepare(rdpSettings* settings, const char** lpPeerHostname, UINT16* l BOOL proxy_parse_uri(rdpSettings* settings, const char* uri); BOOL proxy_connect(rdpSettings* settings, BIO* bio, const char* hostname, UINT16 port); -#endif +#endif /* FREERDP_LIB_CORE_HTTP_PROXY_H */ diff --git a/libfreerdp/core/rdp.h b/libfreerdp/core/rdp.h index cd68c9ffa..d9a8cbc44 100644 --- a/libfreerdp/core/rdp.h +++ b/libfreerdp/core/rdp.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __RDP_H -#define __RDP_H +#ifndef FREERDP_LIB_CORE_RDP_H +#define FREERDP_LIB_CORE_RDP_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -250,4 +250,4 @@ BOOL rdp_decrypt(rdpRdp* rdp, wStream* s, INT32 length, UINT16 securityFlags); BOOL rdp_set_error_info(rdpRdp* rdp, UINT32 errorInfo); BOOL rdp_send_error_info(rdpRdp* rdp); -#endif /* __RDP_H */ +#endif /* FREERDP_LIB_CORE_RDP_H */ diff --git a/libfreerdp/core/redirection.h b/libfreerdp/core/redirection.h index cf6bca7ab..cfe5f0fd7 100644 --- a/libfreerdp/core/redirection.h +++ b/libfreerdp/core/redirection.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __REDIRECTION_H -#define __REDIRECTION_H +#ifndef FREERDP_LIB_CORE_REDIRECTION_H +#define FREERDP_LIB_CORE_REDIRECTION_H typedef struct rdp_redirection rdpRedirection; @@ -65,4 +65,4 @@ FREERDP_LOCAL void redirection_free(rdpRedirection* redirection); #define DEBUG_REDIR(...) do { } while (0) #endif -#endif /* __REDIRECTION_H */ +#endif /* FREERDP_LIB_CORE_REDIRECTION_H */ diff --git a/libfreerdp/core/security.h b/libfreerdp/core/security.h index 956463149..1617bc57d 100644 --- a/libfreerdp/core/security.h +++ b/libfreerdp/core/security.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_SECURITY_H -#define FREERDP_SECURITY_H +#ifndef FREERDP_LIB_CORE_SECURITY_H +#define FREERDP_LIB_CORE_SECURITY_H #include "rdp.h" #include @@ -54,4 +54,4 @@ FREERDP_LOCAL BOOL security_fips_decrypt(BYTE* data, size_t length, rdpRdp* rdp) FREERDP_LOCAL BOOL security_fips_check_signature(const BYTE* data, size_t length, const BYTE* sig, rdpRdp* rdp); -#endif /* __SECURITY_H */ +#endif /* FREERDP_LIB_CORE_SECURITY_H */ diff --git a/libfreerdp/core/server.h b/libfreerdp/core/server.h index 01c656679..f543606ec 100644 --- a/libfreerdp/core/server.h +++ b/libfreerdp/core/server.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef FREERDP_CORE_SERVER_H -#define FREERDP_CORE_SERVER_H +#ifndef FREERDP_LIB_CORE_SERVER_H +#define FREERDP_LIB_CORE_SERVER_H #include #include @@ -247,4 +247,4 @@ FREERDP_LOCAL BOOL WINAPI FreeRDP_WTSLogoffUser(HANDLE hServer); FREERDP_LOCAL BOOL WINAPI FreeRDP_WTSLogonUser(HANDLE hServer, LPCSTR username, LPCSTR password, LPCSTR domain); -#endif /* FREERDP_CORE_SERVER_H */ +#endif /* FREERDP_LIB_CORE_SERVER_H */ diff --git a/libfreerdp/core/surface.h b/libfreerdp/core/surface.h index 89d4fa610..2176714d5 100644 --- a/libfreerdp/core/surface.h +++ b/libfreerdp/core/surface.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __SURFACE -#define __SURFACE +#ifndef FREERDP_LIB_CORE_SURFACE_H +#define FREERDP_LIB_CORE_SURFACE_H #include "rdp.h" @@ -43,5 +43,5 @@ FREERDP_LOCAL BOOL update_write_surfcmd_surface_bits_header(wStream* s, FREERDP_LOCAL BOOL update_write_surfcmd_frame_marker(wStream* s, UINT16 frameAction, UINT32 frameId); -#endif /* __SURFACE */ +#endif /* FREERDP_LIB_CORE_SURFACE_H */ diff --git a/libfreerdp/core/tcp.h b/libfreerdp/core/tcp.h index 4e72b80ea..6638c19b0 100644 --- a/libfreerdp/core/tcp.h +++ b/libfreerdp/core/tcp.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __TCP_H -#define __TCP_H +#ifndef FREERDP_LIB_CORE_TCP_H +#define FREERDP_LIB_CORE_TCP_H #include @@ -67,4 +67,4 @@ FREERDP_LOCAL int freerdp_tcp_connect(rdpContext* context, rdpSettings* settings, const char* hostname, int port, int timeout); -#endif /* __TCP_H */ +#endif /* FREERDP_LIB_CORE_TCP_H */ diff --git a/libfreerdp/core/timezone.h b/libfreerdp/core/timezone.h index ba9a2e280..6e721d2e6 100644 --- a/libfreerdp/core/timezone.h +++ b/libfreerdp/core/timezone.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __TIMEZONE_H -#define __TIMEZONE_H +#ifndef FREERDP_LIB_CORE_TIMEZONE_H +#define FREERDP_LIB_CORE_TIMEZONE_H #include "rdp.h" @@ -43,4 +43,4 @@ FREERDP_LOCAL BOOL rdp_write_client_time_zone(wStream* s, #define DEBUG_TIMEZONE(...) do { } while (0) #endif -#endif /* __TIMEZONE_H */ +#endif /* FREERDP_LIB_CORE_TIMEZONE_H */ diff --git a/libfreerdp/core/tpdu.h b/libfreerdp/core/tpdu.h index 93f59dfee..fc28c3bf2 100644 --- a/libfreerdp/core/tpdu.h +++ b/libfreerdp/core/tpdu.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __TPDU_H -#define __TPDU_H +#ifndef FREERDP_LIB_CORE_TPDU_H +#define FREERDP_LIB_CORE_TPDU_H #include #include @@ -52,4 +52,4 @@ FREERDP_LOCAL void tpdu_write_disconnect_request(wStream* s, UINT16 length); FREERDP_LOCAL BOOL tpdu_read_data(wStream* s, UINT16* li); FREERDP_LOCAL void tpdu_write_data(wStream* s); -#endif /* __TPDU_H */ +#endif /* FREERDP_LIB_CORE_TPDU_H */ diff --git a/libfreerdp/core/tpkt.h b/libfreerdp/core/tpkt.h index 9b18048e8..cb264d4a3 100644 --- a/libfreerdp/core/tpkt.h +++ b/libfreerdp/core/tpkt.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __TPKT_H -#define __TPKT_H +#ifndef FREERDP_LIB_CORE_TPKT_H +#define FREERDP_LIB_CORE_TPKT_H #include "tpdu.h" #include "transport.h" @@ -32,4 +32,4 @@ FREERDP_LOCAL BOOL tpkt_verify_header(wStream* s); FREERDP_LOCAL BOOL tpkt_read_header(wStream* s, UINT16* length); FREERDP_LOCAL void tpkt_write_header(wStream* s, UINT16 length); -#endif /* __TPKT_H */ +#endif /* FREERDP_LIB_CORE_TPKT_H */ diff --git a/libfreerdp/core/transport.h b/libfreerdp/core/transport.h index f265450e4..1f82506a9 100644 --- a/libfreerdp/core/transport.h +++ b/libfreerdp/core/transport.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __TRANSPORT_H -#define __TRANSPORT_H +#ifndef FREERDP_LIB_CORE_TRANSPORT_H +#define FREERDP_LIB_CORE_TRANSPORT_H typedef enum { @@ -123,4 +123,4 @@ FREERDP_LOCAL int transport_receive_pool_return(rdpTransport* transport, FREERDP_LOCAL rdpTransport* transport_new(rdpContext* context); FREERDP_LOCAL void transport_free(rdpTransport* transport); -#endif +#endif /* FREERDP_LIB_CORE_TRANSPORT_H */ diff --git a/libfreerdp/core/update.h b/libfreerdp/core/update.h index 8f71c7a43..d9b43d00a 100644 --- a/libfreerdp/core/update.h +++ b/libfreerdp/core/update.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __UPDATE_H -#define __UPDATE_H +#ifndef FREERDP_LIB_CORE_UPDATE_H +#define FREERDP_LIB_CORE_UPDATE_H #include "rdp.h" #include "orders.h" @@ -67,4 +67,4 @@ FREERDP_LOCAL void update_register_server_callbacks(rdpUpdate* update); FREERDP_LOCAL void update_register_client_callbacks(rdpUpdate* update); FREERDP_LOCAL int update_process_messages(rdpUpdate* update); -#endif /* __UPDATE_H */ +#endif /* FREERDP_LIB_CORE_UPDATE_H */ diff --git a/libfreerdp/core/window.h b/libfreerdp/core/window.h index e9e173c93..7bb8a2040 100644 --- a/libfreerdp/core/window.h +++ b/libfreerdp/core/window.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef __WINDOW_H -#define __WINDOW_H +#ifndef FREERDP_LIB_CORE_WINDOW_H +#define FREERDP_LIB_CORE_WINDOW_H #include "update.h" @@ -38,4 +38,4 @@ FREERDP_LOCAL BOOL update_recv_altsec_window_order(rdpUpdate* update, #define DEBUG_WND(...) do { } while (0) #endif -#endif /* __WINDOW_H */ +#endif /* FREERDP_LIB_CORE_WINDOW_H */ diff --git a/libfreerdp/crypto/opensslcompat.h b/libfreerdp/crypto/opensslcompat.h index b42d32fd2..911a90080 100644 --- a/libfreerdp/crypto/opensslcompat.h +++ b/libfreerdp/crypto/opensslcompat.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef FREERDP_CRYPTO_OPENSSLCOMPAT_H -#define FREERDP_CRYPTO_OPENSSLCOMPAT_H +#ifndef FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H +#define FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -62,4 +62,4 @@ void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM #endif /* OPENSSL < 1.1.0 || LIBRESSL */ #endif /* WITH_OPENSSL */ -#endif /* FREERDP_CRYPTO_OPENSSLCOMPAT_H */ +#endif /* FREERDP_LIB_CRYPTO_OPENSSLCOMPAT_H */ diff --git a/libfreerdp/gdi/brush.h b/libfreerdp/gdi/brush.h index a9dd30fde..0be63660f 100644 --- a/libfreerdp/gdi/brush.h +++ b/libfreerdp/gdi/brush.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_GDI_BRUSH_H -#define FREERDP_GDI_BRUSH_H +#ifndef FREERDP_LIB_GDI_BRUSH_H +#define FREERDP_LIB_GDI_BRUSH_H #include #include @@ -47,4 +47,4 @@ static INLINE UINT32 gdi_GetBrushStyle(HGDI_DC hdc) } #endif -#endif /* FREERDP_GDI_BRUSH_H */ +#endif /* FREERDP_LIB_GDI_BRUSH_H */ diff --git a/libfreerdp/gdi/clipping.h b/libfreerdp/gdi/clipping.h index 5e403dbb3..d7ebf6b3b 100644 --- a/libfreerdp/gdi/clipping.h +++ b/libfreerdp/gdi/clipping.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_GDI_CLIPPING_H -#define FREERDP_GDI_CLIPPING_H +#ifndef FREERDP_LIB_GDI_CLIPPING_H +#define FREERDP_LIB_GDI_CLIPPING_H #include #include @@ -40,4 +40,4 @@ FREERDP_LOCAL BOOL gdi_ClipCoords(HGDI_DC hdc, UINT32* x, UINT32* y, } #endif -#endif /* FREERDP_GDI_CLIPPING_H */ +#endif /* FREERDP_LIB_GDI_CLIPPING_H */ diff --git a/libfreerdp/gdi/drawing.h b/libfreerdp/gdi/drawing.h index a69cff54d..94daef965 100644 --- a/libfreerdp/gdi/drawing.h +++ b/libfreerdp/gdi/drawing.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_GDI_DRAWING_H -#define FREERDP_GDI_DRAWING_H +#ifndef FREERDP_LIB_GDI_DRAWING_H +#define FREERDP_LIB_GDI_DRAWING_H #include #include @@ -41,4 +41,4 @@ FREERDP_LOCAL UINT32 gdi_SetTextColor(HGDI_DC hdc, UINT32 crColor); } #endif -#endif /* FREERDP_GDI_DRAWING_H */ +#endif /* FREERDP_LIB_GDI_DRAWING_H */ diff --git a/libfreerdp/gdi/gdi.h b/libfreerdp/gdi/gdi.h index 2d74fcb61..e17f310a5 100644 --- a/libfreerdp/gdi/gdi.h +++ b/libfreerdp/gdi/gdi.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __GDI_CORE_H -#define __GDI_CORE_H +#ifndef FREERDP_LIB_GDI_CORE_H +#define FREERDP_LIB_GDI_CORE_H #include "graphics.h" #include "brush.h" @@ -92,4 +92,4 @@ static INLINE BYTE* gdi_get_brush_pointer(HGDI_DC hdcBrush, UINT32 x, UINT32 y) return p; } -#endif /* __GDI_CORE_H */ +#endif /* FREERDP_LIB_GDI_CORE_H */ diff --git a/libfreerdp/gdi/graphics.h b/libfreerdp/gdi/graphics.h index 0f9d4edec..1c6e166d6 100644 --- a/libfreerdp/gdi/graphics.h +++ b/libfreerdp/gdi/graphics.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef __GDI_GRAPHICS_H -#define __GDI_GRAPHICS_H +#ifndef FREERDP_LIB_GDI_GRAPHICS_H +#define FREERDP_LIB_GDI_GRAPHICS_H #include #include @@ -32,4 +32,4 @@ FREERDP_LOCAL HGDI_BITMAP gdi_create_bitmap(rdpGdi* gdi, UINT32 width, FREERDP_LOCAL BOOL gdi_register_graphics(rdpGraphics* graphics); -#endif /* __GDI_GRAPHICS_H */ +#endif /* FREERDP_LIB_GDI_GRAPHICS_H */ diff --git a/libfreerdp/gdi/line.h b/libfreerdp/gdi/line.h index 4bced80a4..f583ca61c 100644 --- a/libfreerdp/gdi/line.h +++ b/libfreerdp/gdi/line.h @@ -19,8 +19,8 @@ * limitations under the License. */ -#ifndef FREERDP_GDI_LINE_H -#define FREERDP_GDI_LINE_H +#ifndef FREERDP_LIB_GDI_LINE_H +#define FREERDP_LIB_GDI_LINE_H #include #include @@ -41,4 +41,4 @@ FREERDP_LOCAL BOOL gdi_MoveToEx(HGDI_DC hdc, UINT32 X, UINT32 Y, } #endif -#endif /* FREERDP_GDI_LINE_H */ +#endif /* FREERDP_LIB_GDI_LINE_H */ diff --git a/libfreerdp/locale/keyboard_xkbfile.h b/libfreerdp/locale/keyboard_xkbfile.h index b4d6b61af..72fd6089e 100644 --- a/libfreerdp/locale/keyboard_xkbfile.h +++ b/libfreerdp/locale/keyboard_xkbfile.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __LOCALE_KEYBOARD_XKB_H -#define __LOCALE_KEYBOARD_XKB_H +#ifndef FREERDP_LIB_LOCALE_KEYBOARD_XKB_H +#define FREERDP_LIB_LOCALE_KEYBOARD_XKB_H #include #include @@ -32,4 +32,4 @@ FREERDP_LOCAL int detect_keyboard_layout_from_xkbfile(void* display, FREERDP_LOCAL int freerdp_keyboard_load_map_from_xkbfile(void* display, DWORD x11_keycode_to_rdp_scancode[256]); -#endif /* __LOCALE_KEYBOARD_XKB_H */ +#endif /* FREERDP_LIB_LOCALE_KEYBOARD_XKB_H */ diff --git a/libfreerdp/locale/liblocale.h b/libfreerdp/locale/liblocale.h index 34fa8c2c4..b9310fa96 100644 --- a/libfreerdp/locale/liblocale.h +++ b/libfreerdp/locale/liblocale.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __LIBLOCALE_H -#define __LIBLOCALE_H +#ifndef FREERDP_LIB_LOCALE_LIB_H +#define FREERDP_LIB_LOCALE_LIB_H #ifdef HAVE_CONFIG_H #include "config.h" @@ -40,4 +40,4 @@ #define DEBUG_TIMEZONE(...) do { } while (0) #endif -#endif /* __LIBLOCALE_H */ +#endif /* FREERDP_LIB_LOCALE_LIB_H */ diff --git a/libfreerdp/locale/xkb_layout_ids.h b/libfreerdp/locale/xkb_layout_ids.h index 84d5cc104..1816f0878 100644 --- a/libfreerdp/locale/xkb_layout_ids.h +++ b/libfreerdp/locale/xkb_layout_ids.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __FREERDP_XKB_LAYOUT_IDS_H -#define __FREERDP_XKB_LAYOUT_IDS_H +#ifndef FREERDP_LIB_LOCALE_XKB_LAYOUT_IDS_H +#define FREERDP_LIB_LOCALE_XKB_LAYOUT_IDS_H #include #include @@ -26,4 +26,4 @@ FREERDP_LOCAL UINT32 find_keyboard_layout_in_xorg_rules(char* layout, char* variant); -#endif /* __FREERDP_XKB_LAYOUT_IDS_H */ +#endif /* FREERDP_LIB_LOCALE_XKB_LAYOUT_IDS_H */ diff --git a/libfreerdp/primitives/prim_internal.h b/libfreerdp/primitives/prim_internal.h index f931212e3..3cd7b1d4e 100644 --- a/libfreerdp/primitives/prim_internal.h +++ b/libfreerdp/primitives/prim_internal.h @@ -14,12 +14,8 @@ * */ -#ifdef __GNUC__ -# pragma once -#endif - -#ifndef __PRIM_INTERNAL_H_INCLUDED__ -#define __PRIM_INTERNAL_H_INCLUDED__ +#ifndef FREERDP_LIB_PRIM_INTERNAL_H +#define FREERDP_LIB_PRIM_INTERNAL_H #ifndef CMAKE_BUILD_TYPE #define CMAKE_BUILD_TYPE Release @@ -193,4 +189,4 @@ FREERDP_LOCAL void primitives_init_colors_opt(primitives_t* prims); FREERDP_LOCAL void primitives_init_YCoCg_opt(primitives_t* prims); FREERDP_LOCAL void primitives_init_YUV_opt(primitives_t* prims); -#endif /* !__PRIM_INTERNAL_H_INCLUDED__ */ +#endif /* FREERDP_LIB_PRIM_INTERNAL_H */ diff --git a/libfreerdp/primitives/prim_templates.h b/libfreerdp/primitives/prim_templates.h index ba2405c43..b68c67049 100644 --- a/libfreerdp/primitives/prim_templates.h +++ b/libfreerdp/primitives/prim_templates.h @@ -17,8 +17,8 @@ # pragma once #endif -#ifndef __PRIM_TEMPLATES_H_INCLUDED__ -#define __PRIM_TEMPLATES_H_INCLUDED__ +#ifndef FREERDP_LIB_PRIM_TEMPLATES_H +#define FREERDP_LIB_PRIM_TEMPLATES_H /* These are prototypes for SSE (potentially NEON) routines that do a * simple SSE operation over an array of data. Since so much of this @@ -415,4 +415,4 @@ return PRIMITIVES_SUCCESS; \ } -#endif /* !__PRIM_TEMPLATES_H_INCLUDED__ */ +#endif /* FREERDP_LIB_PRIM_TEMPLATES_H */ diff --git a/libfreerdp/primitives/test/TestPrimitivesYCoCg.c b/libfreerdp/primitives/test/TestPrimitivesYCoCg.c index de09ccaf2..c115336a5 100644 --- a/libfreerdp/primitives/test/TestPrimitivesYCoCg.c +++ b/libfreerdp/primitives/test/TestPrimitivesYCoCg.c @@ -52,7 +52,7 @@ static BOOL test_YCoCgRToRGB_8u_AC4R_func(UINT32 width, UINT32 height) if (!in || !out_c || !out_sse) goto fail; - winpr_RAND(in, sizeof(in)); + winpr_RAND(in, size); for (x = 0; x < sizeof(formats) / sizeof(formats[0]); x++) { diff --git a/libfreerdp/primitives/test/prim_test.h b/libfreerdp/primitives/test/prim_test.h index 45519f37b..761e36fd5 100644 --- a/libfreerdp/primitives/test/prim_test.h +++ b/libfreerdp/primitives/test/prim_test.h @@ -13,8 +13,8 @@ * this code may be covered by patents by HP, Microsoft, or other parties. */ -#ifndef __PRIMTEST_H_INCLUDED__ -#define __PRIMTEST_H_INCLUDED__ +#ifndef FREERDP_LIB_PRIMTEST_H +#define FREERDP_LIB_PRIMTEST_H #include #include @@ -57,4 +57,4 @@ BOOL speed_test(const char* name, const char* dsc, UINT32 iterations, speed_test_fkt generic, speed_test_fkt optimized, ...); -#endif // !__PRIMTEST_H_INCLUDED__ +#endif /* FREERDP_LIB_PRIMTEST_H */ diff --git a/server/Mac/mf_audin.h b/server/Mac/mf_audin.h index d3e172b97..e50e119b8 100644 --- a/server/Mac/mf_audin.h +++ b/server/Mac/mf_audin.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef MF_AUDIN_H -#define MF_AUDIN_H +#ifndef FREERDP_SERVER_MAC_AUDIN_H +#define FREERDP_SERVER_MAC_AUDIN_H #include #include @@ -30,5 +30,5 @@ void mf_peer_audin_init(mfPeerContext* context); -#endif /* MF_AUDIN_H */ +#endif /* FREERDP_SERVER_MAC_AUDIN_H */ diff --git a/server/Mac/mf_event.h b/server/Mac/mf_event.h index a9111a67f..883ba4132 100644 --- a/server/Mac/mf_event.h +++ b/server/Mac/mf_event.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef __MF_EVENT_H -#define __MF_EVENT_H +#ifndef FREERDP_SERVER_MAC_EVENT_H +#define FREERDP_SERVER_MAC_EVENT_H typedef struct mf_event mfEvent; typedef struct mf_event_queue mfEventQueue; @@ -31,8 +31,8 @@ typedef struct mf_event_region mfEventRegion; enum mf_event_type { - MF_EVENT_TYPE_REGION, - MF_EVENT_TYPE_FRAME_TICK + FREERDP_SERVER_MAC_EVENT_TYPE_REGION, + FREERDP_SERVER_MAC_EVENT_TYPE_FRAME_TICK }; struct mf_event @@ -72,4 +72,4 @@ void mf_event_free(mfEvent* event); mfEventQueue* mf_event_queue_new(void); void mf_event_queue_free(mfEventQueue* event_queue); -#endif /* __MF_EVENT_H */ +#endif /* FREERDP_SERVER_MAC_EVENT_H */ diff --git a/server/Mac/mf_info.h b/server/Mac/mf_info.h index da420c3f5..9c092a0cb 100644 --- a/server/Mac/mf_info.h +++ b/server/Mac/mf_info.h @@ -17,11 +17,11 @@ * limitations under the License. */ -#ifndef MF_INFO_H -#define MF_INFO_H +#ifndef FREERDP_SERVER_MAC_INFO_H +#define FREERDP_SERVER_MAC_INFO_H -#define MF_INFO_DEFAULT_FPS 1 -#define MF_INFO_MAXPEERS 1 +#define FREERDP_SERVER_MAC_INFO_DEFAULT_FPS 1 +#define FREERDP_SERVER_MAC_INFO_MAXPEERS 1 @@ -47,4 +47,4 @@ BOOL mf_info_have_invalid_region(mfInfo* mfi); void mf_info_getScreenData(mfInfo* mfi, long* width, long* height, BYTE** pBits, int* pitch); //BOOL CALLBACK mf_info_monEnumCB(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData); -#endif /* mf_info_H */ +#endif /* FREERDP_SERVER_MAC_INFO_H */ diff --git a/server/Mac/mf_input.h b/server/Mac/mf_input.h index 09be9af48..8e8903cfb 100644 --- a/server/Mac/mf_input.h +++ b/server/Mac/mf_input.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef MF_INPUT_H -#define MF_INPUT_H +#ifndef FREERDP_SERVER_MAC_INPUT_H +#define FREERDP_SERVER_MAC_INPUT_H #include "mf_interface.h" @@ -33,4 +33,4 @@ void mf_input_unicode_keyboard_event_dummy(rdpInput* input, UINT16 flags, UINT16 void mf_input_mouse_event_dummy(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); void mf_input_extended_mouse_event_dummy(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); -#endif /* MF_INPUT_H */ \ No newline at end of file +#endif /* FREERDP_SERVER_MAC_INPUT_H */ \ No newline at end of file diff --git a/server/Mac/mf_interface.h b/server/Mac/mf_interface.h index 80c10172f..9019d684e 100644 --- a/server/Mac/mf_interface.h +++ b/server/Mac/mf_interface.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef MF_INTERFACE_H -#define MF_INTERFACE_H +#ifndef FREERDP_SERVER_MAC_INTERFACE_H +#define FREERDP_SERVER_MAC_INTERFACE_H #include @@ -102,4 +102,4 @@ struct mf_info BOOL force_all_disconnect; }; -#endif +#endif /* FREERDP_SERVER_MAC_INTERFACE_H */ diff --git a/server/Mac/mf_mountain_lion.h b/server/Mac/mf_mountain_lion.h index 4b840f057..1790a3cca 100644 --- a/server/Mac/mf_mountain_lion.h +++ b/server/Mac/mf_mountain_lion.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef MF_MLION_H -#define MF_MLION_H +#ifndef FREERDP_SERVER_MAC_MLION_H +#define FREERDP_SERVER_MAC_MLION_H #include @@ -36,4 +36,4 @@ int mf_mlion_clear_dirty_region(void); int mf_mlion_get_pixelData(long x, long y, long width, long height, BYTE **pxData); -#endif +#endif /* FREERDP_SERVER_MAC_MLION_H */ diff --git a/server/Mac/mf_peer.h b/server/Mac/mf_peer.h index 02a6b1730..9b137dbad 100644 --- a/server/Mac/mf_peer.h +++ b/server/Mac/mf_peer.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef WF_PEER_H -#define WF_PEER_H +#ifndef FREERDP_SERVER_MAC_PEER_H +#define FREERDP_SERVER_MAC_PEER_H #include "mf_interface.h" @@ -41,4 +41,4 @@ BOOL mf_peer_accepted(freerdp_listener* instance, freerdp_peer* client); void* mf_peer_main_loop(void* arg); -#endif /* MF_PEER_H */ +#endif /* FREERDP_SERVER_MAC_PEER_H */ diff --git a/server/Mac/mf_rdpsnd.h b/server/Mac/mf_rdpsnd.h index dedc09d24..ea9099699 100644 --- a/server/Mac/mf_rdpsnd.h +++ b/server/Mac/mf_rdpsnd.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef MF_RDPSND_H -#define MF_RDPSND_H +#ifndef FREERDP_SERVER_MAC_RDPSND_H +#define FREERDP_SERVER_MAC_RDPSND_H #include #include @@ -62,5 +62,5 @@ typedef struct _AQRecorderState AQRecorderState; BOOL mf_peer_rdpsnd_init(mfPeerContext* context); BOOL mf_peer_rdpsnd_stop(void); -#endif /* MF_RDPSND_H */ +#endif /* FREERDP_SERVER_MAC_RDPSND_H */ diff --git a/server/Mac/mfreerdp.h b/server/Mac/mfreerdp.h index 2008b2581..38fa25bbd 100644 --- a/server/Mac/mfreerdp.h +++ b/server/Mac/mfreerdp.h @@ -18,11 +18,11 @@ * limitations under the License. */ -#ifndef MFREERDP_SERVER_H -#define MFREERDP_SERVER_H +#ifndef FREERDP_SERVER_MAC_FREERDP_H +#define FREERDP_SERVER_MAC_FREERDP_H #include #include #include -#endif /* MFREERDP_SERVER_H */ +#endif /* FREERDP_SERVER_MAC_FREERDP_H */ diff --git a/server/Sample/sf_audin.h b/server/Sample/sf_audin.h index db762fc55..e99321c87 100644 --- a/server/Sample/sf_audin.h +++ b/server/Sample/sf_audin.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef SF_AUDIN_H -#define SF_AUDIN_H +#ifndef FREERDP_SERVER_SAMPLE_SF_AUDIN_H +#define FREERDP_SERVER_SAMPLE_SF_AUDIN_H #include #include @@ -28,5 +28,5 @@ void sf_peer_audin_init(testPeerContext* context); -#endif /* WF_AUDIN_H */ +#endif /* FREERDP_SERVER_SAMPLE_SF_AUDIN_H */ diff --git a/server/Sample/sf_encomsp.h b/server/Sample/sf_encomsp.h index 27703145d..7976abc1c 100644 --- a/server/Sample/sf_encomsp.h +++ b/server/Sample/sf_encomsp.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef SF_ENCOMSP_H -#define SF_ENCOMSP_H +#ifndef FREERDP_SERVER_SAMPLE_SF_ENCOMSP_H +#define FREERDP_SERVER_SAMPLE_SF_ENCOMSP_H #include #include @@ -28,4 +28,4 @@ BOOL sf_peer_encomsp_init(testPeerContext* context); -#endif /* SF_ENCOMSP_H */ +#endif /* FREERDP_SERVER_SAMPLE_SF_ENCOMSP_H */ diff --git a/server/Sample/sf_rdpsnd.h b/server/Sample/sf_rdpsnd.h index 78e7c9bbd..7da3f5acf 100644 --- a/server/Sample/sf_rdpsnd.h +++ b/server/Sample/sf_rdpsnd.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef SF_RDPSND_H -#define SF_RDPSND_H +#ifndef FREERDP_SERVER_SAMPLE_SF_RDPSND_H +#define FREERDP_SERVER_SAMPLE_SF_RDPSND_H #include #include @@ -28,5 +28,5 @@ BOOL sf_peer_rdpsnd_init(testPeerContext* context); -#endif /* SF_RDPSND_H */ +#endif /* FREERDP_SERVER_SAMPLE_SF_RDPSND_H */ diff --git a/server/Sample/sfreerdp.h b/server/Sample/sfreerdp.h index 1b81d82a4..529282efd 100644 --- a/server/Sample/sfreerdp.h +++ b/server/Sample/sfreerdp.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef SFREERDP_SERVER_H -#define SFREERDP_SERVER_H +#ifndef FREERDP_SERVER_SAMPLE_SFREERDP_SERVER_H +#define FREERDP_SERVER_SAMPLE_SFREERDP_SERVER_H #include #include @@ -60,5 +60,5 @@ struct test_peer_context }; typedef struct test_peer_context testPeerContext; -#endif /* SFREERDP_SERVER_H */ +#endif /* FREERDP_SERVER_SAMPLE_SFREERDP_SERVER_H */ diff --git a/server/Windows/cli/wfreerdp.h b/server/Windows/cli/wfreerdp.h index f3ab71cb0..017106db4 100644 --- a/server/Windows/cli/wfreerdp.h +++ b/server/Windows/cli/wfreerdp.h @@ -17,9 +17,9 @@ * limitations under the License. */ -#ifndef WFREERDP_H -#define WFREERDP_H +#ifndef FREERDP_SERVER_WIN_FREERDP_H +#define FREERDP_SERVER_WIN_FREERDP_H #include -#endif /* WFREERDP_H */ +#endif /* FREERDP_SERVER_WIN_FREERDP_H */ diff --git a/server/Windows/wf_directsound.h b/server/Windows/wf_directsound.h index 9e51b27d2..01c1bdd20 100644 --- a/server/Windows/wf_directsound.h +++ b/server/Windows/wf_directsound.h @@ -1,5 +1,5 @@ -#ifndef WF_DSOUND_H -#define WF_DSOUND_H +#ifndef FREERDP_SERVER_WIN_DSOUND_H +#define FREERDP_SERVER_WIN_DSOUND_H #include #include "wf_interface.h" @@ -10,4 +10,4 @@ int wf_directsound_activate(RdpsndServerContext* context); DWORD WINAPI wf_rdpsnd_directsound_thread(LPVOID lpParam); -#endif \ No newline at end of file +#endif /* FREERDP_SERVER_WIN_DSOUND_H */ diff --git a/server/Windows/wf_dxgi.h b/server/Windows/wf_dxgi.h index 1f47ee3a8..3feaa24c5 100644 --- a/server/Windows/wf_dxgi.h +++ b/server/Windows/wf_dxgi.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef WF_DXGI_H -#define WF_DXGI_H +#ifndef FREERDP_SERVER_WIN_DXGI_H +#define FREERDP_SERVER_WIN_DXGI_H #include "wf_interface.h" @@ -39,4 +39,4 @@ int wf_dxgi_releasePixelData(wfInfo* context); int wf_dxgi_getInvalidRegion(RECT* invalid); -#endif +#endif /* FREERDP_SERVER_WIN_DXGI_H */ diff --git a/server/Windows/wf_info.h b/server/Windows/wf_info.h index 14ea6ea5c..affa7e827 100644 --- a/server/Windows/wf_info.h +++ b/server/Windows/wf_info.h @@ -17,13 +17,13 @@ * limitations under the License. */ -#ifndef WF_INFO_H -#define WF_INFO_H +#ifndef FREERDP_SERVER_WIN_INFO_H +#define FREERDP_SERVER_WIN_INFO_H #include "wf_interface.h" -#define WF_INFO_DEFAULT_FPS 24 -#define WF_INFO_MAXPEERS 32 +#define FREERDP_SERVER_WIN_INFO_DEFAULT_FPS 24 +#define FREERDP_SERVER_WIN_INFO_MAXPEERS 32 BOOL wf_info_lock(wfInfo* wfi); BOOL wf_info_try_lock(wfInfo* wfi, DWORD dwMilliseconds); @@ -42,4 +42,4 @@ BOOL wf_info_have_invalid_region(wfInfo* wfi); void wf_info_getScreenData(wfInfo* wfi, long* width, long* height, BYTE** pBits, int* pitch); BOOL CALLBACK wf_info_monEnumCB(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData); -#endif /* WF_INFO_H */ +#endif /* FREERDP_SERVER_WIN_INFO_H */ diff --git a/server/Windows/wf_input.h b/server/Windows/wf_input.h index d185f2bf9..a7b98709a 100644 --- a/server/Windows/wf_input.h +++ b/server/Windows/wf_input.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef WF_INPUT_H -#define WF_INPUT_H +#ifndef FREERDP_SERVER_WIN_INPUT_H +#define FREERDP_SERVER_WIN_INPUT_H #include "wf_interface.h" @@ -33,4 +33,4 @@ void wf_peer_unicode_keyboard_event_dummy(rdpInput* input, UINT16 flags, UINT16 void wf_peer_mouse_event_dummy(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); void wf_peer_extended_mouse_event_dummy(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); -#endif /* WF_INPUT_H */ +#endif /* FREERDP_SERVER_WIN_INPUT_H */ diff --git a/server/Windows/wf_interface.h b/server/Windows/wf_interface.h index 6ab6b6f3e..1fbe223ae 100644 --- a/server/Windows/wf_interface.h +++ b/server/Windows/wf_interface.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef WF_INTERFACE_H -#define WF_INTERFACE_H +#ifndef FREERDP_SERVER_WIN_INTERFACE_H +#define FREERDP_SERVER_WIN_INTERFACE_H #include @@ -36,10 +36,10 @@ #define WITH_DXGI_1_2 1 #endif -#define WF_SRV_CALLBACK_EVENT_CONNECT 1 -#define WF_SRV_CALLBACK_EVENT_DISCONNECT 2 -#define WF_SRV_CALLBACK_EVENT_ACTIVATE 4 -#define WF_SRV_CALLBACK_EVENT_AUTH 8 +#define FREERDP_SERVER_WIN_SRV_CALLBACK_EVENT_CONNECT 1 +#define FREERDP_SERVER_WIN_SRV_CALLBACK_EVENT_DISCONNECT 2 +#define FREERDP_SERVER_WIN_SRV_CALLBACK_EVENT_ACTIVATE 4 +#define FREERDP_SERVER_WIN_SRV_CALLBACK_EVENT_AUTH 8 typedef struct wf_info wfInfo; typedef struct wf_peer_context wfPeerContext; @@ -137,4 +137,4 @@ FREERDP_API void wfreerdp_server_register_callback_event(cbCallback cb); void wfreerdp_server_peer_callback_event(int pId, UINT32 eType); -#endif /* WF_INTERFACE_H */ +#endif /* FREERDP_SERVER_WIN_INTERFACE_H */ diff --git a/server/Windows/wf_mirage.h b/server/Windows/wf_mirage.h index 372e02bbe..b88971871 100644 --- a/server/Windows/wf_mirage.h +++ b/server/Windows/wf_mirage.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef WF_MIRAGE_H -#define WF_MIRAGE_H +#ifndef FREERDP_SERVER_WIN_MIRAGE_H +#define FREERDP_SERVER_WIN_MIRAGE_H #include "wf_interface.h" @@ -218,4 +218,4 @@ BOOL wf_mirror_driver_cleanup(wfInfo* wfi); BOOL wf_mirror_driver_activate(wfInfo* wfi); void wf_mirror_driver_deactivate(wfInfo* wfi); -#endif /* WF_MIRAGE_H */ +#endif /* FREERDP_SERVER_WIN_MIRAGE_H */ diff --git a/server/Windows/wf_peer.h b/server/Windows/wf_peer.h index 7d8f1d0ea..0abbb5a18 100644 --- a/server/Windows/wf_peer.h +++ b/server/Windows/wf_peer.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef WF_PEER_H -#define WF_PEER_H +#ifndef FREERDP_SERVER_WIN_PEER_H +#define FREERDP_SERVER_WIN_PEER_H #include "wf_interface.h" @@ -48,4 +48,4 @@ BOOL wf_peer_accepted(freerdp_listener* instance, freerdp_peer* client); DWORD WINAPI wf_peer_main_loop(LPVOID lpParam); -#endif /* WF_PEER_H */ +#endif /* FREERDP_SERVER_WIN_PEER_H */ diff --git a/server/Windows/wf_rdpsnd.h b/server/Windows/wf_rdpsnd.h index c61de61b9..9a82664e2 100644 --- a/server/Windows/wf_rdpsnd.h +++ b/server/Windows/wf_rdpsnd.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef WF_RDPSND_H -#define WF_RDPSND_H +#ifndef FREERDP_SERVER_WIN_RDPSND_H +#define FREERDP_SERVER_WIN_RDPSND_H #include #include @@ -31,5 +31,5 @@ int wf_rdpsnd_unlock(void); BOOL wf_peer_rdpsnd_init(wfPeerContext* context); -#endif /* WF_RDPSND_H */ +#endif /* FREERDP_SERVER_WIN_RDPSND_H */ diff --git a/server/Windows/wf_settings.h b/server/Windows/wf_settings.h index 205ab97e0..40e25aa2b 100644 --- a/server/Windows/wf_settings.h +++ b/server/Windows/wf_settings.h @@ -17,12 +17,12 @@ * limitations under the License. */ -#ifndef WF_SETTINGS_H -#define WF_SETTINGS_H +#ifndef FREERDP_SERVER_WIN_SETTINGS_H +#define FREERDP_SERVER_WIN_SETTINGS_H #include "wf_interface.h" BOOL wf_settings_read_dword(HKEY key, LPCSTR subkey, LPTSTR name, DWORD* value); BOOL wf_settings_read_string_ascii(HKEY key, LPCSTR subkey, LPTSTR name, char** value); -#endif /* WF_SETTINGS_H */ +#endif /* FREERDP_SERVER_WIN_SETTINGS_H */ diff --git a/server/Windows/wf_update.h b/server/Windows/wf_update.h index 0fb9c46bd..47553aff0 100644 --- a/server/Windows/wf_update.h +++ b/server/Windows/wf_update.h @@ -17,8 +17,8 @@ * limitations under the License. */ -#ifndef WF_UPDATE_H -#define WF_UPDATE_H +#ifndef FREERDP_SERVER_WIN_UPDATE_H +#define FREERDP_SERVER_WIN_UPDATE_H #include "wf_interface.h" @@ -34,4 +34,4 @@ void wf_update_end(wfInfo* wfi); void wf_update_peer_activate(wfInfo* wfi, wfPeerContext* context); void wf_update_peer_deactivate(wfInfo* wfi, wfPeerContext* context); -#endif /* WF_UPDATE_H */ +#endif /* FREERDP_SERVER_WIN_UPDATE_H */ diff --git a/server/Windows/wf_wasapi.h b/server/Windows/wf_wasapi.h index 7461f2a0d..303b4f9b2 100644 --- a/server/Windows/wf_wasapi.h +++ b/server/Windows/wf_wasapi.h @@ -1,5 +1,5 @@ -#ifndef WF_WASAPI_H -#define WF_WASAPI_H +#ifndef FREERDP_SERVER_WIN_WASAPI_H +#define FREERDP_SERVER_WIN_WASAPI_H #include #include "wf_interface.h" @@ -12,4 +12,4 @@ int wf_wasapi_get_device_string(LPWSTR pattern, LPWSTR * deviceStr); DWORD WINAPI wf_rdpsnd_wasapi_thread(LPVOID lpParam); -#endif \ No newline at end of file +#endif /* FREERDP_SERVER_WIN_WASAPI_H */ diff --git a/server/shadow/Mac/mac_shadow.h b/server/shadow/Mac/mac_shadow.h index dc5d24b2d..dff555e17 100644 --- a/server/shadow/Mac/mac_shadow.h +++ b/server/shadow/Mac/mac_shadow.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_MAC_H -#define FREERDP_SHADOW_SERVER_MAC_H +#ifndef FREERDP_SERVER_SHADOW_MAC_SHADOW_H +#define FREERDP_SERVER_SHADOW_MAC_SHADOW_H #include @@ -62,4 +62,4 @@ extern "C" { } #endif -#endif /* FREERDP_SHADOW_SERVER_MAC_H */ +#endif /* FREERDP_SERVER_SHADOW_MAC_SHADOW_H */ diff --git a/server/shadow/Win/win_dxgi.h b/server/shadow/Win/win_dxgi.h index 1dcdf7ac8..92b208984 100644 --- a/server/shadow/Win/win_dxgi.h +++ b/server/shadow/Win/win_dxgi.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_WIN_DXGI_H -#define FREERDP_SHADOW_SERVER_WIN_DXGI_H +#ifndef FREERDP_SERVER_SHADOW_WIN_DXGI_H +#define FREERDP_SERVER_SHADOW_WIN_DXGI_H #if _WIN32_WINNT >= 0x0602 //#define WITH_DXGI_1_2 1 @@ -57,4 +57,4 @@ int win_shadow_dxgi_get_invalid_region(winShadowSubsystem* subsystem); } #endif -#endif /* FREERDP_SHADOW_SERVER_WIN_DXGI_H */ +#endif /* FREERDP_SERVER_SHADOW_WIN_DXGI_H */ diff --git a/server/shadow/Win/win_rdp.h b/server/shadow/Win/win_rdp.h index e48d46e6b..bc6b1a185 100644 --- a/server/shadow/Win/win_rdp.h +++ b/server/shadow/Win/win_rdp.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_WIN_RDP_H -#define FREERDP_SHADOW_SERVER_WIN_RDP_H +#ifndef FREERDP_SERVER_SHADOW_WIN_RDP_H +#define FREERDP_SERVER_SHADOW_WIN_RDP_H #include #include @@ -53,4 +53,4 @@ int win_shadow_rdp_stop(winShadowSubsystem* subsystem); } #endif -#endif /* FREERDP_SHADOW_SERVER_WIN_RDP_H */ +#endif /* FREERDP_SERVER_SHADOW_WIN_RDP_H */ diff --git a/server/shadow/Win/win_shadow.h b/server/shadow/Win/win_shadow.h index c403bd6f1..2ce22f1ee 100644 --- a/server/shadow/Win/win_shadow.h +++ b/server/shadow/Win/win_shadow.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_WIN_H -#define FREERDP_SHADOW_SERVER_WIN_H +#ifndef FREERDP_SERVER_SHADOW_WIN_H +#define FREERDP_SERVER_SHADOW_WIN_H #include @@ -87,4 +87,4 @@ extern "C" { } #endif -#endif /* FREERDP_SHADOW_SERVER_WIN_H */ +#endif /* FREERDP_SERVER_SHADOW_WIN_H */ diff --git a/server/shadow/Win/win_wds.h b/server/shadow/Win/win_wds.h index d8859d706..8262e8515 100644 --- a/server/shadow/Win/win_wds.h +++ b/server/shadow/Win/win_wds.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_WIN_WDS_H -#define FREERDP_SHADOW_SERVER_WIN_WDS_H +#ifndef FREERDP_SERVER_SHADOW_WIN_WDS_H +#define FREERDP_SERVER_SHADOW_WIN_WDS_H #define WITH_WDS_API 1 @@ -44,4 +44,4 @@ int win_shadow_wds_uninit(winShadowSubsystem* subsystem); } #endif -#endif /* FREERDP_SHADOW_SERVER_WIN_WDS_H */ +#endif /* FREERDP_SERVER_SHADOW_WIN_WDS_H */ diff --git a/server/shadow/X11/x11_shadow.c b/server/shadow/X11/x11_shadow.c index 9c7505318..2a3f8900b 100644 --- a/server/shadow/X11/x11_shadow.c +++ b/server/shadow/X11/x11_shadow.c @@ -46,7 +46,7 @@ #define TAG SERVER_TAG("shadow.x11") -static int x11_shadow_enum_monitors(MONITOR_DEF* monitors, int maxMonitors); +static UINT32 x11_shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors); #ifdef WITH_PAM @@ -591,6 +591,10 @@ static int x11_shadow_blend_cursor(x11ShadowSubsystem* subsystem) BYTE* pDstData; BYTE A, R, G, B; rdpShadowSurface* surface; + + if (!subsystem) + return -1; + surface = subsystem->server->surface; nXSrc = 0; nYSrc = 0; @@ -1102,7 +1106,7 @@ static int x11_shadow_xshm_init(x11ShadowSubsystem* subsystem) return 1; } -int x11_shadow_enum_monitors(MONITOR_DEF* monitors, int maxMonitors) +UINT32 x11_shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors) { int index; Display* display; @@ -1175,7 +1179,7 @@ int x11_shadow_enum_monitors(MONITOR_DEF* monitors, int maxMonitors) return numMonitors; } -static int x11_shadow_subsystem_init(x11ShadowSubsystem* subsystem) +static int x11_shadow_subsystem_init(rdpShadowSubsystem* sub) { int i; int pf_count; @@ -1188,6 +1192,11 @@ static int x11_shadow_subsystem_init(x11ShadowSubsystem* subsystem) XPixmapFormatValues* pf; XPixmapFormatValues* pfs; MONITOR_DEF* virtualScreen; + x11ShadowSubsystem* subsystem = (x11ShadowSubsystem*)sub; + + if (!subsystem) + return -1; + subsystem->numMonitors = x11_shadow_enum_monitors(subsystem->monitors, 16); x11_shadow_subsystem_base_init(subsystem); @@ -1311,8 +1320,10 @@ static int x11_shadow_subsystem_init(x11ShadowSubsystem* subsystem) return 1; } -static int x11_shadow_subsystem_uninit(x11ShadowSubsystem* subsystem) +static int x11_shadow_subsystem_uninit(rdpShadowSubsystem* sub) { + x11ShadowSubsystem* subsystem = (x11ShadowSubsystem*)sub; + if (!subsystem) return -1; @@ -1337,10 +1348,12 @@ static int x11_shadow_subsystem_uninit(x11ShadowSubsystem* subsystem) return 1; } -static int x11_shadow_subsystem_start(x11ShadowSubsystem* subsystem) +static int x11_shadow_subsystem_start(rdpShadowSubsystem* sub) { - if (!subsystem) - return -1; + x11ShadowSubsystem* subsystem = (x11ShadowSubsystem*)sub; + + if (!subsystem) + return -1; if (!(subsystem->thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) x11_shadow_subsystem_thread, @@ -1353,10 +1366,12 @@ static int x11_shadow_subsystem_start(x11ShadowSubsystem* subsystem) return 1; } -static int x11_shadow_subsystem_stop(x11ShadowSubsystem* subsystem) +static int x11_shadow_subsystem_stop(rdpShadowSubsystem* sub) { - if (!subsystem) - return -1; + x11ShadowSubsystem* subsystem = (x11ShadowSubsystem*)sub; + + if (!subsystem) + return -1; if (subsystem->thread) { @@ -1370,7 +1385,7 @@ static int x11_shadow_subsystem_stop(x11ShadowSubsystem* subsystem) return 1; } -static x11ShadowSubsystem* x11_shadow_subsystem_new(void) +static rdpShadowSubsystem* x11_shadow_subsystem_new(void) { x11ShadowSubsystem* subsystem; subsystem = (x11ShadowSubsystem*) calloc(1, sizeof(x11ShadowSubsystem)); @@ -1395,10 +1410,10 @@ static x11ShadowSubsystem* x11_shadow_subsystem_new(void) subsystem->use_xfixes = TRUE; subsystem->use_xdamage = FALSE; subsystem->use_xinerama = TRUE; - return subsystem; + return (rdpShadowSubsystem*)subsystem; } -static void x11_shadow_subsystem_free(x11ShadowSubsystem* subsystem) +static void x11_shadow_subsystem_free(rdpShadowSubsystem* subsystem) { if (!subsystem) return; @@ -1409,12 +1424,15 @@ static void x11_shadow_subsystem_free(x11ShadowSubsystem* subsystem) FREERDP_API int X11_ShadowSubsystemEntry(RDP_SHADOW_ENTRY_POINTS* pEntryPoints) { - pEntryPoints->New = (pfnShadowSubsystemNew) x11_shadow_subsystem_new; - pEntryPoints->Free = (pfnShadowSubsystemFree) x11_shadow_subsystem_free; - pEntryPoints->Init = (pfnShadowSubsystemInit) x11_shadow_subsystem_init; - pEntryPoints->Uninit = (pfnShadowSubsystemInit) x11_shadow_subsystem_uninit; - pEntryPoints->Start = (pfnShadowSubsystemStart) x11_shadow_subsystem_start; - pEntryPoints->Stop = (pfnShadowSubsystemStop) x11_shadow_subsystem_stop; - pEntryPoints->EnumMonitors = (pfnShadowEnumMonitors) x11_shadow_enum_monitors; + if (!pEntryPoints) + return -1; + + pEntryPoints->New = x11_shadow_subsystem_new; + pEntryPoints->Free = x11_shadow_subsystem_free; + pEntryPoints->Init = x11_shadow_subsystem_init; + pEntryPoints->Uninit = x11_shadow_subsystem_uninit; + pEntryPoints->Start = x11_shadow_subsystem_start; + pEntryPoints->Stop = x11_shadow_subsystem_stop; + pEntryPoints->EnumMonitors = x11_shadow_enum_monitors; return 1; } diff --git a/server/shadow/X11/x11_shadow.h b/server/shadow/X11/x11_shadow.h index 5425bf2fe..e6e361e37 100644 --- a/server/shadow/X11/x11_shadow.h +++ b/server/shadow/X11/x11_shadow.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_X11_H -#define FREERDP_SHADOW_SERVER_X11_H +#ifndef FREERDP_SERVER_SHADOW_X11_H +#define FREERDP_SERVER_SHADOW_X11_H #include @@ -57,17 +57,17 @@ struct x11_shadow_subsystem HANDLE thread; - int bpp; + UINT32 bpp; int xfds; - int depth; - int width; - int height; + UINT32 depth; + UINT32 width; + UINT32 height; int number; XImage* image; Screen* screen; Visual* visual; Display* display; - int scanline_pad; + UINT32 scanline_pad; BOOL composite; BOOL use_xshm; @@ -80,14 +80,14 @@ struct x11_shadow_subsystem Window root_window; XShmSegmentInfo fb_shm_info; - int cursorHotX; - int cursorHotY; - int cursorWidth; - int cursorHeight; + UINT32 cursorHotX; + UINT32 cursorHotY; + UINT32 cursorWidth; + UINT32 cursorHeight; UINT32 cursorId; BYTE* cursorPixels; - int cursorMaxWidth; - int cursorMaxHeight; + UINT32 cursorMaxWidth; + UINT32 cursorMaxHeight; rdpShadowClient* lastMouseClient; #ifdef WITH_XDAMAGE @@ -112,4 +112,4 @@ extern "C" { } #endif -#endif /* FREERDP_SHADOW_SERVER_X11_H */ +#endif /* FREERDP_SERVER_SHADOW_X11_H */ diff --git a/server/shadow/shadow.h b/server/shadow/shadow.h index b41449d1c..2532bfd41 100644 --- a/server/shadow/shadow.h +++ b/server/shadow/shadow.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_H -#define FREERDP_SHADOW_SERVER_H +#ifndef FREERDP_SERVER_SHADOW_SHADOW_H +#define FREERDP_SERVER_SHADOW_SHADOW_H #include @@ -42,5 +42,5 @@ extern "C" { } #endif -#endif /* FREERDP_SHADOW_SERVER_H */ +#endif /* FREERDP_SERVER_SHADOW_SHADOW_H */ diff --git a/server/shadow/shadow_audin.h b/server/shadow/shadow_audin.h index a02bd3b4e..5bc6252a7 100644 --- a/server/shadow/shadow_audin.h +++ b/server/shadow/shadow_audin.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_AUDIN_H -#define FREERDP_SHADOW_SERVER_AUDIN_H +#ifndef FREERDP_SERVER_SHADOW_AUDIN_H +#define FREERDP_SERVER_SHADOW_AUDIN_H #include @@ -35,4 +35,4 @@ void shadow_client_audin_uninit(rdpShadowClient* client); } #endif -#endif /* FREERDP_SHADOW_SERVER_AUDIN_H */ +#endif /* FREERDP_SERVER_SHADOW_AUDIN_H */ diff --git a/server/shadow/shadow_capture.c b/server/shadow/shadow_capture.c index dbf0ae6dc..18c33b984 100644 --- a/server/shadow/shadow_capture.c +++ b/server/shadow/shadow_capture.c @@ -80,14 +80,15 @@ int shadow_capture_align_clip_rect(RECTANGLE_16* rect, RECTANGLE_16* clip) return 1; } -int shadow_capture_compare(BYTE* pData1, int nStep1, int nWidth, int nHeight, BYTE* pData2, int nStep2, RECTANGLE_16* rect) +int shadow_capture_compare(BYTE* pData1, UINT32 nStep1, UINT32 nWidth, UINT32 nHeight, + BYTE* pData2, UINT32 nStep2, RECTANGLE_16* rect) { BOOL equal; BOOL allEqual; - int tw, th; - int tx, ty, k; - int nrow, ncol; - int l, t, r, b; + UINT32 tw, th; + UINT32 tx, ty, k; + UINT32 nrow, ncol; + UINT32 l, t, r, b; BYTE *p1, *p2; BOOL rows[1024]; #ifdef WITH_DEBUG_SHADOW_CAPTURE @@ -105,10 +106,10 @@ int shadow_capture_compare(BYTE* pData1, int nStep1, int nWidth, int nHeight, BY ncol = (nWidth + 15) / 16; l = ncol + 1; - r = -1; + r = 0; t = nrow + 1; - b = -1; + b = 0; for (ty = 0; ty < nrow; ty++) { diff --git a/server/shadow/shadow_capture.h b/server/shadow/shadow_capture.h index f5e7404c5..2989ff883 100644 --- a/server/shadow/shadow_capture.h +++ b/server/shadow/shadow_capture.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_CAPTURE_H -#define FREERDP_SHADOW_SERVER_CAPTURE_H +#ifndef FREERDP_SERVER_SHADOW_CAPTURE_H +#define FREERDP_SERVER_SHADOW_CAPTURE_H #include @@ -45,4 +45,4 @@ void shadow_capture_free(rdpShadowCapture* capture); } #endif -#endif /* FREERDP_SHADOW_SERVER_CAPTURE_H */ +#endif /* FREERDP_SERVER_SHADOW_CAPTURE_H */ diff --git a/server/shadow/shadow_channels.h b/server/shadow/shadow_channels.h index e35b6f6ee..cdd739f1d 100644 --- a/server/shadow/shadow_channels.h +++ b/server/shadow/shadow_channels.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_CHANNELS_H -#define FREERDP_SHADOW_SERVER_CHANNELS_H +#ifndef FREERDP_SERVER_SHADOW_CHANNELS_H +#define FREERDP_SERVER_SHADOW_CHANNELS_H #include @@ -41,4 +41,4 @@ void shadow_client_channels_free(rdpShadowClient* client); } #endif -#endif /* FREERDP_SHADOW_SERVER_CHANNELS_H */ +#endif /* FREERDP_SERVER_SHADOW_CHANNELS_H */ diff --git a/server/shadow/shadow_client.h b/server/shadow/shadow_client.h index 789dde5cc..e61b4513b 100644 --- a/server/shadow/shadow_client.h +++ b/server/shadow/shadow_client.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_CLIENT_H -#define FREERDP_SHADOW_SERVER_CLIENT_H +#ifndef FREERDP_SERVER_SHADOW_CLIENT_H +#define FREERDP_SERVER_SHADOW_CLIENT_H #include @@ -32,4 +32,4 @@ BOOL shadow_client_accepted(freerdp_listener* instance, freerdp_peer* client); } #endif -#endif /* FREERDP_SHADOW_SERVER_CLIENT_H */ +#endif /* FREERDP_SERVER_SHADOW_CLIENT_H */ diff --git a/server/shadow/shadow_encoder.h b/server/shadow/shadow_encoder.h index 611850d1d..0299a4b5c 100644 --- a/server/shadow/shadow_encoder.h +++ b/server/shadow/shadow_encoder.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_ENCODER_H -#define FREERDP_SHADOW_SERVER_ENCODER_H +#ifndef FREERDP_SERVER_SHADOW_ENCODER_H +#define FREERDP_SERVER_SHADOW_ENCODER_H #include #include @@ -74,4 +74,4 @@ void shadow_encoder_free(rdpShadowEncoder* encoder); } #endif -#endif /* FREERDP_SHADOW_SERVER_ENCODER_H */ +#endif /* FREERDP_SERVER_SHADOW_ENCODER_H */ diff --git a/server/shadow/shadow_encomsp.h b/server/shadow/shadow_encomsp.h index c154dc9ab..4e7d80604 100644 --- a/server/shadow/shadow_encomsp.h +++ b/server/shadow/shadow_encomsp.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_ENCOMSP_H -#define FREERDP_SHADOW_SERVER_ENCOMSP_H +#ifndef FREERDP_SERVER_SHADOW_ENCOMSP_H +#define FREERDP_SERVER_SHADOW_ENCOMSP_H #include @@ -35,4 +35,4 @@ void shadow_client_encomsp_uninit(rdpShadowClient* client); } #endif -#endif /* FREERDP_SHADOW_SERVER_ENCOMSP_H */ +#endif /* FREERDP_SERVER_SHADOW_ENCOMSP_H */ diff --git a/server/shadow/shadow_input.h b/server/shadow/shadow_input.h index cc87ffc6e..95ed4da74 100644 --- a/server/shadow/shadow_input.h +++ b/server/shadow/shadow_input.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_INPUT_H -#define FREERDP_SHADOW_SERVER_INPUT_H +#ifndef FREERDP_SERVER_SHADOW_INPUT_H +#define FREERDP_SERVER_SHADOW_INPUT_H #include @@ -31,4 +31,4 @@ void shadow_input_register_callbacks(rdpInput* input); } #endif -#endif /* FREERDP_SHADOW_SERVER_INPUT_H */ +#endif /* FREERDP_SERVER_SHADOW_INPUT_H */ diff --git a/server/shadow/shadow_lobby.h b/server/shadow/shadow_lobby.h index c3aa68156..6c308e6e8 100644 --- a/server/shadow/shadow_lobby.h +++ b/server/shadow/shadow_lobby.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_LOBBY_H -#define FREERDP_SHADOW_SERVER_LOBBY_H +#ifndef FREERDP_SERVER_SHADOW_LOBBY_H +#define FREERDP_SERVER_SHADOW_LOBBY_H #include @@ -36,4 +36,4 @@ BOOL shadow_client_init_lobby(rdpShadowServer* server); } #endif -#endif /* FREERDP_SHADOW_SERVER_LOBBY_H */ +#endif /* FREERDP_SERVER_SHADOW_LOBBY_H */ diff --git a/server/shadow/shadow_mcevent.h b/server/shadow/shadow_mcevent.h index d604700a4..d6f4dab64 100644 --- a/server/shadow/shadow_mcevent.h +++ b/server/shadow/shadow_mcevent.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_MCEVENT_H -#define FREERDP_SHADOW_SERVER_MCEVENT_H +#ifndef FREERDP_SERVER_SHADOW_MCEVENT_H +#define FREERDP_SERVER_SHADOW_MCEVENT_H #include @@ -62,4 +62,4 @@ HANDLE shadow_multiclient_getevent(void* subscriber); } #endif -#endif /* FREERDP_SHADOW_SERVER_MCEVENT_H */ +#endif /* FREERDP_SERVER_SHADOW_MCEVENT_H */ diff --git a/server/shadow/shadow_rdpgfx.h b/server/shadow/shadow_rdpgfx.h index 0ac810d74..36af7572c 100644 --- a/server/shadow/shadow_rdpgfx.h +++ b/server/shadow/shadow_rdpgfx.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_RDPGFX_H -#define FREERDP_SHADOW_SERVER_RDPGFX_H +#ifndef FREERDP_SERVER_SHADOW_RDPGFX_H +#define FREERDP_SERVER_SHADOW_RDPGFX_H #include @@ -35,4 +35,4 @@ void shadow_client_rdpgfx_uninit(rdpShadowClient* client); } #endif -#endif /* FREERDP_SHADOW_SERVER_RDPGFX_H */ +#endif /* FREERDP_SERVER_SHADOW_RDPGFX_H */ diff --git a/server/shadow/shadow_rdpsnd.h b/server/shadow/shadow_rdpsnd.h index b95e9ce3b..c5e60b219 100644 --- a/server/shadow/shadow_rdpsnd.h +++ b/server/shadow/shadow_rdpsnd.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_RDPSND_H -#define FREERDP_SHADOW_SERVER_RDPSND_H +#ifndef FREERDP_SERVER_SHADOW_RDPSND_H +#define FREERDP_SERVER_SHADOW_RDPSND_H #include @@ -35,4 +35,4 @@ void shadow_client_rdpsnd_uninit(rdpShadowClient* client); } #endif -#endif /* FREERDP_SHADOW_SERVER_RDPSND_H */ +#endif /* FREERDP_SERVER_SHADOW_RDPSND_H */ diff --git a/server/shadow/shadow_remdesk.h b/server/shadow/shadow_remdesk.h index 78779ab35..953289377 100644 --- a/server/shadow/shadow_remdesk.h +++ b/server/shadow/shadow_remdesk.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_REMDESK_H -#define FREERDP_SHADOW_SERVER_REMDESK_H +#ifndef FREERDP_SERVER_SHADOW_REMDESK_H +#define FREERDP_SERVER_SHADOW_REMDESK_H #include @@ -35,4 +35,4 @@ void shadow_client_remdesk_uninit(rdpShadowClient* client); } #endif -#endif /* FREERDP_SHADOW_SERVER_REMDESK_H */ +#endif /* FREERDP_SERVER_SHADOW_REMDESK_H */ diff --git a/server/shadow/shadow_screen.h b/server/shadow/shadow_screen.h index 806d40fa7..e8f5c1751 100644 --- a/server/shadow/shadow_screen.h +++ b/server/shadow/shadow_screen.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_SCREEN_H -#define FREERDP_SHADOW_SERVER_SCREEN_H +#ifndef FREERDP_SERVER_SHADOW_SCREEN_H +#define FREERDP_SERVER_SHADOW_SCREEN_H #include @@ -49,4 +49,4 @@ void shadow_screen_free(rdpShadowScreen* screen); } #endif -#endif /* FREERDP_SHADOW_SERVER_SCREEN_H */ +#endif /* FREERDP_SERVER_SHADOW_SCREEN_H */ diff --git a/server/shadow/shadow_subsystem.c b/server/shadow/shadow_subsystem.c index 7f3173af6..cc5766a1f 100644 --- a/server/shadow/shadow_subsystem.c +++ b/server/shadow/shadow_subsystem.c @@ -44,7 +44,7 @@ static int shadow_subsystem_load_entry_points(RDP_SHADOW_ENTRY_POINTS* pEntryPoi return 1; } -rdpShadowSubsystem* shadow_subsystem_new() +rdpShadowSubsystem* shadow_subsystem_new(void) { RDP_SHADOW_ENTRY_POINTS ep; rdpShadowSubsystem* subsystem = NULL; @@ -165,9 +165,9 @@ int shadow_subsystem_stop(rdpShadowSubsystem* subsystem) return status; } -int shadow_enum_monitors(MONITOR_DEF* monitors, int maxMonitors) +UINT32 shadow_enum_monitors(MONITOR_DEF* monitors, UINT32 maxMonitors) { - int numMonitors = 0; + UINT32 numMonitors = 0; RDP_SHADOW_ENTRY_POINTS ep; if (shadow_subsystem_load_entry_points(&ep) < 0) diff --git a/server/shadow/shadow_subsystem.h b/server/shadow/shadow_subsystem.h index 7170cf207..ef8d7ef92 100644 --- a/server/shadow/shadow_subsystem.h +++ b/server/shadow/shadow_subsystem.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_SUBSYSTEM_H -#define FREERDP_SHADOW_SERVER_SUBSYSTEM_H +#ifndef FREERDP_SERVER_SHADOW_SUBSYSTEM_H +#define FREERDP_SERVER_SHADOW_SUBSYSTEM_H #include @@ -28,7 +28,7 @@ extern "C" { #endif -rdpShadowSubsystem* shadow_subsystem_new(); +rdpShadowSubsystem* shadow_subsystem_new(void); void shadow_subsystem_free(rdpShadowSubsystem* subsystem); int shadow_subsystem_init(rdpShadowSubsystem* subsystem, rdpShadowServer* server); @@ -41,5 +41,5 @@ int shadow_subsystem_stop(rdpShadowSubsystem* subsystem); } #endif -#endif /* FREERDP_SHADOW_SERVER_SUBSYSTEM_H */ +#endif /* FREERDP_SERVER_SHADOW_SUBSYSTEM_H */ diff --git a/server/shadow/shadow_surface.h b/server/shadow/shadow_surface.h index 2eefe5e33..abfbd562b 100644 --- a/server/shadow/shadow_surface.h +++ b/server/shadow/shadow_surface.h @@ -16,8 +16,8 @@ * limitations under the License. */ -#ifndef FREERDP_SHADOW_SERVER_SURFACE_H -#define FREERDP_SHADOW_SERVER_SURFACE_H +#ifndef FREERDP_SERVER_SHADOW_SURFACE_H +#define FREERDP_SERVER_SHADOW_SURFACE_H #include @@ -36,4 +36,4 @@ BOOL shadow_surface_resize(rdpShadowSurface *surface, int x, int y, int width, i } #endif -#endif /* FREERDP_SHADOW_SERVER_SURFACE_H */ +#endif /* FREERDP_SERVER_SHADOW_SURFACE_H */ diff --git a/uwac/include/uwac/uwac-tools.h b/uwac/include/uwac/uwac-tools.h index 07813fbd5..859e51dde 100644 --- a/uwac/include/uwac/uwac-tools.h +++ b/uwac/include/uwac/uwac-tools.h @@ -20,8 +20,8 @@ * OF THIS SOFTWARE. */ -#ifndef __UWAC_TOOLS_H_ -#define __UWAC_TOOLS_H_ +#ifndef UWAC_TOOLS_H_ +#define UWAC_TOOLS_H_ #include #include @@ -57,4 +57,4 @@ UWAC_API void UwacTouchAutomataReset(UwacTouchAutomata *automata); */ UWAC_API bool UwacTouchAutomataInjectEvent(UwacTouchAutomata *automata, UwacEvent *event); -#endif /* __UWAC_TOOLS_H_ */ +#endif /* UWAC_TOOLS_H_ */ diff --git a/uwac/include/uwac/uwac.h b/uwac/include/uwac/uwac.h index fd422f4b5..5042803cc 100644 --- a/uwac/include/uwac/uwac.h +++ b/uwac/include/uwac/uwac.h @@ -20,8 +20,8 @@ * OF THIS SOFTWARE. */ -#ifndef __UWAC_H_ -#define __UWAC_H_ +#ifndef UWAC_H_ +#define UWAC_H_ #include #include @@ -483,4 +483,4 @@ UWAC_API const char *UwacSeatGetName(const UwacSeat *seat); } #endif -#endif /* __UWAC_H_ */ +#endif /* UWAC_H_ */ diff --git a/uwac/libuwac/uwac-os.h b/uwac/libuwac/uwac-os.h index be927df7d..64b582117 100644 --- a/uwac/libuwac/uwac-os.h +++ b/uwac/libuwac/uwac-os.h @@ -28,8 +28,8 @@ * Functions have been renamed just to prevent name clashes. */ -#ifndef __UWAC_OS_H -#define __UWAC_OS_H +#ifndef UWAC_OS_H +#define UWAC_OS_H #include @@ -42,4 +42,4 @@ ssize_t uwac_os_recvmsg_cloexec(int sockfd, struct msghdr *msg, int flags); int uwac_os_epoll_create_cloexec(void); int uwac_create_anonymous_file(off_t size); -#endif /* __UWAC_OS_H */ +#endif /* UWAC_OS_H */ diff --git a/uwac/libuwac/uwac-priv.h b/uwac/libuwac/uwac-priv.h index 8b0324d23..2a8e16b88 100644 --- a/uwac/libuwac/uwac-priv.h +++ b/uwac/libuwac/uwac-priv.h @@ -20,8 +20,8 @@ * OF THIS SOFTWARE. */ -#ifndef __UWAC_PRIV_H_ -#define __UWAC_PRIV_H_ +#ifndef UWAC_PRIV_H_ +#define UWAC_PRIV_H_ #include "config.h" @@ -234,4 +234,4 @@ void UwacSeatDestroy(UwacSeat *s); UwacOutput *UwacCreateOutput(UwacDisplay *d, uint32_t id, uint32_t version); int UwacDestroyOutput(UwacOutput *output); -#endif /* __UWAC_PRIV_H_ */ +#endif /* UWAC_PRIV_H_ */ diff --git a/uwac/libuwac/uwac-utils.h b/uwac/libuwac/uwac-utils.h index e30507300..bd96bb08c 100644 --- a/uwac/libuwac/uwac-utils.h +++ b/uwac/libuwac/uwac-utils.h @@ -20,8 +20,8 @@ * OF THIS SOFTWARE. */ -#ifndef __UWAC_UTILS_H_ -#define __UWAC_UTILS_H_ +#ifndef UWAC_UTILS_H_ +#define UWAC_UTILS_H_ #include @@ -50,4 +50,4 @@ char *xstrdup(const char *s); void *xrealloc(char *p, size_t s); -#endif /* __UWAC_UTILS_H_ */ +#endif /* UWAC_UTILS_H_ */