From 1ed644786c480efc925ca541ab6b9be948a9f436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 9 Oct 2012 02:38:39 -0400 Subject: [PATCH] freerdp: change boolean type to BOOL type --- channels/audin/client/alsa/audin_alsa.c | 6 +- channels/audin/client/audin_main.c | 8 +- channels/audin/client/audin_main.h | 4 +- channels/audin/client/pulse/audin_pulse.c | 6 +- channels/audin/server/audin.c | 18 +-- channels/cliprdr/client/cliprdr_format.c | 4 +- channels/cliprdr/client/cliprdr_main.h | 10 +- channels/disk/client/disk_file.c | 26 ++-- channels/disk/client/disk_file.h | 16 +-- channels/printer/client/printer_cups.c | 2 +- channels/printer/client/printer_main.h | 2 +- channels/printer/client/printer_win.c | 2 +- channels/rdpdr/client/devman.c | 2 +- channels/rdpdr/client/devman.h | 2 +- channels/rdpdr/client/rdpdr_main.c | 4 +- .../rdpsnd/client/MacAudio/rdpsnd_audio_q.c | 2 +- channels/rdpsnd/client/alsa/rdpsnd_alsa.c | 2 +- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 4 +- channels/rdpsnd/client/rdpsnd_main.c | 6 +- channels/rdpsnd/client/rdpsnd_main.h | 2 +- channels/rdpsnd/server/rdpsnd.c | 18 +-- channels/serial/client/serial_main.c | 4 +- channels/serial/client/serial_tty.c | 12 +- channels/serial/client/serial_tty.h | 6 +- channels/smartcard/client/scard_main.c | 6 +- channels/smartcard/client/scard_main.h | 4 +- channels/smartcard/client/scard_operations.c | 20 +-- channels/tsmf/client/alsa/tsmf_alsa.c | 8 +- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 24 ++-- .../tsmf/client/gstreamer/tsmf_gstreamer.c | 12 +- channels/tsmf/client/pulse/tsmf_pulse.c | 12 +- channels/tsmf/client/tsmf_audio.h | 6 +- channels/tsmf/client/tsmf_codec.c | 10 +- channels/tsmf/client/tsmf_codec.h | 4 +- channels/tsmf/client/tsmf_decoder.h | 6 +- channels/tsmf/client/tsmf_ifman.h | 2 +- channels/tsmf/client/tsmf_main.c | 2 +- channels/tsmf/client/tsmf_main.h | 2 +- channels/tsmf/client/tsmf_media.c | 4 +- channels/urbdrc/client/urbdrc_main.c | 2 +- client/DirectFB/df_event.c | 6 +- client/DirectFB/df_event.h | 2 +- client/DirectFB/dfreerdp.c | 12 +- client/Mac/MRDPRailView.h | 14 +- client/Mac/MRDPRailView.m | 2 +- client/Mac/MRDPView.h | 18 +-- client/Mac/MRDPView.m | 12 +- client/Sample/freerdp.c | 4 +- client/Windows/wf_cliprdr.c | 8 +- client/Windows/wf_cliprdr.h | 8 +- client/Windows/wf_event.c | 2 +- client/Windows/wf_gdi.c | 2 +- client/Windows/wf_graphics.c | 6 +- client/Windows/wf_rail.c | 2 +- client/Windows/wf_rail.h | 2 +- client/Windows/wfreerdp.c | 10 +- client/Windows/wfreerdp.h | 2 +- client/X11/xf_cliprdr.c | 22 +-- client/X11/xf_cliprdr.h | 8 +- client/X11/xf_event.c | 60 ++++---- client/X11/xf_event.h | 2 +- client/X11/xf_gdi.c | 4 +- client/X11/xf_graphics.c | 6 +- client/X11/xf_keyboard.c | 10 +- client/X11/xf_keyboard.h | 8 +- client/X11/xf_monitor.c | 2 +- client/X11/xf_monitor.h | 4 +- client/X11/xf_rail.c | 4 +- client/X11/xf_rail.h | 2 +- client/X11/xf_tsmf.c | 4 +- client/X11/xf_window.c | 24 ++-- client/X11/xf_window.h | 24 ++-- client/X11/xfreerdp.c | 20 +-- client/X11/xfreerdp.h | 36 ++--- cunit/test_freerdp.c | 2 +- include/freerdp/channels/channels.h | 4 +- include/freerdp/channels/wtsvc.h | 10 +- include/freerdp/codec/bitmap.h | 2 +- include/freerdp/codec/jpeg.h | 2 +- include/freerdp/codec/mppc_enc.h | 6 +- include/freerdp/codec/rfx.h | 2 +- include/freerdp/crypto/ber.h | 28 ++-- include/freerdp/crypto/crypto.h | 4 +- include/freerdp/crypto/der.h | 2 +- include/freerdp/crypto/er.h | 42 +++--- include/freerdp/crypto/nla.h | 2 +- include/freerdp/crypto/per.h | 22 +-- include/freerdp/crypto/tls.h | 10 +- include/freerdp/freerdp.h | 20 +-- include/freerdp/graphics.h | 12 +- include/freerdp/input.h | 2 +- include/freerdp/listener.h | 8 +- include/freerdp/locale/keyboard.h | 2 +- include/freerdp/peer.h | 24 ++-- include/freerdp/primary.h | 4 +- include/freerdp/rail.h | 16 +-- include/freerdp/rail/icon.h | 2 +- include/freerdp/rail/window_list.h | 2 +- include/freerdp/secondary.h | 6 +- include/freerdp/server/audin.h | 4 +- include/freerdp/server/rdpsnd.h | 8 +- include/freerdp/settings.h | 128 +++++++++--------- include/freerdp/types.h | 15 +- include/freerdp/update.h | 6 +- include/freerdp/utils/file.h | 6 +- include/freerdp/utils/load_plugin.h | 4 +- include/freerdp/utils/pcap.h | 12 +- include/freerdp/utils/tcp.h | 2 +- libfreerdp/cache/bitmap.c | 2 +- libfreerdp/channels/libchannels.c | 4 +- libfreerdp/channels/wtsvc.c | 24 ++-- libfreerdp/codec/bitmap.c | 4 +- libfreerdp/codec/include/bitmap.c | 4 +- libfreerdp/codec/jpeg.c | 8 +- libfreerdp/codec/mppc_enc.c | 6 +- libfreerdp/core/activation.c | 42 +++--- libfreerdp/core/activation.h | 42 +++--- libfreerdp/core/capabilities.c | 10 +- libfreerdp/core/capabilities.h | 8 +- libfreerdp/core/certificate.c | 10 +- libfreerdp/core/certificate.h | 6 +- libfreerdp/core/channel.c | 2 +- libfreerdp/core/channel.h | 2 +- libfreerdp/core/connection.c | 46 +++---- libfreerdp/core/connection.h | 34 ++--- libfreerdp/core/fastpath.c | 30 ++-- libfreerdp/core/fastpath.h | 10 +- libfreerdp/core/freerdp.c | 12 +- libfreerdp/core/gcc.c | 26 ++-- libfreerdp/core/gcc.h | 26 ++-- libfreerdp/core/graphics.c | 2 +- libfreerdp/core/info.c | 14 +- libfreerdp/core/info.h | 14 +- libfreerdp/core/input.c | 16 +-- libfreerdp/core/input.h | 2 +- libfreerdp/core/license.c | 6 +- libfreerdp/core/license.h | 6 +- libfreerdp/core/listener.c | 8 +- libfreerdp/core/mcs.c | 40 +++--- libfreerdp/core/mcs.h | 36 ++--- libfreerdp/core/nego.c | 34 ++--- libfreerdp/core/nego.h | 32 ++--- libfreerdp/core/orders.c | 18 +-- libfreerdp/core/orders.h | 8 +- libfreerdp/core/peer.c | 18 +-- libfreerdp/core/rdp.c | 28 ++-- libfreerdp/core/rdp.h | 26 ++-- libfreerdp/core/redirection.c | 6 +- libfreerdp/core/redirection.h | 4 +- libfreerdp/core/rpc.c | 14 +- libfreerdp/core/rpc.h | 16 +-- libfreerdp/core/rts.c | 12 +- libfreerdp/core/rts.h | 12 +- libfreerdp/core/security.c | 16 +-- libfreerdp/core/security.h | 14 +- libfreerdp/core/surface.c | 2 +- libfreerdp/core/surface.h | 2 +- libfreerdp/core/tcp.c | 8 +- libfreerdp/core/tcp.h | 8 +- libfreerdp/core/timezone.c | 2 +- libfreerdp/core/timezone.h | 2 +- libfreerdp/core/tpkt.c | 4 +- libfreerdp/core/tpkt.h | 2 +- libfreerdp/core/transport.c | 22 +-- libfreerdp/core/transport.h | 26 ++-- libfreerdp/core/tsg.c | 2 +- libfreerdp/core/tsg.h | 2 +- libfreerdp/core/update.c | 8 +- libfreerdp/core/update.h | 6 +- libfreerdp/crypto/ber.c | 26 ++-- libfreerdp/crypto/crypto.c | 8 +- libfreerdp/crypto/der.c | 4 +- libfreerdp/crypto/er.c | 40 +++--- libfreerdp/crypto/nla.c | 14 +- libfreerdp/crypto/per.c | 22 +-- libfreerdp/crypto/tls.c | 20 +-- libfreerdp/gdi/graphics.c | 6 +- libfreerdp/gdi/graphics.h | 2 +- libfreerdp/locale/keyboard.c | 2 +- libfreerdp/locale/keyboard_xkbfile.c | 4 +- libfreerdp/locale/locale.c | 2 +- libfreerdp/locale/timezone.c | 4 +- libfreerdp/rail/window.c | 2 +- libfreerdp/rail/window_list.c | 2 +- libfreerdp/utils/file.c | 8 +- libfreerdp/utils/load_plugin.c | 2 +- libfreerdp/utils/pcap.c | 10 +- libfreerdp/utils/tcp.c | 2 +- server/Sample/sf_rdpsnd.c | 2 +- server/Sample/sf_rdpsnd.h | 2 +- server/Sample/sfreerdp.c | 8 +- server/Sample/sfreerdp.h | 4 +- server/Windows/wf_peer.c | 6 +- server/Windows/wf_peer.h | 4 +- server/X11/xf_input.c | 6 +- server/X11/xf_peer.c | 14 +- server/X11/xf_peer.h | 2 +- server/X11/xfreerdp.c | 2 +- server/X11/xfreerdp.h | 2 +- 199 files changed, 1074 insertions(+), 1079 deletions(-) diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index 50069d101..2e71da378 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -58,7 +58,7 @@ typedef struct _AudinALSADevice void* user_data; } AudinALSADevice; -static boolean audin_alsa_set_params(AudinALSADevice* alsa, snd_pcm_t* capture_handle) +static BOOL audin_alsa_set_params(AudinALSADevice* alsa, snd_pcm_t* capture_handle) { int error; snd_pcm_hw_params_t* hw_params; @@ -93,7 +93,7 @@ static boolean audin_alsa_set_params(AudinALSADevice* alsa, snd_pcm_t* capture_h return TRUE; } -static boolean audin_alsa_thread_receive(AudinALSADevice* alsa, uint8* src, int size) +static BOOL audin_alsa_thread_receive(AudinALSADevice* alsa, uint8* src, int size) { int frames; int cframes; @@ -239,7 +239,7 @@ static void audin_alsa_free(IAudinDevice* device) free(alsa); } -static boolean audin_alsa_format_supported(IAudinDevice* device, audinFormat* format) +static BOOL audin_alsa_format_supported(IAudinDevice* device, audinFormat* format) { switch (format->wFormatTag) { diff --git a/channels/audin/client/audin_main.c b/channels/audin/client/audin_main.c index d1c19033c..d0da0f914 100644 --- a/channels/audin/client/audin_main.c +++ b/channels/audin/client/audin_main.c @@ -219,7 +219,7 @@ static int audin_send_open_reply_pdu(IWTSVirtualChannelCallback* pChannelCallbac return error; } -static boolean audin_receive_wave_data(uint8* data, int size, void* user_data) +static BOOL audin_receive_wave_data(uint8* data, int size, void* user_data) { int error; STREAM* out; @@ -436,7 +436,7 @@ static void audin_register_device_plugin(IWTSPlugin* pPlugin, IAudinDevice* devi audin->device = device; } -static boolean audin_load_device_plugin(IWTSPlugin* pPlugin, const char* name, RDP_PLUGIN_DATA* data) +static BOOL audin_load_device_plugin(IWTSPlugin* pPlugin, const char* name, RDP_PLUGIN_DATA* data) { char* fullname; PFREERDP_AUDIN_DEVICE_ENTRY entry; @@ -471,9 +471,9 @@ static boolean audin_load_device_plugin(IWTSPlugin* pPlugin, const char* name, R return TRUE; } -static boolean audin_process_plugin_data(IWTSPlugin* pPlugin, RDP_PLUGIN_DATA* data) +static BOOL audin_process_plugin_data(IWTSPlugin* pPlugin, RDP_PLUGIN_DATA* data) { - boolean ret; + BOOL ret; AUDIN_PLUGIN* audin = (AUDIN_PLUGIN*) pPlugin; RDP_PLUGIN_DATA default_data[2] = { { 0 }, { 0 } }; diff --git a/channels/audin/client/audin_main.h b/channels/audin/client/audin_main.h index 43728ef51..751005841 100644 --- a/channels/audin/client/audin_main.h +++ b/channels/audin/client/audin_main.h @@ -34,7 +34,7 @@ #define DEBUG_DVC(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__) #endif -typedef boolean (*AudinReceive) (uint8* data, int size, void* user_data); +typedef BOOL (*AudinReceive) (uint8* data, int size, void* user_data); typedef struct audin_format audinFormat; struct audin_format @@ -52,7 +52,7 @@ typedef struct _IAudinDevice IAudinDevice; struct _IAudinDevice { void (*Open) (IAudinDevice* devplugin, AudinReceive receive, void* user_data); - boolean (*FormatSupported) (IAudinDevice* devplugin, audinFormat* format); + BOOL (*FormatSupported) (IAudinDevice* devplugin, audinFormat* format); void (*SetFormat) (IAudinDevice* devplugin, audinFormat* format, uint32 FramesPerPacket); void (*Close) (IAudinDevice* devplugin); void (*Free) (IAudinDevice* devplugin); diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index 4628ac425..0c74f494a 100644 --- a/channels/audin/client/pulse/audin_pulse.c +++ b/channels/audin/client/pulse/audin_pulse.c @@ -80,7 +80,7 @@ static void audin_pulse_context_state_callback(pa_context* context, void* userda } } -static boolean audin_pulse_connect(IAudinDevice* device) +static BOOL audin_pulse_connect(IAudinDevice* device) { pa_context_state_t state; AudinPulseDevice* pulse = (AudinPulseDevice*) device; @@ -155,7 +155,7 @@ static void audin_pulse_free(IAudinDevice* device) free(pulse); } -static boolean audin_pulse_format_supported(IAudinDevice* device, audinFormat* format) +static BOOL audin_pulse_format_supported(IAudinDevice* device, audinFormat* format) { AudinPulseDevice* pulse = (AudinPulseDevice*) device; @@ -279,7 +279,7 @@ static void audin_pulse_stream_request_callback(pa_stream* stream, size_t length { int frames; int cframes; - boolean ret; + BOOL ret; const void* data; const uint8* src; int encoded_size; diff --git a/channels/audin/server/audin.c b/channels/audin/server/audin.c index 2d395e1b0..8d14abeeb 100644 --- a/channels/audin/server/audin.c +++ b/channels/audin/server/audin.c @@ -50,7 +50,7 @@ typedef struct _audin_server FREERDP_DSP_CONTEXT* dsp_context; - boolean opened; + BOOL opened; } audin_server; static void audin_server_select_format(audin_server_context* context, int client_format_index) @@ -73,7 +73,7 @@ static void audin_server_send_version(audin_server* audin, STREAM* s) WTSVirtualChannelWrite(audin->audin_channel, stream_get_head(s), stream_get_length(s), NULL); } -static boolean audin_server_recv_version(audin_server* audin, STREAM* s, uint32 length) +static BOOL audin_server_recv_version(audin_server* audin, STREAM* s, uint32 length) { uint32 Version; @@ -120,7 +120,7 @@ static void audin_server_send_formats(audin_server* audin, STREAM* s) WTSVirtualChannelWrite(audin->audin_channel, stream_get_head(s), stream_get_length(s), NULL); } -static boolean audin_server_recv_formats(audin_server* audin, STREAM* s, uint32 length) +static BOOL audin_server_recv_formats(audin_server* audin, STREAM* s, uint32 length) { int i; @@ -189,7 +189,7 @@ static void audin_server_send_open(audin_server* audin, STREAM* s) WTSVirtualChannelWrite(audin->audin_channel, stream_get_head(s), stream_get_length(s), NULL); } -static boolean audin_server_recv_open_reply(audin_server* audin, STREAM* s, uint32 length) +static BOOL audin_server_recv_open_reply(audin_server* audin, STREAM* s, uint32 length) { uint32 Result; @@ -202,7 +202,7 @@ static boolean audin_server_recv_open_reply(audin_server* audin, STREAM* s, uint return TRUE; } -static boolean audin_server_recv_data(audin_server* audin, STREAM* s, uint32 length) +static BOOL audin_server_recv_data(audin_server* audin, STREAM* s, uint32 length) { rdpsndFormat* format; int sbytes_per_sample; @@ -266,7 +266,7 @@ static void* audin_server_thread_func(void* arg) STREAM* s; void* buffer; uint8 MessageId; - boolean ready = FALSE; + BOOL ready = FALSE; uint32 bytes_returned = 0; audin_server* audin = (audin_server*) arg; freerdp_thread* thread = audin->audin_channel_thread; @@ -287,7 +287,7 @@ static void* audin_server_thread_func(void* arg) if (WTSVirtualChannelQuery(audin->audin_channel, WTSVirtualChannelReady, &buffer, &bytes_returned) == FALSE) break; - ready = *((boolean*)buffer); + ready = *((BOOL*)buffer); WTSFreeMemory(buffer); if (ready) break; @@ -366,7 +366,7 @@ static void* audin_server_thread_func(void* arg) return NULL; } -static boolean audin_server_open(audin_server_context* context) +static BOOL audin_server_open(audin_server_context* context) { audin_server* audin = (audin_server*) context; @@ -386,7 +386,7 @@ static boolean audin_server_open(audin_server_context* context) return FALSE; } -static boolean audin_server_close(audin_server_context* context) +static BOOL audin_server_close(audin_server_context* context) { audin_server* audin = (audin_server*) context; diff --git a/channels/cliprdr/client/cliprdr_format.c b/channels/cliprdr/client/cliprdr_format.c index 131135fa2..f60a46ccf 100644 --- a/channels/cliprdr/client/cliprdr_format.c +++ b/channels/cliprdr/client/cliprdr_format.c @@ -112,7 +112,7 @@ static void cliprdr_send_format_list_response(cliprdrPlugin* cliprdr) void cliprdr_process_short_format_names(cliprdrPlugin* cliprdr, STREAM* s, uint32 length, uint16 flags) { int i; - boolean ascii; + BOOL ascii; int num_formats; CLIPRDR_FORMAT_NAME* format_name; @@ -198,7 +198,7 @@ void cliprdr_process_format_list(cliprdrPlugin* cliprdr, STREAM* s, uint32 dataL { int i; uint32 format; - boolean supported; + BOOL supported; CLIPRDR_FORMAT_NAME* format_name; RDP_CB_FORMAT_LIST_EVENT* cb_event; diff --git a/channels/cliprdr/client/cliprdr_main.h b/channels/cliprdr/client/cliprdr_main.h index 249ae4406..42d642013 100644 --- a/channels/cliprdr/client/cliprdr_main.h +++ b/channels/cliprdr/client/cliprdr_main.h @@ -35,11 +35,11 @@ typedef struct _CLIPRDR_FORMAT_NAME CLIPRDR_FORMAT_NAME; struct cliprdr_plugin { rdpSvcPlugin plugin; - boolean received_caps; - boolean use_long_format_names; - boolean stream_fileclip_enabled; - boolean fileclip_no_file_paths; - boolean can_lock_clipdata; + BOOL received_caps; + BOOL use_long_format_names; + BOOL stream_fileclip_enabled; + BOOL fileclip_no_file_paths; + BOOL can_lock_clipdata; CLIPRDR_FORMAT_NAME* format_names; int num_format_names; }; diff --git a/channels/disk/client/disk_file.c b/channels/disk/client/disk_file.c index cee593ef5..38c77f12e 100644 --- a/channels/disk/client/disk_file.c +++ b/channels/disk/client/disk_file.c @@ -55,7 +55,7 @@ #include "disk_file.h" -static boolean disk_file_wildcard_match(const char* pattern, const char* filename) +static BOOL disk_file_wildcard_match(const char* pattern, const char* filename) { const char *p = pattern, *f = filename; char c; @@ -121,13 +121,13 @@ static char* disk_file_combine_fullpath(const char* base_path, const char* path) return fullpath; } -static boolean disk_file_remove_dir(const char* path) +static BOOL disk_file_remove_dir(const char* path) { DIR* dir; char* p; struct STAT st; struct dirent* pdirent; - boolean ret = TRUE; + BOOL ret = TRUE; dir = opendir(path); @@ -200,15 +200,15 @@ static void disk_file_set_fullpath(DISK_FILE* file, char* fullpath) file->filename += 1; } -static boolean disk_file_init(DISK_FILE* file, uint32 DesiredAccess, uint32 CreateDisposition, uint32 CreateOptions) +static BOOL disk_file_init(DISK_FILE* file, uint32 DesiredAccess, uint32 CreateDisposition, uint32 CreateOptions) { struct STAT st; - boolean exists; + BOOL exists; #ifdef WIN32 const static int mode = _S_IREAD | _S_IWRITE ; #else const static int mode = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH; - boolean largeFile = FALSE; + BOOL largeFile = FALSE; #endif int oflag = 0; @@ -346,7 +346,7 @@ void disk_file_free(DISK_FILE* file) free(file); } -boolean disk_file_seek(DISK_FILE* file, uint64 Offset) +BOOL disk_file_seek(DISK_FILE* file, uint64 Offset) { if (file->is_dir || file->fd == -1) return FALSE; @@ -357,7 +357,7 @@ boolean disk_file_seek(DISK_FILE* file, uint64 Offset) return TRUE; } -boolean disk_file_read(DISK_FILE* file, uint8* buffer, uint32* Length) +BOOL disk_file_read(DISK_FILE* file, uint8* buffer, uint32* Length) { ssize_t r; @@ -372,7 +372,7 @@ boolean disk_file_read(DISK_FILE* file, uint8* buffer, uint32* Length) return TRUE; } -boolean disk_file_write(DISK_FILE* file, uint8* buffer, uint32 Length) +BOOL disk_file_write(DISK_FILE* file, uint8* buffer, uint32 Length) { ssize_t r; @@ -391,7 +391,7 @@ boolean disk_file_write(DISK_FILE* file, uint8* buffer, uint32 Length) return TRUE; } -boolean disk_file_query_information(DISK_FILE* file, uint32 FsInformationClass, STREAM* output) +BOOL disk_file_query_information(DISK_FILE* file, uint32 FsInformationClass, STREAM* output) { struct STAT st; @@ -442,7 +442,7 @@ boolean disk_file_query_information(DISK_FILE* file, uint32 FsInformationClass, return TRUE; } -boolean disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint32 Length, STREAM* input) +BOOL disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint32 Length, STREAM* input) { char* s; @@ -541,11 +541,11 @@ boolean disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, ui return TRUE; } -boolean disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, uint8 InitialQuery, +BOOL disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, uint8 InitialQuery, const char* path, STREAM* output) { int length; - boolean ret; + BOOL ret; WCHAR* ent_path; struct STAT st; struct dirent* ent; diff --git a/channels/disk/client/disk_file.h b/channels/disk/client/disk_file.h index f97696bd2..653959254 100644 --- a/channels/disk/client/disk_file.h +++ b/channels/disk/client/disk_file.h @@ -84,7 +84,7 @@ typedef struct _DISK_FILE DISK_FILE; struct _DISK_FILE { uint32 id; - boolean is_dir; + BOOL is_dir; int fd; int err; DIR* dir; @@ -92,19 +92,19 @@ struct _DISK_FILE char* fullpath; char* filename; char* pattern; - boolean delete_pending; + BOOL delete_pending; }; DISK_FILE* disk_file_new(const char* base_path, const char* path, uint32 id, uint32 DesiredAccess, uint32 CreateDisposition, uint32 CreateOptions); void disk_file_free(DISK_FILE* file); -boolean disk_file_seek(DISK_FILE* file, uint64 Offset); -boolean disk_file_read(DISK_FILE* file, uint8* buffer, uint32* Length); -boolean disk_file_write(DISK_FILE* file, uint8* buffer, uint32 Length); -boolean disk_file_query_information(DISK_FILE* file, uint32 FsInformationClass, STREAM* output); -boolean disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint32 Length, STREAM* input); -boolean disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, uint8 InitialQuery, +BOOL disk_file_seek(DISK_FILE* file, uint64 Offset); +BOOL disk_file_read(DISK_FILE* file, uint8* buffer, uint32* Length); +BOOL disk_file_write(DISK_FILE* file, uint8* buffer, uint32 Length); +BOOL disk_file_query_information(DISK_FILE* file, uint32 FsInformationClass, STREAM* output); +BOOL disk_file_set_information(DISK_FILE* file, uint32 FsInformationClass, uint32 Length, STREAM* input); +BOOL disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, uint8 InitialQuery, const char* path, STREAM* output); #endif /* __DISK_FILE_H */ diff --git a/channels/printer/client/printer_cups.c b/channels/printer/client/printer_cups.c index 60fba2d87..bd8d4dca3 100644 --- a/channels/printer/client/printer_cups.c +++ b/channels/printer/client/printer_cups.c @@ -213,7 +213,7 @@ static void printer_cups_free_printer(rdpPrinter* printer) free(printer); } -static rdpPrinter* printer_cups_new_printer(rdpCupsPrinterDriver* cups_driver, const char* name, boolean is_default) +static rdpPrinter* printer_cups_new_printer(rdpCupsPrinterDriver* cups_driver, const char* name, BOOL is_default) { rdpCupsPrinter* cups_printer; diff --git a/channels/printer/client/printer_main.h b/channels/printer/client/printer_main.h index 3eeb81646..f21442fae 100644 --- a/channels/printer/client/printer_main.h +++ b/channels/printer/client/printer_main.h @@ -57,7 +57,7 @@ struct rdp_printer int id; char* name; char* driver; - boolean is_default; + BOOL is_default; pcCreatePrintJob CreatePrintJob; pcFindPrintJob FindPrintJob; diff --git a/channels/printer/client/printer_win.c b/channels/printer/client/printer_win.c index 91a3d5820..b1069fa4e 100644 --- a/channels/printer/client/printer_win.c +++ b/channels/printer/client/printer_win.c @@ -171,7 +171,7 @@ static void printer_win_free_printer(rdpPrinter* printer) free(printer); } -static rdpPrinter* printer_win_new_printer(rdpWinPrinterDriver* win_driver, const char* name, const wchar_t* drivername, boolean is_default) +static rdpPrinter* printer_win_new_printer(rdpWinPrinterDriver* win_driver, const char* name, const wchar_t* drivername, BOOL is_default) { rdpWinPrinter* win_printer; wchar_t wname[256]; diff --git a/channels/rdpdr/client/devman.c b/channels/rdpdr/client/devman.c index 5b810313e..9fd28c4c2 100644 --- a/channels/rdpdr/client/devman.c +++ b/channels/rdpdr/client/devman.c @@ -69,7 +69,7 @@ static void devman_register_device(DEVMAN* devman, DEVICE* device) DEBUG_SVC("device %d.%s registered", device->id, device->name); } -boolean devman_load_device_service(DEVMAN* devman, RDP_PLUGIN_DATA* plugin_data) +BOOL devman_load_device_service(DEVMAN* devman, RDP_PLUGIN_DATA* plugin_data) { char* name; DEVICE_SERVICE_ENTRY_POINTS ep; diff --git a/channels/rdpdr/client/devman.h b/channels/rdpdr/client/devman.h index e9364f4d4..fb23f3987 100644 --- a/channels/rdpdr/client/devman.h +++ b/channels/rdpdr/client/devman.h @@ -23,7 +23,7 @@ DEVMAN* devman_new(rdpSvcPlugin* plugin); void devman_free(DEVMAN* devman); -boolean devman_load_device_service(DEVMAN* devman, RDP_PLUGIN_DATA* plugin_data); +BOOL devman_load_device_service(DEVMAN* devman, RDP_PLUGIN_DATA* plugin_data); DEVICE* devman_get_device_by_id(DEVMAN* devman, uint32 id); #endif /* FREERDP_CHANNEL_RDPDR_CLIENT_DEVMAN_H */ diff --git a/channels/rdpdr/client/rdpdr_main.c b/channels/rdpdr/client/rdpdr_main.c index 9953bd0ad..91b7a2df0 100644 --- a/channels/rdpdr/client/rdpdr_main.c +++ b/channels/rdpdr/client/rdpdr_main.c @@ -147,7 +147,7 @@ static void rdpdr_process_server_clientid_confirm(rdpdrPlugin* rdpdr, STREAM* da } } -static void rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, boolean user_loggedon) +static void rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, BOOL user_loggedon) { int i; int pos; @@ -219,7 +219,7 @@ static void rdpdr_send_device_list_announce_request(rdpdrPlugin* rdpdr, boolean svc_plugin_send((rdpSvcPlugin*) rdpdr, data_out); } -static boolean rdpdr_process_irp(rdpdrPlugin* rdpdr, STREAM* data_in) +static BOOL rdpdr_process_irp(rdpdrPlugin* rdpdr, STREAM* data_in) { IRP* irp; diff --git a/channels/rdpsnd/client/MacAudio/rdpsnd_audio_q.c b/channels/rdpsnd/client/MacAudio/rdpsnd_audio_q.c index f06dacde6..528ccda39 100644 --- a/channels/rdpsnd/client/MacAudio/rdpsnd_audio_q.c +++ b/channels/rdpsnd/client/MacAudio/rdpsnd_audio_q.c @@ -125,7 +125,7 @@ static void rdpsnd_audio_free(rdpsndDevicePlugin* device) { } -static boolean rdpsnd_audio_format_supported(rdpsndDevicePlugin* device, rdpsndFormat* format) +static BOOL rdpsnd_audio_format_supported(rdpsndDevicePlugin* device, rdpsndFormat* format) { switch (format->wFormatTag) { diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index 4eaf28ef5..4307b5fd7 100644 --- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c +++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c @@ -264,7 +264,7 @@ static void rdpsnd_alsa_free(rdpsndDevicePlugin* device) free(alsa); } -static boolean rdpsnd_alsa_format_supported(rdpsndDevicePlugin* device, rdpsndFormat* format) +static BOOL rdpsnd_alsa_format_supported(rdpsndDevicePlugin* device, rdpsndFormat* format) { switch (format->wFormatTag) { diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index e0792e40c..2630796d4 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -80,7 +80,7 @@ static void rdpsnd_pulse_context_state_callback(pa_context* context, void* userd } } -static boolean rdpsnd_pulse_connect(rdpsndDevicePlugin* device) +static BOOL rdpsnd_pulse_connect(rdpsndDevicePlugin* device) { pa_context_state_t state; rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*) device; @@ -365,7 +365,7 @@ static void rdpsnd_pulse_free(rdpsndDevicePlugin* device) free(pulse); } -static boolean rdpsnd_pulse_format_supported(rdpsndDevicePlugin* device, rdpsndFormat* format) +static BOOL rdpsnd_pulse_format_supported(rdpsndDevicePlugin* device, rdpsndFormat* format) { rdpsndPulsePlugin* pulse = (rdpsndPulsePlugin*)device; diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index 88528c58d..742626705 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -53,13 +53,13 @@ struct rdpsnd_plugin int n_supported_formats; int current_format; - boolean expectingWave; + BOOL expectingWave; uint8 waveData[4]; uint16 waveDataSize; uint32 wTimeStamp; /* server timestamp */ uint32 wave_timestamp; /* client timestamp */ - boolean is_open; + BOOL is_open; uint32 close_timestamp; uint16 fixed_format; @@ -429,7 +429,7 @@ static void rdpsnd_register_device_plugin(rdpsndPlugin* rdpsnd, rdpsndDevicePlug rdpsnd->device = device; } -static boolean rdpsnd_load_device_plugin(rdpsndPlugin* rdpsnd, const char* name, RDP_PLUGIN_DATA* data) +static BOOL rdpsnd_load_device_plugin(rdpsndPlugin* rdpsnd, const char* name, RDP_PLUGIN_DATA* data) { FREERDP_RDPSND_DEVICE_ENTRY_POINTS entryPoints; PFREERDP_RDPSND_DEVICE_ENTRY entry; diff --git a/channels/rdpsnd/client/rdpsnd_main.h b/channels/rdpsnd/client/rdpsnd_main.h index ace7fb8ed..8ea169421 100644 --- a/channels/rdpsnd/client/rdpsnd_main.h +++ b/channels/rdpsnd/client/rdpsnd_main.h @@ -26,7 +26,7 @@ typedef struct rdpsnd_plugin rdpsndPlugin; typedef struct rdpsnd_device_plugin rdpsndDevicePlugin; -typedef boolean (*pcFormatSupported) (rdpsndDevicePlugin* device, rdpsndFormat* format); +typedef BOOL (*pcFormatSupported) (rdpsndDevicePlugin* device, rdpsndFormat* format); typedef void (*pcOpen) (rdpsndDevicePlugin* device, rdpsndFormat* format, int latency); typedef void (*pcSetFormat) (rdpsndDevicePlugin* device, rdpsndFormat* format, int latency); typedef void (*pcSetVolume) (rdpsndDevicePlugin* device, uint32 value); diff --git a/channels/rdpsnd/server/rdpsnd.c b/channels/rdpsnd/server/rdpsnd.c index 78ee8e913..a3c75ed47 100644 --- a/channels/rdpsnd/server/rdpsnd.c +++ b/channels/rdpsnd/server/rdpsnd.c @@ -60,7 +60,7 @@ typedef struct _rdpsnd_server #define RDPSND_PDU_FINISH(_s) \ { \ - boolean _r; \ + BOOL _r; \ int _pos; \ _pos = stream_get_pos(_s); \ stream_set_pos(_s, 2); \ @@ -71,7 +71,7 @@ typedef struct _rdpsnd_server return _r; \ } -static boolean rdpsnd_server_send_formats(rdpsnd_server* rdpsnd, STREAM* s) +static BOOL rdpsnd_server_send_formats(rdpsnd_server* rdpsnd, STREAM* s) { uint16 i; @@ -109,7 +109,7 @@ static boolean rdpsnd_server_send_formats(rdpsnd_server* rdpsnd, STREAM* s) RDPSND_PDU_FINISH(s); } -static boolean rdpsnd_server_recv_formats(rdpsnd_server* rdpsnd, STREAM* s) +static BOOL rdpsnd_server_recv_formats(rdpsnd_server* rdpsnd, STREAM* s) { int i; @@ -226,7 +226,7 @@ static void* rdpsnd_server_thread_func(void* arg) return 0; } -static boolean rdpsnd_server_initialize(rdpsnd_server_context* context) +static BOOL rdpsnd_server_initialize(rdpsnd_server_context* context) { rdpsnd_server* rdpsnd = (rdpsnd_server*) context; @@ -297,10 +297,10 @@ static void rdpsnd_server_select_format(rdpsnd_server_context* context, int clie freerdp_dsp_context_reset_adpcm(rdpsnd->dsp_context); } -static boolean rdpsnd_server_send_audio_pdu(rdpsnd_server* rdpsnd) +static BOOL rdpsnd_server_send_audio_pdu(rdpsnd_server* rdpsnd) { int size; - boolean r; + BOOL r; uint8* src; int frames; int fill_size; @@ -382,7 +382,7 @@ static boolean rdpsnd_server_send_audio_pdu(rdpsnd_server* rdpsnd) return r; } -static boolean rdpsnd_server_send_samples(rdpsnd_server_context* context, const void* buf, int nframes) +static BOOL rdpsnd_server_send_samples(rdpsnd_server_context* context, const void* buf, int nframes) { int cframes; int cframesize; @@ -411,7 +411,7 @@ static boolean rdpsnd_server_send_samples(rdpsnd_server_context* context, const return TRUE; } -static boolean rdpsnd_server_set_volume(rdpsnd_server_context* context, int left, int right) +static BOOL rdpsnd_server_set_volume(rdpsnd_server_context* context, int left, int right) { rdpsnd_server* rdpsnd = (rdpsnd_server*) context; STREAM* s = rdpsnd->rdpsnd_pdu; @@ -424,7 +424,7 @@ static boolean rdpsnd_server_set_volume(rdpsnd_server_context* context, int left RDPSND_PDU_FINISH(s); } -static boolean rdpsnd_server_close(rdpsnd_server_context* context) +static BOOL rdpsnd_server_close(rdpsnd_server_context* context) { rdpsnd_server* rdpsnd = (rdpsnd_server*) context; STREAM* s = rdpsnd->rdpsnd_pdu; diff --git a/channels/serial/client/serial_main.c b/channels/serial/client/serial_main.c index fce689b7d..f58522033 100644 --- a/channels/serial/client/serial_main.c +++ b/channels/serial/client/serial_main.c @@ -75,7 +75,7 @@ struct _SERIAL_DEVICE static void serial_abort_single_io(SERIAL_DEVICE* serial, uint32 file_id, uint32 abort_io, uint32 io_status); static void serial_check_for_events(SERIAL_DEVICE* serial); static void serial_handle_async_irp(SERIAL_DEVICE* serial, IRP* irp); -static boolean serial_check_fds(SERIAL_DEVICE* serial); +static BOOL serial_check_fds(SERIAL_DEVICE* serial); static void serial_process_irp_create(SERIAL_DEVICE* serial, IRP* irp) { @@ -696,7 +696,7 @@ static void serial_set_fds(SERIAL_DEVICE* serial) } } -static boolean serial_check_fds(SERIAL_DEVICE* serial) +static BOOL serial_check_fds(SERIAL_DEVICE* serial) { if (list_size(serial->pending_irps) == 0) return 1; diff --git a/channels/serial/client/serial_tty.c b/channels/serial/client/serial_tty.c index 693d0d71f..41599d91d 100644 --- a/channels/serial/client/serial_tty.c +++ b/channels/serial/client/serial_tty.c @@ -75,7 +75,7 @@ static uint32 tty_write_data(SERIAL_TTY* tty, uint8* data, int len); static void tty_set_termios(SERIAL_TTY* tty); -static boolean tty_get_termios(SERIAL_TTY* tty); +static BOOL tty_get_termios(SERIAL_TTY* tty); static int tty_get_error_status(); uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, STREAM* output, uint32* abort_io) @@ -369,7 +369,7 @@ uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, return ret; } -boolean serial_tty_read(SERIAL_TTY* tty, uint8* buffer, uint32* Length) +BOOL serial_tty_read(SERIAL_TTY* tty, uint8* buffer, uint32* Length) { long timeout = 90; struct termios *ptermios; @@ -418,7 +418,7 @@ boolean serial_tty_read(SERIAL_TTY* tty, uint8* buffer, uint32* Length) return TRUE; } -boolean serial_tty_write(SERIAL_TTY* tty, uint8* buffer, uint32 Length) +BOOL serial_tty_write(SERIAL_TTY* tty, uint8* buffer, uint32 Length) { ssize_t r; uint32 event_txempty = Length; @@ -531,10 +531,10 @@ SERIAL_TTY* serial_tty_new(const char* path, uint32 id) return tty; } -boolean serial_tty_get_event(SERIAL_TTY* tty, uint32* result) +BOOL serial_tty_get_event(SERIAL_TTY* tty, uint32* result) { int bytes; - boolean ret = FALSE; + BOOL ret = FALSE; DEBUG_SVC("in"); @@ -628,7 +628,7 @@ boolean serial_tty_get_event(SERIAL_TTY* tty, uint32* result) return ret; } -static boolean tty_get_termios(SERIAL_TTY* tty) +static BOOL tty_get_termios(SERIAL_TTY* tty) { speed_t speed; struct termios *ptermios; diff --git a/channels/serial/client/serial_tty.h b/channels/serial/client/serial_tty.h index 94aabcb4f..d2d788cf8 100644 --- a/channels/serial/client/serial_tty.h +++ b/channels/serial/client/serial_tty.h @@ -69,10 +69,10 @@ struct _SERIAL_TTY SERIAL_TTY* serial_tty_new(const char* path, uint32 id); void serial_tty_free(SERIAL_TTY* tty); -boolean serial_tty_read(SERIAL_TTY* tty, uint8* buffer, uint32* Length); -boolean serial_tty_write(SERIAL_TTY* tty, uint8* buffer, uint32 Length); +BOOL serial_tty_read(SERIAL_TTY* tty, uint8* buffer, uint32* Length); +BOOL serial_tty_write(SERIAL_TTY* tty, uint8* buffer, uint32 Length); uint32 serial_tty_control(SERIAL_TTY* tty, uint32 IoControlCode, STREAM* input, STREAM* output, uint32* abort_io); -boolean serial_tty_get_event(SERIAL_TTY* tty, uint32* result); +BOOL serial_tty_get_event(SERIAL_TTY* tty, uint32* result); #endif /* __SERIAL_TTY_H */ diff --git a/channels/smartcard/client/scard_main.c b/channels/smartcard/client/scard_main.c index 9a9c359e6..8023c8d7c 100644 --- a/channels/smartcard/client/scard_main.c +++ b/channels/smartcard/client/scard_main.c @@ -157,7 +157,7 @@ static COMPLETIONIDINFO* scard_mark_duplicate_id(SCARD_DEVICE* scard, uint32 Com return NULL; /* Either no items in the list or no match. */ } -static boolean scard_check_for_duplicate_id(SCARD_DEVICE* scard, uint32 CompletionId) +static BOOL scard_check_for_duplicate_id(SCARD_DEVICE* scard, uint32 CompletionId) { /* * Search from the end of the LIST for one outstanding "CompletionID" @@ -167,7 +167,7 @@ static boolean scard_check_for_duplicate_id(SCARD_DEVICE* scard, uint32 Complet */ LIST_ITEM* item; COMPLETIONIDINFO* CompletionIdInfo; - boolean duplicate; + BOOL duplicate; for (item = scard->CompletionIds->tail; item; item = item->prev) { @@ -201,7 +201,7 @@ static void scard_irp_complete(IRP* irp) * to be in this file so that "scard_irp_request()" can reference it. */ int pos; - boolean duplicate; + BOOL duplicate; SCARD_DEVICE* scard = (SCARD_DEVICE*)irp->device; DEBUG_SVC("DeviceId %d FileId %d CompletionId %d", irp->device->id, irp->FileId, irp->CompletionId); diff --git a/channels/smartcard/client/scard_main.h b/channels/smartcard/client/scard_main.h index 4d009ddae..4844eeecf 100644 --- a/channels/smartcard/client/scard_main.h +++ b/channels/smartcard/client/scard_main.h @@ -84,7 +84,7 @@ struct _COMPLETIONIDINFO { uint32 ID; /* CompletionID */ - boolean duplicate; /* Indicates whether or not this + BOOL duplicate; /* Indicates whether or not this * CompletionID is a duplicate of an * earlier, outstanding, CompletionID. */ @@ -115,7 +115,7 @@ typedef struct _SCARD_DEVICE SCARD_DEVICE; #define DEBUG_SCARD(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__) #endif -boolean scard_async_op(IRP*); +BOOL scard_async_op(IRP*); void scard_device_control(SCARD_DEVICE*, IRP*); #endif diff --git a/channels/smartcard/client/scard_operations.c b/channels/smartcard/client/scard_operations.c index 1d3318f2e..138676bd6 100644 --- a/channels/smartcard/client/scard_operations.c +++ b/channels/smartcard/client/scard_operations.c @@ -84,7 +84,7 @@ #define WIN_FILE_DEVICE_SMARTCARD 0x00000031 -static uint32 sc_output_string(IRP* irp, char *src, boolean wide) +static uint32 sc_output_string(IRP* irp, char *src, BOOL wide) { uint8* p; uint32 len; @@ -179,7 +179,7 @@ static void sc_output_buffer_start(IRP *irp, int length) sc_output_buffer_start_limit(irp, length, 0x7FFFFFFF); } -static uint32 sc_input_string(IRP* irp, char **dest, uint32 dataLength, boolean wide) +static uint32 sc_input_string(IRP* irp, char **dest, uint32 dataLength, BOOL wide) { char* buffer; int bufferSize; @@ -215,7 +215,7 @@ static void sc_input_repos(IRP* irp, uint32 read) stream_seek(irp->input, add); } -static void sc_input_reader_name(IRP* irp, char **dest, boolean wide) +static void sc_input_reader_name(IRP* irp, char **dest, BOOL wide) { uint32 dataLength; @@ -330,7 +330,7 @@ static uint32 handle_IsValidContext(IRP* irp) return rv; } -static uint32 handle_ListReaders(IRP* irp, boolean wide) +static uint32 handle_ListReaders(IRP* irp, BOOL wide) { uint32 len, rv; SCARDCONTEXT hContext; @@ -415,7 +415,7 @@ static uint32 handle_ListReaders(IRP* irp, boolean wide) return rv; } -static uint32 handle_GetStatusChange(IRP* irp, boolean wide) +static uint32 handle_GetStatusChange(IRP* irp, BOOL wide) { LONG rv; SCARDCONTEXT hContext; @@ -546,7 +546,7 @@ static uint32 handle_Cancel(IRP *irp) return rv; } -static uint32 handle_Connect(IRP* irp, boolean wide) +static uint32 handle_Connect(IRP* irp, BOOL wide) { LONG rv; SCARDCONTEXT hContext; @@ -771,7 +771,7 @@ static uint32 handle_State(IRP* irp) return rv; } -static DWORD handle_Status(IRP *irp, boolean wide) +static DWORD handle_Status(IRP *irp, BOOL wide) { LONG rv; SCARDHANDLE hCard; @@ -1195,7 +1195,7 @@ typedef struct _SERVER_SCARD_ATRMASK } SERVER_SCARD_ATRMASK; -static uint32 handle_LocateCardsByATR(IRP* irp, boolean wide) +static uint32 handle_LocateCardsByATR(IRP* irp, BOOL wide) { LONG rv; int i, j, k; @@ -1287,7 +1287,7 @@ static uint32 handle_LocateCardsByATR(IRP* irp, boolean wide) { for (j = 0, rsCur = readerStates; j < readerCount; j++, rsCur++) { - boolean equal = 1; + BOOL equal = 1; for (k = 0; k < cur->cbAtr; k++) { if ((curAtr->rgbAtr[k] & curAtr->rgbMask[k]) != @@ -1327,7 +1327,7 @@ static uint32 handle_LocateCardsByATR(IRP* irp, boolean wide) return rv; } -boolean scard_async_op(IRP* irp) +BOOL scard_async_op(IRP* irp) { uint32 ioctl_code; diff --git a/channels/tsmf/client/alsa/tsmf_alsa.c b/channels/tsmf/client/alsa/tsmf_alsa.c index 52906459d..4dcaa2450 100644 --- a/channels/tsmf/client/alsa/tsmf_alsa.c +++ b/channels/tsmf/client/alsa/tsmf_alsa.c @@ -48,7 +48,7 @@ typedef struct _TSMFALSAAudioDevice FREERDP_DSP_CONTEXT* dsp_context; } TSMFALSAAudioDevice; -static boolean tsmf_alsa_open_device(TSMFALSAAudioDevice* alsa) +static BOOL tsmf_alsa_open_device(TSMFALSAAudioDevice* alsa) { int error; @@ -63,7 +63,7 @@ static boolean tsmf_alsa_open_device(TSMFALSAAudioDevice* alsa) return TRUE; } -static boolean tsmf_alsa_open(ITSMFAudioDevice* audio, const char* device) +static BOOL tsmf_alsa_open(ITSMFAudioDevice* audio, const char* device) { TSMFALSAAudioDevice* alsa = (TSMFALSAAudioDevice*) audio; @@ -80,7 +80,7 @@ static boolean tsmf_alsa_open(ITSMFAudioDevice* audio, const char* device) return tsmf_alsa_open_device(alsa); } -static boolean tsmf_alsa_set_format(ITSMFAudioDevice* audio, +static BOOL tsmf_alsa_set_format(ITSMFAudioDevice* audio, uint32 sample_rate, uint32 channels, uint32 bits_per_sample) { int error; @@ -147,7 +147,7 @@ static boolean tsmf_alsa_set_format(ITSMFAudioDevice* audio, return TRUE; } -static boolean tsmf_alsa_play(ITSMFAudioDevice* audio, uint8* data, uint32 data_size) +static BOOL tsmf_alsa_play(ITSMFAudioDevice* audio, uint8* data, uint32 data_size) { int len; int error; diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index 3ad6268ad..6590f375d 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -55,7 +55,7 @@ typedef struct _TSMFFFmpegDecoder uint32 decoded_size_max; } TSMFFFmpegDecoder; -static boolean tsmf_ffmpeg_init_context(ITSMFDecoder* decoder) +static BOOL tsmf_ffmpeg_init_context(ITSMFDecoder* decoder) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -69,7 +69,7 @@ static boolean tsmf_ffmpeg_init_context(ITSMFDecoder* decoder) return TRUE; } -static boolean tsmf_ffmpeg_init_video_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) +static BOOL tsmf_ffmpeg_init_video_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -84,7 +84,7 @@ static boolean tsmf_ffmpeg_init_video_stream(ITSMFDecoder* decoder, const TS_AM_ return TRUE; } -static boolean tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) +static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -106,7 +106,7 @@ static boolean tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_ return TRUE; } -static boolean tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) +static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; uint32 size; @@ -175,7 +175,7 @@ static boolean tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_ return TRUE; } -static boolean tsmf_ffmpeg_prepare(ITSMFDecoder* decoder) +static BOOL tsmf_ffmpeg_prepare(ITSMFDecoder* decoder) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -190,7 +190,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMFDecoder* decoder) return TRUE; } -static boolean tsmf_ffmpeg_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* media_type) +static BOOL tsmf_ffmpeg_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* media_type) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -260,13 +260,13 @@ static boolean tsmf_ffmpeg_set_format(ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* m return TRUE; } -static boolean tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const uint8* data, uint32 data_size, uint32 extensions) +static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const uint8* data, uint32 data_size, uint32 extensions) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; int decoded; int len; AVFrame* frame; - boolean ret = TRUE; + BOOL ret = TRUE; #if LIBAVCODEC_VERSION_MAJOR < 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR <= 20) len = avcodec_decode_video(mdecoder->codec_context, mdecoder->frame, &decoded, data, data_size); @@ -319,7 +319,7 @@ static boolean tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const uint8* data return ret; } -static boolean tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const uint8* data, uint32 data_size, uint32 extensions) +static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const uint8* data, uint32 data_size, uint32 extensions) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; int len; @@ -419,7 +419,7 @@ static boolean tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const uint8* data return TRUE; } -static boolean tsmf_ffmpeg_decode(ITSMFDecoder* decoder, const uint8* data, uint32 data_size, uint32 extensions) +static BOOL tsmf_ffmpeg_decode(ITSMFDecoder* decoder, const uint8* data, uint32 data_size, uint32 extensions) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -470,7 +470,7 @@ static uint32 tsmf_ffmpeg_get_decoded_format(ITSMFDecoder* decoder) } } -static boolean tsmf_ffmpeg_get_decoded_dimension(ITSMFDecoder* decoder, uint32* width, uint32* height) +static BOOL tsmf_ffmpeg_get_decoded_dimension(ITSMFDecoder* decoder, uint32* width, uint32* height) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder; @@ -505,7 +505,7 @@ static void tsmf_ffmpeg_free(ITSMFDecoder* decoder) free(decoder); } -static boolean initialized = FALSE; +static BOOL initialized = FALSE; ITSMFDecoder* TSMFDecoderEntry(void) diff --git a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c index 9f110039d..caf476657 100644 --- a/channels/tsmf/client/gstreamer/tsmf_gstreamer.c +++ b/channels/tsmf/client/gstreamer/tsmf_gstreamer.c @@ -69,7 +69,7 @@ typedef struct _TSMFGstreamerDecoder GstElement *outsink; GstElement *aVolume; - boolean paused; + BOOL paused; uint64 last_sample_end_time; Display *disp; @@ -319,7 +319,7 @@ static int tsmf_gstreamer_pipeline_set_state(TSMFGstreamerDecoder * mdecoder, Gs return 0; } -static boolean tsmf_gstreamer_set_format(ITSMFDecoder * decoder, TS_AM_MEDIA_TYPE * media_type) +static BOOL tsmf_gstreamer_set_format(ITSMFDecoder * decoder, TS_AM_MEDIA_TYPE * media_type) { TSMFGstreamerDecoder * mdecoder = (TSMFGstreamerDecoder *) decoder; if (!mdecoder) @@ -680,7 +680,7 @@ static void tsmf_gstreamer_pipeline_send_end_of_stream(TSMFGstreamerDecoder * md #ifdef __arm__ /* code from TI to check whether OMX is being lock or not */ -static boolean tsmf_gstreamer_pipeline_omx_available() +static BOOL tsmf_gstreamer_pipeline_omx_available() { bool ret = TRUE; int shm_fd = 0; @@ -772,7 +772,7 @@ static void tsmf_gstreamer_clean_up(TSMFGstreamerDecoder * mdecoder) } -static boolean tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder * mdecoder) +static BOOL tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder * mdecoder) { if (!mdecoder) return FALSE; @@ -1036,7 +1036,7 @@ static boolean tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder * mdecoder) out_pad = gst_element_get_static_pad(mdecoder->outconv, "sink"); - gboolean linkResult = FALSE; + gBOOL linkResult = FALSE; gst_bin_add(GST_BIN(mdecoder->outbin), mdecoder->outconv); gst_bin_add(GST_BIN(mdecoder->outbin), mdecoder->outsink); if (mdecoder->aVolume) @@ -1094,7 +1094,7 @@ static boolean tsmf_gstreamer_pipeline_build(TSMFGstreamerDecoder * mdecoder) return TRUE; } -static boolean tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const uint8 * data, uint32 data_size, uint32 extensions, +static BOOL tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const uint8 * data, uint32 data_size, uint32 extensions, uint64 start_time, uint64 end_time, uint64 duration) { TSMFGstreamerDecoder * mdecoder = (TSMFGstreamerDecoder *) decoder; diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c index d4ba6e6b2..f4c91028f 100644 --- a/channels/tsmf/client/pulse/tsmf_pulse.c +++ b/channels/tsmf/client/pulse/tsmf_pulse.c @@ -67,7 +67,7 @@ static void tsmf_pulse_context_state_callback(pa_context* context, void* userdat } } -static boolean tsmf_pulse_connect(TSMFPulseAudioDevice* pulse) +static BOOL tsmf_pulse_connect(TSMFPulseAudioDevice* pulse) { pa_context_state_t state; @@ -114,7 +114,7 @@ static boolean tsmf_pulse_connect(TSMFPulseAudioDevice* pulse) } } -static boolean tsmf_pulse_open(ITSMFAudioDevice* audio, const char* device) +static BOOL tsmf_pulse_open(ITSMFAudioDevice* audio, const char* device) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*) audio; @@ -198,7 +198,7 @@ static void tsmf_pulse_stream_request_callback(pa_stream* stream, size_t length, pa_threaded_mainloop_signal(pulse->mainloop, 0); } -static boolean tsmf_pulse_close_stream(TSMFPulseAudioDevice* pulse) +static BOOL tsmf_pulse_close_stream(TSMFPulseAudioDevice* pulse) { if (!pulse->context || !pulse->stream) return FALSE; @@ -217,7 +217,7 @@ static boolean tsmf_pulse_close_stream(TSMFPulseAudioDevice* pulse) return TRUE; } -static boolean tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) +static BOOL tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) { pa_stream_state_t state; pa_buffer_attr buffer_attr = { 0 }; @@ -283,7 +283,7 @@ static boolean tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) } } -static boolean tsmf_pulse_set_format(ITSMFAudioDevice* audio, +static BOOL tsmf_pulse_set_format(ITSMFAudioDevice* audio, uint32 sample_rate, uint32 channels, uint32 bits_per_sample) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*) audio; @@ -298,7 +298,7 @@ static boolean tsmf_pulse_set_format(ITSMFAudioDevice* audio, return tsmf_pulse_open_stream(pulse); } -static boolean tsmf_pulse_play(ITSMFAudioDevice* audio, uint8* data, uint32 data_size) +static BOOL tsmf_pulse_play(ITSMFAudioDevice* audio, uint8* data, uint32 data_size) { TSMFPulseAudioDevice* pulse = (TSMFPulseAudioDevice*) audio; uint8* src; diff --git a/channels/tsmf/client/tsmf_audio.h b/channels/tsmf/client/tsmf_audio.h index ec8c04bcd..302053666 100644 --- a/channels/tsmf/client/tsmf_audio.h +++ b/channels/tsmf/client/tsmf_audio.h @@ -27,11 +27,11 @@ typedef struct _ITSMFAudioDevice ITSMFAudioDevice; struct _ITSMFAudioDevice { /* Open the audio device. */ - boolean (*Open) (ITSMFAudioDevice* audio, const char* device); + BOOL (*Open) (ITSMFAudioDevice* audio, const char* device); /* Set the audio data format. */ - boolean (*SetFormat) (ITSMFAudioDevice* audio, uint32 sample_rate, uint32 channels, uint32 bits_per_sample); + BOOL (*SetFormat) (ITSMFAudioDevice* audio, uint32 sample_rate, uint32 channels, uint32 bits_per_sample); /* Play audio data. */ - boolean (*Play) (ITSMFAudioDevice* audio, uint8* data, uint32 data_size); + BOOL (*Play) (ITSMFAudioDevice* audio, uint8* data, uint32 data_size); /* Get the latency of the last written sample, in 100ns */ uint64 (*GetLatency) (ITSMFAudioDevice* audio); /* Change the playback volume level */ diff --git a/channels/tsmf/client/tsmf_codec.c b/channels/tsmf/client/tsmf_codec.c index a45c41298..2a416ab28 100644 --- a/channels/tsmf/client/tsmf_codec.c +++ b/channels/tsmf/client/tsmf_codec.c @@ -284,7 +284,7 @@ static void tsmf_print_guid(const uint8* guid) } /* http://msdn.microsoft.com/en-us/library/dd318229.aspx */ -static uint32 tsmf_codec_parse_BITMAPINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, STREAM* s, boolean bypass) +static uint32 tsmf_codec_parse_BITMAPINFOHEADER(TS_AM_MEDIA_TYPE* mediatype, STREAM* s, BOOL bypass) { uint32 biSize; uint32 biWidth; @@ -367,11 +367,11 @@ typedef struct tagVIDEOINFOHEADER { return 48; } -boolean tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) +BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) { int i; uint32 cbFormat; - boolean ret = TRUE; + BOOL ret = TRUE; memset(mediatype, 0, sizeof(TS_AM_MEDIA_TYPE)); @@ -514,10 +514,10 @@ boolean tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s) return ret; } -boolean tsmf_codec_check_media_type(STREAM* s) +BOOL tsmf_codec_check_media_type(STREAM* s) { uint8* m; - boolean ret; + BOOL ret; TS_AM_MEDIA_TYPE mediatype; stream_get_mark(s, m); diff --git a/channels/tsmf/client/tsmf_codec.h b/channels/tsmf/client/tsmf_codec.h index 291aa97d4..b00c0895f 100644 --- a/channels/tsmf/client/tsmf_codec.h +++ b/channels/tsmf/client/tsmf_codec.h @@ -22,8 +22,8 @@ #include "tsmf_types.h" -boolean tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s); -boolean tsmf_codec_check_media_type(STREAM* s); +BOOL tsmf_codec_parse_media_type(TS_AM_MEDIA_TYPE* mediatype, STREAM* s); +BOOL tsmf_codec_check_media_type(STREAM* s); #endif diff --git a/channels/tsmf/client/tsmf_decoder.h b/channels/tsmf/client/tsmf_decoder.h index 96c7353ae..d9d0cbe59 100644 --- a/channels/tsmf/client/tsmf_decoder.h +++ b/channels/tsmf/client/tsmf_decoder.h @@ -36,15 +36,15 @@ typedef struct _ITSMFDecoder ITSMFDecoder; struct _ITSMFDecoder { /* Set the decoder format. Return true if supported. */ - boolean (*SetFormat) (ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* media_type); + BOOL (*SetFormat) (ITSMFDecoder* decoder, TS_AM_MEDIA_TYPE* media_type); /* Decode a sample. */ - boolean (*Decode) (ITSMFDecoder* decoder, const uint8* data, uint32 data_size, uint32 extensions); + BOOL (*Decode) (ITSMFDecoder* decoder, const uint8* data, uint32 data_size, uint32 extensions); /* Get the decoded data */ uint8* (*GetDecodedData) (ITSMFDecoder* decoder, uint32* size); /* Get the pixel format of decoded video frame */ uint32 (*GetDecodedFormat) (ITSMFDecoder* decoder); /* Get the width and height of decoded video frame */ - boolean (*GetDecodedDimension) (ITSMFDecoder* decoder, uint32* width, uint32* height); + BOOL (*GetDecodedDimension) (ITSMFDecoder* decoder, uint32* width, uint32* height); /* Free the decoder */ void (*Free) (ITSMFDecoder * decoder); /* Optional Contol function */ diff --git a/channels/tsmf/client/tsmf_ifman.h b/channels/tsmf/client/tsmf_ifman.h index 416276427..55108ed84 100644 --- a/channels/tsmf/client/tsmf_ifman.h +++ b/channels/tsmf/client/tsmf_ifman.h @@ -34,7 +34,7 @@ struct _TSMF_IFMAN STREAM* input; uint32 input_size; STREAM* output; - boolean output_pending; + BOOL output_pending; uint32 output_interface_id; }; diff --git a/channels/tsmf/client/tsmf_main.c b/channels/tsmf/client/tsmf_main.c index 3b038e7e4..a94dbe71a 100644 --- a/channels/tsmf/client/tsmf_main.c +++ b/channels/tsmf/client/tsmf_main.c @@ -96,7 +96,7 @@ void tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, stream_free(s); } -boolean tsmf_push_event(IWTSVirtualChannelCallback* pChannelCallback, +BOOL tsmf_push_event(IWTSVirtualChannelCallback* pChannelCallback, RDP_EVENT* event) { int error; diff --git a/channels/tsmf/client/tsmf_main.h b/channels/tsmf/client/tsmf_main.h index 8a4d7e33f..892992cbc 100644 --- a/channels/tsmf/client/tsmf_main.h +++ b/channels/tsmf/client/tsmf_main.h @@ -22,7 +22,7 @@ void tsmf_playback_ack(IWTSVirtualChannelCallback* pChannelCallback, uint32 message_id, uint64 duration, uint32 data_size); -boolean tsmf_push_event(IWTSVirtualChannelCallback* pChannelCallback, +BOOL tsmf_push_event(IWTSVirtualChannelCallback* pChannelCallback, RDP_EVENT* event); #endif diff --git a/channels/tsmf/client/tsmf_media.c b/channels/tsmf/client/tsmf_media.c index a1d7f1b56..3e77c42ae 100644 --- a/channels/tsmf/client/tsmf_media.c +++ b/channels/tsmf/client/tsmf_media.c @@ -154,7 +154,7 @@ static TSMF_SAMPLE* tsmf_stream_pop_sample(TSMF_STREAM* stream, int sync) TSMF_STREAM* s; LIST_ITEM* item; TSMF_SAMPLE* sample; - boolean pending = FALSE; + BOOL pending = FALSE; TSMF_PRESENTATION* presentation = stream->presentation; if (list_size(stream->sample_list) == 0) @@ -455,7 +455,7 @@ static void tsmf_sample_playback_audio(TSMF_SAMPLE* sample) static void tsmf_sample_playback(TSMF_SAMPLE* sample) { - boolean ret = FALSE; + BOOL ret = FALSE; uint32 width; uint32 height; uint32 pixfmt = 0; diff --git a/channels/urbdrc/client/urbdrc_main.c b/channels/urbdrc/client/urbdrc_main.c index 986afe8c7..2dd75c787 100644 --- a/channels/urbdrc/client/urbdrc_main.c +++ b/channels/urbdrc/client/urbdrc_main.c @@ -1031,7 +1031,7 @@ static int urbdrc_load_udevman_plugin(IWTSPlugin* pPlugin, const char* name, RDP static int urbdrc_process_plugin_data(IWTSPlugin* pPlugin, RDP_PLUGIN_DATA* data) { - boolean ret; + BOOL ret; if (data->data[0] && (strcmp((char*)data->data[0], "urbdrc") == 0 || strstr((char*) data->data[0], "/urbdrc.") != NULL)) { diff --git a/client/DirectFB/df_event.c b/client/DirectFB/df_event.c index 9000aef1e..d0d54c4ff 100644 --- a/client/DirectFB/df_event.c +++ b/client/DirectFB/df_event.c @@ -154,7 +154,7 @@ void df_keyboard_init() } -void df_send_mouse_button_event(rdpInput* input, boolean down, uint32 button, uint16 x, uint16 y) +void df_send_mouse_button_event(rdpInput* input, BOOL down, uint32 button, uint16 x, uint16 y) { uint16 flags; @@ -188,7 +188,7 @@ void df_send_mouse_wheel_event(rdpInput* input, sint16 axisrel, uint16 x, uint16 input->MouseEvent(input, flags, x, y); } -void df_send_keyboard_event(rdpInput* input, boolean down, uint8 keycode, uint8 function) +void df_send_keyboard_event(rdpInput* input, BOOL down, uint8 keycode, uint8 function) { uint8 vkcode; RDP_SCANCODE rdp_scancode; @@ -205,7 +205,7 @@ void df_send_keyboard_event(rdpInput* input, boolean down, uint8 keycode, uint8 freerdp_input_send_keyboard_event_ex(input, down, rdp_scancode); } -boolean df_event_process(freerdp* instance, DFBEvent* event) +BOOL df_event_process(freerdp* instance, DFBEvent* event) { int flags; rdpGdi* gdi; diff --git a/client/DirectFB/df_event.h b/client/DirectFB/df_event.h index e55d6c61f..02ad95625 100644 --- a/client/DirectFB/df_event.h +++ b/client/DirectFB/df_event.h @@ -23,6 +23,6 @@ #include "dfreerdp.h" void df_keyboard_init(); -boolean df_event_process(freerdp* instance, DFBEvent* event); +BOOL df_event_process(freerdp* instance, DFBEvent* event); #endif /* __DF_EVENT_H */ diff --git a/client/DirectFB/dfreerdp.c b/client/DirectFB/dfreerdp.c index 10b25327d..2328c9748 100644 --- a/client/DirectFB/dfreerdp.c +++ b/client/DirectFB/dfreerdp.c @@ -85,7 +85,7 @@ void df_end_paint(rdpContext* context) dfi->primary->Blit(dfi->primary, dfi->surface, &(dfi->update_rect), dfi->update_rect.x, dfi->update_rect.y); } -boolean df_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) +BOOL df_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) { dfInfo* dfi; @@ -97,7 +97,7 @@ boolean df_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int return TRUE; } -boolean df_check_fds(freerdp* instance, fd_set* set) +BOOL df_check_fds(freerdp* instance, fd_set* set) { dfInfo* dfi; @@ -112,10 +112,10 @@ boolean df_check_fds(freerdp* instance, fd_set* set) return TRUE; } -boolean df_pre_connect(freerdp* instance) +BOOL df_pre_connect(freerdp* instance) { dfInfo* dfi; - boolean bitmap_cache; + BOOL bitmap_cache; dfContext* context; rdpSettings* settings; @@ -164,7 +164,7 @@ boolean df_pre_connect(freerdp* instance) return TRUE; } -boolean df_post_connect(freerdp* instance) +BOOL df_post_connect(freerdp* instance) { rdpGdi* gdi; dfInfo* dfi; @@ -231,7 +231,7 @@ static int df_process_plugin_args(rdpSettings* settings, const char* name, return 1; } -boolean df_verify_certificate(freerdp* instance, char* subject, char* issuer, char* fingerprint) +BOOL df_verify_certificate(freerdp* instance, char* subject, char* issuer, char* fingerprint) { printf("Certificate details:\n"); printf("\tSubject: %s\n", subject); diff --git a/client/Mac/MRDPRailView.h b/client/Mac/MRDPRailView.h index 68b6f1256..48a849db3 100644 --- a/client/Mac/MRDPRailView.h +++ b/client/Mac/MRDPRailView.h @@ -11,9 +11,9 @@ NSBitmapImageRep * bmiRep; NSPoint savedDragLocation; char * pixelData; - boolean mouseInClientArea; - boolean titleBarClicked; - boolean gestureEventInProgress; + BOOL mouseInClientArea; + BOOL titleBarClicked; + BOOL gestureEventInProgress; int width; int height; int savedWindowId; @@ -31,15 +31,15 @@ int kdcapslock; @public - boolean isMoveSizeInProgress; - boolean saveInitialDragLoc; - boolean skipMoveWindowOnce; + BOOL isMoveSizeInProgress; + BOOL saveInitialDragLoc; + BOOL skipMoveWindowOnce; int localMoveType; } @property (assign) MRDPRailWindow * mrdpRailWindow; @property (assign) int windowIndex; -@property (assign) boolean activateWindow; +@property (assign) BOOL activateWindow; - (void) windowDidMove:(NSNotification *) notification; - (void) updateDisplay; diff --git a/client/Mac/MRDPRailView.m b/client/Mac/MRDPRailView.m index 69e08200b..16f6f66c1 100644 --- a/client/Mac/MRDPRailView.m +++ b/client/Mac/MRDPRailView.m @@ -18,7 +18,7 @@ extern struct kkey g_keys[]; - (void) updateDisplay { - boolean moveWindow = NO; + BOOL moveWindow = NO; NSRect srcRectOuter; NSRect destRectOuter; diff --git a/client/Mac/MRDPView.h b/client/Mac/MRDPView.h index 46c281399..88e094cb1 100644 --- a/client/Mac/MRDPView.h +++ b/client/Mac/MRDPView.h @@ -43,13 +43,13 @@ // RAIL stuff MRDPWindow *currentWindow; NSPoint savedDragLocation; - boolean mouseInClientArea; - boolean isRemoteApp; - boolean firstCreateWindow; - boolean isMoveSizeInProgress; - boolean skipResizeOnce; - boolean saveInitialDragLoc; - boolean skipMoveWindowOnce; + BOOL mouseInClientArea; + BOOL isRemoteApp; + BOOL firstCreateWindow; + BOOL isMoveSizeInProgress; + BOOL skipResizeOnce; + BOOL saveInitialDragLoc; + BOOL skipMoveWindowOnce; // store state info for some keys int kdlshift; @@ -99,8 +99,8 @@ void pointer_set(rdpContext* context, rdpPointer* pointer); void pointer_setNull(rdpContext* context); void pointer_setDefault(rdpContext* context); int rdp_connect(); -boolean mac_pre_connect(freerdp *inst); -boolean mac_post_connect(freerdp *inst); +BOOL mac_pre_connect(freerdp *inst); +BOOL mac_post_connect(freerdp *inst); void mac_context_new(freerdp *inst, rdpContext *context); void mac_context_free(freerdp *inst, rdpContext *context); void mac_set_bounds(rdpContext *context, rdpBounds *bounds); diff --git a/client/Mac/MRDPView.m b/client/Mac/MRDPView.m index 289d644e4..f3ea097d2 100644 --- a/client/Mac/MRDPView.m +++ b/client/Mac/MRDPView.m @@ -1014,7 +1014,7 @@ int rdp_connect() * @return true if successful. false otherwise. ************************************************************************/ -boolean mac_pre_connect(freerdp *inst) +BOOL mac_pre_connect(freerdp *inst) { char *cptr; int len; @@ -1174,7 +1174,7 @@ boolean mac_pre_connect(freerdp *inst) // in order to achieve this, we need to modify the cmd line args entered by the user; if (g_mrdpview->isRemoteApp) { - boolean gotGeometry = NO; + BOOL gotGeometry = NO; // get dimensions of screen that has keyboard focus; // we use these dimensions when connecting to RDP server @@ -1238,7 +1238,7 @@ boolean mac_pre_connect(freerdp *inst) * ************************************************************************/ -boolean mac_post_connect(freerdp *inst) +BOOL mac_post_connect(freerdp *inst) { uint32 flags; rdpPointer rdp_pointer; @@ -1915,9 +1915,9 @@ void mac_process_rail_event(freerdp *inst, RDP_EVENT *event) void mac_rail_CreateWindow(rdpRail *rail, rdpWindow *window) { - boolean centerWindow = NO; - boolean moveWindow = NO; - boolean displayAsModal = NO; + BOOL centerWindow = NO; + BOOL moveWindow = NO; + BOOL displayAsModal = NO; NSMutableArray * ma = g_mrdpview->windows; // make sure window fits resolution diff --git a/client/Sample/freerdp.c b/client/Sample/freerdp.c index 919a92655..3eefeb07b 100644 --- a/client/Sample/freerdp.c +++ b/client/Sample/freerdp.c @@ -144,7 +144,7 @@ void tf_process_channel_event(rdpChannels* channels, freerdp* instance) } } -boolean tf_pre_connect(freerdp* instance) +BOOL tf_pre_connect(freerdp* instance) { tfInfo* tfi; tfContext* context; @@ -184,7 +184,7 @@ boolean tf_pre_connect(freerdp* instance) return TRUE; } -boolean tf_post_connect(freerdp* instance) +BOOL tf_post_connect(freerdp* instance) { rdpGdi* gdi; diff --git a/client/Windows/wf_cliprdr.c b/client/Windows/wf_cliprdr.c index 6da40f7ae..470429c0d 100644 --- a/client/Windows/wf_cliprdr.c +++ b/client/Windows/wf_cliprdr.c @@ -83,22 +83,22 @@ void wf_process_cliprdr_event(wfInfo* wfi, RDP_EVENT* event) } } -boolean wf_cliprdr_process_selection_notify(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +BOOL wf_cliprdr_process_selection_notify(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { return TRUE; } -boolean wf_cliprdr_process_selection_request(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +BOOL wf_cliprdr_process_selection_request(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { return TRUE; } -boolean wf_cliprdr_process_selection_clear(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +BOOL wf_cliprdr_process_selection_clear(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { return TRUE; } -boolean wf_cliprdr_process_property_notify(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +BOOL wf_cliprdr_process_property_notify(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { return TRUE; } diff --git a/client/Windows/wf_cliprdr.h b/client/Windows/wf_cliprdr.h index 5e1398cf0..484c6dccf 100644 --- a/client/Windows/wf_cliprdr.h +++ b/client/Windows/wf_cliprdr.h @@ -24,10 +24,10 @@ void wf_cliprdr_init(wfInfo* wfi, rdpChannels* chanman); void wf_cliprdr_uninit(wfInfo* wfi); void wf_process_cliprdr_event(wfInfo* wfi, RDP_EVENT* event); -boolean wf_cliprdr_process_selection_notify(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); -boolean wf_cliprdr_process_selection_request(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); -boolean wf_cliprdr_process_selection_clear(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); -boolean wf_cliprdr_process_property_notify(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +BOOL wf_cliprdr_process_selection_notify(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +BOOL wf_cliprdr_process_selection_request(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +BOOL wf_cliprdr_process_selection_clear(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); +BOOL wf_cliprdr_process_property_notify(wfInfo* wfi, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); void wf_cliprdr_check_owner(wfInfo* wfi); #endif /* __WF_CLIPRDR_H */ diff --git a/client/Windows/wf_event.c b/client/Windows/wf_event.c index e96816092..2f9c5142b 100644 --- a/client/Windows/wf_event.c +++ b/client/Windows/wf_event.c @@ -127,7 +127,7 @@ LRESULT CALLBACK wf_event_proc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam int x, y, w, h; PAINTSTRUCT ps; rdpInput* input; - boolean processed; + BOOL processed; processed = TRUE; ptr = GetWindowLongPtr(hWnd, GWLP_USERDATA); diff --git a/client/Windows/wf_gdi.c b/client/Windows/wf_gdi.c index 537252b0d..76bd92c93 100644 --- a/client/Windows/wf_gdi.c +++ b/client/Windows/wf_gdi.c @@ -59,7 +59,7 @@ const uint8 wf_rop2_table[] = R2_WHITE, /* 1 */ }; -boolean wf_set_rop2(HDC hdc, int rop2) +BOOL wf_set_rop2(HDC hdc, int rop2) { if ((rop2 < 0x01) || (rop2 > 0x10)) { diff --git a/client/Windows/wf_graphics.c b/client/Windows/wf_graphics.c index 3cce037fd..650002885 100644 --- a/client/Windows/wf_graphics.c +++ b/client/Windows/wf_graphics.c @@ -143,7 +143,7 @@ void wf_Bitmap_Paint(rdpContext* context, rdpBitmap* bitmap) } void wf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, - uint8* data, int width, int height, int bpp, int length, boolean compressed, int codec_id) + uint8* data, int width, int height, int bpp, int length, BOOL compressed, int codec_id) { uint16 size; @@ -156,7 +156,7 @@ void wf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, if (compressed) { - boolean status; + BOOL status; status = bitmap_decompress(data, bitmap->data, width, height, length, bpp, bpp); @@ -175,7 +175,7 @@ void wf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, bitmap->bpp = bpp; } -void wf_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, boolean primary) +void wf_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL primary) { wfInfo* wfi = ((wfContext*) context)->wfi; diff --git a/client/Windows/wf_rail.c b/client/Windows/wf_rail.c index 618110a70..0c383b3ed 100644 --- a/client/Windows/wf_rail.c +++ b/client/Windows/wf_rail.c @@ -41,7 +41,7 @@ void wf_rail_send_client_system_command(wfInfo* wfi, uint32 windowId, uint16 com { } -void wf_rail_send_activate(wfInfo* wfi, HWND window, boolean enabled) +void wf_rail_send_activate(wfInfo* wfi, HWND window, BOOL enabled) { } diff --git a/client/Windows/wf_rail.h b/client/Windows/wf_rail.h index 2441c4c17..053b27c61 100644 --- a/client/Windows/wf_rail.h +++ b/client/Windows/wf_rail.h @@ -24,7 +24,7 @@ void wf_rail_paint(wfInfo* wfi, rdpRail* rail, sint32 uleft, sint32 utop, uint32 uright, uint32 ubottom); void wf_rail_register_callbacks(wfInfo* wfi, rdpRail* rail); void wf_rail_send_client_system_command(wfInfo* wfi, uint32 windowId, uint16 command); -void wf_rail_send_activate(wfInfo* wfi, HWND window, boolean enabled); +void wf_rail_send_activate(wfInfo* wfi, HWND window, BOOL enabled); void wf_process_rail_event(wfInfo* wfi, rdpChannels* chanman, RDP_EVENT* event); void wf_rail_adjust_position(wfInfo* wfi, rdpWindow *window); void wf_rail_end_local_move(wfInfo* wfi, rdpWindow *window); diff --git a/client/Windows/wfreerdp.c b/client/Windows/wfreerdp.c index 1b8624465..5686b5d30 100644 --- a/client/Windows/wfreerdp.c +++ b/client/Windows/wfreerdp.c @@ -139,7 +139,7 @@ void wf_hw_end_paint(rdpContext* context) } -boolean wf_pre_connect(freerdp* instance) +BOOL wf_pre_connect(freerdp* instance) { int i1; wfInfo* wfi; @@ -262,7 +262,7 @@ uint32 wfi_detect_cpu() return cpu_opt; } -boolean wf_post_connect(freerdp* instance) +BOOL wf_post_connect(freerdp* instance) { rdpGdi* gdi; wfInfo* wfi; @@ -395,7 +395,7 @@ boolean wf_post_connect(freerdp* instance) return TRUE; } -boolean wf_verify_certificate(freerdp* instance, char* subject, char* issuer, char* fingerprint) +BOOL wf_verify_certificate(freerdp* instance, char* subject, char* issuer, char* fingerprint) { #if 0 DWORD mode; @@ -441,12 +441,12 @@ void wf_process_channel_event(rdpChannels* channels, freerdp* instance) freerdp_event_free(event); } -boolean wf_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) +BOOL wf_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) { return TRUE; } -boolean wf_check_fds(freerdp* instance) +BOOL wf_check_fds(freerdp* instance) { return TRUE; } diff --git a/client/Windows/wfreerdp.h b/client/Windows/wfreerdp.h index 7827b2273..73875478e 100644 --- a/client/Windows/wfreerdp.h +++ b/client/Windows/wfreerdp.h @@ -88,7 +88,7 @@ struct wf_info RFX_CONTEXT* rfx_context; NSC_CONTEXT* nsc_context; - boolean sw_gdi; + BOOL sw_gdi; }; #endif diff --git a/client/X11/xf_cliprdr.c b/client/X11/xf_cliprdr.c index 95afe041b..7e140daaf 100644 --- a/client/X11/xf_cliprdr.c +++ b/client/X11/xf_cliprdr.c @@ -65,11 +65,11 @@ struct clipboard_context /* client->server data */ Window owner; int request_index; - boolean sync; + BOOL sync; /* INCR mechanism */ Atom incr_atom; - boolean incr_starts; + BOOL incr_starts; uint8* incr_data; int incr_data_length; }; @@ -230,7 +230,7 @@ static void be2le(uint8* data, int size) } } -static boolean xf_cliprdr_is_self_owned(xfInfo* xfi) +static BOOL xf_cliprdr_is_self_owned(xfInfo* xfi) { Atom type; uint32 id = 0; @@ -638,7 +638,7 @@ static uint8* xf_cliprdr_process_requested_html(uint8* data, int* size) return outbuf; } -static void xf_cliprdr_process_requested_data(xfInfo* xfi, boolean has_data, uint8* data, int size) +static void xf_cliprdr_process_requested_data(xfInfo* xfi, BOOL has_data, uint8* data, int size) { uint8* outbuf; clipboardContext* cb = (clipboardContext*) xfi->clipboard_context; @@ -691,12 +691,12 @@ static void xf_cliprdr_process_requested_data(xfInfo* xfi, boolean has_data, uin xf_cliprdr_send_format_list(xfi); } -static boolean xf_cliprdr_get_requested_data(xfInfo* xfi, Atom target) +static BOOL xf_cliprdr_get_requested_data(xfInfo* xfi, Atom target) { Atom type; int format; uint8* data = NULL; - boolean has_data = FALSE; + BOOL has_data = FALSE; unsigned long length, bytes_left, dummy; clipboardContext* cb = (clipboardContext*) xfi->clipboard_context; @@ -1039,7 +1039,7 @@ void xf_process_cliprdr_event(xfInfo* xfi, RDP_EVENT* event) } } -boolean xf_cliprdr_process_selection_notify(xfInfo* xfi, XEvent* xevent) +BOOL xf_cliprdr_process_selection_notify(xfInfo* xfi, XEvent* xevent) { clipboardContext* cb = (clipboardContext*) xfi->clipboard_context; @@ -1063,7 +1063,7 @@ boolean xf_cliprdr_process_selection_notify(xfInfo* xfi, XEvent* xevent) } } -boolean xf_cliprdr_process_selection_request(xfInfo* xfi, XEvent* xevent) +BOOL xf_cliprdr_process_selection_request(xfInfo* xfi, XEvent* xevent) { int i; int fmt; @@ -1072,7 +1072,7 @@ boolean xf_cliprdr_process_selection_request(xfInfo* xfi, XEvent* xevent) XEvent* respond; uint32 alt_format; uint8* data = NULL; - boolean delay_respond; + BOOL delay_respond; unsigned long length, bytes_left; clipboardContext* cb = (clipboardContext*) xfi->clipboard_context; @@ -1174,7 +1174,7 @@ boolean xf_cliprdr_process_selection_request(xfInfo* xfi, XEvent* xevent) return TRUE; } -boolean xf_cliprdr_process_selection_clear(xfInfo* xfi, XEvent* xevent) +BOOL xf_cliprdr_process_selection_clear(xfInfo* xfi, XEvent* xevent) { clipboardContext* cb = (clipboardContext*) xfi->clipboard_context; @@ -1186,7 +1186,7 @@ boolean xf_cliprdr_process_selection_clear(xfInfo* xfi, XEvent* xevent) return TRUE; } -boolean xf_cliprdr_process_property_notify(xfInfo* xfi, XEvent* xevent) +BOOL xf_cliprdr_process_property_notify(xfInfo* xfi, XEvent* xevent) { clipboardContext* cb = (clipboardContext*) xfi->clipboard_context; diff --git a/client/X11/xf_cliprdr.h b/client/X11/xf_cliprdr.h index 3ad729e93..f5ec699b2 100644 --- a/client/X11/xf_cliprdr.h +++ b/client/X11/xf_cliprdr.h @@ -25,10 +25,10 @@ void xf_cliprdr_init(xfInfo* xfi, rdpChannels* chanman); void xf_cliprdr_uninit(xfInfo* xfi); void xf_process_cliprdr_event(xfInfo* xfi, RDP_EVENT* event); -boolean xf_cliprdr_process_selection_notify(xfInfo* xfi, XEvent* xevent); -boolean xf_cliprdr_process_selection_request(xfInfo* xfi, XEvent* xevent); -boolean xf_cliprdr_process_selection_clear(xfInfo* xfi, XEvent* xevent); -boolean xf_cliprdr_process_property_notify(xfInfo* xfi, XEvent* xevent); +BOOL xf_cliprdr_process_selection_notify(xfInfo* xfi, XEvent* xevent); +BOOL xf_cliprdr_process_selection_request(xfInfo* xfi, XEvent* xevent); +BOOL xf_cliprdr_process_selection_clear(xfInfo* xfi, XEvent* xevent); +BOOL xf_cliprdr_process_property_notify(xfInfo* xfi, XEvent* xevent); void xf_cliprdr_check_owner(xfInfo* xfi); #ifdef WITH_DEBUG_X11_CLIPRDR diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index f2b4094eb..247ee783c 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -73,7 +73,7 @@ static const char* const X11_EVENT_STRINGS[] = }; #endif -static boolean xf_event_Expose(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_Expose(xfInfo* xfi, XEvent* event, BOOL app) { int x, y; int w, h; @@ -105,13 +105,13 @@ static boolean xf_event_Expose(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_VisibilityNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_VisibilityNotify(xfInfo* xfi, XEvent* event, BOOL app) { xfi->unobscured = event->xvisibility.state == VisibilityUnobscured; return TRUE; } -static boolean xf_event_MotionNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_MotionNotify(xfInfo* xfi, XEvent* event, BOOL app) { rdpInput* input; int x, y; @@ -150,13 +150,13 @@ static boolean xf_event_MotionNotify(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_ButtonPress(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_ButtonPress(xfInfo* xfi, XEvent* event, BOOL app) { int x, y; int flags; Window childWindow; - boolean wheel; - boolean extended; + BOOL wheel; + BOOL extended; rdpInput* input; input = xfi->instance->input; @@ -253,12 +253,12 @@ static boolean xf_event_ButtonPress(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_ButtonRelease(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_ButtonRelease(xfInfo* xfi, XEvent* event, BOOL app) { int x, y; int flags; Window childWindow; - boolean extended; + BOOL extended; rdpInput* input; input = xfi->instance->input; @@ -335,7 +335,7 @@ static boolean xf_event_ButtonRelease(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_KeyPress(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_KeyPress(xfInfo* xfi, XEvent* event, BOOL app) { KeySym keysym; char str[256]; @@ -352,7 +352,7 @@ static boolean xf_event_KeyPress(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_KeyRelease(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_KeyRelease(xfInfo* xfi, XEvent* event, BOOL app) { XEvent next_event; @@ -374,7 +374,7 @@ static boolean xf_event_KeyRelease(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_FocusIn(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_FocusIn(xfInfo* xfi, XEvent* event, BOOL app) { if (event->xfocus.mode == NotifyGrab) return TRUE; @@ -405,7 +405,7 @@ static boolean xf_event_FocusIn(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_FocusOut(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_FocusOut(xfInfo* xfi, XEvent* event, BOOL app) { if (event->xfocus.mode == NotifyUngrab) return TRUE; @@ -423,7 +423,7 @@ static boolean xf_event_FocusOut(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_MappingNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_MappingNotify(xfInfo* xfi, XEvent* event, BOOL app) { if (event->xmapping.request == MappingModifier) { @@ -434,7 +434,7 @@ static boolean xf_event_MappingNotify(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_ClientMessage(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_ClientMessage(xfInfo* xfi, XEvent* event, BOOL app) { if ((event->xclient.message_type == xfi->WM_PROTOCOLS) && ((Atom) event->xclient.data.l[0] == xfi->WM_DELETE_WINDOW)) @@ -464,7 +464,7 @@ static boolean xf_event_ClientMessage(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_EnterNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_EnterNotify(xfInfo* xfi, XEvent* event, BOOL app) { if (app != TRUE) { @@ -495,7 +495,7 @@ static boolean xf_event_EnterNotify(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_LeaveNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_LeaveNotify(xfInfo* xfi, XEvent* event, BOOL app) { if (app != TRUE) { @@ -506,7 +506,7 @@ static boolean xf_event_LeaveNotify(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_ConfigureNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_ConfigureNotify(xfInfo* xfi, XEvent* event, BOOL app) { rdpWindow* window; rdpRail* rail = ((rdpContext*) xfi->context)->rail; @@ -564,7 +564,7 @@ static boolean xf_event_ConfigureNotify(xfInfo* xfi, XEvent* event, boolean app) return True; } -static boolean xf_event_MapNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_MapNotify(xfInfo* xfi, XEvent* event, BOOL app) { RECTANGLE_16 rect; rdpWindow* window; @@ -602,7 +602,7 @@ static boolean xf_event_MapNotify(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_UnmapNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_UnmapNotify(xfInfo* xfi, XEvent* event, BOOL app) { rdpWindow* window; rdpUpdate* update = xfi->instance->update; @@ -632,7 +632,7 @@ static boolean xf_event_UnmapNotify(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_SelectionNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_SelectionNotify(xfInfo* xfi, XEvent* event, BOOL app) { if (app != TRUE) { @@ -643,7 +643,7 @@ static boolean xf_event_SelectionNotify(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_SelectionRequest(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_SelectionRequest(xfInfo* xfi, XEvent* event, BOOL app) { if (app != TRUE) { @@ -654,7 +654,7 @@ static boolean xf_event_SelectionRequest(xfInfo* xfi, XEvent* event, boolean app return TRUE; } -static boolean xf_event_SelectionClear(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_SelectionClear(xfInfo* xfi, XEvent* event, BOOL app) { if (app != TRUE) { @@ -665,7 +665,7 @@ static boolean xf_event_SelectionClear(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_PropertyNotify(xfInfo* xfi, XEvent* event, boolean app) +static BOOL xf_event_PropertyNotify(xfInfo* xfi, XEvent* event, BOOL app) { //This section handles sending the appropriate commands to the rail server //when the window has been minimized, maximized, restored locally @@ -683,10 +683,10 @@ static boolean xf_event_PropertyNotify(xfInfo* xfi, XEvent* event, boolean app) if ((((Atom)event->xproperty.atom == xfi->_NET_WM_STATE) && (event->xproperty.state != PropertyDelete)) || (((Atom)event->xproperty.atom == xfi->WM_STATE) && (event->xproperty.state != PropertyDelete))) { - boolean status; - boolean maxVert = FALSE; - boolean maxHorz = FALSE; - boolean minimized = FALSE; + BOOL status; + BOOL maxVert = FALSE; + BOOL maxHorz = FALSE; + BOOL minimized = FALSE; unsigned long nitems; unsigned long bytes; unsigned char* prop; @@ -765,7 +765,7 @@ static boolean xf_event_PropertyNotify(xfInfo* xfi, XEvent* event, boolean app) return TRUE; } -static boolean xf_event_suppress_events(xfInfo *xfi, rdpWindow *window, XEvent*event) +static BOOL xf_event_suppress_events(xfInfo *xfi, rdpWindow *window, XEvent*event) { if (! xfi->remote_app) return FALSE; @@ -850,9 +850,9 @@ static boolean xf_event_suppress_events(xfInfo *xfi, rdpWindow *window, XEvent*e } -boolean xf_event_process(freerdp* instance, XEvent* event) +BOOL xf_event_process(freerdp* instance, XEvent* event) { - boolean status = TRUE; + BOOL status = TRUE; xfInfo* xfi = ((xfContext*) instance->context)->xfi; rdpRail* rail = ((rdpContext*) xfi->context)->rail; rdpWindow* window; diff --git a/client/X11/xf_event.h b/client/X11/xf_event.h index b35541432..f0ef8da57 100644 --- a/client/X11/xf_event.h +++ b/client/X11/xf_event.h @@ -24,7 +24,7 @@ #include "xfreerdp.h" -boolean xf_event_process(freerdp* instance, XEvent* event); +BOOL xf_event_process(freerdp* instance, XEvent* event); void xf_event_SendClientEvent(xfInfo *xfi, xfWindow* window, Atom atom, unsigned int numArgs, ...); #endif /* __XF_EVENT_H */ diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c index 711850d37..0a457fc35 100644 --- a/client/X11/xf_gdi.c +++ b/client/X11/xf_gdi.c @@ -55,7 +55,7 @@ static const uint8 xf_rop2_table[] = GXset /* 1 */ }; -boolean xf_set_rop2(xfInfo* xfi, int rop2) +BOOL xf_set_rop2(xfInfo* xfi, int rop2) { if ((rop2 < 0x01) || (rop2 > 0x10)) { @@ -67,7 +67,7 @@ boolean xf_set_rop2(xfInfo* xfi, int rop2) return TRUE; } -boolean xf_set_rop3(xfInfo* xfi, int rop3) +BOOL xf_set_rop3(xfInfo* xfi, int rop3) { int function = -1; diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c index e51563ef0..5c3fa2128 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c @@ -113,7 +113,7 @@ void xf_Bitmap_Paint(rdpContext* context, rdpBitmap* bitmap) void xf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, uint8* data, int width, int height, int bpp, int length, - boolean compressed, int codec_id) + BOOL compressed, int codec_id) { uint16 size; RFX_MESSAGE* msg; @@ -122,7 +122,7 @@ void xf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, int yindex; int xindex; xfInfo* xfi; - boolean status; + BOOL status; size = width * height * (bpp + 7) / 8; @@ -189,7 +189,7 @@ void xf_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, bitmap->bpp = bpp; } -void xf_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, boolean primary) +void xf_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL primary) { xfInfo* xfi = ((xfContext*) context)->xfi; diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c index 175d5ff9d..52d6e638f 100644 --- a/client/X11/xf_keyboard.c +++ b/client/X11/xf_keyboard.c @@ -40,7 +40,7 @@ void xf_kbd_init(xfInfo* xfi) void xf_kbd_clear(xfInfo* xfi) { - memset(xfi->pressed_keys, 0, 256 * sizeof(boolean)); + memset(xfi->pressed_keys, 0, 256 * sizeof(BOOL)); } void xf_kbd_set_keypress(xfInfo* xfi, uint8 keycode, KeySym keysym) @@ -75,13 +75,13 @@ void xf_kbd_release_all_keypress(xfInfo* xfi) } } -boolean xf_kbd_key_pressed(xfInfo* xfi, KeySym keysym) +BOOL xf_kbd_key_pressed(xfInfo* xfi, KeySym keysym) { KeyCode keycode = XKeysymToKeycode(xfi->display, keysym); return (xfi->pressed_keys[keycode] == keysym); } -void xf_kbd_send_key(xfInfo* xfi, boolean down, uint8 keycode) +void xf_kbd_send_key(xfInfo* xfi, BOOL down, uint8 keycode) { RDP_SCANCODE rdp_scancode; rdpInput* input; @@ -137,7 +137,7 @@ int xf_kbd_read_keyboard_state(xfInfo* xfi) return state; } -boolean xf_kbd_get_key_state(xfInfo* xfi, int state, int keysym) +BOOL xf_kbd_get_key_state(xfInfo* xfi, int state, int keysym) { int offset; int modifierpos, key, keysymMask = 0; @@ -194,7 +194,7 @@ void xf_kbd_focus_in(xfInfo* xfi) input->SynchronizeEvent(input, syncFlags); } -boolean xf_kbd_handle_special_keys(xfInfo* xfi, KeySym keysym) +BOOL xf_kbd_handle_special_keys(xfInfo* xfi, KeySym keysym) { if (keysym == XK_Return) { diff --git a/client/X11/xf_keyboard.h b/client/X11/xf_keyboard.h index 699e5817e..cb01fc89f 100644 --- a/client/X11/xf_keyboard.h +++ b/client/X11/xf_keyboard.h @@ -29,12 +29,12 @@ void xf_kbd_clear(xfInfo* xfi); void xf_kbd_set_keypress(xfInfo* xfi, uint8 keycode, KeySym keysym); void xf_kbd_unset_keypress(xfInfo* xfi, uint8 keycode); void xf_kbd_release_all_keypress(xfInfo* xfi); -boolean xf_kbd_key_pressed(xfInfo* xfi, KeySym keysym); -void xf_kbd_send_key(xfInfo* xfi, boolean down, uint8 keycode); +BOOL xf_kbd_key_pressed(xfInfo* xfi, KeySym keysym); +void xf_kbd_send_key(xfInfo* xfi, BOOL down, uint8 keycode); int xf_kbd_read_keyboard_state(xfInfo* xfi); -boolean xf_kbd_get_key_state(xfInfo* xfi, int state, int keysym); +BOOL xf_kbd_get_key_state(xfInfo* xfi, int state, int keysym); int xf_kbd_get_toggle_keys_state(xfInfo* xfi); void xf_kbd_focus_in(xfInfo* xfi); -boolean xf_kbd_handle_special_keys(xfInfo* xfi, KeySym keysym); +BOOL xf_kbd_handle_special_keys(xfInfo* xfi, KeySym keysym); #endif /* __XF_KEYBOARD_H */ diff --git a/client/X11/xf_monitor.c b/client/X11/xf_monitor.c index c026f2e3c..8d07b7126 100644 --- a/client/X11/xf_monitor.c +++ b/client/X11/xf_monitor.c @@ -35,7 +35,7 @@ /* See MSDN Section on Multiple Display Monitors: http://msdn.microsoft.com/en-us/library/dd145071 */ -boolean xf_detect_monitors(xfInfo* xfi, rdpSettings* settings) +BOOL xf_detect_monitors(xfInfo* xfi, rdpSettings* settings) { int i; VIRTUAL_SCREEN* vscreen; diff --git a/client/X11/xf_monitor.h b/client/X11/xf_monitor.h index ba1fd6c68..42196f1da 100644 --- a/client/X11/xf_monitor.h +++ b/client/X11/xf_monitor.h @@ -27,7 +27,7 @@ struct _MONITOR_INFO { RECTANGLE_16 area; RECTANGLE_16 workarea; - boolean primary; + BOOL primary; }; typedef struct _MONITOR_INFO MONITOR_INFO; @@ -42,6 +42,6 @@ typedef struct _VIRTUAL_SCREEN VIRTUAL_SCREEN; #include "xfreerdp.h" -boolean xf_detect_monitors(xfInfo* xfi, rdpSettings* settings); +BOOL xf_detect_monitors(xfInfo* xfi, rdpSettings* settings); #endif /* __XF_MONITOR_H */ diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c index 10c340b91..fab540025 100644 --- a/client/X11/xf_rail.c +++ b/client/X11/xf_rail.c @@ -56,7 +56,7 @@ void xf_rail_paint(xfInfo* xfi, rdpRail* rail, sint32 uleft, sint32 utop, uint32 { xfWindow* xfw; rdpWindow* window; - boolean intersect; + BOOL intersect; uint32 iwidth, iheight; sint32 ileft, itop; uint32 iright, ibottom; @@ -263,7 +263,7 @@ static void xf_send_rail_client_event(rdpChannels* channels, uint16 event_type, } } -void xf_rail_send_activate(xfInfo* xfi, Window xwindow, boolean enabled) +void xf_rail_send_activate(xfInfo* xfi, Window xwindow, BOOL enabled) { rdpRail* rail; rdpChannels* channels; diff --git a/client/X11/xf_rail.h b/client/X11/xf_rail.h index fa8e67f8f..542a0fc19 100644 --- a/client/X11/xf_rail.h +++ b/client/X11/xf_rail.h @@ -25,7 +25,7 @@ void xf_rail_paint(xfInfo* xfi, rdpRail* rail, sint32 uleft, sint32 utop, uint32 uright, uint32 ubottom); void xf_rail_register_callbacks(xfInfo* xfi, rdpRail* rail); void xf_rail_send_client_system_command(xfInfo* xfi, uint32 windowId, uint16 command); -void xf_rail_send_activate(xfInfo* xfi, Window xwindow, boolean enabled); +void xf_rail_send_activate(xfInfo* xfi, Window xwindow, BOOL enabled); void xf_process_rail_event(xfInfo* xfi, rdpChannels* chanman, RDP_EVENT* event); void xf_rail_adjust_position(xfInfo* xfi, rdpWindow *window); void xf_rail_end_local_move(xfInfo* xfi, rdpWindow *window); diff --git a/client/X11/xf_tsmf.c b/client/X11/xf_tsmf.c index 199321582..85bad593f 100644 --- a/client/X11/xf_tsmf.c +++ b/client/X11/xf_tsmf.c @@ -180,7 +180,7 @@ void xf_tsmf_uninit(xfInfo* xfi) } } -static boolean +static BOOL xf_tsmf_is_format_supported(xfXvContext* xv, uint32 pixfmt) { int i; @@ -204,7 +204,7 @@ static void xf_process_tsmf_video_frame_event(xfInfo* xfi, RDP_VIDEO_FRAME_EVENT uint8* data2; uint32 pixfmt; uint32 xvpixfmt; - boolean converti420yv12 = FALSE; + BOOL converti420yv12 = FALSE; XvImage * image; int colorkey = 0; XShmSegmentInfo shminfo; diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index 61b177562..3e92f2340 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -117,7 +117,7 @@ void xf_SendClientEvent(xfInfo* xfi, xfWindow* window, Atom atom, unsigned int n va_end(argp); } -void xf_SetWindowFullscreen(xfInfo* xfi, xfWindow* window, boolean fullscreen) +void xf_SetWindowFullscreen(xfInfo* xfi, xfWindow* window, BOOL fullscreen) { if (fullscreen) { @@ -132,7 +132,7 @@ void xf_SetWindowFullscreen(xfInfo* xfi, xfWindow* window, boolean fullscreen) /* http://tronche.com/gui/x/xlib/window-information/XGetWindowProperty.html */ -boolean xf_GetWindowProperty(xfInfo* xfi, Window window, Atom property, int length, +BOOL xf_GetWindowProperty(xfInfo* xfi, Window window, Atom property, int length, unsigned long* nitems, unsigned long* bytes, uint8** prop) { int status; @@ -158,9 +158,9 @@ boolean xf_GetWindowProperty(xfInfo* xfi, Window window, Atom property, int leng return TRUE; } -boolean xf_GetCurrentDesktop(xfInfo* xfi) +BOOL xf_GetCurrentDesktop(xfInfo* xfi) { - boolean status; + BOOL status; unsigned long nitems; unsigned long bytes; unsigned char* prop; @@ -178,10 +178,10 @@ boolean xf_GetCurrentDesktop(xfInfo* xfi) return TRUE; } -boolean xf_GetWorkArea(xfInfo* xfi) +BOOL xf_GetWorkArea(xfInfo* xfi) { long* plong; - boolean status; + BOOL status; unsigned long nitems; unsigned long bytes; unsigned char* prop; @@ -213,7 +213,7 @@ boolean xf_GetWorkArea(xfInfo* xfi) return TRUE; } -void xf_SetWindowDecorations(xfInfo* xfi, xfWindow* window, boolean show) +void xf_SetWindowDecorations(xfInfo* xfi, xfWindow* window, BOOL show) { PropMotifWmHints hints; @@ -304,7 +304,7 @@ static void xf_SetWindowPID(xfInfo* xfi, xfWindow* window, pid_t pid) 32, PropModeReplace, (unsigned char *)&pid, 1); } -xfWindow* xf_CreateDesktopWindow(xfInfo* xfi, char* name, int width, int height, boolean decorations) +xfWindow* xf_CreateDesktopWindow(xfInfo* xfi, char* name, int width, int height, BOOL decorations) { xfWindow* window; XEvent xevent; @@ -651,7 +651,7 @@ void xf_EndLocalMoveSize(xfInfo *xfi, xfWindow *window) void xf_MoveWindow(xfInfo* xfi, xfWindow* window, int x, int y, int width, int height) { - boolean resize = FALSE; + BOOL resize = FALSE; if ((width * height) < 1) return; @@ -881,11 +881,11 @@ void xf_UpdateWindowArea(xfInfo* xfi, xfWindow* window, int x, int y, int width, XFlush(xfi->display); } -boolean xf_IsWindowBorder(xfInfo* xfi, xfWindow* xfw, int x, int y) +BOOL xf_IsWindowBorder(xfInfo* xfi, xfWindow* xfw, int x, int y) { rdpWindow* wnd; - boolean clientArea = FALSE; - boolean windowArea = FALSE; + BOOL clientArea = FALSE; + BOOL windowArea = FALSE; wnd = xfw->window; diff --git a/client/X11/xf_window.h b/client/X11/xf_window.h index b6809cd12..0888a885a 100644 --- a/client/X11/xf_window.h +++ b/client/X11/xf_window.h @@ -71,26 +71,26 @@ struct xf_window int width; int height; Window handle; - boolean fullscreen; - boolean decorations; + BOOL fullscreen; + BOOL decorations; rdpWindow* window; - boolean is_mapped; - boolean is_transient; + BOOL is_mapped; + BOOL is_transient; xfLocalMove local_move; uint8 rail_state; - boolean rail_ignore_configure; + BOOL rail_ignore_configure; }; void xf_ewmhints_init(xfInfo* xfi); -boolean xf_GetCurrentDesktop(xfInfo* xfi); -boolean xf_GetWorkArea(xfInfo* xfi); +BOOL xf_GetCurrentDesktop(xfInfo* xfi); +BOOL xf_GetWorkArea(xfInfo* xfi); -void xf_SetWindowFullscreen(xfInfo* xfi, xfWindow* window, boolean fullscreen); -void xf_SetWindowDecorations(xfInfo* xfi, xfWindow* window, boolean show); +void xf_SetWindowFullscreen(xfInfo* xfi, xfWindow* window, BOOL fullscreen); +void xf_SetWindowDecorations(xfInfo* xfi, xfWindow* window, BOOL show); void xf_SetWindowUnlisted(xfInfo* xfi, xfWindow* window); -xfWindow* xf_CreateDesktopWindow(xfInfo* xfi, char* name, int width, int height, boolean decorations); +xfWindow* xf_CreateDesktopWindow(xfInfo* xfi, char* name, int width, int height, BOOL decorations); void xf_ResizeDesktopWindow(xfInfo* xfi, xfWindow* window, int width, int height); xfWindow* xf_CreateWindow(xfInfo* xfi, rdpWindow* wnd, int x, int y, int width, int height, uint32 id); @@ -102,11 +102,11 @@ void xf_SetWindowRects(xfInfo* xfi, xfWindow* window, RECTANGLE_16* rects, int n void xf_SetWindowVisibilityRects(xfInfo* xfi, xfWindow* window, RECTANGLE_16* rects, int nrects); void xf_SetWindowStyle(xfInfo* xfi, xfWindow* window, uint32 style, uint32 ex_style); void xf_UpdateWindowArea(xfInfo* xfi, xfWindow* window, int x, int y, int width, int height); -boolean xf_IsWindowBorder(xfInfo* xfi, xfWindow* xfw, int x, int y); +BOOL xf_IsWindowBorder(xfInfo* xfi, xfWindow* xfw, int x, int y); void xf_DestroyWindow(xfInfo* xfi, xfWindow* window); rdpWindow* xf_rdpWindowFromWindow(xfInfo* xfi, Window wnd); -boolean xf_GetWindowProperty(xfInfo* xfi, Window window, Atom property, int length, +BOOL xf_GetWindowProperty(xfInfo* xfi, Window window, Atom property, int length, unsigned long* nitems, unsigned long* bytes, uint8** prop); void xf_SetWindowMinMaxInfo(xfInfo* xfi, xfWindow* window, int maxWidth, int maxHeight, diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c index f644be32f..58ab5cafa 100644 --- a/client/X11/xfreerdp.c +++ b/client/X11/xfreerdp.c @@ -226,7 +226,7 @@ void xf_hw_end_paint(rdpContext* context) void xf_hw_desktop_resize(rdpContext* context) { xfInfo* xfi; - boolean same; + BOOL same; rdpSettings* settings; xfi = ((xfContext*) context)->xfi; @@ -263,7 +263,7 @@ void xf_hw_desktop_resize(rdpContext* context) } } -boolean xf_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) +BOOL xf_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) { xfInfo* xfi = ((xfContext*) instance->context)->xfi; @@ -273,7 +273,7 @@ boolean xf_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int return TRUE; } -boolean xf_process_x_events(freerdp* instance) +BOOL xf_process_x_events(freerdp* instance) { XEvent xevent; xfInfo* xfi = ((xfContext*) instance->context)->xfi; @@ -351,7 +351,7 @@ void xf_toggle_fullscreen(xfInfo* xfi) XFreePixmap(xfi->display, contents); } -boolean xf_get_pixmap_info(xfInfo* xfi) +BOOL xf_get_pixmap_info(xfInfo* xfi) { int i; int vi_count; @@ -477,10 +477,10 @@ int _xf_error_handler(Display* d, XErrorEvent* ev) * @return TRUE if successful. FALSE otherwise. * Can exit with error code XF_EXIT_PARSE_ARGUMENTS if there is an error in the parameters. */ -boolean xf_pre_connect(freerdp* instance) +BOOL xf_pre_connect(freerdp* instance) { xfInfo* xfi; - boolean bitmap_cache; + BOOL bitmap_cache; rdpSettings* settings; int arg_parse_result; @@ -667,7 +667,7 @@ uint32 xf_detect_cpu() * It will be called only if the connection was initialized properly, and will continue the initialization based on the * newly created connection. */ -boolean xf_post_connect(freerdp* instance) +BOOL xf_post_connect(freerdp* instance) { #ifdef WITH_SSE2 uint32 cpu; @@ -810,7 +810,7 @@ boolean xf_post_connect(freerdp* instance) * @param domain - unused * @return TRUE if a password was successfully entered. See freerdp_passphrase_read() for more details. */ -boolean xf_authenticate(freerdp* instance, char** username, char** password, char** domain) +BOOL xf_authenticate(freerdp* instance, char** username, char** password, char** domain) { // FIXME: seems this callback may be called when 'username' is not known. // But it doesn't do anything to fix it... @@ -832,7 +832,7 @@ boolean xf_authenticate(freerdp* instance, char** username, char** password, cha * @param fingerprint * @return TRUE if the certificate is trusted. FALSE otherwise. */ -boolean xf_verify_certificate(freerdp* instance, char* subject, char* issuer, char* fingerprint) +BOOL xf_verify_certificate(freerdp* instance, char* subject, char* issuer, char* fingerprint) { char answer; @@ -1117,7 +1117,7 @@ int xfreerdp_run(freerdp* instance) memset(wfds, 0, sizeof(wfds)); memset(&timeout, 0, sizeof(struct timeval)); - boolean status = freerdp_connect(instance); + BOOL status = freerdp_connect(instance); /* Connection succeeded. --authonly ? */ if (instance->settings->authentication_only) { freerdp_disconnect(instance); diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h index 1f813cae7..ed51e9283 100644 --- a/client/X11/xfreerdp.h +++ b/client/X11/xfreerdp.h @@ -101,40 +101,40 @@ struct xf_info Colormap colormap; int screen_number; int scanline_pad; - boolean big_endian; - boolean fullscreen; - boolean grab_keyboard; - boolean unobscured; - boolean decorations; - boolean debug; + BOOL big_endian; + BOOL fullscreen; + BOOL grab_keyboard; + BOOL unobscured; + BOOL decorations; + BOOL debug; xfWindow* window; xfWorkArea workArea; int current_desktop; - boolean remote_app; - boolean disconnect; + BOOL remote_app; + BOOL disconnect; HCLRCONV clrconv; Window parent_window; HGDI_DC hdc; - boolean sw_gdi; + BOOL sw_gdi; uint8* primary_buffer; - boolean frame_begin; + BOOL frame_begin; uint16 frame_x1; uint16 frame_y1; uint16 frame_x2; uint16 frame_y2; - boolean focused; - boolean mouse_active; - boolean mouse_motion; - boolean suppress_output; - boolean fullscreen_toggle; + BOOL focused; + BOOL mouse_active; + BOOL mouse_motion; + BOOL suppress_output; + BOOL fullscreen_toggle; uint32 keyboard_layout_id; - boolean pressed_keys[256]; + BOOL pressed_keys[256]; XModifierKeymap* modifier_map; XSetWindowAttributes attribs; - boolean complex_regions; + BOOL complex_regions; VIRTUAL_SCREEN vscreen; uint8* bmp_codec_none; uint8* bmp_codec_nsc; @@ -170,7 +170,7 @@ struct xf_info void xf_create_window(xfInfo* xfi); void xf_toggle_fullscreen(xfInfo* xfi); -boolean xf_post_connect(freerdp* instance); +BOOL xf_post_connect(freerdp* instance); enum XF_EXIT_CODE { diff --git a/cunit/test_freerdp.c b/cunit/test_freerdp.c index 9c08ff6a5..045f3ab37 100644 --- a/cunit/test_freerdp.c +++ b/cunit/test_freerdp.c @@ -104,7 +104,7 @@ void assert_stream(STREAM* s, uint8* data, int length, const char* func, int lin } } -typedef boolean (*pInitTestSuite)(void); +typedef BOOL (*pInitTestSuite)(void); struct _test_suite { diff --git a/include/freerdp/channels/channels.h b/include/freerdp/channels/channels.h index b5b1d187a..61f0f4d5a 100644 --- a/include/freerdp/channels/channels.h +++ b/include/freerdp/channels/channels.h @@ -42,9 +42,9 @@ FREERDP_API int freerdp_channels_post_connect(rdpChannels* channels, freerdp* in FREERDP_API int freerdp_channels_data(freerdp* instance, int channel_id, void* data, int data_size, int flags, int total_size); FREERDP_API int freerdp_channels_send_event(rdpChannels* channels, RDP_EVENT* event); -FREERDP_API boolean freerdp_channels_get_fds(rdpChannels* channels, freerdp* instance, void** read_fds, +FREERDP_API BOOL freerdp_channels_get_fds(rdpChannels* channels, freerdp* instance, void** read_fds, int* read_count, void** write_fds, int* write_count); -FREERDP_API boolean freerdp_channels_check_fds(rdpChannels* channels, freerdp* instance); +FREERDP_API BOOL freerdp_channels_check_fds(rdpChannels* channels, freerdp* instance); FREERDP_API RDP_EVENT* freerdp_channels_pop_event(rdpChannels* channels); FREERDP_API void freerdp_channels_close(rdpChannels* channels, freerdp* instance); diff --git a/include/freerdp/channels/wtsvc.h b/include/freerdp/channels/wtsvc.h index 535b93bfb..274eeb5cf 100644 --- a/include/freerdp/channels/wtsvc.h +++ b/include/freerdp/channels/wtsvc.h @@ -53,7 +53,7 @@ FREERDP_API WTSVirtualChannelManager* WTSCreateVirtualChannelManager(freerdp_pee FREERDP_API void WTSDestroyVirtualChannelManager(WTSVirtualChannelManager* vcm); FREERDP_API void WTSVirtualChannelManagerGetFileDescriptor(WTSVirtualChannelManager* vcm, void** fds, int* fds_count); -FREERDP_API boolean WTSVirtualChannelManagerCheckFileDescriptor(WTSVirtualChannelManager* vcm); +FREERDP_API BOOL WTSVirtualChannelManagerCheckFileDescriptor(WTSVirtualChannelManager* vcm); /** * Opens a static or dynamic virtual channel and return the handle. If the @@ -76,7 +76,7 @@ FREERDP_API void* WTSVirtualChannelOpenEx( * Servers use this function to gain access to a virtual channel file handle * that can be used for asynchronous I/O. */ -FREERDP_API boolean WTSVirtualChannelQuery( +FREERDP_API BOOL WTSVirtualChannelQuery( /* __in */ void* hChannelHandle, /* __in */ WTS_VIRTUAL_CLASS WtsVirtualClass, /* __out */ void** ppBuffer, @@ -105,7 +105,7 @@ FREERDP_API void WTSFreeMemory( * The caller should use the file handle returned by WTSVirtualChannelQuery to * determine whether a packet has arrived. */ -FREERDP_API boolean WTSVirtualChannelRead( +FREERDP_API BOOL WTSVirtualChannelRead( /* __in */ void* hChannelHandle, /* __in */ uint32 TimeOut, /* __out */ uint8* Buffer, @@ -115,7 +115,7 @@ FREERDP_API boolean WTSVirtualChannelRead( /** * Writes data to the server end of a virtual channel. */ -FREERDP_API boolean WTSVirtualChannelWrite( +FREERDP_API BOOL WTSVirtualChannelWrite( /* __in */ void* hChannelHandle, /* __in */ uint8* Buffer, /* __in */ uint32 Length, @@ -124,7 +124,7 @@ FREERDP_API boolean WTSVirtualChannelWrite( /** * Closes an open virtual channel handle. */ -FREERDP_API boolean WTSVirtualChannelClose( +FREERDP_API BOOL WTSVirtualChannelClose( /* __in */ void* hChannelHandle); #endif /* __FREERDP_WTSVC_H */ diff --git a/include/freerdp/codec/bitmap.h b/include/freerdp/codec/bitmap.h index bed673bdc..7a63fff13 100644 --- a/include/freerdp/codec/bitmap.h +++ b/include/freerdp/codec/bitmap.h @@ -23,6 +23,6 @@ #include #include -FREERDP_API boolean bitmap_decompress(uint8* srcData, uint8* dstData, int width, int height, int size, int srcBpp, int dstBpp); +FREERDP_API BOOL bitmap_decompress(uint8* srcData, uint8* dstData, int width, int height, int size, int srcBpp, int dstBpp); #endif /* __BITMAP_H */ diff --git a/include/freerdp/codec/jpeg.h b/include/freerdp/codec/jpeg.h index e9e528348..881967965 100644 --- a/include/freerdp/codec/jpeg.h +++ b/include/freerdp/codec/jpeg.h @@ -22,7 +22,7 @@ #include -boolean +BOOL jpeg_decompress(uint8* input, uint8* output, int width, int height, int size, int bpp); #endif /* __BITMAP_H */ diff --git a/include/freerdp/codec/mppc_enc.h b/include/freerdp/codec/mppc_enc.h index a41a7013d..32f348b0f 100644 --- a/include/freerdp/codec/mppc_enc.h +++ b/include/freerdp/codec/mppc_enc.h @@ -42,9 +42,9 @@ struct rdp_mppc_enc uint16* hash_table; }; -FREERDP_API boolean compress_rdp(struct rdp_mppc_enc* enc, uint8* srcData, int len); -FREERDP_API boolean compress_rdp_4(struct rdp_mppc_enc* enc, uint8* srcData, int len); -FREERDP_API boolean compress_rdp_5(struct rdp_mppc_enc* enc, uint8* srcData, int len); +FREERDP_API BOOL compress_rdp(struct rdp_mppc_enc* enc, uint8* srcData, int len); +FREERDP_API BOOL compress_rdp_4(struct rdp_mppc_enc* enc, uint8* srcData, int len); +FREERDP_API BOOL compress_rdp_5(struct rdp_mppc_enc* enc, uint8* srcData, int len); FREERDP_API struct rdp_mppc_enc* mppc_enc_new(int protocol_type); FREERDP_API void mppc_enc_free(struct rdp_mppc_enc* enc); diff --git a/include/freerdp/codec/rfx.h b/include/freerdp/codec/rfx.h index 3a7920845..ef9f42ccf 100644 --- a/include/freerdp/codec/rfx.h +++ b/include/freerdp/codec/rfx.h @@ -93,7 +93,7 @@ struct _RFX_CONTEXT /* temporary data within a frame */ uint32 frame_idx; - boolean header_processed; + BOOL header_processed; uint8 num_quants; uint32* quants; uint8 quant_idx_y; diff --git a/include/freerdp/crypto/ber.h b/include/freerdp/crypto/ber.h index 482398297..26558ae63 100644 --- a/include/freerdp/crypto/ber.h +++ b/include/freerdp/crypto/ber.h @@ -55,30 +55,30 @@ FREERDP_API void ber_read_length(STREAM* s, int* length); FREERDP_API int ber_write_length(STREAM* s, int length); FREERDP_API int _ber_skip_length(int length); FREERDP_API int ber_get_content_length(int length); -FREERDP_API boolean ber_read_universal_tag(STREAM* s, uint8 tag, boolean pc); -FREERDP_API void ber_write_universal_tag(STREAM* s, uint8 tag, boolean pc); -FREERDP_API boolean ber_read_application_tag(STREAM* s, uint8 tag, int* length); +FREERDP_API BOOL ber_read_universal_tag(STREAM* s, uint8 tag, BOOL pc); +FREERDP_API void ber_write_universal_tag(STREAM* s, uint8 tag, BOOL pc); +FREERDP_API BOOL ber_read_application_tag(STREAM* s, uint8 tag, int* length); FREERDP_API void ber_write_application_tag(STREAM* s, uint8 tag, int length); -FREERDP_API boolean ber_read_application_tag(STREAM* s, uint8 tag, int* length); -FREERDP_API boolean ber_read_enumerated(STREAM* s, uint8* enumerated, uint8 count); +FREERDP_API BOOL ber_read_application_tag(STREAM* s, uint8 tag, int* length); +FREERDP_API BOOL ber_read_enumerated(STREAM* s, uint8* enumerated, uint8 count); FREERDP_API void ber_write_enumerated(STREAM* s, uint8 enumerated, uint8 count); -FREERDP_API boolean ber_read_contextual_tag(STREAM* s, uint8 tag, int* length, boolean pc); -FREERDP_API int ber_write_contextual_tag(STREAM* s, uint8 tag, int length, boolean pc); +FREERDP_API BOOL ber_read_contextual_tag(STREAM* s, uint8 tag, int* length, BOOL pc); +FREERDP_API int ber_write_contextual_tag(STREAM* s, uint8 tag, int length, BOOL pc); FREERDP_API int ber_skip_contextual_tag(int length); -FREERDP_API boolean ber_read_sequence_tag(STREAM* s, int* length); +FREERDP_API BOOL ber_read_sequence_tag(STREAM* s, int* length); FREERDP_API int ber_write_sequence_tag(STREAM* s, int length); FREERDP_API int ber_skip_sequence(int length); FREERDP_API int ber_skip_sequence_tag(int length); -FREERDP_API boolean ber_read_bit_string(STREAM* s, int* length, uint8* padding); +FREERDP_API BOOL ber_read_bit_string(STREAM* s, int* length, uint8* padding); FREERDP_API void ber_write_octet_string(STREAM* s, const uint8* oct_str, int length); -FREERDP_API boolean ber_read_octet_string_tag(STREAM* s, int* length); +FREERDP_API BOOL ber_read_octet_string_tag(STREAM* s, int* length); FREERDP_API int ber_write_octet_string_tag(STREAM* s, int length); FREERDP_API int ber_skip_octet_string(int length); -FREERDP_API boolean ber_read_boolean(STREAM* s, boolean* value); -FREERDP_API void ber_write_boolean(STREAM* s, boolean value); -FREERDP_API boolean ber_read_integer(STREAM* s, uint32* value); +FREERDP_API BOOL ber_read_BOOL(STREAM* s, BOOL* value); +FREERDP_API void ber_write_BOOL(STREAM* s, BOOL value); +FREERDP_API BOOL ber_read_integer(STREAM* s, uint32* value); FREERDP_API int ber_write_integer(STREAM* s, uint32 value); -FREERDP_API boolean ber_read_integer_length(STREAM* s, int* length); +FREERDP_API BOOL ber_read_integer_length(STREAM* s, int* length); FREERDP_API int ber_skip_integer(uint32 value); #endif /* FREERDP_CRYPTO_BER_H */ diff --git a/include/freerdp/crypto/crypto.h b/include/freerdp/crypto/crypto.h index e57431f77..73ee40774 100644 --- a/include/freerdp/crypto/crypto.h +++ b/include/freerdp/crypto/crypto.h @@ -125,9 +125,9 @@ FREERDP_API char* crypto_cert_issuer(X509* xcert); FREERDP_API void crypto_cert_print_info(X509* xcert); FREERDP_API void crypto_cert_free(CryptoCert cert); -FREERDP_API boolean x509_verify_certificate(CryptoCert cert, char* certificate_store_path); +FREERDP_API BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path); FREERDP_API rdpCertificateData* crypto_get_certificate_data(X509* xcert, char* hostname); -FREERDP_API boolean crypto_cert_get_public_key(CryptoCert cert, BYTE** PublicKey, DWORD* PublicKeyLength); +FREERDP_API BOOL crypto_cert_get_public_key(CryptoCert cert, BYTE** PublicKey, DWORD* PublicKeyLength); #define TSSK_KEY_LENGTH 64 extern const uint8 tssk_modulus[]; diff --git a/include/freerdp/crypto/der.h b/include/freerdp/crypto/der.h index 725a400e2..13537c7bf 100644 --- a/include/freerdp/crypto/der.h +++ b/include/freerdp/crypto/der.h @@ -30,7 +30,7 @@ FREERDP_API int der_skip_octet_string(int length); FREERDP_API int der_skip_sequence_tag(int length); FREERDP_API int der_write_sequence_tag(STREAM* s, int length); FREERDP_API int der_skip_contextual_tag(int length); -FREERDP_API int der_write_contextual_tag(STREAM* s, uint8 tag, int length, boolean pc); +FREERDP_API int der_write_contextual_tag(STREAM* s, uint8 tag, int length, BOOL pc); FREERDP_API void der_write_octet_string(STREAM* s, uint8* oct_str, int length); #endif /* FREERDP_CRYPTO_DER_H */ diff --git a/include/freerdp/crypto/er.h b/include/freerdp/crypto/er.h index e2bb49da8..9ad53a642 100644 --- a/include/freerdp/crypto/er.h +++ b/include/freerdp/crypto/er.h @@ -55,34 +55,34 @@ #define ER_PC(_pc) (_pc ? ER_CONSTRUCT : ER_PRIMITIVE) FREERDP_API void er_read_length(STREAM* s, int* length); -FREERDP_API int er_write_length(STREAM* s, int length, boolean flag); +FREERDP_API int er_write_length(STREAM* s, int length, BOOL flag); FREERDP_API int _er_skip_length(int length); FREERDP_API int er_get_content_length(int length); -FREERDP_API boolean er_read_universal_tag(STREAM* s, uint8 tag, boolean pc); -FREERDP_API void er_write_universal_tag(STREAM* s, uint8 tag, boolean pc); -FREERDP_API boolean er_read_application_tag(STREAM* s, uint8 tag, int* length); -FREERDP_API void er_write_application_tag(STREAM* s, uint8 tag, int length, boolean flag); -FREERDP_API boolean er_read_application_tag(STREAM* s, uint8 tag, int* length); -FREERDP_API boolean er_read_enumerated(STREAM* s, uint8* enumerated, uint8 count); -FREERDP_API void er_write_enumerated(STREAM* s, uint8 enumerated, uint8 count, boolean flag); -FREERDP_API boolean er_read_contextual_tag(STREAM* s, uint8 tag, int* length, boolean pc); -FREERDP_API int er_write_contextual_tag(STREAM* s, uint8 tag, int length, boolean pc, boolean flag); +FREERDP_API BOOL er_read_universal_tag(STREAM* s, uint8 tag, BOOL pc); +FREERDP_API void er_write_universal_tag(STREAM* s, uint8 tag, BOOL pc); +FREERDP_API BOOL er_read_application_tag(STREAM* s, uint8 tag, int* length); +FREERDP_API void er_write_application_tag(STREAM* s, uint8 tag, int length, BOOL flag); +FREERDP_API BOOL er_read_application_tag(STREAM* s, uint8 tag, int* length); +FREERDP_API BOOL er_read_enumerated(STREAM* s, uint8* enumerated, uint8 count); +FREERDP_API void er_write_enumerated(STREAM* s, uint8 enumerated, uint8 count, BOOL flag); +FREERDP_API BOOL er_read_contextual_tag(STREAM* s, uint8 tag, int* length, BOOL pc); +FREERDP_API int er_write_contextual_tag(STREAM* s, uint8 tag, int length, BOOL pc, BOOL flag); FREERDP_API int er_skip_contextual_tag(int length); -FREERDP_API boolean er_read_sequence_tag(STREAM* s, int* length); -FREERDP_API int er_write_sequence_tag(STREAM* s, int length, boolean flag); +FREERDP_API BOOL er_read_sequence_tag(STREAM* s, int* length); +FREERDP_API int er_write_sequence_tag(STREAM* s, int length, BOOL flag); FREERDP_API int er_skip_sequence(int length); FREERDP_API int er_skip_sequence_tag(int length); -FREERDP_API boolean er_read_bit_string(STREAM* s, int* length, uint8* padding); -FREERDP_API boolean er_write_bit_string_tag(STREAM* s, uint32 length, uint8 padding, boolean flag); -FREERDP_API boolean er_read_octet_string(STREAM* s, int* length); -FREERDP_API void er_write_octet_string(STREAM* s, uint8* oct_str, int length, boolean flag); -FREERDP_API int er_write_octet_string_tag(STREAM* s, int length, boolean flag); +FREERDP_API BOOL er_read_bit_string(STREAM* s, int* length, uint8* padding); +FREERDP_API BOOL er_write_bit_string_tag(STREAM* s, uint32 length, uint8 padding, BOOL flag); +FREERDP_API BOOL er_read_octet_string(STREAM* s, int* length); +FREERDP_API void er_write_octet_string(STREAM* s, uint8* oct_str, int length, BOOL flag); +FREERDP_API int er_write_octet_string_tag(STREAM* s, int length, BOOL flag); FREERDP_API int er_skip_octet_string(int length); -FREERDP_API boolean er_read_boolean(STREAM* s, boolean* value); -FREERDP_API void er_write_boolean(STREAM* s, boolean value); -FREERDP_API boolean er_read_integer(STREAM* s, uint32* value); +FREERDP_API BOOL er_read_BOOL(STREAM* s, BOOL* value); +FREERDP_API void er_write_BOOL(STREAM* s, BOOL value); +FREERDP_API BOOL er_read_integer(STREAM* s, uint32* value); FREERDP_API int er_write_integer(STREAM* s, sint32 value); -FREERDP_API boolean er_read_integer_length(STREAM* s, int* length); +FREERDP_API BOOL er_read_integer_length(STREAM* s, int* length); FREERDP_API int er_skip_integer(sint32 value); #endif /* FREERDP_CRYPTO_ER_H */ diff --git a/include/freerdp/crypto/nla.h b/include/freerdp/crypto/nla.h index 7e0a08b93..6e1434664 100644 --- a/include/freerdp/crypto/nla.h +++ b/include/freerdp/crypto/nla.h @@ -36,7 +36,7 @@ typedef struct rdp_credssp rdpCredssp; struct rdp_credssp { rdpTls* tls; - boolean server; + BOOL server; int send_seq_num; int recv_seq_num; freerdp* instance; diff --git a/include/freerdp/crypto/per.h b/include/freerdp/crypto/per.h index 07aa7e605..d03e32240 100644 --- a/include/freerdp/crypto/per.h +++ b/include/freerdp/crypto/per.h @@ -23,27 +23,27 @@ #include #include -FREERDP_API boolean per_read_length(STREAM* s, uint16* length); +FREERDP_API BOOL per_read_length(STREAM* s, uint16* length); FREERDP_API void per_write_length(STREAM* s, int length); -FREERDP_API boolean per_read_choice(STREAM* s, uint8* choice); +FREERDP_API BOOL per_read_choice(STREAM* s, uint8* choice); FREERDP_API void per_write_choice(STREAM* s, uint8 choice); -FREERDP_API boolean per_read_selection(STREAM* s, uint8* selection); +FREERDP_API BOOL per_read_selection(STREAM* s, uint8* selection); FREERDP_API void per_write_selection(STREAM* s, uint8 selection); -FREERDP_API boolean per_read_number_of_sets(STREAM* s, uint8* number); +FREERDP_API BOOL per_read_number_of_sets(STREAM* s, uint8* number); FREERDP_API void per_write_number_of_sets(STREAM* s, uint8 number); -FREERDP_API boolean per_read_padding(STREAM* s, int length); +FREERDP_API BOOL per_read_padding(STREAM* s, int length); FREERDP_API void per_write_padding(STREAM* s, int length); -FREERDP_API boolean per_read_integer(STREAM* s, uint32* integer); -FREERDP_API boolean per_read_integer16(STREAM* s, uint16* integer, uint16 min); +FREERDP_API BOOL per_read_integer(STREAM* s, uint32* integer); +FREERDP_API BOOL per_read_integer16(STREAM* s, uint16* integer, uint16 min); FREERDP_API void per_write_integer(STREAM* s, uint32 integer); FREERDP_API void per_write_integer16(STREAM* s, uint16 integer, uint16 min); -FREERDP_API boolean per_read_enumerated(STREAM* s, uint8* enumerated, uint8 count); +FREERDP_API BOOL per_read_enumerated(STREAM* s, uint8* enumerated, uint8 count); FREERDP_API void per_write_enumerated(STREAM* s, uint8 enumerated, uint8 count); FREERDP_API void per_write_object_identifier(STREAM* s, uint8 oid[6]); -FREERDP_API boolean per_read_object_identifier(STREAM* s, uint8 oid[6]); -FREERDP_API boolean per_read_octet_string(STREAM* s, uint8* oct_str, int length, int min); +FREERDP_API BOOL per_read_object_identifier(STREAM* s, uint8 oid[6]); +FREERDP_API BOOL per_read_octet_string(STREAM* s, uint8* oct_str, int length, int min); FREERDP_API void per_write_octet_string(STREAM* s, uint8* oct_str, int length, int min); -FREERDP_API boolean per_read_numeric_string(STREAM* s, int min); +FREERDP_API BOOL per_read_numeric_string(STREAM* s, int min); FREERDP_API void per_write_numeric_string(STREAM* s, uint8* num_str, int length, int min); #endif /* FREERDP_CRYPTO_PER_H */ diff --git a/include/freerdp/crypto/tls.h b/include/freerdp/crypto/tls.h index c271202e2..105d05186 100644 --- a/include/freerdp/crypto/tls.h +++ b/include/freerdp/crypto/tls.h @@ -43,9 +43,9 @@ struct rdp_tls rdpCertificateStore* certificate_store; }; -FREERDP_API boolean tls_connect(rdpTls* tls); -FREERDP_API boolean tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_file); -FREERDP_API boolean tls_disconnect(rdpTls* tls); +FREERDP_API BOOL tls_connect(rdpTls* tls); +FREERDP_API BOOL tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_file); +FREERDP_API BOOL tls_disconnect(rdpTls* tls); FREERDP_API int tls_read(rdpTls* tls, uint8* data, int length); FREERDP_API int tls_write(rdpTls* tls, uint8* data, int length); @@ -53,11 +53,11 @@ FREERDP_API int tls_write(rdpTls* tls, uint8* data, int length); FREERDP_API int tls_read_all(rdpTls* tls, uint8* data, int length); FREERDP_API int tls_write_all(rdpTls* tls, uint8* data, int length); -FREERDP_API boolean tls_verify_certificate(rdpTls* tls, CryptoCert cert, char* hostname); +FREERDP_API BOOL tls_verify_certificate(rdpTls* tls, CryptoCert cert, char* hostname); FREERDP_API void tls_print_certificate_error(char* hostname, char* fingerprint); FREERDP_API void tls_print_certificate_name_mismatch_error(char* hostname, char* common_name, char** alt_names, int alt_names_count); -FREERDP_API boolean tls_print_error(char* func, SSL* connection, int value); +FREERDP_API BOOL tls_print_error(char* func, SSL* connection, int value); FREERDP_API rdpTls* tls_new(rdpSettings* settings); FREERDP_API void tls_free(rdpTls* tls); diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h index 6296f79fa..3200e3c4e 100644 --- a/include/freerdp/freerdp.h +++ b/include/freerdp/freerdp.h @@ -48,11 +48,11 @@ extern "C" { typedef void (*pContextNew)(freerdp* instance, rdpContext* context); typedef void (*pContextFree)(freerdp* instance, rdpContext* context); -typedef boolean (*pPreConnect)(freerdp* instance); -typedef boolean (*pPostConnect)(freerdp* instance); -typedef boolean (*pAuthenticate)(freerdp* instance, char** username, char** password, char** domain); -typedef boolean (*pVerifyCertificate)(freerdp* instance, char* subject, char* issuer, char* fingerprint); -typedef boolean (*pVerifyChangedCertificate)(freerdp* instance, char* subject, char* issuer, char* new_fingerprint, char* old_fingerprint); +typedef BOOL (*pPreConnect)(freerdp* instance); +typedef BOOL (*pPostConnect)(freerdp* instance); +typedef BOOL (*pAuthenticate)(freerdp* instance, char** username, char** password, char** domain); +typedef BOOL (*pVerifyCertificate)(freerdp* instance, char* subject, char* issuer, char* fingerprint); +typedef BOOL (*pVerifyChangedCertificate)(freerdp* instance, char* subject, char* issuer, char* new_fingerprint, char* old_fingerprint); typedef int (*pSendChannelData)(freerdp* instance, int channelId, uint8* data, int size); typedef int (*pReceiveChannelData)(freerdp* instance, int channelId, uint8* data, int size, int flags, int total_size); @@ -184,12 +184,12 @@ struct rdp_freerdp FREERDP_API void freerdp_context_new(freerdp* instance); FREERDP_API void freerdp_context_free(freerdp* instance); -FREERDP_API boolean freerdp_connect(freerdp* instance); -FREERDP_API boolean freerdp_shall_disconnect(freerdp* instance); -FREERDP_API boolean freerdp_disconnect(freerdp* instance); +FREERDP_API BOOL freerdp_connect(freerdp* instance); +FREERDP_API BOOL freerdp_shall_disconnect(freerdp* instance); +FREERDP_API BOOL freerdp_disconnect(freerdp* instance); -FREERDP_API boolean freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount); -FREERDP_API boolean freerdp_check_fds(freerdp* instance); +FREERDP_API BOOL freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount); +FREERDP_API BOOL freerdp_check_fds(freerdp* instance); FREERDP_API uint32 freerdp_error_info(freerdp* instance); diff --git a/include/freerdp/graphics.h b/include/freerdp/graphics.h index 24a98ba20..907fac1b6 100644 --- a/include/freerdp/graphics.h +++ b/include/freerdp/graphics.h @@ -36,8 +36,8 @@ typedef void (*pBitmap_Free)(rdpContext* context, rdpBitmap* bitmap); typedef void (*pBitmap_Paint)(rdpContext* context, rdpBitmap* bitmap); typedef void (*pBitmap_Decompress)(rdpContext* context, rdpBitmap* bitmap, uint8* data, int width, int height, int bpp, int length, - boolean compressed, int codec_id); -typedef void (*pBitmap_SetSurface)(rdpContext* context, rdpBitmap* bitmap, boolean primary); + BOOL compressed, int codec_id); +typedef void (*pBitmap_SetSurface)(rdpContext* context, rdpBitmap* bitmap, BOOL primary); struct rdp_bitmap { @@ -61,8 +61,8 @@ struct rdp_bitmap uint8* data; /* 25 */ uint32 paddingB[32 - 26]; /* 26 */ - boolean compressed; /* 32 */ - boolean ephemeral; /* 33 */ + BOOL compressed; /* 32 */ + BOOL ephemeral; /* 33 */ uint32 paddingC[64 - 34]; /* 34 */ }; @@ -71,11 +71,11 @@ FREERDP_API void Bitmap_New(rdpContext* context, rdpBitmap* bitmap); FREERDP_API void Bitmap_Free(rdpContext* context, rdpBitmap* bitmap); FREERDP_API void Bitmap_Register(rdpContext* context, rdpBitmap* bitmap); FREERDP_API void Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, - uint8* data, int width, int height, int bpp, int length, boolean compressed); + uint8* data, int width, int height, int bpp, int length, BOOL compressed); FREERDP_API void Bitmap_SetRectangle(rdpContext* context, rdpBitmap* bitmap, uint16 left, uint16 top, uint16 right, uint16 bottom); FREERDP_API void Bitmap_SetDimensions(rdpContext* context, rdpBitmap* bitmap, uint16 width, uint16 height); -FREERDP_API void Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, boolean primary); +FREERDP_API void Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL primary); /* Pointer Class */ diff --git a/include/freerdp/input.h b/include/freerdp/input.h index fecf17003..0275f0957 100644 --- a/include/freerdp/input.h +++ b/include/freerdp/input.h @@ -76,7 +76,7 @@ struct rdp_input FREERDP_API void freerdp_input_send_synchronize_event(rdpInput* input, uint32 flags); FREERDP_API void freerdp_input_send_keyboard_event(rdpInput* input, uint16 flags, uint16 code); -FREERDP_API void freerdp_input_send_keyboard_event_ex(rdpInput* input, boolean down, uint32 rdp_scancode); +FREERDP_API void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, uint32 rdp_scancode); FREERDP_API void freerdp_input_send_unicode_keyboard_event(rdpInput* input, uint16 flags, uint16 code); FREERDP_API void freerdp_input_send_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y); FREERDP_API void freerdp_input_send_extended_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y); diff --git a/include/freerdp/listener.h b/include/freerdp/listener.h index c5b95f9cd..120c09ac5 100644 --- a/include/freerdp/listener.h +++ b/include/freerdp/listener.h @@ -31,10 +31,10 @@ typedef struct rdp_freerdp_listener freerdp_listener; extern "C" { #endif -typedef boolean (*psListenerOpen)(freerdp_listener* instance, const char* bind_address, uint16 port); -typedef boolean (*psListenerOpenLocal)(freerdp_listener* instance, const char* path); -typedef boolean (*psListenerGetFileDescriptor)(freerdp_listener* instance, void** rfds, int* rcount); -typedef boolean (*psListenerCheckFileDescriptor)(freerdp_listener* instance); +typedef BOOL (*psListenerOpen)(freerdp_listener* instance, const char* bind_address, uint16 port); +typedef BOOL (*psListenerOpenLocal)(freerdp_listener* instance, const char* path); +typedef BOOL (*psListenerGetFileDescriptor)(freerdp_listener* instance, void** rfds, int* rcount); +typedef BOOL (*psListenerCheckFileDescriptor)(freerdp_listener* instance); typedef void (*psListenerClose)(freerdp_listener* instance); typedef void (*psPeerAccepted)(freerdp_listener* instance, freerdp_peer* client); diff --git a/include/freerdp/locale/keyboard.h b/include/freerdp/locale/keyboard.h index 3daeee602..7a83e2155 100644 --- a/include/freerdp/locale/keyboard.h +++ b/include/freerdp/locale/keyboard.h @@ -202,7 +202,7 @@ FREERDP_API uint32 freerdp_keyboard_init(uint32 keyboardLayoutId); FREERDP_API RDP_KEYBOARD_LAYOUT* freerdp_keyboard_get_layouts(uint32 types); FREERDP_API const char* freerdp_keyboard_get_layout_name_from_id(uint32 keyboardLayoutId); FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(uint32 keycode); -FREERDP_API uint32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(uint32 scancode, boolean extended); +FREERDP_API uint32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(uint32 scancode, BOOL extended); FREERDP_API RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_virtual_key_code(uint32 vkcode); #endif /* __FREERDP_LOCALE_KEYBOARD_H */ diff --git a/include/freerdp/peer.h b/include/freerdp/peer.h index 64c10312d..cfa211282 100644 --- a/include/freerdp/peer.h +++ b/include/freerdp/peer.h @@ -31,15 +31,15 @@ typedef void (*psPeerContextNew)(freerdp_peer* client, rdpContext* context); typedef void (*psPeerContextFree)(freerdp_peer* client, rdpContext* context); -typedef boolean (*psPeerInitialize)(freerdp_peer* client); -typedef boolean (*psPeerGetFileDescriptor)(freerdp_peer* client, void** rfds, int* rcount); -typedef boolean (*psPeerCheckFileDescriptor)(freerdp_peer* client); -typedef boolean (*psPeerClose)(freerdp_peer* client); +typedef BOOL (*psPeerInitialize)(freerdp_peer* client); +typedef BOOL (*psPeerGetFileDescriptor)(freerdp_peer* client, void** rfds, int* rcount); +typedef BOOL (*psPeerCheckFileDescriptor)(freerdp_peer* client); +typedef BOOL (*psPeerClose)(freerdp_peer* client); typedef void (*psPeerDisconnect)(freerdp_peer* client); -typedef boolean (*psPeerCapabilities)(freerdp_peer* client); -typedef boolean (*psPeerPostConnect)(freerdp_peer* client); -typedef boolean (*psPeerActivate)(freerdp_peer* client); -typedef boolean (*psPeerLogon)(freerdp_peer* client, SEC_WINNT_AUTH_IDENTITY* identity, boolean automatic); +typedef BOOL (*psPeerCapabilities)(freerdp_peer* client); +typedef BOOL (*psPeerPostConnect)(freerdp_peer* client); +typedef BOOL (*psPeerActivate)(freerdp_peer* client); +typedef BOOL (*psPeerLogon)(freerdp_peer* client, SEC_WINNT_AUTH_IDENTITY* identity, BOOL automatic); typedef int (*psPeerSendChannelData)(freerdp_peer* client, int channelId, uint8* data, int size); typedef int (*psPeerReceiveChannelData)(freerdp_peer* client, int channelId, uint8* data, int size, int flags, int total_size); @@ -73,10 +73,10 @@ struct rdp_freerdp_peer psPeerReceiveChannelData ReceiveChannelData; uint32 ack_frame_id; - boolean local; - boolean connected; - boolean activated; - boolean authenticated; + BOOL local; + BOOL connected; + BOOL activated; + BOOL authenticated; SEC_WINNT_AUTH_IDENTITY identity; }; diff --git a/include/freerdp/primary.h b/include/freerdp/primary.h index dc55f3746..fcec1bf80 100644 --- a/include/freerdp/primary.h +++ b/include/freerdp/primary.h @@ -56,7 +56,7 @@ struct _ORDER_INFO sint32 deltaBoundTop; sint32 deltaBoundRight; sint32 deltaBoundBottom; - boolean deltaCoordinates; + BOOL deltaCoordinates; }; typedef struct _ORDER_INFO ORDER_INFO; @@ -330,7 +330,7 @@ struct _FAST_INDEX_ORDER sint32 opTop; sint32 opRight; sint32 opBottom; - boolean opaqueRect; + BOOL opaqueRect; sint32 x; sint32 y; uint32 cbData; diff --git a/include/freerdp/rail.h b/include/freerdp/rail.h index db8832bcb..6e971369b 100644 --- a/include/freerdp/rail.h +++ b/include/freerdp/rail.h @@ -201,23 +201,23 @@ struct _RAIL_SYSPARAM_ORDER { uint32 param; uint32 params; - boolean dragFullWindows; - boolean keyboardCues; - boolean keyboardPref; - boolean mouseButtonSwap; + BOOL dragFullWindows; + BOOL keyboardCues; + BOOL keyboardPref; + BOOL mouseButtonSwap; RECTANGLE_16 workArea; RECTANGLE_16 displayChange; RECTANGLE_16 taskbarPos; HIGH_CONTRAST highContrast; - boolean setScreenSaveActive; - boolean setScreenSaveSecure; + BOOL setScreenSaveActive; + BOOL setScreenSaveSecure; }; typedef struct _RAIL_SYSPARAM_ORDER RAIL_SYSPARAM_ORDER; struct _RAIL_ACTIVATE_ORDER { uint32 windowId; - boolean enabled; + BOOL enabled; }; typedef struct _RAIL_ACTIVATE_ORDER RAIL_ACTIVATE_ORDER; @@ -261,7 +261,7 @@ typedef struct _RAIL_MINMAXINFO_ORDER RAIL_MINMAXINFO_ORDER; struct _RAIL_LOCALMOVESIZE_ORDER { uint32 windowId; - boolean isMoveSizeStart; + BOOL isMoveSizeStart; uint16 moveSizeType; uint16 posX; uint16 posY; diff --git a/include/freerdp/rail/icon.h b/include/freerdp/rail/icon.h index 0e8c0283b..05a0c7cf8 100644 --- a/include/freerdp/rail/icon.h +++ b/include/freerdp/rail/icon.h @@ -34,7 +34,7 @@ typedef struct rdp_icon_cache rdpIconCache; struct rdp_icon { ICON_INFO* entry; - boolean big; + BOOL big; void* extra; }; diff --git a/include/freerdp/rail/window_list.h b/include/freerdp/rail/window_list.h index a61b54678..a9e6ba13b 100644 --- a/include/freerdp/rail/window_list.h +++ b/include/freerdp/rail/window_list.h @@ -39,7 +39,7 @@ struct rdp_window_list }; FREERDP_API void window_list_rewind(rdpWindowList* list); -FREERDP_API boolean window_list_has_next(rdpWindowList* list); +FREERDP_API BOOL window_list_has_next(rdpWindowList* list); FREERDP_API rdpWindow* window_list_get_next(rdpWindowList* list); FREERDP_API rdpWindow* window_list_get_by_id(rdpWindowList* list, uint32 windowId); diff --git a/include/freerdp/secondary.h b/include/freerdp/secondary.h index b2cce52d7..0a22bd416 100644 --- a/include/freerdp/secondary.h +++ b/include/freerdp/secondary.h @@ -74,7 +74,7 @@ struct _CACHE_BITMAP_ORDER uint32 bitmapHeight; uint32 bitmapLength; uint32 cacheIndex; - boolean compressed; + BOOL compressed; uint8 bitmapComprHdr[8]; uint8* bitmapDataStream; }; @@ -91,7 +91,7 @@ struct _CACHE_BITMAP_V2_ORDER uint32 bitmapHeight; uint32 bitmapLength; uint32 cacheIndex; - boolean compressed; + BOOL compressed; uint32 cbCompFirstRowSize; uint32 cbCompMainBodySize; uint32 cbScanWidth; @@ -210,7 +210,7 @@ struct rdp_secondary_update /* internal */ - boolean glyph_v2; + BOOL glyph_v2; CACHE_BITMAP_ORDER cache_bitmap_order; CACHE_BITMAP_V2_ORDER cache_bitmap_v2_order; CACHE_BITMAP_V3_ORDER cache_bitmap_v3_order; diff --git a/include/freerdp/server/audin.h b/include/freerdp/server/audin.h index 07a1a36c0..2d32b3f56 100644 --- a/include/freerdp/server/audin.h +++ b/include/freerdp/server/audin.h @@ -26,8 +26,8 @@ typedef struct _audin_server_context audin_server_context; typedef void (*psAudinServerSelectFormat)(audin_server_context* context, int client_format_index); -typedef boolean (*psAudinServerOpen)(audin_server_context* context); -typedef boolean (*psAudinServerClose)(audin_server_context* context); +typedef BOOL (*psAudinServerOpen)(audin_server_context* context); +typedef BOOL (*psAudinServerClose)(audin_server_context* context); typedef void (*psAudinServerOpening)(audin_server_context* context); typedef void (*psAudinServerOpenResult)(audin_server_context* context, uint32 result); diff --git a/include/freerdp/server/rdpsnd.h b/include/freerdp/server/rdpsnd.h index 8288fdb92..1042ce288 100644 --- a/include/freerdp/server/rdpsnd.h +++ b/include/freerdp/server/rdpsnd.h @@ -25,11 +25,11 @@ typedef struct _rdpsnd_server_context rdpsnd_server_context; -typedef boolean (*psRdpsndServerInitialize)(rdpsnd_server_context* context); +typedef BOOL (*psRdpsndServerInitialize)(rdpsnd_server_context* context); typedef void (*psRdpsndServerSelectFormat)(rdpsnd_server_context* context, int client_format_index); -typedef boolean (*psRdpsndServerSendSamples)(rdpsnd_server_context* context, const void* buf, int nframes); -typedef boolean (*psRdpsndServerSetVolume)(rdpsnd_server_context* context, int left, int right); -typedef boolean (*psRdpsndServerClose)(rdpsnd_server_context* context); +typedef BOOL (*psRdpsndServerSendSamples)(rdpsnd_server_context* context, const void* buf, int nframes); +typedef BOOL (*psRdpsndServerSetVolume)(rdpsnd_server_context* context, int left, int right); +typedef BOOL (*psRdpsndServerClose)(rdpsnd_server_context* context); typedef void (*psRdpsndServerActivated)(rdpsnd_server_context* context); diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index ad85c9f91..f497cf97e 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -188,7 +188,7 @@ struct rdp_channel char name[8]; /* ui sets */ int options; /* ui sets */ int channel_id; /* core sets */ - boolean joined; /* client has joined the channel */ + BOOL joined; /* client has joined the channel */ void* handle; /* just for ui */ }; typedef struct rdp_channel rdpChannel; @@ -213,7 +213,7 @@ typedef struct _BITMAP_CACHE_CELL_INFO BITMAP_CACHE_CELL_INFO; struct _BITMAP_CACHE_V2_CELL_INFO { uint32 numEntries; - boolean persistent; + BOOL persistent; }; typedef struct _BITMAP_CACHE_V2_CELL_INFO BITMAP_CACHE_V2_CELL_INFO; @@ -268,14 +268,14 @@ struct rdp_settings ALIGN64 uint32 selected_protocol; /* 26 */ ALIGN64 uint32 encryption_method; /* 27 */ ALIGN64 uint32 encryption_level; /* 28 */ - ALIGN64 boolean authentication; /* 29 */ + ALIGN64 BOOL authentication; /* 29 */ ALIGN64 uint32 negotiationFlags; /* 30 */ - ALIGN64 boolean security_layer_negotiation; /* 31 */ + ALIGN64 BOOL security_layer_negotiation; /* 31 */ uint64 paddingB[48 - 32]; /* 32 */ /* Connection Settings */ ALIGN64 uint32 port; /* 48 */ - ALIGN64 boolean ipv6; /* 49 */ + ALIGN64 BOOL ipv6; /* 49 */ ALIGN64 char* hostname; /* 50 */ ALIGN64 char* username; /* 51 */ ALIGN64 char* password; /* 52 */ @@ -284,33 +284,33 @@ struct rdp_settings ALIGN64 char* directory; /* 55 */ ALIGN64 char* ip_address; /* 56 */ ALIGN64 char* client_dir; /* 57 */ - ALIGN64 boolean autologon; /* 58 */ - ALIGN64 boolean compression; /* 59 */ + ALIGN64 BOOL autologon; /* 58 */ + ALIGN64 BOOL compression; /* 59 */ ALIGN64 uint32 performance_flags; /* 60 */ ALIGN64 BYTE* password_cookie; /* 61 */ ALIGN64 DWORD password_cookie_length; /* 62 */ ALIGN64 char* kerberos_kdc; /* 63 */ ALIGN64 char* kerberos_realm; /* 64 */ - ALIGN64 boolean ts_gateway; /* 65 */ + ALIGN64 BOOL ts_gateway; /* 65 */ ALIGN64 char* tsg_hostname; /* 66 */ ALIGN64 char* tsg_username; /* 67 */ ALIGN64 char* tsg_password; /* 68 */ - ALIGN64 boolean local; /* 69 */ - ALIGN64 boolean authentication_only; /* 70 */ - ALIGN64 boolean from_stdin; /* 71 */ - ALIGN64 boolean send_preconnection_pdu; /* 72 */ + ALIGN64 BOOL local; /* 69 */ + ALIGN64 BOOL authentication_only; /* 70 */ + ALIGN64 BOOL from_stdin; /* 71 */ + ALIGN64 BOOL send_preconnection_pdu; /* 72 */ ALIGN64 uint32 preconnection_id; /* 73 */ ALIGN64 char* preconnection_blob; /* 74 */ uint64 paddingC[80 - 75]; /* 75 */ /* User Interface Parameters */ - ALIGN64 boolean sw_gdi; /* 80 */ - ALIGN64 boolean workarea; /* 81 */ - ALIGN64 boolean fullscreen; /* 82 */ - ALIGN64 boolean grab_keyboard; /* 83 */ - ALIGN64 boolean decorations; /* 84 */ + ALIGN64 BOOL sw_gdi; /* 80 */ + ALIGN64 BOOL workarea; /* 81 */ + ALIGN64 BOOL fullscreen; /* 82 */ + ALIGN64 BOOL grab_keyboard; /* 83 */ + ALIGN64 BOOL decorations; /* 84 */ ALIGN64 uint32 percent_screen; /* 85 */ - ALIGN64 boolean mouse_motion; /* 86 */ + ALIGN64 BOOL mouse_motion; /* 86 */ ALIGN64 char* window_title; /* 87 */ ALIGN64 uint64 parent_window_xid; /* 88 */ uint64 paddingD[112 - 89]; /* 89 */ @@ -320,38 +320,38 @@ struct rdp_settings ALIGN64 uint32 share_id; /* 113 */ ALIGN64 uint32 pdu_source; /* 114 */ ALIGN64 void* unused115; /* 115 */ - ALIGN64 boolean server_mode; /* 116 */ + ALIGN64 BOOL server_mode; /* 116 */ ALIGN64 char* config_path; /* 117 */ ALIGN64 char* current_path; /* 118 */ ALIGN64 char* development_path; /* 119 */ - ALIGN64 boolean development_mode; /* 120 */ + ALIGN64 BOOL development_mode; /* 120 */ uint64 paddingE[144 - 121]; /* 121 */ /* Security */ - ALIGN64 boolean encryption; /* 144 */ - ALIGN64 boolean tls_security; /* 145 */ - ALIGN64 boolean nla_security; /* 146 */ - ALIGN64 boolean rdp_security; /* 147 */ + ALIGN64 BOOL encryption; /* 144 */ + ALIGN64 BOOL tls_security; /* 145 */ + ALIGN64 BOOL nla_security; /* 146 */ + ALIGN64 BOOL rdp_security; /* 147 */ ALIGN64 uint32 ntlm_version; /* 148 */ - ALIGN64 boolean salted_checksum; /* 149 */ + ALIGN64 BOOL salted_checksum; /* 149 */ uint64 paddingF[160 - 150]; /* 150 */ /* Session */ - ALIGN64 boolean console_audio; /* 160 */ - ALIGN64 boolean console_session; /* 161 */ + ALIGN64 BOOL console_audio; /* 160 */ + ALIGN64 BOOL console_session; /* 161 */ ALIGN64 uint32 redirected_session_id; /* 162 */ - ALIGN64 boolean audio_playback; /* 163 */ - ALIGN64 boolean audio_capture; /* 164 */ + ALIGN64 BOOL audio_playback; /* 163 */ + ALIGN64 BOOL audio_capture; /* 164 */ uint64 paddingG[176 - 165]; /* 165 */ /* Output Control */ - ALIGN64 boolean refresh_rect; /* 176 */ - ALIGN64 boolean suppress_output; /* 177 */ - ALIGN64 boolean desktop_resize; /* 178 */ + ALIGN64 BOOL refresh_rect; /* 176 */ + ALIGN64 BOOL suppress_output; /* 177 */ + ALIGN64 BOOL desktop_resize; /* 178 */ uint64 paddingH[192 - 179]; /* 179 */ /* Reconnection */ - ALIGN64 boolean auto_reconnection; /* 192 */ + ALIGN64 BOOL auto_reconnection; /* 192 */ ALIGN64 ARC_CS_PRIVATE_PACKET* client_auto_reconnect_cookie; /* 193 */ ALIGN64 ARC_SC_PRIVATE_PACKET* server_auto_reconnect_cookie; /* 194 */ uint64 paddingI[208 - 195]; /* 195 */ @@ -364,18 +364,18 @@ struct rdp_settings ALIGN64 uint32 os_major_type; /* 216 */ ALIGN64 uint32 os_minor_type; /* 217 */ ALIGN64 uint32 vc_chunk_size; /* 218 */ - ALIGN64 boolean sound_beeps; /* 219 */ - ALIGN64 boolean smooth_fonts; /* 220 */ - ALIGN64 boolean frame_marker; /* 221 */ - ALIGN64 boolean fastpath_input; /* 222 */ - ALIGN64 boolean fastpath_output; /* 223 */ + ALIGN64 BOOL sound_beeps; /* 219 */ + ALIGN64 BOOL smooth_fonts; /* 220 */ + ALIGN64 BOOL frame_marker; /* 221 */ + ALIGN64 BOOL fastpath_input; /* 222 */ + ALIGN64 BOOL fastpath_output; /* 223 */ ALIGN64 uint8* received_caps; /* 224 */ ALIGN64 uint8* order_support; /* 225 */ - ALIGN64 boolean surface_commands; /* 226 */ - ALIGN64 boolean disable_wallpaper; /* 227 */ - ALIGN64 boolean disable_full_window_drag; /* 228 */ - ALIGN64 boolean disable_menu_animations; /* 229 */ - ALIGN64 boolean disable_theming; /* 230 */ + ALIGN64 BOOL surface_commands; /* 226 */ + ALIGN64 BOOL disable_wallpaper; /* 227 */ + ALIGN64 BOOL disable_full_window_drag; /* 228 */ + ALIGN64 BOOL disable_menu_animations; /* 229 */ + ALIGN64 BOOL disable_theming; /* 230 */ ALIGN64 uint32 connection_type; /* 231 */ ALIGN64 uint32 multifrag_max_request_size; /* 232 */ uint64 paddingK[248 - 233]; /* 233 */ @@ -389,7 +389,7 @@ struct rdp_settings ALIGN64 DWORD server_random_length; /* 253 */ ALIGN64 BYTE* server_certificate; /* 254 */ ALIGN64 DWORD server_certificate_length; /* 255 */ - ALIGN64 boolean ignore_certificate; /* 256 */ + ALIGN64 BOOL ignore_certificate; /* 256 */ ALIGN64 rdpCertificate* server_cert; /* 257 */ ALIGN64 char* rdp_key_file; /* 258 */ ALIGN64 rdpKey* server_key; /* 259 */ @@ -397,73 +397,73 @@ struct rdp_settings uint64 paddingL[280 - 261]; /* 261 */ /* Codecs */ - ALIGN64 boolean rfx_codec; /* 280 */ - ALIGN64 boolean ns_codec; /* 281 */ + ALIGN64 BOOL rfx_codec; /* 280 */ + ALIGN64 BOOL ns_codec; /* 281 */ ALIGN64 uint32 rfx_codec_id; /* 282 */ ALIGN64 uint32 ns_codec_id; /* 283 */ ALIGN64 uint32 rfx_codec_mode; /* 284 */ - ALIGN64 boolean frame_acknowledge; /* 285 */ - ALIGN64 boolean jpeg_codec; /* 286 */ + ALIGN64 BOOL frame_acknowledge; /* 285 */ + ALIGN64 BOOL jpeg_codec; /* 286 */ ALIGN64 uint32 jpeg_codec_id; /* 287 */ ALIGN64 uint32 jpeg_quality; /* 288 */ ALIGN64 uint32 v3_codec_id; /* 289 */ - ALIGN64 boolean rfx_codec_only; /* 290 */ + ALIGN64 BOOL rfx_codec_only; /* 290 */ uint64 paddingM[296 - 291]; /* 291 */ /* Recording */ - ALIGN64 boolean dump_rfx; /* 296 */ - ALIGN64 boolean play_rfx; /* 297 */ + ALIGN64 BOOL dump_rfx; /* 296 */ + ALIGN64 BOOL play_rfx; /* 297 */ ALIGN64 char* dump_rfx_file; /* 298 */ ALIGN64 char* play_rfx_file; /* 299 */ uint64 paddingN[312 - 300]; /* 300 */ /* RemoteApp */ - ALIGN64 boolean remote_app; /* 312 */ + ALIGN64 BOOL remote_app; /* 312 */ ALIGN64 uint32 num_icon_caches; /* 313 */ ALIGN64 uint32 num_icon_cache_entries; /* 314 */ - ALIGN64 boolean rail_langbar_supported; /* 315 */ + ALIGN64 BOOL rail_langbar_supported; /* 315 */ uint64 paddingO[320 - 316]; /* 316 */ /* Pointer */ - ALIGN64 boolean large_pointer; /* 320 */ - ALIGN64 boolean color_pointer; /* 321 */ + ALIGN64 BOOL large_pointer; /* 320 */ + ALIGN64 BOOL color_pointer; /* 321 */ ALIGN64 uint32 pointer_cache_size; /* 322 */ uint64 paddingP[328 - 323]; /* 323 */ /* Bitmap Cache */ - ALIGN64 boolean bitmap_cache; /* 328 */ - ALIGN64 boolean bitmap_cache_v3; /* 329 */ - ALIGN64 boolean persistent_bitmap_cache; /* 330 */ + ALIGN64 BOOL bitmap_cache; /* 328 */ + ALIGN64 BOOL bitmap_cache_v3; /* 329 */ + ALIGN64 BOOL persistent_bitmap_cache; /* 330 */ ALIGN64 uint32 bitmapCacheV2NumCells; /* 331 */ ALIGN64 BITMAP_CACHE_V2_CELL_INFO* bitmapCacheV2CellInfo; /* 332 */ uint64 paddingQ[344 - 333]; /* 333 */ /* Offscreen Bitmap Cache */ - ALIGN64 boolean offscreen_bitmap_cache; /* 344 */ + ALIGN64 BOOL offscreen_bitmap_cache; /* 344 */ ALIGN64 uint32 offscreen_bitmap_cache_size; /* 345 */ ALIGN64 uint32 offscreen_bitmap_cache_entries; /* 346 */ uint64 paddingR[352 - 347]; /* 347 */ /* Glyph Cache */ - ALIGN64 boolean glyph_cache; /* 352 */ + ALIGN64 BOOL glyph_cache; /* 352 */ ALIGN64 uint32 glyphSupportLevel; /* 353 */ ALIGN64 GLYPH_CACHE_DEFINITION* glyphCache; /* 354 */ ALIGN64 GLYPH_CACHE_DEFINITION* fragCache; /* 355 */ uint64 paddingS[360 - 356]; /* 356 */ /* Draw Nine Grid */ - ALIGN64 boolean draw_nine_grid; /* 360 */ + ALIGN64 BOOL draw_nine_grid; /* 360 */ ALIGN64 uint32 draw_nine_grid_cache_size; /* 361 */ ALIGN64 uint32 draw_nine_grid_cache_entries; /* 362 */ uint64 paddingT[368 - 363]; /* 363 */ /* Draw GDI+ */ - ALIGN64 boolean draw_gdi_plus; /* 368 */ - ALIGN64 boolean draw_gdi_plus_cache; /* 369 */ + ALIGN64 BOOL draw_gdi_plus; /* 368 */ + ALIGN64 BOOL draw_gdi_plus_cache; /* 369 */ uint64 paddingU[376 - 370]; /* 370 */ /* Desktop Composition */ - ALIGN64 boolean desktop_composition; /* 376 */ + ALIGN64 BOOL desktop_composition; /* 376 */ uint64 paddingV[384 - 377]; /* 377 */ /* Channels */ diff --git a/include/freerdp/types.h b/include/freerdp/types.h index 89dda14b2..b6905c522 100644 --- a/include/freerdp/types.h +++ b/include/freerdp/types.h @@ -72,29 +72,24 @@ typedef signed long long sint64; #include #ifdef _WIN32 -#define boolean BOOLEAN +#define BOOL BOOLEAN #else -typedef int boolean; +typedef int BOOL; #endif #else #ifndef __cplusplus -#ifndef __bool_TRUE_FALSE_are_defined -#define __bool_TRUE_FALSE_are_defined 1 - #define TRUE 1 #define FALSE 0 #ifdef _WIN32 -#define boolean BOOLEAN +#define BOOL BOOLEAN #else -typedef int boolean; +typedef int BOOL; #endif -#endif /* __bool_TRUE_FALSE_are_defined */ - #else /* ifdef __cplusplus */ #ifndef TRUE @@ -105,7 +100,7 @@ typedef int boolean; #define FALSE 0 #endif -typedef int boolean; +typedef int BOOL; #endif /* __cplusplus */ diff --git a/include/freerdp/update.h b/include/freerdp/update.h index fa52bb69b..e96832673 100644 --- a/include/freerdp/update.h +++ b/include/freerdp/update.h @@ -53,7 +53,7 @@ struct _BITMAP_DATA uint32 cbScanWidth; uint32 cbUncompressedSize; uint8* bitmapDataStream; - boolean compressed; + BOOL compressed; }; typedef struct _BITMAP_DATA BITMAP_DATA; @@ -181,8 +181,8 @@ struct rdp_update /* internal */ - boolean dump_rfx; - boolean play_rfx; + BOOL dump_rfx; + BOOL play_rfx; rdpPcap* pcap_rfx; BITMAP_UPDATE bitmap_update; diff --git a/include/freerdp/utils/file.h b/include/freerdp/utils/file.h index 2d063fa0a..9eee16248 100644 --- a/include/freerdp/utils/file.h +++ b/include/freerdp/utils/file.h @@ -25,15 +25,15 @@ #include FREERDP_API void freerdp_mkdir(char* path); -FREERDP_API boolean freerdp_check_file_exists(char* file); +FREERDP_API BOOL freerdp_check_file_exists(char* file); FREERDP_API char* freerdp_get_home_path(rdpSettings* settings); FREERDP_API char* freerdp_get_config_path(rdpSettings* settings); FREERDP_API char* freerdp_get_current_path(rdpSettings* settings); FREERDP_API char* freerdp_construct_path(char* base_path, char* relative_path); FREERDP_API char* freerdp_append_shared_library_suffix(char* file_path); FREERDP_API char* freerdp_get_parent_path(char* base_path, int depth); -FREERDP_API boolean freerdp_path_contains_separator(char* path); -FREERDP_API boolean freerdp_detect_development_mode(rdpSettings* settings); +FREERDP_API BOOL freerdp_path_contains_separator(char* path); +FREERDP_API BOOL freerdp_detect_development_mode(rdpSettings* settings); FREERDP_API void freerdp_detect_paths(rdpSettings* settings); #endif /* __FILE_UTILS_H */ diff --git a/include/freerdp/utils/load_plugin.h b/include/freerdp/utils/load_plugin.h index d1d840d15..0cd24a149 100644 --- a/include/freerdp/utils/load_plugin.h +++ b/include/freerdp/utils/load_plugin.h @@ -25,11 +25,11 @@ FREERDP_API void* freerdp_open_library(const char* file); FREERDP_API void* freerdp_get_library_symbol(void* library, const char* name); -FREERDP_API boolean freerdp_close_library(void* library); +FREERDP_API BOOL freerdp_close_library(void* library); FREERDP_API void* freerdp_load_library_symbol(const char* file, const char* name); FREERDP_API void* freerdp_load_plugin(const char* name, const char* entry_name); FREERDP_API void* freerdp_load_channel_plugin(rdpSettings* settings, const char* name, const char* entry_name); -FREERDP_API boolean freerdp_register_static_plugin(const char* name, const char* entry_name, void* entry_addr); +FREERDP_API BOOL freerdp_register_static_plugin(const char* name, const char* entry_name, void* entry_addr); FREERDP_API void* freerdp_load_static_plugin(const char* name, const char* entry_name); #endif /* __LOAD_PLUGIN_UTILS_H */ diff --git a/include/freerdp/utils/pcap.h b/include/freerdp/utils/pcap.h index b8344e68e..667a0c5e5 100644 --- a/include/freerdp/utils/pcap.h +++ b/include/freerdp/utils/pcap.h @@ -58,7 +58,7 @@ struct rdp_pcap { FILE* fp; char* name; - boolean write; + BOOL write; int file_size; int record_count; pcap_header header; @@ -68,14 +68,14 @@ struct rdp_pcap }; typedef struct rdp_pcap rdpPcap; -FREERDP_API rdpPcap* pcap_open(char* name, boolean write); +FREERDP_API rdpPcap* pcap_open(char* name, BOOL write); FREERDP_API void pcap_close(rdpPcap* pcap); FREERDP_API void pcap_add_record(rdpPcap* pcap, void* data, uint32 length); -FREERDP_API boolean pcap_has_next_record(rdpPcap* pcap); -FREERDP_API boolean pcap_get_next_record(rdpPcap* pcap, pcap_record* record); -FREERDP_API boolean pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record); -FREERDP_API boolean pcap_get_next_record_content(rdpPcap* pcap, pcap_record* record); +FREERDP_API BOOL pcap_has_next_record(rdpPcap* pcap); +FREERDP_API BOOL pcap_get_next_record(rdpPcap* pcap, pcap_record* record); +FREERDP_API BOOL pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record); +FREERDP_API BOOL pcap_get_next_record_content(rdpPcap* pcap, pcap_record* record); FREERDP_API void pcap_flush(rdpPcap* pcap); #endif /* __UTILS_PCAP_H */ diff --git a/include/freerdp/utils/tcp.h b/include/freerdp/utils/tcp.h index d8aefffed..4c486b541 100644 --- a/include/freerdp/utils/tcp.h +++ b/include/freerdp/utils/tcp.h @@ -28,7 +28,7 @@ FREERDP_API int freerdp_tcp_read(int sockfd, uint8* data, int length); FREERDP_API int freerdp_tcp_write(int sockfd, uint8* data, int length); FREERDP_API int freerdp_tcp_disconnect(int sockfd); -FREERDP_API int freerdp_tcp_set_no_delay(int sockfd, boolean no_delay); +FREERDP_API int freerdp_tcp_set_no_delay(int sockfd, BOOL no_delay); FREERDP_API int freerdp_wsa_startup(); FREERDP_API int freerdp_wsa_cleanup(); diff --git a/libfreerdp/cache/bitmap.c b/libfreerdp/cache/bitmap.c index 2f73efeef..2aec2e332 100644 --- a/libfreerdp/cache/bitmap.c +++ b/libfreerdp/cache/bitmap.c @@ -162,7 +162,7 @@ void update_gdi_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmap_update) int i; rdpBitmap* bitmap; BITMAP_DATA* bitmap_data; - boolean reused = TRUE; + BOOL reused = TRUE; rdpCache* cache = context->cache; if (cache->bitmap->bitmap == NULL) diff --git a/libfreerdp/channels/libchannels.c b/libfreerdp/channels/libchannels.c index f47376aa5..0b62a9103 100644 --- a/libfreerdp/channels/libchannels.c +++ b/libfreerdp/channels/libchannels.c @@ -949,7 +949,7 @@ static void freerdp_channels_process_sync(rdpChannels* channels, freerdp* instan /** * called only from main thread */ -boolean freerdp_channels_get_fds(rdpChannels* channels, freerdp* instance, void** read_fds, +BOOL freerdp_channels_get_fds(rdpChannels* channels, freerdp* instance, void** read_fds, int* read_count, void** write_fds, int* write_count) { wait_obj_get_fds(channels->signal, read_fds, read_count); @@ -959,7 +959,7 @@ boolean freerdp_channels_get_fds(rdpChannels* channels, freerdp* instance, void* /** * called only from main thread */ -boolean freerdp_channels_check_fds(rdpChannels* channels, freerdp* instance) +BOOL freerdp_channels_check_fds(rdpChannels* channels, freerdp* instance) { if (wait_obj_is_set(channels->signal)) { diff --git a/libfreerdp/channels/wtsvc.c b/libfreerdp/channels/wtsvc.c index f0200c439..c6ab04346 100644 --- a/libfreerdp/channels/wtsvc.c +++ b/libfreerdp/channels/wtsvc.c @@ -357,7 +357,7 @@ static void WTSProcessChannelData(rdpPeerChannel* channel, int channelId, uint8* static int WTSReceiveChannelData(freerdp_peer* client, int channelId, uint8* data, int size, int flags, int total_size) { int i; - boolean result = FALSE; + BOOL result = FALSE; rdpPeerChannel* channel; for (i = 0; i < client->settings->num_channels; i++) @@ -444,9 +444,9 @@ void WTSVirtualChannelManagerGetFileDescriptor(WTSVirtualChannelManager* vcm, } } -boolean WTSVirtualChannelManagerCheckFileDescriptor(WTSVirtualChannelManager* vcm) +BOOL WTSVirtualChannelManagerCheckFileDescriptor(WTSVirtualChannelManager* vcm) { - boolean result = TRUE; + BOOL result = TRUE; wts_data_item* item; rdpPeerChannel* channel; uint32 dynvc_caps; @@ -569,16 +569,16 @@ void* WTSVirtualChannelOpenEx( return channel; } -boolean WTSVirtualChannelQuery( +BOOL WTSVirtualChannelQuery( /* __in */ void* hChannelHandle, /* __in */ WTS_VIRTUAL_CLASS WtsVirtualClass, /* __out */ void** ppBuffer, /* __out */ uint32* pBytesReturned) { - boolean bval; + BOOL bval; void* fds[10]; int fds_count = 0; - boolean result = FALSE; + BOOL result = FALSE; rdpPeerChannel* channel = (rdpPeerChannel*) hChannelHandle; switch (WtsVirtualClass) @@ -615,9 +615,9 @@ boolean WTSVirtualChannelQuery( break; } } - *ppBuffer = malloc(sizeof(boolean)); - memcpy(*ppBuffer, &bval, sizeof(boolean)); - *pBytesReturned = sizeof(boolean); + *ppBuffer = malloc(sizeof(BOOL)); + memcpy(*ppBuffer, &bval, sizeof(BOOL)); + *pBytesReturned = sizeof(BOOL); break; default: @@ -632,7 +632,7 @@ void WTSFreeMemory( free(pMemory); } -boolean WTSVirtualChannelRead( +BOOL WTSVirtualChannelRead( /* __in */ void* hChannelHandle, /* __in */ uint32 TimeOut, /* __out */ uint8* Buffer, @@ -671,7 +671,7 @@ boolean WTSVirtualChannelRead( return TRUE; } -boolean WTSVirtualChannelWrite( +BOOL WTSVirtualChannelWrite( /* __in */ void* hChannelHandle, /* __in */ uint8* Buffer, /* __in */ uint32 Length, @@ -749,7 +749,7 @@ boolean WTSVirtualChannelWrite( return TRUE; } -boolean WTSVirtualChannelClose( +BOOL WTSVirtualChannelClose( /* __in */ void* hChannelHandle) { STREAM* s; diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c index 2908b8920..ff39207a4 100644 --- a/libfreerdp/codec/bitmap.c +++ b/libfreerdp/codec/bitmap.c @@ -384,7 +384,7 @@ static int process_raw_plane(uint8* srcData, int width, int height, uint8* dstDa * 4 byte bitmap decompress * RDP6_BITMAP_STREAM */ -static boolean bitmap_decompress4(uint8* srcData, uint8* dstData, int width, int height, int size) +static BOOL bitmap_decompress4(uint8* srcData, uint8* dstData, int width, int height, int size) { int RLE; int code; @@ -439,7 +439,7 @@ static boolean bitmap_decompress4(uint8* srcData, uint8* dstData, int width, int /** * bitmap decompression routine */ -boolean bitmap_decompress(uint8* srcData, uint8* dstData, int width, int height, int size, int srcBpp, int dstBpp) +BOOL bitmap_decompress(uint8* srcData, uint8* dstData, int width, int height, int size, int srcBpp, int dstBpp) { uint8 * TmpBfr; diff --git a/libfreerdp/codec/include/bitmap.c b/libfreerdp/codec/include/bitmap.c index f2a0056ab..b6d702aeb 100644 --- a/libfreerdp/codec/include/bitmap.c +++ b/libfreerdp/codec/include/bitmap.c @@ -260,8 +260,8 @@ void RLEDECOMPRESS(uint8* pbSrcBuffer, uint32 cbSrcBuffer, uint8* pbDestBuffer, PIXEL temp; PIXEL fgPel = WHITE_PIXEL; - boolean fInsertFgPel = FALSE; - boolean fFirstLine = TRUE; + BOOL fInsertFgPel = FALSE; + BOOL fFirstLine = TRUE; uint8 bitmask; PIXEL pixelA, pixelB; diff --git a/libfreerdp/codec/jpeg.c b/libfreerdp/codec/jpeg.c index bd590ee10..ad00b75a5 100644 --- a/libfreerdp/codec/jpeg.c +++ b/libfreerdp/codec/jpeg.c @@ -44,7 +44,7 @@ static void my_init_source(j_decompress_ptr cinfo) } /*****************************************************************************/ -static boolean my_fill_input_buffer(j_decompress_ptr cinfo) +static BOOL my_fill_input_buffer(j_decompress_ptr cinfo) { struct mydata_decomp* md; @@ -60,7 +60,7 @@ static void my_skip_input_data(j_decompress_ptr cinfo, long num_bytes) } /*****************************************************************************/ -static boolean my_resync_to_restart(j_decompress_ptr cinfo, int desired) +static BOOL my_resync_to_restart(j_decompress_ptr cinfo, int desired) { return 1; } @@ -123,7 +123,7 @@ do_decompress(char* comp_data, int comp_data_bytes, } /* jpeg decompress */ -boolean +BOOL jpeg_decompress(uint8 * input, uint8 * output, int width, int height, int size, int bpp) { int lwidth; @@ -150,7 +150,7 @@ jpeg_decompress(uint8 * input, uint8 * output, int width, int height, int size, #else -boolean +BOOL jpeg_decompress(uint8 * input, uint8 * output, int width, int height, int size, int bpp) { return 0; diff --git a/libfreerdp/codec/mppc_enc.c b/libfreerdp/codec/mppc_enc.c index e2e34111b..59cbc25b4 100644 --- a/libfreerdp/codec/mppc_enc.c +++ b/libfreerdp/codec/mppc_enc.c @@ -499,7 +499,7 @@ void mppc_enc_free(struct rdp_mppc_enc* enc) * @return TRUE on success, FALSE on failure */ -boolean compress_rdp(struct rdp_mppc_enc* enc, uint8* srcData, int len) +BOOL compress_rdp(struct rdp_mppc_enc* enc, uint8* srcData, int len) { if ((enc == NULL) || (srcData == NULL) || (len <= 0) || (len > enc->buf_len)) return FALSE; @@ -525,7 +525,7 @@ boolean compress_rdp(struct rdp_mppc_enc* enc, uint8* srcData, int len) * @return TRUE on success, FALSE on failure */ -boolean compress_rdp_4(struct rdp_mppc_enc* enc, uint8* srcData, int len) +BOOL compress_rdp_4(struct rdp_mppc_enc* enc, uint8* srcData, int len) { /* RDP 4.0 encoding not yet implemented */ return FALSE; @@ -541,7 +541,7 @@ boolean compress_rdp_4(struct rdp_mppc_enc* enc, uint8* srcData, int len) * @return TRUE on success, FALSE on failure */ -boolean compress_rdp_5(struct rdp_mppc_enc* enc, uint8* srcData, int len) +BOOL compress_rdp_5(struct rdp_mppc_enc* enc, uint8* srcData, int len) { char* outputBuffer; /* points to enc->outputBuffer */ char* hptr_end; /* points to end of history data */ diff --git a/libfreerdp/core/activation.c b/libfreerdp/core/activation.c index 19bebd2d6..dd1f49e2b 100644 --- a/libfreerdp/core/activation.c +++ b/libfreerdp/core/activation.c @@ -40,7 +40,7 @@ void rdp_write_synchronize_pdu(STREAM* s, rdpSettings* settings) stream_write_uint16(s, settings->pdu_source); /* targetUser (2 bytes) */ } -boolean rdp_recv_synchronize_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_synchronize_pdu(rdpRdp* rdp, STREAM* s) { if (rdp->settings->server_mode) return rdp_recv_server_synchronize_pdu(rdp, s); @@ -48,13 +48,13 @@ boolean rdp_recv_synchronize_pdu(rdpRdp* rdp, STREAM* s) return rdp_recv_client_synchronize_pdu(rdp, s); } -boolean rdp_recv_server_synchronize_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_server_synchronize_pdu(rdpRdp* rdp, STREAM* s) { rdp->finalize_sc_pdus |= FINALIZE_SC_SYNCHRONIZE_PDU; return TRUE; } -boolean rdp_send_server_synchronize_pdu(rdpRdp* rdp) +BOOL rdp_send_server_synchronize_pdu(rdpRdp* rdp) { STREAM* s; @@ -66,7 +66,7 @@ boolean rdp_send_server_synchronize_pdu(rdpRdp* rdp) return TRUE; } -boolean rdp_recv_client_synchronize_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_client_synchronize_pdu(rdpRdp* rdp, STREAM* s) { uint16 messageType; @@ -86,7 +86,7 @@ boolean rdp_recv_client_synchronize_pdu(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_send_client_synchronize_pdu(rdpRdp* rdp) +BOOL rdp_send_client_synchronize_pdu(rdpRdp* rdp) { STREAM* s; @@ -97,7 +97,7 @@ boolean rdp_send_client_synchronize_pdu(rdpRdp* rdp) return rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_SYNCHRONIZE, rdp->mcs->user_id); } -boolean rdp_recv_control_pdu(STREAM* s, uint16* action) +BOOL rdp_recv_control_pdu(STREAM* s, uint16* action) { if (stream_get_left(s) < 8) return FALSE; @@ -116,7 +116,7 @@ void rdp_write_client_control_pdu(STREAM* s, uint16 action) stream_write_uint32(s, 0); /* controlId (4 bytes) */ } -boolean rdp_recv_server_control_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_server_control_pdu(rdpRdp* rdp, STREAM* s) { uint16 action; @@ -136,7 +136,7 @@ boolean rdp_recv_server_control_pdu(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_send_server_control_cooperate_pdu(rdpRdp* rdp) +BOOL rdp_send_server_control_cooperate_pdu(rdpRdp* rdp) { STREAM* s; @@ -151,7 +151,7 @@ boolean rdp_send_server_control_cooperate_pdu(rdpRdp* rdp) return TRUE; } -boolean rdp_send_server_control_granted_pdu(rdpRdp* rdp) +BOOL rdp_send_server_control_granted_pdu(rdpRdp* rdp) { STREAM* s; @@ -166,7 +166,7 @@ boolean rdp_send_server_control_granted_pdu(rdpRdp* rdp) return TRUE; } -boolean rdp_send_client_control_pdu(rdpRdp* rdp, uint16 action) +BOOL rdp_send_client_control_pdu(rdpRdp* rdp, uint16 action) { STREAM* s; @@ -201,7 +201,7 @@ void rdp_write_client_persistent_key_list_pdu(STREAM* s, rdpSettings* settings) /* entries */ } -boolean rdp_send_client_persistent_key_list_pdu(rdpRdp* rdp) +BOOL rdp_send_client_persistent_key_list_pdu(rdpRdp* rdp) { STREAM* s; @@ -211,7 +211,7 @@ boolean rdp_send_client_persistent_key_list_pdu(rdpRdp* rdp) return rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_BITMAP_CACHE_PERSISTENT_LIST, rdp->mcs->user_id); } -boolean rdp_recv_client_font_list_pdu(STREAM* s) +BOOL rdp_recv_client_font_list_pdu(STREAM* s) { if (stream_get_left(s) < 8) return FALSE; @@ -227,7 +227,7 @@ void rdp_write_client_font_list_pdu(STREAM* s, uint16 flags) stream_write_uint16(s, 50); /* entrySize (2 bytes) */ } -boolean rdp_send_client_font_list_pdu(rdpRdp* rdp, uint16 flags) +BOOL rdp_send_client_font_list_pdu(rdpRdp* rdp, uint16 flags) { STREAM* s; @@ -237,7 +237,7 @@ boolean rdp_send_client_font_list_pdu(rdpRdp* rdp, uint16 flags) return rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_FONT_LIST, rdp->mcs->user_id); } -boolean rdp_recv_font_map_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_font_map_pdu(rdpRdp* rdp, STREAM* s) { if (rdp->settings->server_mode) return rdp_recv_server_font_map_pdu(rdp, s); @@ -245,13 +245,13 @@ boolean rdp_recv_font_map_pdu(rdpRdp* rdp, STREAM* s) return rdp_recv_client_font_map_pdu(rdp, s); } -boolean rdp_recv_server_font_map_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_server_font_map_pdu(rdpRdp* rdp, STREAM* s) { rdp->finalize_sc_pdus |= FINALIZE_SC_FONT_MAP_PDU; return TRUE; } -boolean rdp_recv_client_font_map_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_client_font_map_pdu(rdpRdp* rdp, STREAM* s) { rdp->finalize_sc_pdus |= FINALIZE_SC_FONT_MAP_PDU; @@ -263,7 +263,7 @@ boolean rdp_recv_client_font_map_pdu(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_send_server_font_map_pdu(rdpRdp* rdp) +BOOL rdp_send_server_font_map_pdu(rdpRdp* rdp) { STREAM* s; @@ -277,7 +277,7 @@ boolean rdp_send_server_font_map_pdu(rdpRdp* rdp) return rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_FONT_MAP, rdp->mcs->user_id); } -boolean rdp_recv_deactivate_all(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_deactivate_all(rdpRdp* rdp, STREAM* s) { uint16 lengthSourceDescriptor; @@ -305,7 +305,7 @@ boolean rdp_recv_deactivate_all(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_send_deactivate_all(rdpRdp* rdp) +BOOL rdp_send_deactivate_all(rdpRdp* rdp) { STREAM* s; @@ -318,7 +318,7 @@ boolean rdp_send_deactivate_all(rdpRdp* rdp) return rdp_send_pdu(rdp, s, PDU_TYPE_DEACTIVATE_ALL, rdp->mcs->user_id); } -boolean rdp_server_accept_client_control_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_client_control_pdu(rdpRdp* rdp, STREAM* s) { uint16 action; @@ -332,7 +332,7 @@ boolean rdp_server_accept_client_control_pdu(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_accept_client_font_list_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_client_font_list_pdu(rdpRdp* rdp, STREAM* s) { if (!rdp_recv_client_font_list_pdu(s)) return FALSE; diff --git a/libfreerdp/core/activation.h b/libfreerdp/core/activation.h index b3e0ac091..563832e03 100644 --- a/libfreerdp/core/activation.h +++ b/libfreerdp/core/activation.h @@ -38,28 +38,28 @@ #define FONTLIST_FIRST 0x0001 #define FONTLIST_LAST 0x0002 -boolean rdp_recv_deactivate_all(rdpRdp* rdp, STREAM* s); -boolean rdp_send_deactivate_all(rdpRdp* rdp); +BOOL rdp_recv_deactivate_all(rdpRdp* rdp, STREAM* s); +BOOL rdp_send_deactivate_all(rdpRdp* rdp); -boolean rdp_recv_synchronize_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_recv_server_synchronize_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_send_server_synchronize_pdu(rdpRdp* rdp); -boolean rdp_recv_client_synchronize_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_send_client_synchronize_pdu(rdpRdp* rdp); -boolean rdp_recv_control_pdu(STREAM* s, uint16* action); -boolean rdp_recv_server_control_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_send_server_control_cooperate_pdu(rdpRdp* rdp); -boolean rdp_send_server_control_granted_pdu(rdpRdp* rdp); -boolean rdp_send_client_control_pdu(rdpRdp* rdp, uint16 action); -boolean rdp_send_client_persistent_key_list_pdu(rdpRdp* rdp); -boolean rdp_recv_client_font_list_pdu(STREAM* s); -boolean rdp_send_client_font_list_pdu(rdpRdp* rdp, uint16 flags); -boolean rdp_recv_font_map_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_recv_server_font_map_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_recv_client_font_map_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_send_server_font_map_pdu(rdpRdp* rdp); +BOOL rdp_recv_synchronize_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_recv_server_synchronize_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_send_server_synchronize_pdu(rdpRdp* rdp); +BOOL rdp_recv_client_synchronize_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_send_client_synchronize_pdu(rdpRdp* rdp); +BOOL rdp_recv_control_pdu(STREAM* s, uint16* action); +BOOL rdp_recv_server_control_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_send_server_control_cooperate_pdu(rdpRdp* rdp); +BOOL rdp_send_server_control_granted_pdu(rdpRdp* rdp); +BOOL rdp_send_client_control_pdu(rdpRdp* rdp, uint16 action); +BOOL rdp_send_client_persistent_key_list_pdu(rdpRdp* rdp); +BOOL rdp_recv_client_font_list_pdu(STREAM* s); +BOOL rdp_send_client_font_list_pdu(rdpRdp* rdp, uint16 flags); +BOOL rdp_recv_font_map_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_recv_server_font_map_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_recv_client_font_map_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_send_server_font_map_pdu(rdpRdp* rdp); -boolean rdp_server_accept_client_control_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_server_accept_client_font_list_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_client_control_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_client_font_list_pdu(rdpRdp* rdp, STREAM* s); #endif /* __ACTIVATION_H */ diff --git a/libfreerdp/core/capabilities.c b/libfreerdp/core/capabilities.c index 3f0f0f85a..c5018f91f 100644 --- a/libfreerdp/core/capabilities.c +++ b/libfreerdp/core/capabilities.c @@ -1686,7 +1686,7 @@ void rdp_write_frame_acknowledge_capability_set(STREAM* s, rdpSettings* settings rdp_capability_set_finish(s, header, CAPSET_TYPE_FRAME_ACKNOWLEDGE); } -boolean rdp_read_capability_sets(STREAM* s, rdpSettings* settings, uint16 numberCapabilities) +BOOL rdp_read_capability_sets(STREAM* s, rdpSettings* settings, uint16 numberCapabilities) { uint16 type; uint16 length; @@ -1843,7 +1843,7 @@ boolean rdp_read_capability_sets(STREAM* s, rdpSettings* settings, uint16 number return TRUE; } -boolean rdp_recv_demand_active(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_demand_active(rdpRdp* rdp, STREAM* s) { uint16 length; uint16 channelId; @@ -1966,7 +1966,7 @@ void rdp_write_demand_active(STREAM* s, rdpSettings* settings) stream_write_uint32(s, 0); /* sessionId */ } -boolean rdp_send_demand_active(rdpRdp* rdp) +BOOL rdp_send_demand_active(rdpRdp* rdp) { STREAM* s; @@ -1981,7 +1981,7 @@ boolean rdp_send_demand_active(rdpRdp* rdp) return TRUE; } -boolean rdp_recv_confirm_active(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_confirm_active(rdpRdp* rdp, STREAM* s) { uint16 length; uint16 channelId; @@ -2154,7 +2154,7 @@ void rdp_write_confirm_active(STREAM* s, rdpSettings* settings) stream_set_mark(s, em); } -boolean rdp_send_confirm_active(rdpRdp* rdp) +BOOL rdp_send_confirm_active(rdpRdp* rdp) { STREAM* s; diff --git a/libfreerdp/core/capabilities.h b/libfreerdp/core/capabilities.h index e7778a6bf..69c2c9353 100644 --- a/libfreerdp/core/capabilities.h +++ b/libfreerdp/core/capabilities.h @@ -163,11 +163,11 @@ #define CLW_ENTROPY_RLGR1 0x01 #define CLW_ENTROPY_RLGR3 0x04 -boolean rdp_recv_demand_active(rdpRdp* rdp, STREAM* s); +BOOL rdp_recv_demand_active(rdpRdp* rdp, STREAM* s); void rdp_write_demand_active(STREAM* s, rdpSettings* settings); -boolean rdp_send_demand_active(rdpRdp* rdp); -boolean rdp_recv_confirm_active(rdpRdp* rdp, STREAM* s); +BOOL rdp_send_demand_active(rdpRdp* rdp); +BOOL rdp_recv_confirm_active(rdpRdp* rdp, STREAM* s); void rdp_write_confirm_active(STREAM* s, rdpSettings* settings); -boolean rdp_send_confirm_active(rdpRdp* rdp); +BOOL rdp_send_confirm_active(rdpRdp* rdp); #endif /* __CAPABILITIES_H */ diff --git a/libfreerdp/core/certificate.c b/libfreerdp/core/certificate.c index 37a702fc9..8870cee26 100644 --- a/libfreerdp/core/certificate.c +++ b/libfreerdp/core/certificate.c @@ -248,7 +248,7 @@ void certificate_free_x509_certificate_chain(rdpX509CertChain* x509_cert_chain) } } -static boolean certificate_process_server_public_key(rdpCertificate* certificate, STREAM* s, uint32 length) +static BOOL certificate_process_server_public_key(rdpCertificate* certificate, STREAM* s, uint32 length) { uint8 magic[4]; uint32 keylen; @@ -279,7 +279,7 @@ static boolean certificate_process_server_public_key(rdpCertificate* certificate return TRUE; } -static boolean certificate_process_server_public_signature(rdpCertificate* certificate, uint8* sigdata, int sigdatalen, STREAM* s, uint32 siglen) +static BOOL certificate_process_server_public_signature(rdpCertificate* certificate, uint8* sigdata, int sigdatalen, STREAM* s, uint32 siglen) { int i, sum; CryptoMd5 md5ctx; @@ -340,7 +340,7 @@ static boolean certificate_process_server_public_signature(rdpCertificate* certi * @param s stream */ -boolean certificate_read_server_proprietary_certificate(rdpCertificate* certificate, STREAM* s) +BOOL certificate_read_server_proprietary_certificate(rdpCertificate* certificate, STREAM* s) { uint32 dwSigAlgId; uint32 dwKeyAlgId; @@ -410,7 +410,7 @@ boolean certificate_read_server_proprietary_certificate(rdpCertificate* certific * @param s stream */ -boolean certificate_read_server_x509_certificate_chain(rdpCertificate* certificate, STREAM* s) +BOOL certificate_read_server_x509_certificate_chain(rdpCertificate* certificate, STREAM* s) { int i; uint32 certLength; @@ -458,7 +458,7 @@ boolean certificate_read_server_x509_certificate_chain(rdpCertificate* certifica * @param length certificate length */ -boolean certificate_read_server_certificate(rdpCertificate* certificate, uint8* server_cert, int length) +BOOL certificate_read_server_certificate(rdpCertificate* certificate, uint8* server_cert, int length) { STREAM* s; uint32 dwVersion; diff --git a/libfreerdp/core/certificate.h b/libfreerdp/core/certificate.h index efd897ffa..387846b1f 100644 --- a/libfreerdp/core/certificate.h +++ b/libfreerdp/core/certificate.h @@ -47,9 +47,9 @@ void certificate_read_x509_certificate(rdpCertBlob* cert, rdpCertInfo* info); rdpX509CertChain* certificate_new_x509_certificate_chain(uint32 count); void certificate_free_x509_certificate_chain(rdpX509CertChain* x509_cert_chain); -boolean certificate_read_server_proprietary_certificate(rdpCertificate* certificate, STREAM* s); -boolean certificate_read_server_x509_certificate_chain(rdpCertificate* certificate, STREAM* s); -boolean certificate_read_server_certificate(rdpCertificate* certificate, uint8* server_cert, int length); +BOOL certificate_read_server_proprietary_certificate(rdpCertificate* certificate, STREAM* s); +BOOL certificate_read_server_x509_certificate_chain(rdpCertificate* certificate, STREAM* s); +BOOL certificate_read_server_certificate(rdpCertificate* certificate, uint8* server_cert, int length); rdpCertificate* certificate_new(); void certificate_free(rdpCertificate* certificate); diff --git a/libfreerdp/core/channel.c b/libfreerdp/core/channel.c index 8cb582b3d..893371d4e 100644 --- a/libfreerdp/core/channel.c +++ b/libfreerdp/core/channel.c @@ -34,7 +34,7 @@ #include "rdp.h" #include "channel.h" -boolean freerdp_channel_send(rdpRdp* rdp, uint16 channel_id, uint8* data, int size) +BOOL freerdp_channel_send(rdpRdp* rdp, uint16 channel_id, uint8* data, int size) { STREAM* s; uint32 flags; diff --git a/libfreerdp/core/channel.h b/libfreerdp/core/channel.h index f33c52cb1..bdc4c2207 100644 --- a/libfreerdp/core/channel.h +++ b/libfreerdp/core/channel.h @@ -20,7 +20,7 @@ #ifndef __CHANNEL_H #define __CHANNEL_H -boolean freerdp_channel_send(rdpRdp* rdp, uint16 channel_id, uint8* data, int size); +BOOL freerdp_channel_send(rdpRdp* rdp, uint16 channel_id, uint8* data, int size); void freerdp_channel_process(freerdp* instance, STREAM* s, uint16 channel_id); void freerdp_channel_peer_process(freerdp_peer* client, STREAM* s, uint16 channel_id); diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index 4885145a2..701cdb82b 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -68,7 +68,7 @@ * @return true if the connection succeeded. FALSE otherwise. */ -boolean rdp_client_connect(rdpRdp* rdp) +BOOL rdp_client_connect(rdpRdp* rdp) { rdpSettings* settings = rdp->settings; @@ -123,12 +123,12 @@ boolean rdp_client_connect(rdpRdp* rdp) return TRUE; } -boolean rdp_client_disconnect(rdpRdp* rdp) +BOOL rdp_client_disconnect(rdpRdp* rdp) { return transport_disconnect(rdp->transport); } -boolean rdp_client_redirect(rdpRdp* rdp) +BOOL rdp_client_redirect(rdpRdp* rdp) { rdpSettings* settings = rdp->settings; rdpRedirection* redirection = rdp->redirection; @@ -202,7 +202,7 @@ boolean rdp_client_redirect(rdpRdp* rdp) return rdp_client_connect(rdp); } -static boolean rdp_client_establish_keys(rdpRdp* rdp) +static BOOL rdp_client_establish_keys(rdpRdp* rdp) { uint8 client_random[CLIENT_RANDOM_LENGTH]; uint8 crypt_client_random[256 + 8]; @@ -265,7 +265,7 @@ static boolean rdp_client_establish_keys(rdpRdp* rdp) return TRUE; } -static boolean rdp_server_establish_keys(rdpRdp* rdp, STREAM* s) +static BOOL rdp_server_establish_keys(rdpRdp* rdp, STREAM* s) { uint8 client_random[64]; /* Should be only 32 after successful decryption, but on failure might take up to 64 bytes. */ uint8 crypt_client_random[256 + 8]; @@ -337,7 +337,7 @@ static boolean rdp_server_establish_keys(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_client_connect_mcs_connect_response(rdpRdp* rdp, STREAM* s) +BOOL rdp_client_connect_mcs_connect_response(rdpRdp* rdp, STREAM* s) { if (!mcs_recv_connect_response(rdp->mcs, s)) { @@ -356,7 +356,7 @@ boolean rdp_client_connect_mcs_connect_response(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_client_connect_mcs_attach_user_confirm(rdpRdp* rdp, STREAM* s) +BOOL rdp_client_connect_mcs_attach_user_confirm(rdpRdp* rdp, STREAM* s) { if (!mcs_recv_attach_user_confirm(rdp->mcs, s)) return FALSE; @@ -369,11 +369,11 @@ boolean rdp_client_connect_mcs_attach_user_confirm(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, STREAM* s) +BOOL rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, STREAM* s) { int i; uint16 channel_id; - boolean all_joined = TRUE; + BOOL all_joined = TRUE; if (!mcs_recv_channel_join_confirm(rdp->mcs, s, &channel_id)) return FALSE; @@ -435,7 +435,7 @@ boolean rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_client_connect_license(rdpRdp* rdp, STREAM* s) +BOOL rdp_client_connect_license(rdpRdp* rdp, STREAM* s) { if (!license_recv(rdp->license, s)) return FALSE; @@ -454,7 +454,7 @@ boolean rdp_client_connect_license(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_client_connect_demand_active(rdpRdp* rdp, STREAM* s) +BOOL rdp_client_connect_demand_active(rdpRdp* rdp, STREAM* s) { uint8* mark; uint16 width; @@ -501,7 +501,7 @@ boolean rdp_client_connect_demand_active(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_client_connect_finalize(rdpRdp* rdp) +BOOL rdp_client_connect_finalize(rdpRdp* rdp) { /** * [MS-RDPBCGR] 1.3.1.1 - 8. @@ -523,9 +523,9 @@ boolean rdp_client_connect_finalize(rdpRdp* rdp) return TRUE; } -boolean rdp_server_accept_nego(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_nego(rdpRdp* rdp, STREAM* s) { - boolean status; + BOOL status; rdpSettings* settings = rdp->settings; transport_set_blocking_mode(rdp->transport, TRUE); @@ -586,7 +586,7 @@ boolean rdp_server_accept_nego(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, STREAM* s) { int i; @@ -610,7 +610,7 @@ boolean rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_accept_mcs_erect_domain_request(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_mcs_erect_domain_request(rdpRdp* rdp, STREAM* s) { if (!mcs_recv_erect_domain_request(rdp->mcs, s)) return FALSE; @@ -620,7 +620,7 @@ boolean rdp_server_accept_mcs_erect_domain_request(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_accept_mcs_attach_user_request(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_mcs_attach_user_request(rdpRdp* rdp, STREAM* s) { if (!mcs_recv_attach_user_request(rdp->mcs, s)) return FALSE; @@ -633,11 +633,11 @@ boolean rdp_server_accept_mcs_attach_user_request(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, STREAM* s) { int i; uint16 channel_id; - boolean all_joined = TRUE; + BOOL all_joined = TRUE; if (!mcs_recv_channel_join_request(rdp->mcs, s, &channel_id)) return FALSE; @@ -665,7 +665,7 @@ boolean rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_accept_client_keys(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_client_keys(rdpRdp* rdp, STREAM* s) { if (!rdp_server_establish_keys(rdp, s)) @@ -676,7 +676,7 @@ boolean rdp_server_accept_client_keys(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_accept_client_info(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_client_info(rdpRdp* rdp, STREAM* s) { if (!rdp_recv_client_info(rdp, s)) @@ -690,7 +690,7 @@ boolean rdp_server_accept_client_info(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_accept_confirm_active(rdpRdp* rdp, STREAM* s) +BOOL rdp_server_accept_confirm_active(rdpRdp* rdp, STREAM* s) { if (!rdp_recv_confirm_active(rdp, s)) return FALSE; @@ -707,7 +707,7 @@ boolean rdp_server_accept_confirm_active(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_server_reactivate(rdpRdp* rdp) +BOOL rdp_server_reactivate(rdpRdp* rdp) { if (!rdp_send_deactivate_all(rdp)) return FALSE; diff --git a/libfreerdp/core/connection.h b/libfreerdp/core/connection.h index 283a0c0d0..e29232822 100644 --- a/libfreerdp/core/connection.h +++ b/libfreerdp/core/connection.h @@ -45,23 +45,23 @@ enum CONNECTION_STATE CONNECTION_STATE_ACTIVE }; -boolean rdp_client_connect(rdpRdp* rdp); -boolean rdp_client_redirect(rdpRdp* rdp); -boolean rdp_client_connect_mcs_connect_response(rdpRdp* rdp, STREAM* s); -boolean rdp_client_connect_mcs_attach_user_confirm(rdpRdp* rdp, STREAM* s); -boolean rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, STREAM* s); -boolean rdp_client_connect_license(rdpRdp* rdp, STREAM* s); -boolean rdp_client_connect_demand_active(rdpRdp* rdp, STREAM* s); -boolean rdp_client_connect_finalize(rdpRdp* rdp); +BOOL rdp_client_connect(rdpRdp* rdp); +BOOL rdp_client_redirect(rdpRdp* rdp); +BOOL rdp_client_connect_mcs_connect_response(rdpRdp* rdp, STREAM* s); +BOOL rdp_client_connect_mcs_attach_user_confirm(rdpRdp* rdp, STREAM* s); +BOOL rdp_client_connect_mcs_channel_join_confirm(rdpRdp* rdp, STREAM* s); +BOOL rdp_client_connect_license(rdpRdp* rdp, STREAM* s); +BOOL rdp_client_connect_demand_active(rdpRdp* rdp, STREAM* s); +BOOL rdp_client_connect_finalize(rdpRdp* rdp); -boolean rdp_server_accept_nego(rdpRdp* rdp, STREAM* s); -boolean rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, STREAM* s); -boolean rdp_server_accept_mcs_erect_domain_request(rdpRdp* rdp, STREAM* s); -boolean rdp_server_accept_mcs_attach_user_request(rdpRdp* rdp, STREAM* s); -boolean rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, STREAM* s); -boolean rdp_server_accept_client_keys(rdpRdp* rdp, STREAM* s); -boolean rdp_server_accept_client_info(rdpRdp* rdp, STREAM* s); -boolean rdp_server_accept_confirm_active(rdpRdp* rdp, STREAM* s); -boolean rdp_server_reactivate(rdpRdp* rdp); +BOOL rdp_server_accept_nego(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_mcs_connect_initial(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_mcs_erect_domain_request(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_mcs_attach_user_request(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_mcs_channel_join_request(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_client_keys(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_client_info(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_accept_confirm_active(rdpRdp* rdp, STREAM* s); +BOOL rdp_server_reactivate(rdpRdp* rdp); #endif /* __CONNECTION_H */ diff --git a/libfreerdp/core/fastpath.c b/libfreerdp/core/fastpath.c index f5f9c3e32..86f4f29f3 100644 --- a/libfreerdp/core/fastpath.c +++ b/libfreerdp/core/fastpath.c @@ -143,7 +143,7 @@ uint16 fastpath_read_header_rdp(rdpFastPath* fastpath, STREAM* s) return length - stream_get_length(s); } -static boolean fastpath_recv_orders(rdpFastPath* fastpath, STREAM* s) +static BOOL fastpath_recv_orders(rdpFastPath* fastpath, STREAM* s) { rdpUpdate* update = fastpath->rdp->update; uint16 numberOrders; @@ -187,7 +187,7 @@ static void fastpath_recv_update_synchronize(rdpFastPath* fastpath, STREAM* s) stream_seek_uint16(s); /* size (2 bytes), must be set to zero */ } -static boolean fastpath_recv_update(rdpFastPath* fastpath, uint8 updateCode, uint32 size, STREAM* s) +static BOOL fastpath_recv_update(rdpFastPath* fastpath, uint8 updateCode, uint32 size, STREAM* s) { rdpUpdate* update = fastpath->rdp->update; rdpContext* context = fastpath->rdp->update->context; @@ -257,7 +257,7 @@ static boolean fastpath_recv_update(rdpFastPath* fastpath, uint8 updateCode, uin return TRUE; } -static boolean fastpath_recv_update_data(rdpFastPath* fastpath, STREAM* s) +static BOOL fastpath_recv_update_data(rdpFastPath* fastpath, STREAM* s) { uint16 size; int next_pos; @@ -338,7 +338,7 @@ static boolean fastpath_recv_update_data(rdpFastPath* fastpath, STREAM* s) return TRUE; } -boolean fastpath_recv_updates(rdpFastPath* fastpath, STREAM* s) +BOOL fastpath_recv_updates(rdpFastPath* fastpath, STREAM* s) { rdpUpdate* update = fastpath->rdp->update; @@ -358,7 +358,7 @@ boolean fastpath_recv_updates(rdpFastPath* fastpath, STREAM* s) return TRUE; } -static boolean fastpath_read_input_event_header(STREAM* s, uint8* eventFlags, uint8* eventCode) +static BOOL fastpath_read_input_event_header(STREAM* s, uint8* eventFlags, uint8* eventCode) { uint8 eventHeader; @@ -373,7 +373,7 @@ static boolean fastpath_read_input_event_header(STREAM* s, uint8* eventFlags, ui return TRUE; } -static boolean fastpath_recv_input_event_scancode(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) +static BOOL fastpath_recv_input_event_scancode(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) { uint16 flags; uint16 code; @@ -397,7 +397,7 @@ static boolean fastpath_recv_input_event_scancode(rdpFastPath* fastpath, STREAM* return TRUE; } -static boolean fastpath_recv_input_event_mouse(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) +static BOOL fastpath_recv_input_event_mouse(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) { uint16 pointerFlags; uint16 xPos; @@ -415,7 +415,7 @@ static boolean fastpath_recv_input_event_mouse(rdpFastPath* fastpath, STREAM* s, return TRUE; } -static boolean fastpath_recv_input_event_mousex(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) +static BOOL fastpath_recv_input_event_mousex(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) { uint16 pointerFlags; uint16 xPos; @@ -433,14 +433,14 @@ static boolean fastpath_recv_input_event_mousex(rdpFastPath* fastpath, STREAM* s return TRUE; } -static boolean fastpath_recv_input_event_sync(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) +static BOOL fastpath_recv_input_event_sync(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) { IFCALL(fastpath->rdp->input->SynchronizeEvent, fastpath->rdp->input, eventFlags); return TRUE; } -static boolean fastpath_recv_input_event_unicode(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) +static BOOL fastpath_recv_input_event_unicode(rdpFastPath* fastpath, STREAM* s, uint8 eventFlags) { uint16 unicodeCode; uint16 flags; @@ -461,7 +461,7 @@ static boolean fastpath_recv_input_event_unicode(rdpFastPath* fastpath, STREAM* return TRUE; } -static boolean fastpath_recv_input_event(rdpFastPath* fastpath, STREAM* s) +static BOOL fastpath_recv_input_event(rdpFastPath* fastpath, STREAM* s) { uint8 eventFlags; uint8 eventCode; @@ -504,7 +504,7 @@ static boolean fastpath_recv_input_event(rdpFastPath* fastpath, STREAM* s) return TRUE; } -boolean fastpath_recv_inputs(rdpFastPath* fastpath, STREAM* s) +BOOL fastpath_recv_inputs(rdpFastPath* fastpath, STREAM* s) { uint8 i; @@ -564,7 +564,7 @@ STREAM* fastpath_input_pdu_init(rdpFastPath* fastpath, uint8 eventFlags, uint8 e return s; } -boolean fastpath_send_input_pdu(rdpFastPath* fastpath, STREAM* s) +BOOL fastpath_send_input_pdu(rdpFastPath* fastpath, STREAM* s) { rdpRdp *rdp; uint16 length; @@ -631,7 +631,7 @@ STREAM* fastpath_update_pdu_init(rdpFastPath* fastpath) return s; } -boolean fastpath_send_update_pdu(rdpFastPath* fastpath, uint8 updateCode, STREAM* s) +BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, uint8 updateCode, STREAM* s) { rdpRdp* rdp; uint8* bm; @@ -647,7 +647,7 @@ boolean fastpath_send_update_pdu(rdpFastPath* fastpath, uint8 updateCode, STREAM int pdu_data_bytes; int dlen; int bytes_to_crypt; - boolean result; + BOOL result; uint16 pduLength; uint16 maxLength; uint32 totalLength; diff --git a/libfreerdp/core/fastpath.h b/libfreerdp/core/fastpath.h index 56ba81d48..d7104cbb5 100644 --- a/libfreerdp/core/fastpath.h +++ b/libfreerdp/core/fastpath.h @@ -105,16 +105,16 @@ struct rdp_fastpath uint16 fastpath_header_length(STREAM* s); uint16 fastpath_read_header(rdpFastPath* fastpath, STREAM* s); uint16 fastpath_read_header_rdp(rdpFastPath* fastpath, STREAM* s); -boolean fastpath_recv_updates(rdpFastPath* fastpath, STREAM* s); -boolean fastpath_recv_inputs(rdpFastPath* fastpath, STREAM* s); +BOOL fastpath_recv_updates(rdpFastPath* fastpath, STREAM* s); +BOOL fastpath_recv_inputs(rdpFastPath* fastpath, STREAM* s); STREAM* fastpath_input_pdu_init(rdpFastPath* fastpath, uint8 eventFlags, uint8 eventCode); -boolean fastpath_send_input_pdu(rdpFastPath* fastpath, STREAM* s); +BOOL fastpath_send_input_pdu(rdpFastPath* fastpath, STREAM* s); STREAM* fastpath_update_pdu_init(rdpFastPath* fastpath); -boolean fastpath_send_update_pdu(rdpFastPath* fastpath, uint8 updateCode, STREAM* s); +BOOL fastpath_send_update_pdu(rdpFastPath* fastpath, uint8 updateCode, STREAM* s); -boolean fastpath_send_surfcmd_frame_marker(rdpFastPath* fastpath, uint16 frameAction, uint32 frameId); +BOOL fastpath_send_surfcmd_frame_marker(rdpFastPath* fastpath, uint16 frameAction, uint32 frameId); rdpFastPath* fastpath_new(rdpRdp* rdp); void fastpath_free(rdpFastPath* fastpath); diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index 1eff2af8b..8738346a2 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -47,11 +47,11 @@ * @return TRUE if successful. FALSE otherwise. * */ -boolean freerdp_connect(freerdp* instance) +BOOL freerdp_connect(freerdp* instance) { rdpRdp* rdp; rdpSettings* settings; - boolean status = FALSE; + BOOL status = FALSE; /* We always set the return code to 0 before we start the connect sequence*/ connectErrorCode = 0; @@ -157,7 +157,7 @@ boolean freerdp_connect(freerdp* instance) return status; } -boolean freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) +BOOL freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount) { rdpRdp* rdp; @@ -167,7 +167,7 @@ boolean freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds return TRUE; } -boolean freerdp_check_fds(freerdp* instance) +BOOL freerdp_check_fds(freerdp* instance) { int status; rdpRdp* rdp; @@ -187,7 +187,7 @@ static int freerdp_send_channel_data(freerdp* instance, int channel_id, uint8* d return rdp_send_channel_data(instance->context->rdp, channel_id, data, size); } -boolean freerdp_disconnect(freerdp* instance) +BOOL freerdp_disconnect(freerdp* instance) { rdpRdp* rdp; @@ -197,7 +197,7 @@ boolean freerdp_disconnect(freerdp* instance) return TRUE; } -boolean freerdp_shall_disconnect(freerdp* instance) +BOOL freerdp_shall_disconnect(freerdp* instance) { return instance->context->rdp->disconnect; } diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c index d59010031..d466ca4a3 100644 --- a/libfreerdp/core/gcc.c +++ b/libfreerdp/core/gcc.c @@ -138,7 +138,7 @@ uint8 h221_sc_key[4] = "McDn"; * @param settings rdp settings */ -boolean gcc_read_conference_create_request(STREAM* s, rdpSettings* settings) +BOOL gcc_read_conference_create_request(STREAM* s, rdpSettings* settings) { uint16 length; uint8 choice; @@ -223,7 +223,7 @@ void gcc_write_conference_create_request(STREAM* s, STREAM* user_data) per_write_octet_string(s, user_data->data, stream_get_length(user_data), 0); /* array of client data blocks */ } -boolean gcc_read_conference_create_response(STREAM* s, rdpSettings* settings) +BOOL gcc_read_conference_create_response(STREAM* s, rdpSettings* settings) { uint16 length; uint32 tag; @@ -306,7 +306,7 @@ void gcc_write_conference_create_response(STREAM* s, STREAM* user_data) per_write_octet_string(s, user_data->data, stream_get_length(user_data), 0); /* array of server data blocks */ } -boolean gcc_read_client_data_blocks(STREAM* s, rdpSettings* settings, int length) +BOOL gcc_read_client_data_blocks(STREAM* s, rdpSettings* settings, int length) { uint16 type; uint16 blockLength; @@ -368,7 +368,7 @@ void gcc_write_client_data_blocks(STREAM* s, rdpSettings* settings) gcc_write_client_monitor_data(s, settings); } -boolean gcc_read_server_data_blocks(STREAM* s, rdpSettings* settings, int length) +BOOL gcc_read_server_data_blocks(STREAM* s, rdpSettings* settings, int length) { uint16 type; uint16 offset = 0; @@ -429,7 +429,7 @@ void gcc_write_server_data_blocks(STREAM* s, rdpSettings* settings) gcc_write_server_security_data(s, settings); } -boolean gcc_read_user_data_header(STREAM* s, uint16* type, uint16* length) +BOOL gcc_read_user_data_header(STREAM* s, uint16* type, uint16* length) { stream_read_uint16(s, *type); /* type */ stream_read_uint16(s, *length); /* length */ @@ -464,7 +464,7 @@ void gcc_write_user_data_header(STREAM* s, uint16 type, uint16 length) * @param settings rdp settings */ -boolean gcc_read_client_core_data(STREAM* s, rdpSettings* settings, uint16 blockLength) +BOOL gcc_read_client_core_data(STREAM* s, rdpSettings* settings, uint16 blockLength) { char* str; uint32 version; @@ -722,7 +722,7 @@ void gcc_write_client_core_data(STREAM* s, rdpSettings* settings) stream_write_uint32(s, settings->selected_protocol); /* serverSelectedProtocol */ } -boolean gcc_read_server_core_data(STREAM* s, rdpSettings* settings) +BOOL gcc_read_server_core_data(STREAM* s, rdpSettings* settings) { uint32 version; uint32 clientRequestedProtocols; @@ -753,7 +753,7 @@ void gcc_write_server_core_data(STREAM* s, rdpSettings* settings) * @param settings rdp settings */ -boolean gcc_read_client_security_data(STREAM* s, rdpSettings* settings, uint16 blockLength) +BOOL gcc_read_client_security_data(STREAM* s, rdpSettings* settings, uint16 blockLength) { if (blockLength < 8) return FALSE; @@ -795,7 +795,7 @@ void gcc_write_client_security_data(STREAM* s, rdpSettings* settings) } } -boolean gcc_read_server_security_data(STREAM* s, rdpSettings* settings) +BOOL gcc_read_server_security_data(STREAM* s, rdpSettings* settings) { uint8* data; uint32 length; @@ -1023,7 +1023,7 @@ void gcc_write_server_security_data(STREAM* s, rdpSettings* settings) * @param settings rdp settings */ -boolean gcc_read_client_network_data(STREAM* s, rdpSettings* settings, uint16 blockLength) +BOOL gcc_read_client_network_data(STREAM* s, rdpSettings* settings, uint16 blockLength) { int i; @@ -1077,7 +1077,7 @@ void gcc_write_client_network_data(STREAM* s, rdpSettings* settings) } } -boolean gcc_read_server_network_data(STREAM* s, rdpSettings* settings) +BOOL gcc_read_server_network_data(STREAM* s, rdpSettings* settings) { int i; uint16 MCSChannelId; @@ -1130,7 +1130,7 @@ void gcc_write_server_network_data(STREAM* s, rdpSettings* settings) * @param settings rdp settings */ -boolean gcc_read_client_cluster_data(STREAM* s, rdpSettings* settings, uint16 blockLength) +BOOL gcc_read_client_cluster_data(STREAM* s, rdpSettings* settings, uint16 blockLength) { uint32 flags; @@ -1174,7 +1174,7 @@ void gcc_write_client_cluster_data(STREAM* s, rdpSettings* settings) * @param settings rdp settings */ -boolean gcc_read_client_monitor_data(STREAM* s, rdpSettings* settings, uint16 blockLength) +BOOL gcc_read_client_monitor_data(STREAM* s, rdpSettings* settings, uint16 blockLength) { printf("CS_MONITOR\n"); return TRUE; diff --git a/libfreerdp/core/gcc.h b/libfreerdp/core/gcc.h index 7f61403e1..1726c9b53 100644 --- a/libfreerdp/core/gcc.h +++ b/libfreerdp/core/gcc.h @@ -81,31 +81,31 @@ /* Monitor Flags */ #define MONITOR_PRIMARY 0x00000001 -boolean gcc_read_conference_create_request(STREAM* s, rdpSettings* settings); +BOOL gcc_read_conference_create_request(STREAM* s, rdpSettings* settings); void gcc_write_conference_create_request(STREAM* s, STREAM* user_data); -boolean gcc_read_conference_create_response(STREAM* s, rdpSettings* settings); +BOOL gcc_read_conference_create_response(STREAM* s, rdpSettings* settings); void gcc_write_conference_create_response(STREAM* s, STREAM* user_data); -boolean gcc_read_client_data_blocks(STREAM* s, rdpSettings *settings, int length); +BOOL gcc_read_client_data_blocks(STREAM* s, rdpSettings *settings, int length); void gcc_write_client_data_blocks(STREAM* s, rdpSettings *settings); -boolean gcc_read_server_data_blocks(STREAM* s, rdpSettings *settings, int length); +BOOL gcc_read_server_data_blocks(STREAM* s, rdpSettings *settings, int length); void gcc_write_server_data_blocks(STREAM* s, rdpSettings *settings); -boolean gcc_read_user_data_header(STREAM* s, uint16* type, uint16* length); +BOOL gcc_read_user_data_header(STREAM* s, uint16* type, uint16* length); void gcc_write_user_data_header(STREAM* s, uint16 type, uint16 length); -boolean gcc_read_client_core_data(STREAM* s, rdpSettings *settings, uint16 blockLength); +BOOL gcc_read_client_core_data(STREAM* s, rdpSettings *settings, uint16 blockLength); void gcc_write_client_core_data(STREAM* s, rdpSettings *settings); -boolean gcc_read_server_core_data(STREAM* s, rdpSettings *settings); +BOOL gcc_read_server_core_data(STREAM* s, rdpSettings *settings); void gcc_write_server_core_data(STREAM* s, rdpSettings *settings); -boolean gcc_read_client_security_data(STREAM* s, rdpSettings *settings, uint16 blockLength); +BOOL gcc_read_client_security_data(STREAM* s, rdpSettings *settings, uint16 blockLength); void gcc_write_client_security_data(STREAM* s, rdpSettings *settings); -boolean gcc_read_server_security_data(STREAM* s, rdpSettings *settings); +BOOL gcc_read_server_security_data(STREAM* s, rdpSettings *settings); void gcc_write_server_security_data(STREAM* s, rdpSettings *settings); -boolean gcc_read_client_network_data(STREAM* s, rdpSettings *settings, uint16 blockLength); +BOOL gcc_read_client_network_data(STREAM* s, rdpSettings *settings, uint16 blockLength); void gcc_write_client_network_data(STREAM* s, rdpSettings *settings); -boolean gcc_read_server_network_data(STREAM* s, rdpSettings *settings); +BOOL gcc_read_server_network_data(STREAM* s, rdpSettings *settings); void gcc_write_server_network_data(STREAM* s, rdpSettings *settings); -boolean gcc_read_client_cluster_data(STREAM* s, rdpSettings *settings, uint16 blockLength); +BOOL gcc_read_client_cluster_data(STREAM* s, rdpSettings *settings, uint16 blockLength); void gcc_write_client_cluster_data(STREAM* s, rdpSettings *settings); -boolean gcc_read_client_monitor_data(STREAM* s, rdpSettings *settings, uint16 blockLength); +BOOL gcc_read_client_monitor_data(STREAM* s, rdpSettings *settings, uint16 blockLength); void gcc_write_client_monitor_data(STREAM* s, rdpSettings *settings); #endif /* __GCC_H */ diff --git a/libfreerdp/core/graphics.c b/libfreerdp/core/graphics.c index cc574ce9a..fce81082d 100644 --- a/libfreerdp/core/graphics.c +++ b/libfreerdp/core/graphics.c @@ -77,7 +77,7 @@ void Bitmap_SetDimensions(rdpContext* context, rdpBitmap* bitmap, uint16 width, } /* static method */ -void Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, boolean primary) +void Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL primary) { context->graphics->Bitmap_Prototype->SetSurface(context, bitmap, primary); } diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c index 4960896ce..445678f11 100644 --- a/libfreerdp/core/info.c +++ b/libfreerdp/core/info.c @@ -67,7 +67,7 @@ void rdp_read_server_auto_reconnect_cookie(STREAM* s, rdpSettings* settings) * @param settings settings */ -boolean rdp_read_client_auto_reconnect_cookie(STREAM* s, rdpSettings* settings) +BOOL rdp_read_client_auto_reconnect_cookie(STREAM* s, rdpSettings* settings) { ARC_CS_PRIVATE_PACKET* autoReconnectCookie; autoReconnectCookie = settings->client_auto_reconnect_cookie; @@ -108,7 +108,7 @@ void rdp_write_client_auto_reconnect_cookie(STREAM* s, rdpSettings* settings) * @param settings settings */ -boolean rdp_read_extended_info_packet(STREAM* s, rdpSettings* settings) +BOOL rdp_read_extended_info_packet(STREAM* s, rdpSettings* settings) { uint16 clientAddressFamily; uint16 cbClientAddress; @@ -216,7 +216,7 @@ void rdp_write_extended_info_packet(STREAM* s, rdpSettings* settings) * @param settings settings */ -boolean rdp_read_info_packet(STREAM* s, rdpSettings* settings) +BOOL rdp_read_info_packet(STREAM* s, rdpSettings* settings) { uint32 flags; uint16 cbDomain; @@ -315,7 +315,7 @@ void rdp_write_info_packet(STREAM* s, rdpSettings* settings) int cbAlternateShell; WCHAR* workingDir; int cbWorkingDir; - boolean usedPasswordCookie = FALSE; + BOOL usedPasswordCookie = FALSE; flags = INFO_MOUSE | INFO_UNICODE | @@ -418,7 +418,7 @@ void rdp_write_info_packet(STREAM* s, rdpSettings* settings) * @param s stream */ -boolean rdp_recv_client_info(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_client_info(rdpRdp* rdp, STREAM* s) { uint16 length; uint16 channelId; @@ -457,7 +457,7 @@ boolean rdp_recv_client_info(rdpRdp* rdp, STREAM* s) * @param rdp RDP module */ -boolean rdp_send_client_info(rdpRdp* rdp) +BOOL rdp_send_client_info(rdpRdp* rdp) { STREAM* s; @@ -535,7 +535,7 @@ void rdp_recv_logon_info_extended(rdpRdp* rdp, STREAM* s) stream_seek(s, 570); /* pad */ } -boolean rdp_recv_save_session_info(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_save_session_info(rdpRdp* rdp, STREAM* s) { uint32 infoType; diff --git a/libfreerdp/core/info.h b/libfreerdp/core/info.h index f7df7ae54..fa3d0f1a1 100644 --- a/libfreerdp/core/info.h +++ b/libfreerdp/core/info.h @@ -73,18 +73,18 @@ void rdp_read_system_time(STREAM* s, SYSTEM_TIME* system_time); void rdp_write_system_time(STREAM* s, SYSTEM_TIME* system_time); void rdp_get_client_time_zone(STREAM* s, rdpSettings* settings); -boolean rdp_read_client_time_zone(STREAM* s, rdpSettings* settings); +BOOL rdp_read_client_time_zone(STREAM* s, rdpSettings* settings); void rdp_write_client_time_zone(STREAM* s, rdpSettings* settings); void rdp_read_server_auto_reconnect_cookie(STREAM* s, rdpSettings* settings); -boolean rdp_read_client_auto_reconnect_cookie(STREAM* s, rdpSettings* settings); +BOOL rdp_read_client_auto_reconnect_cookie(STREAM* s, rdpSettings* settings); void rdp_write_client_auto_reconnect_cookie(STREAM* s, rdpSettings* settings); void rdp_write_auto_reconnect_cookie(STREAM* s, rdpSettings* settings); -boolean rdp_read_extended_info_packet(STREAM* s, rdpSettings* settings); +BOOL rdp_read_extended_info_packet(STREAM* s, rdpSettings* settings); void rdp_write_extended_info_packet(STREAM* s, rdpSettings* settings); -boolean rdp_read_info_packet(STREAM* s, rdpSettings* settings); +BOOL rdp_read_info_packet(STREAM* s, rdpSettings* settings); void rdp_write_info_packet(STREAM* s, rdpSettings* settings); -boolean rdp_recv_client_info(rdpRdp* rdp, STREAM* s); -boolean rdp_send_client_info(rdpRdp* rdp); -boolean rdp_recv_save_session_info(rdpRdp* rdp, STREAM* s); +BOOL rdp_recv_client_info(rdpRdp* rdp, STREAM* s); +BOOL rdp_send_client_info(rdpRdp* rdp); +BOOL rdp_recv_save_session_info(rdpRdp* rdp, STREAM* s); #endif /* __INFO_H */ diff --git a/libfreerdp/core/input.c b/libfreerdp/core/input.c index 587e742f7..683840094 100644 --- a/libfreerdp/core/input.c +++ b/libfreerdp/core/input.c @@ -202,7 +202,7 @@ void input_send_fastpath_extended_mouse_event(rdpInput* input, uint16 flags, uin fastpath_send_input_pdu(rdp->fastpath, s); } -static boolean input_recv_sync_event(rdpInput* input, STREAM* s) +static BOOL input_recv_sync_event(rdpInput* input, STREAM* s) { uint32 toggleFlags; @@ -217,7 +217,7 @@ static boolean input_recv_sync_event(rdpInput* input, STREAM* s) return TRUE; } -static boolean input_recv_keyboard_event(rdpInput* input, STREAM* s) +static BOOL input_recv_keyboard_event(rdpInput* input, STREAM* s) { uint16 keyboardFlags, keyCode; @@ -233,7 +233,7 @@ static boolean input_recv_keyboard_event(rdpInput* input, STREAM* s) return TRUE; } -static boolean input_recv_unicode_keyboard_event(rdpInput* input, STREAM* s) +static BOOL input_recv_unicode_keyboard_event(rdpInput* input, STREAM* s) { uint16 keyboardFlags, unicodeCode; @@ -262,7 +262,7 @@ static boolean input_recv_unicode_keyboard_event(rdpInput* input, STREAM* s) return TRUE; } -static boolean input_recv_mouse_event(rdpInput* input, STREAM* s) +static BOOL input_recv_mouse_event(rdpInput* input, STREAM* s) { uint16 pointerFlags, xPos, yPos; @@ -278,7 +278,7 @@ static boolean input_recv_mouse_event(rdpInput* input, STREAM* s) return TRUE; } -static boolean input_recv_extended_mouse_event(rdpInput* input, STREAM* s) +static BOOL input_recv_extended_mouse_event(rdpInput* input, STREAM* s) { uint16 pointerFlags, xPos, yPos; @@ -294,7 +294,7 @@ static boolean input_recv_extended_mouse_event(rdpInput* input, STREAM* s) return TRUE; } -static boolean input_recv_event(rdpInput* input, STREAM* s) +static BOOL input_recv_event(rdpInput* input, STREAM* s) { uint16 messageType; @@ -341,7 +341,7 @@ static boolean input_recv_event(rdpInput* input, STREAM* s) return TRUE; } -boolean input_recv(rdpInput* input, STREAM* s) +BOOL input_recv(rdpInput* input, STREAM* s) { uint16 i, numberEvents; @@ -396,7 +396,7 @@ void freerdp_input_send_keyboard_event(rdpInput* input, uint16 flags, uint16 cod IFCALL(input->KeyboardEvent, input, flags, code); } -void freerdp_input_send_keyboard_event_ex(rdpInput* input, boolean down, uint32 rdp_scancode) +void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, uint32 rdp_scancode) { freerdp_input_send_keyboard_event(input, (RDP_SCANCODE_EXTENDED(rdp_scancode) ? KBD_FLAGS_EXTENDED : 0) | diff --git a/libfreerdp/core/input.h b/libfreerdp/core/input.h index cf1b2a51f..791969560 100644 --- a/libfreerdp/core/input.h +++ b/libfreerdp/core/input.h @@ -49,7 +49,7 @@ void input_send_fastpath_unicode_keyboard_event(rdpInput* input, uint16 flags, u void input_send_fastpath_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y); void input_send_fastpath_extended_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y); -boolean input_recv(rdpInput* input, STREAM* s); +BOOL input_recv(rdpInput* input, STREAM* s); void input_register_client_callbacks(rdpInput* input); diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c index 0ab8b23bd..8e3781d47 100644 --- a/libfreerdp/core/license.c +++ b/libfreerdp/core/license.c @@ -127,7 +127,7 @@ STREAM* license_send_stream_init(rdpLicense* license) * @param s stream */ -boolean license_send(rdpLicense* license, STREAM* s, uint8 type) +BOOL license_send(rdpLicense* license, STREAM* s, uint8 type) { int length; uint8 flags; @@ -170,7 +170,7 @@ boolean license_send(rdpLicense* license, STREAM* s, uint8 type) * @param s stream */ -boolean license_recv(rdpLicense* license, STREAM* s) +BOOL license_recv(rdpLicense* license, STREAM* s) { uint16 length; uint16 channelId; @@ -873,7 +873,7 @@ void license_send_platform_challenge_response_packet(rdpLicense* license) * @param license license module */ -boolean license_send_valid_client_error_packet(rdpLicense* license) +BOOL license_send_valid_client_error_packet(rdpLicense* license) { STREAM* s; diff --git a/libfreerdp/core/license.h b/libfreerdp/core/license.h index 49102f433..f90412ffc 100644 --- a/libfreerdp/core/license.h +++ b/libfreerdp/core/license.h @@ -156,8 +156,8 @@ struct rdp_license SCOPE_LIST* scope_list; }; -boolean license_recv(rdpLicense* license, STREAM* s); -boolean license_send(rdpLicense* license, STREAM* s, uint8 type); +BOOL license_recv(rdpLicense* license, STREAM* s); +BOOL license_send(rdpLicense* license, STREAM* s, uint8 type); STREAM* license_send_stream_init(rdpLicense* license); void license_generate_randoms(rdpLicense* license); @@ -191,7 +191,7 @@ void license_send_new_license_request_packet(rdpLicense* license); void license_write_platform_challenge_response_packet(rdpLicense* license, STREAM* s, uint8* mac_data); void license_send_platform_challenge_response_packet(rdpLicense* license); -boolean license_send_valid_client_error_packet(rdpLicense* license); +BOOL license_send_valid_client_error_packet(rdpLicense* license); rdpLicense* license_new(rdpRdp* rdp); void license_free(rdpLicense* license); diff --git a/libfreerdp/core/listener.c b/libfreerdp/core/listener.c index 8dbb99d42..ba268a6d7 100644 --- a/libfreerdp/core/listener.c +++ b/libfreerdp/core/listener.c @@ -73,7 +73,7 @@ static const char *inet_ntop(int af, const void* src, char* dst, socklen_t cnt) #endif #endif -static boolean freerdp_listener_open(freerdp_listener* instance, const char* bind_address, uint16 port) +static BOOL freerdp_listener_open(freerdp_listener* instance, const char* bind_address, uint16 port) { rdpListener* listener = (rdpListener*) instance->listener; int status; @@ -171,7 +171,7 @@ static boolean freerdp_listener_open(freerdp_listener* instance, const char* bin return (listener->num_sockfds > 0 ? TRUE : FALSE); } -static boolean freerdp_listener_open_local(freerdp_listener* instance, const char* path) +static BOOL freerdp_listener_open_local(freerdp_listener* instance, const char* path) { #ifndef _WIN32 int status; @@ -235,7 +235,7 @@ static void freerdp_listener_close(freerdp_listener* instance) listener->num_sockfds = 0; } -static boolean freerdp_listener_get_fds(freerdp_listener* instance, void** rfds, int* rcount) +static BOOL freerdp_listener_get_fds(freerdp_listener* instance, void** rfds, int* rcount) { int i; rdpListener* listener = (rdpListener*) instance->listener; @@ -252,7 +252,7 @@ static boolean freerdp_listener_get_fds(freerdp_listener* instance, void** rfds, return TRUE; } -static boolean freerdp_listener_check_fds(freerdp_listener* instance) +static BOOL freerdp_listener_check_fds(freerdp_listener* instance) { int i; void* sin_addr; diff --git a/libfreerdp/core/mcs.c b/libfreerdp/core/mcs.c index 15238c418..ee95a03f1 100644 --- a/libfreerdp/core/mcs.c +++ b/libfreerdp/core/mcs.c @@ -189,7 +189,7 @@ static const char* const mcs_result_enumerated[] = * @return */ -boolean mcs_read_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU* domainMCSPDU, uint16* length) +BOOL mcs_read_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU* domainMCSPDU, uint16* length) { uint8 choice; enum DomainMCSPDU MCSPDU; @@ -252,7 +252,7 @@ static void mcs_init_domain_parameters(DomainParameters* domainParameters, * @param domainParameters domain parameters */ -boolean mcs_read_domain_parameters(STREAM* s, DomainParameters* domainParameters) +BOOL mcs_read_domain_parameters(STREAM* s, DomainParameters* domainParameters) { int length; ber_read_sequence_tag(s, &length); @@ -321,10 +321,10 @@ void mcs_print_domain_parameters(DomainParameters* domainParameters) * @param s stream */ -boolean mcs_recv_connect_initial(rdpMcs* mcs, STREAM* s) +BOOL mcs_recv_connect_initial(rdpMcs* mcs, STREAM* s) { int length; - boolean upwardFlag; + BOOL upwardFlag; tpkt_read_header(s); @@ -345,7 +345,7 @@ boolean mcs_recv_connect_initial(rdpMcs* mcs, STREAM* s) stream_seek(s, length); /* upwardFlag (BOOLEAN) */ - if (!ber_read_boolean(s, &upwardFlag)) + if (!ber_read_BOOL(s, &upwardFlag)) return FALSE; /* targetParameters (DomainParameters) */ @@ -388,7 +388,7 @@ void mcs_write_connect_initial(STREAM* s, rdpMcs* mcs, STREAM* user_data) ber_write_octet_string(tmps, calledDomainSelector, sizeof(calledDomainSelector)); /* upwardFlag (BOOLEAN) */ - ber_write_boolean(tmps, TRUE); + ber_write_BOOL(tmps, TRUE); /* targetParameters (DomainParameters) */ mcs_write_domain_parameters(tmps, &mcs->targetParameters); @@ -442,7 +442,7 @@ void mcs_write_connect_response(STREAM* s, rdpMcs* mcs, STREAM* user_data) * @param mcs mcs module */ -boolean mcs_send_connect_initial(rdpMcs* mcs) +BOOL mcs_send_connect_initial(rdpMcs* mcs) { STREAM* s; int length; @@ -485,7 +485,7 @@ boolean mcs_send_connect_initial(rdpMcs* mcs) * @param mcs mcs module */ -boolean mcs_recv_connect_response(rdpMcs* mcs, STREAM* s) +BOOL mcs_recv_connect_response(rdpMcs* mcs, STREAM* s) { int length; uint8 result; @@ -520,7 +520,7 @@ boolean mcs_recv_connect_response(rdpMcs* mcs, STREAM* s) * @param mcs mcs module */ -boolean mcs_send_connect_response(rdpMcs* mcs) +BOOL mcs_send_connect_response(rdpMcs* mcs) { STREAM* s; int length; @@ -563,7 +563,7 @@ boolean mcs_send_connect_response(rdpMcs* mcs) * @param s stream */ -boolean mcs_recv_erect_domain_request(rdpMcs* mcs, STREAM* s) +BOOL mcs_recv_erect_domain_request(rdpMcs* mcs, STREAM* s) { uint16 length; enum DomainMCSPDU MCSPDU; @@ -581,7 +581,7 @@ boolean mcs_recv_erect_domain_request(rdpMcs* mcs, STREAM* s) * @param mcs */ -boolean mcs_send_erect_domain_request(rdpMcs* mcs) +BOOL mcs_send_erect_domain_request(rdpMcs* mcs) { STREAM* s; uint16 length = 12; @@ -605,7 +605,7 @@ boolean mcs_send_erect_domain_request(rdpMcs* mcs) * @param s stream */ -boolean mcs_recv_attach_user_request(rdpMcs* mcs, STREAM* s) +BOOL mcs_recv_attach_user_request(rdpMcs* mcs, STREAM* s) { uint16 length; enum DomainMCSPDU MCSPDU; @@ -623,7 +623,7 @@ boolean mcs_recv_attach_user_request(rdpMcs* mcs, STREAM* s) * @param mcs mcs module */ -boolean mcs_send_attach_user_request(rdpMcs* mcs) +BOOL mcs_send_attach_user_request(rdpMcs* mcs) { STREAM* s; uint16 length = 8; @@ -643,7 +643,7 @@ boolean mcs_send_attach_user_request(rdpMcs* mcs) * @param mcs mcs module */ -boolean mcs_recv_attach_user_confirm(rdpMcs* mcs, STREAM* s) +BOOL mcs_recv_attach_user_confirm(rdpMcs* mcs, STREAM* s) { uint16 length; uint8 result; @@ -665,7 +665,7 @@ boolean mcs_recv_attach_user_confirm(rdpMcs* mcs, STREAM* s) * @param mcs mcs module */ -boolean mcs_send_attach_user_confirm(rdpMcs* mcs) +BOOL mcs_send_attach_user_confirm(rdpMcs* mcs) { STREAM* s; uint16 length = 11; @@ -690,7 +690,7 @@ boolean mcs_send_attach_user_confirm(rdpMcs* mcs) * @param s stream */ -boolean mcs_recv_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id) +BOOL mcs_recv_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id) { uint16 length; enum DomainMCSPDU MCSPDU; @@ -717,7 +717,7 @@ boolean mcs_recv_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id * @param channel_id channel id */ -boolean mcs_send_channel_join_request(rdpMcs* mcs, uint16 channel_id) +BOOL mcs_send_channel_join_request(rdpMcs* mcs, uint16 channel_id) { STREAM* s; uint16 length = 12; @@ -740,7 +740,7 @@ boolean mcs_send_channel_join_request(rdpMcs* mcs, uint16 channel_id) * @param mcs mcs module */ -boolean mcs_recv_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id) +BOOL mcs_recv_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id) { uint16 length; uint8 result; @@ -766,7 +766,7 @@ boolean mcs_recv_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id * @param mcs mcs module */ -boolean mcs_send_channel_join_confirm(rdpMcs* mcs, uint16 channel_id) +BOOL mcs_send_channel_join_confirm(rdpMcs* mcs, uint16 channel_id) { STREAM* s; uint16 length = 15; @@ -789,7 +789,7 @@ boolean mcs_send_channel_join_confirm(rdpMcs* mcs, uint16 channel_id) * @param mcs mcs module */ -boolean mcs_send_disconnect_provider_ultimatum(rdpMcs* mcs) +BOOL mcs_send_disconnect_provider_ultimatum(rdpMcs* mcs) { STREAM* s; uint16 length = 9; diff --git a/libfreerdp/core/mcs.h b/libfreerdp/core/mcs.h index 763bd1460..820606368 100644 --- a/libfreerdp/core/mcs.h +++ b/libfreerdp/core/mcs.h @@ -119,8 +119,8 @@ struct rdp_mcs DomainParameters minimumParameters; DomainParameters maximumParameters; - boolean user_channel_joined; - boolean global_channel_joined; + BOOL user_channel_joined; + BOOL global_channel_joined; }; typedef struct rdp_mcs rdpMcs; @@ -132,22 +132,22 @@ typedef struct rdp_mcs rdpMcs; void mcs_write_connect_initial(STREAM* s, rdpMcs* mcs, STREAM* user_data); void mcs_write_connect_response(STREAM* s, rdpMcs* mcs, STREAM* user_data); -boolean mcs_recv_connect_initial(rdpMcs* mcs, STREAM* s); -boolean mcs_send_connect_initial(rdpMcs* mcs); -boolean mcs_recv_connect_response(rdpMcs* mcs, STREAM* s); -boolean mcs_send_connect_response(rdpMcs* mcs); -boolean mcs_recv_erect_domain_request(rdpMcs* mcs, STREAM* s); -boolean mcs_send_erect_domain_request(rdpMcs* mcs); -boolean mcs_recv_attach_user_request(rdpMcs* mcs, STREAM* s); -boolean mcs_send_attach_user_request(rdpMcs* mcs); -boolean mcs_recv_attach_user_confirm(rdpMcs* mcs, STREAM* s); -boolean mcs_send_attach_user_confirm(rdpMcs* mcs); -boolean mcs_recv_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id); -boolean mcs_send_channel_join_request(rdpMcs* mcs, uint16 channel_id); -boolean mcs_recv_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id); -boolean mcs_send_channel_join_confirm(rdpMcs* mcs, uint16 channel_id); -boolean mcs_send_disconnect_provider_ultimatum(rdpMcs* mcs); -boolean mcs_read_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU* domainMCSPDU, uint16* length); +BOOL mcs_recv_connect_initial(rdpMcs* mcs, STREAM* s); +BOOL mcs_send_connect_initial(rdpMcs* mcs); +BOOL mcs_recv_connect_response(rdpMcs* mcs, STREAM* s); +BOOL mcs_send_connect_response(rdpMcs* mcs); +BOOL mcs_recv_erect_domain_request(rdpMcs* mcs, STREAM* s); +BOOL mcs_send_erect_domain_request(rdpMcs* mcs); +BOOL mcs_recv_attach_user_request(rdpMcs* mcs, STREAM* s); +BOOL mcs_send_attach_user_request(rdpMcs* mcs); +BOOL mcs_recv_attach_user_confirm(rdpMcs* mcs, STREAM* s); +BOOL mcs_send_attach_user_confirm(rdpMcs* mcs); +BOOL mcs_recv_channel_join_request(rdpMcs* mcs, STREAM* s, uint16* channel_id); +BOOL mcs_send_channel_join_request(rdpMcs* mcs, uint16 channel_id); +BOOL mcs_recv_channel_join_confirm(rdpMcs* mcs, STREAM* s, uint16* channel_id); +BOOL mcs_send_channel_join_confirm(rdpMcs* mcs, uint16 channel_id); +BOOL mcs_send_disconnect_provider_ultimatum(rdpMcs* mcs); +BOOL mcs_read_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU* domainMCSPDU, uint16* length); void mcs_write_domain_mcspdu_header(STREAM* s, enum DomainMCSPDU domainMCSPDU, uint16 length, uint8 options); rdpMcs* mcs_new(rdpTransport* transport); diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c index 0091649f2..61faf114a 100644 --- a/libfreerdp/core/nego.c +++ b/libfreerdp/core/nego.c @@ -51,7 +51,7 @@ static const char PROTOCOL_SECURITY_STRINGS[3][4] = "NLA" }; -boolean nego_security_connect(rdpNego* nego); +BOOL nego_security_connect(rdpNego* nego); /** * Negotiate protocol security and connect. @@ -59,7 +59,7 @@ boolean nego_security_connect(rdpNego* nego); * @return */ -boolean nego_connect(rdpNego* nego) +BOOL nego_connect(rdpNego* nego) { if (nego->state == NEGO_STATE_INITIAL) { @@ -147,7 +147,7 @@ boolean nego_connect(rdpNego* nego) } /* connect to selected security layer */ -boolean nego_security_connect(rdpNego* nego) +BOOL nego_security_connect(rdpNego* nego) { if(!nego->tcp_connected) { @@ -184,7 +184,7 @@ boolean nego_security_connect(rdpNego* nego) * @return */ -boolean nego_tcp_connect(rdpNego* nego) +BOOL nego_tcp_connect(rdpNego* nego) { if (!nego->tcp_connected) nego->tcp_connected = transport_connect(nego->transport, nego->hostname, nego->port); @@ -198,7 +198,7 @@ boolean nego_tcp_connect(rdpNego* nego) * @return */ -boolean nego_transport_connect(rdpNego* nego) +BOOL nego_transport_connect(rdpNego* nego) { nego_tcp_connect(nego); @@ -231,7 +231,7 @@ int nego_transport_disconnect(rdpNego* nego) * @return */ -boolean nego_send_preconnection_pdu(rdpNego* nego) +BOOL nego_send_preconnection_pdu(rdpNego* nego) { STREAM* s; uint32 cbSize; @@ -393,7 +393,7 @@ void nego_attempt_rdp(rdpNego* nego) * @param nego */ -boolean nego_recv_response(rdpNego* nego) +BOOL nego_recv_response(rdpNego* nego) { STREAM* s = transport_recv_stream_init(nego->transport, 1024); @@ -411,7 +411,7 @@ boolean nego_recv_response(rdpNego* nego) * @param extra nego pointer */ -boolean nego_recv(rdpTransport* transport, STREAM* s, void* extra) +BOOL nego_recv(rdpTransport* transport, STREAM* s, void* extra) { uint8 li; uint8 type; @@ -480,7 +480,7 @@ boolean nego_recv(rdpTransport* transport, STREAM* s, void* extra) * @param s stream */ -boolean nego_read_request(rdpNego* nego, STREAM* s) +BOOL nego_read_request(rdpNego* nego, STREAM* s) { uint8 li; uint8 c; @@ -557,7 +557,7 @@ void nego_send(rdpNego* nego) * @param nego */ -boolean nego_send_negotiation_request(rdpNego* nego) +BOOL nego_send_negotiation_request(rdpNego* nego) { STREAM* s; int length; @@ -696,13 +696,13 @@ void nego_process_negotiation_failure(rdpNego* nego, STREAM* s) * @param nego */ -boolean nego_send_negotiation_response(rdpNego* nego) +BOOL nego_send_negotiation_response(rdpNego* nego) { STREAM* s; uint8* bm; uint8* em; int length; - boolean status; + BOOL status; rdpSettings* settings; status = TRUE; @@ -853,7 +853,7 @@ void nego_set_target(rdpNego* nego, char* hostname, int port) * @param enable_rdp whether to enable security layer negotiation (TRUE for enabled, FALSE for disabled) */ -void nego_set_negotiation_enabled(rdpNego* nego, boolean security_layer_negotiation_enabled) +void nego_set_negotiation_enabled(rdpNego* nego, BOOL security_layer_negotiation_enabled) { DEBUG_NEGO("Enabling security layer negotiation: %s", security_layer_negotiation_enabled ? "TRUE" : "FALSE"); nego->security_layer_negotiation_enabled = security_layer_negotiation_enabled; @@ -865,7 +865,7 @@ void nego_set_negotiation_enabled(rdpNego* nego, boolean security_layer_negotiat * @param enable_rdp whether to enable normal RDP protocol (TRUE for enabled, FALSE for disabled) */ -void nego_enable_rdp(rdpNego* nego, boolean enable_rdp) +void nego_enable_rdp(rdpNego* nego, BOOL enable_rdp) { DEBUG_NEGO("Enabling RDP security: %s", enable_rdp ? "TRUE" : "FALSE"); nego->enabled_protocols[PROTOCOL_RDP] = enable_rdp; @@ -876,7 +876,7 @@ void nego_enable_rdp(rdpNego* nego, boolean enable_rdp) * @param nego pointer to the negotiation structure * @param enable_tls whether to enable TLS + RDP protocol (TRUE for enabled, FALSE for disabled) */ -void nego_enable_tls(rdpNego* nego, boolean enable_tls) +void nego_enable_tls(rdpNego* nego, BOOL enable_tls) { DEBUG_NEGO("Enabling TLS security: %s", enable_tls ? "TRUE" : "FALSE"); nego->enabled_protocols[PROTOCOL_TLS] = enable_tls; @@ -889,7 +889,7 @@ void nego_enable_tls(rdpNego* nego, boolean enable_tls) * @param enable_nla whether to enable network level authentication protocol (TRUE for enabled, FALSE for disabled) */ -void nego_enable_nla(rdpNego* nego, boolean enable_nla) +void nego_enable_nla(rdpNego* nego, BOOL enable_nla) { DEBUG_NEGO("Enabling NLA security: %s", enable_nla ? "TRUE" : "FALSE"); nego->enabled_protocols[PROTOCOL_NLA] = enable_nla; @@ -925,7 +925,7 @@ void nego_set_cookie(rdpNego* nego, char* cookie) * @param send_pcpdu */ -void nego_set_send_preconnection_pdu(rdpNego* nego, boolean send_pcpdu) +void nego_set_send_preconnection_pdu(rdpNego* nego, BOOL send_pcpdu) { nego->send_preconnection_pdu = send_pcpdu; } diff --git a/libfreerdp/core/nego.h b/libfreerdp/core/nego.h index 20a81a244..ce8bcd13a 100644 --- a/libfreerdp/core/nego.h +++ b/libfreerdp/core/nego.h @@ -81,54 +81,54 @@ struct rdp_nego char* cookie; BYTE* RoutingToken; DWORD RoutingTokenLength; - boolean send_preconnection_pdu; + BOOL send_preconnection_pdu; uint32 preconnection_id; char* preconnection_blob; NEGO_STATE state; - boolean tcp_connected; - boolean security_connected; + BOOL tcp_connected; + BOOL security_connected; uint32 selected_protocol; uint32 requested_protocols; - boolean security_layer_negotiation_enabled; + BOOL security_layer_negotiation_enabled; uint8 enabled_protocols[3]; rdpTransport* transport; }; typedef struct rdp_nego rdpNego; -boolean nego_connect(rdpNego* nego); +BOOL nego_connect(rdpNego* nego); -boolean nego_send_preconnection_pdu(rdpNego* nego); +BOOL nego_send_preconnection_pdu(rdpNego* nego); void nego_attempt_nla(rdpNego* nego); void nego_attempt_tls(rdpNego* nego); void nego_attempt_rdp(rdpNego* nego); void nego_send(rdpNego* nego); -boolean nego_recv(rdpTransport* transport, STREAM* s, void* extra); -boolean nego_recv_response(rdpNego* nego); -boolean nego_read_request(rdpNego* nego, STREAM* s); +BOOL nego_recv(rdpTransport* transport, STREAM* s, void* extra); +BOOL nego_recv_response(rdpNego* nego); +BOOL nego_read_request(rdpNego* nego, STREAM* s); -boolean nego_send_negotiation_request(rdpNego* nego); +BOOL nego_send_negotiation_request(rdpNego* nego); void nego_process_negotiation_request(rdpNego* nego, STREAM* s); void nego_process_negotiation_response(rdpNego* nego, STREAM* s); void nego_process_negotiation_failure(rdpNego* nego, STREAM* s); -boolean nego_send_negotiation_response(rdpNego* nego); +BOOL nego_send_negotiation_response(rdpNego* nego); rdpNego* nego_new(struct rdp_transport * transport); void nego_free(rdpNego* nego); void nego_init(rdpNego* nego); void nego_set_target(rdpNego* nego, char* hostname, int port); -void nego_set_negotiation_enabled(rdpNego* nego, boolean security_layer_negotiation_enabled); -void nego_enable_rdp(rdpNego* nego, boolean enable_rdp); -void nego_enable_nla(rdpNego* nego, boolean enable_nla); -void nego_enable_tls(rdpNego* nego, boolean enable_tls); +void nego_set_negotiation_enabled(rdpNego* nego, BOOL security_layer_negotiation_enabled); +void nego_enable_rdp(rdpNego* nego, BOOL enable_rdp); +void nego_enable_nla(rdpNego* nego, BOOL enable_nla); +void nego_enable_tls(rdpNego* nego, BOOL enable_tls); void nego_set_routing_token(rdpNego* nego, BYTE* RoutingToken, DWORD RoutingTokenLength); void nego_set_cookie(rdpNego* nego, char* cookie); -void nego_set_send_preconnection_pdu(rdpNego* nego, boolean send_pcpdu); +void nego_set_send_preconnection_pdu(rdpNego* nego, BOOL send_pcpdu); void nego_set_preconnection_id(rdpNego* nego, uint32 id); void nego_set_preconnection_blob(rdpNego* nego, char* blob); diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c index c96c3feb4..5ef0d24a1 100644 --- a/libfreerdp/core/orders.c +++ b/libfreerdp/core/orders.c @@ -142,7 +142,7 @@ static const uint8 BMF_BPP[] = 0, 1, 0, 8, 16, 24, 32 }; -static INLINE void update_read_coord(STREAM* s, sint32* coord, boolean delta) +static INLINE void update_read_coord(STREAM* s, sint32* coord, BOOL delta) { sint8 lsi8; sint16 lsi16; @@ -218,7 +218,7 @@ static INLINE void update_read_2byte_unsigned(STREAM* s, uint32* value) static INLINE void update_read_2byte_signed(STREAM* s, sint32* value) { uint8 byte; - boolean negative; + BOOL negative; stream_read_uint8(s, byte); @@ -1201,7 +1201,7 @@ void update_read_ellipse_cb_order(STREAM* s, ORDER_INFO* orderInfo, ELLIPSE_CB_O /* Secondary Drawing Orders */ -void update_read_cache_bitmap_order(STREAM* s, CACHE_BITMAP_ORDER* cache_bitmap_order, boolean compressed, uint16 flags) +void update_read_cache_bitmap_order(STREAM* s, CACHE_BITMAP_ORDER* cache_bitmap_order, BOOL compressed, uint16 flags) { stream_read_uint8(s, cache_bitmap_order->cacheId); /* cacheId (1 byte) */ stream_seek_uint8(s); /* pad1Octet (1 byte) */ @@ -1230,7 +1230,7 @@ void update_read_cache_bitmap_order(STREAM* s, CACHE_BITMAP_ORDER* cache_bitmap_ cache_bitmap_order->compressed = compressed; } -void update_read_cache_bitmap_v2_order(STREAM* s, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2_order, boolean compressed, uint16 flags) +void update_read_cache_bitmap_v2_order(STREAM* s, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2_order, BOOL compressed, uint16 flags) { uint8 bitsPerPixelId; @@ -1285,7 +1285,7 @@ void update_read_cache_bitmap_v2_order(STREAM* s, CACHE_BITMAP_V2_ORDER* cache_b cache_bitmap_v2_order->compressed = compressed; } -void update_read_cache_bitmap_v3_order(STREAM* s, CACHE_BITMAP_V3_ORDER* cache_bitmap_v3_order, boolean compressed, uint16 flags) +void update_read_cache_bitmap_v3_order(STREAM* s, CACHE_BITMAP_V3_ORDER* cache_bitmap_v3_order, BOOL compressed, uint16 flags) { uint8 bitsPerPixelId; BITMAP_DATA_EX* bitmapData; @@ -1446,7 +1446,7 @@ void update_read_cache_brush_order(STREAM* s, CACHE_BRUSH_ORDER* cache_brush_ord int i; int size; uint8 iBitmapFormat; - boolean compressed = FALSE; + BOOL compressed = FALSE; stream_read_uint8(s, cache_brush_order->index); /* cacheEntry (1 byte) */ @@ -1512,7 +1512,7 @@ void update_read_cache_brush_order(STREAM* s, CACHE_BRUSH_ORDER* cache_brush_ord void update_read_create_offscreen_bitmap_order(STREAM* s, CREATE_OFFSCREEN_BITMAP_ORDER* create_offscreen_bitmap) { uint16 flags; - boolean deleteListPresent; + BOOL deleteListPresent; OFFSCREEN_DELETE_LIST* deleteList; stream_read_uint16(s, flags); /* flags (2 bytes) */ @@ -1702,7 +1702,7 @@ void update_read_bounds(STREAM* s, rdpBounds* bounds) update_read_coord(s, &bounds->bottom, TRUE); } -boolean update_recv_primary_order(rdpUpdate* update, STREAM* s, uint8 flags) +BOOL update_recv_primary_order(rdpUpdate* update, STREAM* s, uint8 flags) { ORDER_INFO* orderInfo; rdpContext* context = update->context; @@ -2028,7 +2028,7 @@ void update_recv_altsec_order(rdpUpdate* update, STREAM* s, uint8 flags) } } -boolean update_recv_order(rdpUpdate* update, STREAM* s) +BOOL update_recv_order(rdpUpdate* update, STREAM* s) { uint8 controlFlags; diff --git a/libfreerdp/core/orders.h b/libfreerdp/core/orders.h index d04c4cff6..c6b7e2d17 100644 --- a/libfreerdp/core/orders.h +++ b/libfreerdp/core/orders.h @@ -184,7 +184,7 @@ #define CG_GLYPH_UNICODE_PRESENT 0x0010 -boolean update_recv_order(rdpUpdate* update, STREAM* s); +BOOL update_recv_order(rdpUpdate* update, STREAM* s); void update_read_dstblt_order(STREAM* s, ORDER_INFO* orderInfo, DSTBLT_ORDER* dstblt); void update_read_patblt_order(STREAM* s, ORDER_INFO* orderInfo, PATBLT_ORDER* patblt); @@ -209,9 +209,9 @@ void update_read_polygon_cb_order(STREAM* s, ORDER_INFO* orderInfo, POLYGON_CB_O void update_read_ellipse_sc_order(STREAM* s, ORDER_INFO* orderInfo, ELLIPSE_SC_ORDER* ellipse_sc); void update_read_ellipse_cb_order(STREAM* s, ORDER_INFO* orderInfo, ELLIPSE_CB_ORDER* ellipse_cb); -void update_read_cache_bitmap_order(STREAM* s, CACHE_BITMAP_ORDER* cache_bitmap_order, boolean compressed, uint16 flags); -void update_read_cache_bitmap_v2_order(STREAM* s, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2_order, boolean compressed, uint16 flags); -void update_read_cache_bitmap_v3_order(STREAM* s, CACHE_BITMAP_V3_ORDER* cache_bitmap_v3_order, boolean compressed, uint16 flags); +void update_read_cache_bitmap_order(STREAM* s, CACHE_BITMAP_ORDER* cache_bitmap_order, BOOL compressed, uint16 flags); +void update_read_cache_bitmap_v2_order(STREAM* s, CACHE_BITMAP_V2_ORDER* cache_bitmap_v2_order, BOOL compressed, uint16 flags); +void update_read_cache_bitmap_v3_order(STREAM* s, CACHE_BITMAP_V3_ORDER* cache_bitmap_v3_order, BOOL compressed, uint16 flags); void update_read_cache_color_table_order(STREAM* s, CACHE_COLOR_TABLE_ORDER* cache_color_table_order, uint16 flags); void update_read_cache_glyph_order(STREAM* s, CACHE_GLYPH_ORDER* cache_glyph_order, uint16 flags); void update_read_cache_glyph_v2_order(STREAM* s, CACHE_GLYPH_V2_ORDER* cache_glyph_v2_order, uint16 flags); diff --git a/libfreerdp/core/peer.c b/libfreerdp/core/peer.c index 60b306202..7feae92cf 100644 --- a/libfreerdp/core/peer.c +++ b/libfreerdp/core/peer.c @@ -26,7 +26,7 @@ #include "peer.h" -static boolean freerdp_peer_initialize(freerdp_peer* client) +static BOOL freerdp_peer_initialize(freerdp_peer* client) { client->context->rdp->settings->server_mode = TRUE; client->context->rdp->settings->frame_acknowledge = 0; @@ -42,7 +42,7 @@ static boolean freerdp_peer_initialize(freerdp_peer* client) return TRUE; } -static boolean freerdp_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) +static BOOL freerdp_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) { rfds[*rcount] = (void*)(long)(client->context->rdp->transport->tcp->sockfd); (*rcount)++; @@ -50,7 +50,7 @@ static boolean freerdp_peer_get_fds(freerdp_peer* client, void** rfds, int* rcou return TRUE; } -static boolean freerdp_peer_check_fds(freerdp_peer* client) +static BOOL freerdp_peer_check_fds(freerdp_peer* client) { int status; rdpRdp* rdp; @@ -65,7 +65,7 @@ static boolean freerdp_peer_check_fds(freerdp_peer* client) return TRUE; } -static boolean peer_recv_data_pdu(freerdp_peer* client, STREAM* s) +static BOOL peer_recv_data_pdu(freerdp_peer* client, STREAM* s) { uint8 type; uint16 length; @@ -153,7 +153,7 @@ static boolean peer_recv_data_pdu(freerdp_peer* client, STREAM* s) return TRUE; } -static boolean peer_recv_tpkt_pdu(freerdp_peer* client, STREAM* s) +static BOOL peer_recv_tpkt_pdu(freerdp_peer* client, STREAM* s) { rdpRdp* rdp; uint16 length; @@ -212,7 +212,7 @@ static boolean peer_recv_tpkt_pdu(freerdp_peer* client, STREAM* s) return TRUE; } -static boolean peer_recv_fastpath_pdu(freerdp_peer* client, STREAM* s) +static BOOL peer_recv_fastpath_pdu(freerdp_peer* client, STREAM* s) { rdpRdp* rdp; uint16 length; @@ -236,7 +236,7 @@ static boolean peer_recv_fastpath_pdu(freerdp_peer* client, STREAM* s) return fastpath_recv_inputs(fastpath, s); } -static boolean peer_recv_pdu(freerdp_peer* client, STREAM* s) +static BOOL peer_recv_pdu(freerdp_peer* client, STREAM* s) { if (tpkt_verify_header(s)) return peer_recv_tpkt_pdu(client, s); @@ -244,7 +244,7 @@ static boolean peer_recv_pdu(freerdp_peer* client, STREAM* s) return peer_recv_fastpath_pdu(client, s); } -static boolean peer_recv_callback(rdpTransport* transport, STREAM* s, void* extra) +static BOOL peer_recv_callback(rdpTransport* transport, STREAM* s, void* extra) { freerdp_peer* client = (freerdp_peer*) extra; rdpRdp* rdp = client->context->rdp; @@ -333,7 +333,7 @@ static boolean peer_recv_callback(rdpTransport* transport, STREAM* s, void* extr return TRUE; } -static boolean freerdp_peer_close(freerdp_peer* client) +static BOOL freerdp_peer_close(freerdp_peer* client) { /** * [MS-RDPBCGR] 1.3.1.4.2 User-Initiated Disconnection Sequence on Server diff --git a/libfreerdp/core/rdp.c b/libfreerdp/core/rdp.c index e71c48e6e..207ec7436 100644 --- a/libfreerdp/core/rdp.c +++ b/libfreerdp/core/rdp.c @@ -96,7 +96,7 @@ void rdp_write_security_header(STREAM* s, uint16 flags) stream_write_uint16(s, 0); /* flagsHi (unused) */ } -boolean rdp_read_share_control_header(STREAM* s, uint16* length, uint16* type, uint16* channel_id) +BOOL rdp_read_share_control_header(STREAM* s, uint16* length, uint16* type, uint16* channel_id) { /* Share Control Header */ stream_read_uint16(s, *length); /* totalLength */ @@ -125,7 +125,7 @@ void rdp_write_share_control_header(STREAM* s, uint16 length, uint16 type, uint1 stream_write_uint16(s, channel_id); /* pduSource */ } -boolean rdp_read_share_data_header(STREAM* s, uint16* length, uint8* type, uint32* share_id, +BOOL rdp_read_share_data_header(STREAM* s, uint16* length, uint8* type, uint32* share_id, uint8 *compressed_type, uint16 *compressed_len) { if (stream_get_left(s) < 12) @@ -222,7 +222,7 @@ STREAM* rdp_data_pdu_init(rdpRdp* rdp) * @param channel_id channel id */ -boolean rdp_read_header(rdpRdp* rdp, STREAM* s, uint16* length, uint16* channel_id) +BOOL rdp_read_header(rdpRdp* rdp, STREAM* s, uint16* length, uint16* channel_id) { uint16 initiator; enum DomainMCSPDU MCSPDU; @@ -385,7 +385,7 @@ static uint32 rdp_get_sec_bytes(rdpRdp* rdp) * @param channel_id channel id */ -boolean rdp_send(rdpRdp* rdp, STREAM* s, uint16 channel_id) +BOOL rdp_send(rdpRdp* rdp, STREAM* s, uint16 channel_id) { uint16 length; uint32 sec_bytes; @@ -410,7 +410,7 @@ boolean rdp_send(rdpRdp* rdp, STREAM* s, uint16 channel_id) return TRUE; } -boolean rdp_send_pdu(rdpRdp* rdp, STREAM* s, uint16 type, uint16 channel_id) +BOOL rdp_send_pdu(rdpRdp* rdp, STREAM* s, uint16 type, uint16 channel_id) { uint16 length; uint32 sec_bytes; @@ -437,7 +437,7 @@ boolean rdp_send_pdu(rdpRdp* rdp, STREAM* s, uint16 type, uint16 channel_id) return TRUE; } -boolean rdp_send_data_pdu(rdpRdp* rdp, STREAM* s, uint8 type, uint16 channel_id) +BOOL rdp_send_data_pdu(rdpRdp* rdp, STREAM* s, uint8 type, uint16 channel_id) { uint16 length; uint32 sec_bytes; @@ -473,7 +473,7 @@ void rdp_recv_set_error_info_data_pdu(rdpRdp* rdp, STREAM* s) rdp_print_errinfo(rdp->errorInfo); } -boolean rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s) { uint8 type; uint16 length; @@ -607,7 +607,7 @@ boolean rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s) return TRUE; } -boolean rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, STREAM* s) { uint16 type; uint16 length; @@ -637,7 +637,7 @@ boolean rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, STREAM* s) * @param length int */ -boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, uint16 securityFlags) +BOOL rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, uint16 securityFlags) { uint8 cmac[8], wmac[8]; @@ -701,7 +701,7 @@ boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, uint16 securityFlags) * @param s stream */ -static boolean rdp_recv_tpkt_pdu(rdpRdp* rdp, STREAM* s) +static BOOL rdp_recv_tpkt_pdu(rdpRdp* rdp, STREAM* s) { uint16 length; uint16 pduType; @@ -784,7 +784,7 @@ static boolean rdp_recv_tpkt_pdu(rdpRdp* rdp, STREAM* s) return TRUE; } -static boolean rdp_recv_fastpath_pdu(rdpRdp* rdp, STREAM* s) +static BOOL rdp_recv_fastpath_pdu(rdpRdp* rdp, STREAM* s) { uint16 length; rdpFastPath* fastpath; @@ -806,7 +806,7 @@ static boolean rdp_recv_fastpath_pdu(rdpRdp* rdp, STREAM* s) return fastpath_recv_updates(rdp->fastpath, s); } -static boolean rdp_recv_pdu(rdpRdp* rdp, STREAM* s) +static BOOL rdp_recv_pdu(rdpRdp* rdp, STREAM* s) { if (tpkt_verify_header(s)) return rdp_recv_tpkt_pdu(rdp, s); @@ -829,7 +829,7 @@ void rdp_recv(rdpRdp* rdp) rdp_recv_pdu(rdp, s); } -static boolean rdp_recv_callback(rdpTransport* transport, STREAM* s, void* extra) +static BOOL rdp_recv_callback(rdpTransport* transport, STREAM* s, void* extra) { rdpRdp* rdp = (rdpRdp*) extra; @@ -893,7 +893,7 @@ int rdp_send_channel_data(rdpRdp* rdp, int channel_id, uint8* data, int size) * @param rdp RDP module * @param blocking blocking mode */ -void rdp_set_blocking_mode(rdpRdp* rdp, boolean blocking) +void rdp_set_blocking_mode(rdpRdp* rdp, BOOL blocking) { rdp->transport->recv_callback = rdp_recv_callback; rdp->transport->recv_extra = rdp; diff --git a/libfreerdp/core/rdp.h b/libfreerdp/core/rdp.h index 50fb58a74..1ff51dd7a 100644 --- a/libfreerdp/core/rdp.h +++ b/libfreerdp/core/rdp.h @@ -141,8 +141,8 @@ struct rdp_rdp struct crypto_des3_struct* fips_decrypt; struct crypto_hmac_struct* fips_hmac; uint32 sec_flags; - boolean do_crypt; - boolean do_secure_checksum; + BOOL do_crypt; + BOOL do_secure_checksum; uint8 sign_key[16]; uint8 decrypt_key[16]; uint8 encrypt_key[16]; @@ -154,40 +154,40 @@ struct rdp_rdp uint8 fips_decrypt_key[24]; uint32 errorInfo; uint32 finalize_sc_pdus; - boolean disconnect; + BOOL disconnect; }; void rdp_read_security_header(STREAM* s, uint16* flags); void rdp_write_security_header(STREAM* s, uint16 flags); -boolean rdp_read_share_control_header(STREAM* s, uint16* length, uint16* type, uint16* channel_id); +BOOL rdp_read_share_control_header(STREAM* s, uint16* length, uint16* type, uint16* channel_id); void rdp_write_share_control_header(STREAM* s, uint16 length, uint16 type, uint16 channel_id); -boolean rdp_read_share_data_header(STREAM* s, uint16* length, uint8* type, uint32* share_id, +BOOL rdp_read_share_data_header(STREAM* s, uint16* length, uint8* type, uint32* share_id, uint8 *compressed_type, uint16 *compressed_len); void rdp_write_share_data_header(STREAM* s, uint16 length, uint8 type, uint32 share_id); STREAM* rdp_send_stream_init(rdpRdp* rdp); -boolean rdp_read_header(rdpRdp* rdp, STREAM* s, uint16* length, uint16* channel_id); +BOOL rdp_read_header(rdpRdp* rdp, STREAM* s, uint16* length, uint16* channel_id); void rdp_write_header(rdpRdp* rdp, STREAM* s, uint16 length, uint16 channel_id); STREAM* rdp_pdu_init(rdpRdp* rdp); -boolean rdp_send_pdu(rdpRdp* rdp, STREAM* s, uint16 type, uint16 channel_id); +BOOL rdp_send_pdu(rdpRdp* rdp, STREAM* s, uint16 type, uint16 channel_id); STREAM* rdp_data_pdu_init(rdpRdp* rdp); -boolean rdp_send_data_pdu(rdpRdp* rdp, STREAM* s, uint8 type, uint16 channel_id); -boolean rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_send_data_pdu(rdpRdp* rdp, STREAM* s, uint8 type, uint16 channel_id); +BOOL rdp_recv_data_pdu(rdpRdp* rdp, STREAM* s); -boolean rdp_send(rdpRdp* rdp, STREAM* s, uint16 channel_id); +BOOL rdp_send(rdpRdp* rdp, STREAM* s, uint16 channel_id); void rdp_recv(rdpRdp* rdp); int rdp_send_channel_data(rdpRdp* rdp, int channel_id, uint8* data, int size); -boolean rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, STREAM* s); +BOOL rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, STREAM* s); -void rdp_set_blocking_mode(rdpRdp* rdp, boolean blocking); +void rdp_set_blocking_mode(rdpRdp* rdp, BOOL blocking); int rdp_check_fds(rdpRdp* rdp); rdpRdp* rdp_new(freerdp* instance); @@ -199,6 +199,6 @@ void rdp_free(rdpRdp* rdp); #define DEBUG_RDP(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__) #endif -boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, uint16 securityFlags); +BOOL rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, uint16 securityFlags); #endif /* __RDP_H */ diff --git a/libfreerdp/core/redirection.c b/libfreerdp/core/redirection.c index b9669f155..a16dd596e 100644 --- a/libfreerdp/core/redirection.c +++ b/libfreerdp/core/redirection.c @@ -59,7 +59,7 @@ void rdp_print_redirection_flags(uint32 flags) printf("}\n"); } -boolean rdp_recv_server_redirection_pdu(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_server_redirection_pdu(rdpRdp* rdp, STREAM* s) { uint16 flags; uint16 length; @@ -164,13 +164,13 @@ boolean rdp_recv_server_redirection_pdu(rdpRdp* rdp, STREAM* s) return rdp_client_redirect(rdp); } -boolean rdp_recv_redirection_packet(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_redirection_packet(rdpRdp* rdp, STREAM* s) { rdp_recv_server_redirection_pdu(rdp, s); return TRUE; } -boolean rdp_recv_enhanced_security_redirection_packet(rdpRdp* rdp, STREAM* s) +BOOL rdp_recv_enhanced_security_redirection_packet(rdpRdp* rdp, STREAM* s) { stream_seek_uint16(s); /* pad2Octets (2 bytes) */ rdp_recv_server_redirection_pdu(rdp, s); diff --git a/libfreerdp/core/redirection.h b/libfreerdp/core/redirection.h index cd69aef46..d57b6980d 100644 --- a/libfreerdp/core/redirection.h +++ b/libfreerdp/core/redirection.h @@ -61,8 +61,8 @@ struct rdp_redirection }; typedef struct rdp_redirection rdpRedirection; -boolean rdp_recv_redirection_packet(rdpRdp* rdp, STREAM* s); -boolean rdp_recv_enhanced_security_redirection_packet(rdpRdp* rdp, STREAM* s); +BOOL rdp_recv_redirection_packet(rdpRdp* rdp, STREAM* s); +BOOL rdp_recv_enhanced_security_redirection_packet(rdpRdp* rdp, STREAM* s); rdpRedirection* redirection_new(); void redirection_free(rdpRedirection* redirection); diff --git a/libfreerdp/core/rpc.c b/libfreerdp/core/rpc.c index c1b0f2544..bef70f0f6 100644 --- a/libfreerdp/core/rpc.c +++ b/libfreerdp/core/rpc.c @@ -33,7 +33,7 @@ #include "rpc.h" -boolean ntlm_client_init(rdpNtlm* ntlm, boolean confidentiality, char* user, char* domain, char* password) +BOOL ntlm_client_init(rdpNtlm* ntlm, BOOL confidentiality, char* user, char* domain, char* password) { SECURITY_STATUS status; @@ -95,7 +95,7 @@ boolean ntlm_client_init(rdpNtlm* ntlm, boolean confidentiality, char* user, cha return TRUE; } -boolean ntlm_authenticate(rdpNtlm* ntlm) +BOOL ntlm_authenticate(rdpNtlm* ntlm) { SECURITY_STATUS status; @@ -209,7 +209,7 @@ STREAM* rpc_ntlm_http_request(rdpRpc* rpc, SecBuffer* ntlm_token, int content_le return s; } -boolean rpc_ntlm_http_out_connect(rdpRpc* rpc) +BOOL rpc_ntlm_http_out_connect(rdpRpc* rpc) { STREAM* s; int ntlm_token_length; @@ -259,7 +259,7 @@ boolean rpc_ntlm_http_out_connect(rdpRpc* rpc) return TRUE; } -boolean rpc_ntlm_http_in_connect(rdpRpc* rpc) +BOOL rpc_ntlm_http_in_connect(rdpRpc* rpc) { STREAM* s; int ntlm_token_length; @@ -357,7 +357,7 @@ int rpc_in_write(rdpRpc* rpc, uint8* data, int length) return status; } -boolean rpc_send_bind_pdu(rdpRpc* rpc) +BOOL rpc_send_bind_pdu(rdpRpc* rpc) { STREAM* pdu; rpcconn_bind_hdr_t* bind_pdu; @@ -530,7 +530,7 @@ int rpc_recv_bind_ack_pdu(rdpRpc* rpc) return status; } -boolean rpc_send_rpc_auth_3_pdu(rdpRpc* rpc) +BOOL rpc_send_rpc_auth_3_pdu(rdpRpc* rpc) { STREAM* pdu; STREAM* s = stream_new(0); @@ -861,7 +861,7 @@ int rpc_read(rdpRpc* rpc, uint8* data, int length) return read; } -boolean rpc_connect(rdpRpc* rpc) +BOOL rpc_connect(rdpRpc* rpc) { rpc->tls_in = rpc->transport->tls_in; rpc->tls_out = rpc->transport->tls_out; diff --git a/libfreerdp/core/rpc.h b/libfreerdp/core/rpc.h index c75f8c393..03bf81cfe 100644 --- a/libfreerdp/core/rpc.h +++ b/libfreerdp/core/rpc.h @@ -538,12 +538,12 @@ struct rdp_ntlm PSecBuffer pBuffer; SecBuffer inputBuffer; SecBuffer outputBuffer; - boolean haveContext; - boolean haveInputBuffer; + BOOL haveContext; + BOOL haveInputBuffer; SecBufferDesc inputBufferDesc; SecBufferDesc outputBufferDesc; CredHandle credentials; - boolean confidentiality; + BOOL confidentiality; SecPkgInfo* pPackageInfo; SecurityFunctionTable* table; SEC_WINNT_AUTH_IDENTITY identity; @@ -662,18 +662,18 @@ struct rdp_rpc RpcVirtualConnection* VirtualConnection; }; -boolean ntlm_authenticate(rdpNtlm* ntlm); +BOOL ntlm_authenticate(rdpNtlm* ntlm); -boolean ntlm_client_init(rdpNtlm* ntlm, boolean confidentiality, char* user, char* domain, char* password); +BOOL ntlm_client_init(rdpNtlm* ntlm, BOOL confidentiality, char* user, char* domain, char* password); void ntlm_client_uninit(rdpNtlm* ntlm); rdpNtlm* ntlm_new(); void ntlm_free(rdpNtlm* ntlm); -boolean rpc_connect(rdpRpc* rpc); +BOOL rpc_connect(rdpRpc* rpc); -boolean rpc_ntlm_http_out_connect(rdpRpc* rpc); -boolean rpc_ntlm_http_in_connect(rdpRpc* rpc); +BOOL rpc_ntlm_http_out_connect(rdpRpc* rpc); +BOOL rpc_ntlm_http_in_connect(rdpRpc* rpc); void rpc_pdu_header_read(STREAM* s, RPC_PDU_HEADER* header); diff --git a/libfreerdp/core/rts.c b/libfreerdp/core/rts.c index 2f2fe40dc..edb3aa6ec 100644 --- a/libfreerdp/core/rts.c +++ b/libfreerdp/core/rts.c @@ -45,7 +45,7 @@ * */ -boolean rts_connect(rdpRpc* rpc) +BOOL rts_connect(rdpRpc* rpc) { int status; RTS_PDU rts_pdu; @@ -357,7 +357,7 @@ void rpc_generate_cookie(uint8* cookie) RAND_pseudo_bytes(cookie, 16); } -boolean rts_send_CONN_A1_pdu(rdpRpc* rpc) +BOOL rts_send_CONN_A1_pdu(rdpRpc* rpc) { STREAM* s; RTS_PDU_HEADER header; @@ -404,7 +404,7 @@ boolean rts_send_CONN_A1_pdu(rdpRpc* rpc) return TRUE; } -boolean rts_send_CONN_B1_pdu(rdpRpc* rpc) +BOOL rts_send_CONN_B1_pdu(rdpRpc* rpc) { STREAM* s; RTS_PDU_HEADER header; @@ -453,7 +453,7 @@ boolean rts_send_CONN_B1_pdu(rdpRpc* rpc) return TRUE; } -boolean rts_send_keep_alive_pdu(rdpRpc* rpc) +BOOL rts_send_keep_alive_pdu(rdpRpc* rpc) { STREAM* s; RTS_PDU_HEADER header; @@ -486,7 +486,7 @@ boolean rts_send_keep_alive_pdu(rdpRpc* rpc) return TRUE; } -boolean rts_send_flow_control_ack_pdu(rdpRpc* rpc) +BOOL rts_send_flow_control_ack_pdu(rdpRpc* rpc) { STREAM* s; RTS_PDU_HEADER header; @@ -530,7 +530,7 @@ boolean rts_send_flow_control_ack_pdu(rdpRpc* rpc) return TRUE; } -boolean rts_send_ping_pdu(rdpRpc* rpc) +BOOL rts_send_ping_pdu(rdpRpc* rpc) { STREAM* s; RTS_PDU_HEADER header; diff --git a/libfreerdp/core/rts.h b/libfreerdp/core/rts.h index 449c0e2b3..b162dbe04 100644 --- a/libfreerdp/core/rts.h +++ b/libfreerdp/core/rts.h @@ -113,7 +113,7 @@ struct _rts_pdu }; typedef struct _rts_pdu RTS_PDU; -boolean rts_connect(rdpRpc* rpc); +BOOL rts_connect(rdpRpc* rpc); void rts_pdu_header_read(STREAM* s, RTS_PDU_HEADER* header); void rts_pdu_header_write(STREAM* s, RTS_PDU_HEADER* header); @@ -149,11 +149,11 @@ void rts_destination_command_write(STREAM* s, uint32 Destination); void rts_ping_traffic_sent_notify_command_read(rdpRpc* rpc, STREAM* s); void rts_ping_traffic_sent_notify_command_write(STREAM* s, uint32 PingTrafficSent); -boolean rts_send_CONN_A1_pdu(rdpRpc* rpc); -boolean rts_send_CONN_B1_pdu(rdpRpc* rpc); -boolean rts_send_keep_alive_pdu(rdpRpc* rpc); -boolean rts_send_flow_control_ack_pdu(rdpRpc* rpc); -boolean rts_send_ping_pdu(rdpRpc* rpc); +BOOL rts_send_CONN_A1_pdu(rdpRpc* rpc); +BOOL rts_send_CONN_B1_pdu(rdpRpc* rpc); +BOOL rts_send_keep_alive_pdu(rdpRpc* rpc); +BOOL rts_send_flow_control_ack_pdu(rdpRpc* rpc); +BOOL rts_send_ping_pdu(rdpRpc* rpc); int rts_recv_pdu(rdpRpc* rpc, RTS_PDU* rts_pdu); diff --git a/libfreerdp/core/security.c b/libfreerdp/core/security.c index cfa7c0042..8c7bf4cda 100644 --- a/libfreerdp/core/security.c +++ b/libfreerdp/core/security.c @@ -255,7 +255,7 @@ void security_mac_signature(rdpRdp *rdp, uint8* data, uint32 length, uint8* outp memcpy(output, md5_digest, 8); } -void security_salted_mac_signature(rdpRdp *rdp, uint8* data, uint32 length, boolean encryption, uint8* output) +void security_salted_mac_signature(rdpRdp *rdp, uint8* data, uint32 length, BOOL encryption, uint8* output) { CryptoMd5 md5; CryptoSha1 sha1; @@ -345,7 +345,7 @@ static void fips_expand_key_bits(uint8* in, uint8* out) out[i] = fips_oddparity_table[fips_reverse_table[out[i]]]; } -boolean security_establish_keys(uint8* client_random, rdpRdp* rdp) +BOOL security_establish_keys(uint8* client_random, rdpRdp* rdp) { uint8 pre_master_secret[48]; uint8 master_secret[48]; @@ -435,7 +435,7 @@ boolean security_establish_keys(uint8* client_random, rdpRdp* rdp) return TRUE; } -boolean security_key_update(uint8* key, uint8* update_key, int key_len) +BOOL security_key_update(uint8* key, uint8* update_key, int key_len) { uint8 sha1h[CRYPTO_SHA1_DIGEST_LENGTH]; CryptoMd5 md5; @@ -465,7 +465,7 @@ boolean security_key_update(uint8* key, uint8* update_key, int key_len) return TRUE; } -boolean security_encrypt(uint8* data, int length, rdpRdp* rdp) +BOOL security_encrypt(uint8* data, int length, rdpRdp* rdp) { if (rdp->encrypt_use_count >= 4096) { @@ -480,7 +480,7 @@ boolean security_encrypt(uint8* data, int length, rdpRdp* rdp) return TRUE; } -boolean security_decrypt(uint8* data, int length, rdpRdp* rdp) +BOOL security_decrypt(uint8* data, int length, rdpRdp* rdp) { if (rdp->decrypt_use_count >= 4096) { @@ -510,20 +510,20 @@ void security_hmac_signature(uint8* data, int length, uint8* output, rdpRdp* rdp memmove(output, buf, 8); } -boolean security_fips_encrypt(uint8* data, int length, rdpRdp* rdp) +BOOL security_fips_encrypt(uint8* data, int length, rdpRdp* rdp) { crypto_des3_encrypt(rdp->fips_encrypt, length, data, data); rdp->encrypt_use_count++; return TRUE; } -boolean security_fips_decrypt(uint8* data, int length, rdpRdp* rdp) +BOOL security_fips_decrypt(uint8* data, int length, rdpRdp* rdp) { crypto_des3_decrypt(rdp->fips_decrypt, length, data, data); return TRUE; } -boolean security_fips_check_signature(uint8* data, int length, uint8* sig, rdpRdp* rdp) +BOOL security_fips_check_signature(uint8* data, int length, uint8* sig, rdpRdp* rdp) { uint8 buf[20]; uint8 use_count_le[4]; diff --git a/libfreerdp/core/security.h b/libfreerdp/core/security.h index 5f7d9b87c..8747d56f4 100644 --- a/libfreerdp/core/security.h +++ b/libfreerdp/core/security.h @@ -33,15 +33,15 @@ void security_licensing_encryption_key(uint8* session_key_blob, uint8* client_ra void security_mac_data(uint8* mac_salt_key, uint8* data, uint32 length, uint8* output); void security_mac_signature(rdpRdp *rdp, uint8* data, uint32 length, uint8* output); -void security_salted_mac_signature(rdpRdp *rdp, uint8* data, uint32 length, boolean encryption, uint8* output); -boolean security_establish_keys(uint8* client_random, rdpRdp* rdp); +void security_salted_mac_signature(rdpRdp *rdp, uint8* data, uint32 length, BOOL encryption, uint8* output); +BOOL security_establish_keys(uint8* client_random, rdpRdp* rdp); -boolean security_encrypt(uint8* data, int length, rdpRdp* rdp); -boolean security_decrypt(uint8* data, int length, rdpRdp* rdp); +BOOL security_encrypt(uint8* data, int length, rdpRdp* rdp); +BOOL security_decrypt(uint8* data, int length, rdpRdp* rdp); void security_hmac_signature(uint8* data, int length, uint8* output, rdpRdp* rdp); -boolean security_fips_encrypt(uint8* data, int length, rdpRdp* rdp); -boolean security_fips_decrypt(uint8* data, int length, rdpRdp* rdp); -boolean security_fips_check_signature(uint8* data, int length, uint8* sig, rdpRdp* rdp); +BOOL security_fips_encrypt(uint8* data, int length, rdpRdp* rdp); +BOOL security_fips_decrypt(uint8* data, int length, rdpRdp* rdp); +BOOL security_fips_check_signature(uint8* data, int length, uint8* sig, rdpRdp* rdp); #endif /* __SECURITY_H */ diff --git a/libfreerdp/core/surface.c b/libfreerdp/core/surface.c index e0509711f..8738feaa3 100644 --- a/libfreerdp/core/surface.c +++ b/libfreerdp/core/surface.c @@ -76,7 +76,7 @@ static int update_recv_surfcmd_frame_marker(rdpUpdate* update, STREAM* s) return 6; } -boolean update_recv_surfcmds(rdpUpdate* update, uint32 size, STREAM* s) +BOOL update_recv_surfcmds(rdpUpdate* update, uint32 size, STREAM* s) { uint8* mark; uint16 cmdType; diff --git a/libfreerdp/core/surface.h b/libfreerdp/core/surface.h index 354971e06..00c34337c 100644 --- a/libfreerdp/core/surface.h +++ b/libfreerdp/core/surface.h @@ -33,7 +33,7 @@ enum SURFCMD_CMDTYPE CMDTYPE_STREAM_SURFACE_BITS = 0x0006 }; -boolean update_recv_surfcmds(rdpUpdate* update, uint32 size, STREAM* s); +BOOL update_recv_surfcmds(rdpUpdate* update, uint32 size, STREAM* s); void update_write_surfcmd_surface_bits_header(STREAM* s, SURFACE_BITS_COMMAND* cmd); void update_write_surfcmd_frame_marker(STREAM* s, uint16 frameAction, uint32 frameId); diff --git a/libfreerdp/core/tcp.c b/libfreerdp/core/tcp.c index b8ee68751..fe0a6e056 100644 --- a/libfreerdp/core/tcp.c +++ b/libfreerdp/core/tcp.c @@ -117,7 +117,7 @@ void tcp_get_mac_address(rdpTcp * tcp) mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); */ } -boolean tcp_connect(rdpTcp* tcp, const char* hostname, uint16 port) +BOOL tcp_connect(rdpTcp* tcp, const char* hostname, uint16 port) { uint32 option_value; socklen_t option_len; @@ -170,7 +170,7 @@ int tcp_write(rdpTcp* tcp, uint8* data, int length) return freerdp_tcp_write(tcp->sockfd, data, length); } -boolean tcp_disconnect(rdpTcp* tcp) +BOOL tcp_disconnect(rdpTcp* tcp) { freerdp_tcp_disconnect(tcp->sockfd); tcp->sockfd = -1; @@ -178,7 +178,7 @@ boolean tcp_disconnect(rdpTcp* tcp) return TRUE; } -boolean tcp_set_blocking_mode(rdpTcp* tcp, boolean blocking) +BOOL tcp_set_blocking_mode(rdpTcp* tcp, BOOL blocking) { #ifndef _WIN32 int flags; @@ -210,7 +210,7 @@ boolean tcp_set_blocking_mode(rdpTcp* tcp, boolean blocking) return TRUE; } -boolean tcp_set_keep_alive_mode(rdpTcp* tcp) +BOOL tcp_set_keep_alive_mode(rdpTcp* tcp) { #ifndef _WIN32 uint32 option_value; diff --git a/libfreerdp/core/tcp.h b/libfreerdp/core/tcp.h index ced110d7e..fbdb1440f 100644 --- a/libfreerdp/core/tcp.h +++ b/libfreerdp/core/tcp.h @@ -44,12 +44,12 @@ struct rdp_tcp #endif }; -boolean tcp_connect(rdpTcp* tcp, const char* hostname, uint16 port); -boolean tcp_disconnect(rdpTcp* tcp); +BOOL tcp_connect(rdpTcp* tcp, const char* hostname, uint16 port); +BOOL tcp_disconnect(rdpTcp* tcp); int tcp_read(rdpTcp* tcp, uint8* data, int length); int tcp_write(rdpTcp* tcp, uint8* data, int length); -boolean tcp_set_blocking_mode(rdpTcp* tcp, boolean blocking); -boolean tcp_set_keep_alive_mode(rdpTcp* tcp); +BOOL tcp_set_blocking_mode(rdpTcp* tcp, BOOL blocking); +BOOL tcp_set_keep_alive_mode(rdpTcp* tcp); rdpTcp* tcp_new(rdpSettings* settings); void tcp_free(rdpTcp* tcp); diff --git a/libfreerdp/core/timezone.c b/libfreerdp/core/timezone.c index f6675106e..1844bed80 100644 --- a/libfreerdp/core/timezone.c +++ b/libfreerdp/core/timezone.c @@ -74,7 +74,7 @@ void rdp_write_system_time(STREAM* s, SYSTEM_TIME* system_time) * @param settings settings */ -boolean rdp_read_client_time_zone(STREAM* s, rdpSettings* settings) +BOOL rdp_read_client_time_zone(STREAM* s, rdpSettings* settings) { char* str; TIME_ZONE_INFO* clientTimeZone; diff --git a/libfreerdp/core/timezone.h b/libfreerdp/core/timezone.h index 8be62d4fb..0bdff4fcb 100644 --- a/libfreerdp/core/timezone.h +++ b/libfreerdp/core/timezone.h @@ -33,7 +33,7 @@ void rdp_read_system_time(STREAM* s, SYSTEM_TIME* system_time); void rdp_write_system_time(STREAM* s, SYSTEM_TIME* system_time); void rdp_get_client_time_zone(STREAM* s, rdpSettings* settings); -boolean rdp_read_client_time_zone(STREAM* s, rdpSettings* settings); +BOOL rdp_read_client_time_zone(STREAM* s, rdpSettings* settings); void rdp_write_client_time_zone(STREAM* s, rdpSettings* settings); #ifdef WITH_DEBUG_TIMEZONE diff --git a/libfreerdp/core/tpkt.c b/libfreerdp/core/tpkt.c index 24d5dee81..5d6e17342 100644 --- a/libfreerdp/core/tpkt.c +++ b/libfreerdp/core/tpkt.c @@ -60,10 +60,10 @@ /** * Verify if a packet has valid TPKT header.\n * @param s - * @return boolean + * @return BOOL */ -boolean tpkt_verify_header(STREAM* s) +BOOL tpkt_verify_header(STREAM* s) { uint8 version; diff --git a/libfreerdp/core/tpkt.h b/libfreerdp/core/tpkt.h index d7f3d5c93..ae0db9fef 100644 --- a/libfreerdp/core/tpkt.h +++ b/libfreerdp/core/tpkt.h @@ -27,7 +27,7 @@ #define TPKT_HEADER_LENGTH 4 -boolean tpkt_verify_header(STREAM* s); +BOOL tpkt_verify_header(STREAM* s); uint16 tpkt_read_header(STREAM* s); void tpkt_write_header(STREAM* s, uint16 length); diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c index 9627dc34c..21bc13f4e 100644 --- a/libfreerdp/core/transport.c +++ b/libfreerdp/core/transport.c @@ -70,7 +70,7 @@ void transport_attach(rdpTransport* transport, int sockfd) transport->tcp->sockfd = sockfd; } -boolean transport_disconnect(rdpTransport* transport) +BOOL transport_disconnect(rdpTransport* transport) { if (transport->layer == TRANSPORT_LAYER_TLS) tls_disconnect(transport->tls); @@ -78,14 +78,14 @@ boolean transport_disconnect(rdpTransport* transport) return tcp_disconnect(transport->tcp); } -boolean transport_connect_rdp(rdpTransport* transport) +BOOL transport_connect_rdp(rdpTransport* transport) { /* RDP encryption */ return TRUE; } -boolean transport_connect_tls(rdpTransport* transport) +BOOL transport_connect_tls(rdpTransport* transport) { if (transport->tls == NULL) transport->tls = tls_new(transport->settings); @@ -106,7 +106,7 @@ boolean transport_connect_tls(rdpTransport* transport) return TRUE; } -boolean transport_connect_nla(rdpTransport* transport) +BOOL transport_connect_nla(rdpTransport* transport) { freerdp* instance; rdpSettings* settings; @@ -155,7 +155,7 @@ boolean transport_connect_nla(rdpTransport* transport) return TRUE; } -boolean transport_tsg_connect(rdpTransport* transport, const char* hostname, uint16 port) +BOOL transport_tsg_connect(rdpTransport* transport, const char* hostname, uint16 port) { rdpTsg* tsg = tsg_new(transport); @@ -184,9 +184,9 @@ boolean transport_tsg_connect(rdpTransport* transport, const char* hostname, uin return TRUE; } -boolean transport_connect(rdpTransport* transport, const char* hostname, uint16 port) +BOOL transport_connect(rdpTransport* transport, const char* hostname, uint16 port) { - boolean status = FALSE; + BOOL status = FALSE; rdpSettings* settings = transport->settings; if (transport->settings->ts_gateway) @@ -210,14 +210,14 @@ boolean transport_connect(rdpTransport* transport, const char* hostname, uint16 return status; } -boolean transport_accept_rdp(rdpTransport* transport) +BOOL transport_accept_rdp(rdpTransport* transport) { /* RDP encryption */ return TRUE; } -boolean transport_accept_tls(rdpTransport* transport) +BOOL transport_accept_tls(rdpTransport* transport) { if (transport->tls == NULL) transport->tls = tls_new(transport->settings); @@ -231,7 +231,7 @@ boolean transport_accept_tls(rdpTransport* transport) return TRUE; } -boolean transport_accept_nla(rdpTransport* transport) +BOOL transport_accept_nla(rdpTransport* transport) { freerdp* instance; rdpSettings* settings; @@ -487,7 +487,7 @@ int transport_check_fds(rdpTransport** ptransport) return 0; } -boolean transport_set_blocking_mode(rdpTransport* transport, boolean blocking) +BOOL transport_set_blocking_mode(rdpTransport* transport, BOOL blocking) { transport->blocking = blocking; return tcp_set_blocking_mode(transport->tcp, blocking); diff --git a/libfreerdp/core/transport.h b/libfreerdp/core/transport.h index 8d4a85f72..3c2641088 100644 --- a/libfreerdp/core/transport.h +++ b/libfreerdp/core/transport.h @@ -43,7 +43,7 @@ typedef struct rdp_transport rdpTransport; #include #include -typedef boolean (*TransportRecv) (rdpTransport* transport, STREAM* stream, void* extra); +typedef BOOL (*TransportRecv) (rdpTransport* transport, STREAM* stream, void* extra); struct rdp_transport { @@ -64,27 +64,27 @@ struct rdp_transport STREAM* recv_buffer; TransportRecv recv_callback; struct wait_obj* recv_event; - boolean blocking; - boolean process_single_pdu; /* process single pdu in transport_check_fds */ + BOOL blocking; + BOOL process_single_pdu; /* process single pdu in transport_check_fds */ }; STREAM* transport_recv_stream_init(rdpTransport* transport, int size); STREAM* transport_send_stream_init(rdpTransport* transport, int size); -boolean transport_connect(rdpTransport* transport, const char* hostname, uint16 port); +BOOL transport_connect(rdpTransport* transport, const char* hostname, uint16 port); void transport_attach(rdpTransport* transport, int sockfd); -boolean transport_disconnect(rdpTransport* transport); -boolean transport_connect_rdp(rdpTransport* transport); -boolean transport_connect_tls(rdpTransport* transport); -boolean transport_connect_nla(rdpTransport* transport); -boolean transport_connect_tsg(rdpTransport* transport); -boolean transport_accept_rdp(rdpTransport* transport); -boolean transport_accept_tls(rdpTransport* transport); -boolean transport_accept_nla(rdpTransport* transport); +BOOL transport_disconnect(rdpTransport* transport); +BOOL transport_connect_rdp(rdpTransport* transport); +BOOL transport_connect_tls(rdpTransport* transport); +BOOL transport_connect_nla(rdpTransport* transport); +BOOL transport_connect_tsg(rdpTransport* transport); +BOOL transport_accept_rdp(rdpTransport* transport); +BOOL transport_accept_tls(rdpTransport* transport); +BOOL transport_accept_nla(rdpTransport* transport); int transport_read(rdpTransport* transport, STREAM* s); int transport_write(rdpTransport* transport, STREAM* s); void transport_get_fds(rdpTransport* transport, void** rfds, int* rcount); int transport_check_fds(rdpTransport** ptransport); -boolean transport_set_blocking_mode(rdpTransport* transport, boolean blocking); +BOOL transport_set_blocking_mode(rdpTransport* transport, BOOL blocking); rdpTransport* transport_new(rdpSettings* settings); void transport_free(rdpTransport* transport); diff --git a/libfreerdp/core/tsg.c b/libfreerdp/core/tsg.c index e901b7fb9..80c15a716 100644 --- a/libfreerdp/core/tsg.c +++ b/libfreerdp/core/tsg.c @@ -453,7 +453,7 @@ DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], uint32 count, return length; } -boolean tsg_connect(rdpTsg* tsg, const char* hostname, uint16 port) +BOOL tsg_connect(rdpTsg* tsg, const char* hostname, uint16 port) { uint8* data; uint32 length; diff --git a/libfreerdp/core/tsg.h b/libfreerdp/core/tsg.h index 624ad1b47..4fcbb12b3 100644 --- a/libfreerdp/core/tsg.h +++ b/libfreerdp/core/tsg.h @@ -241,7 +241,7 @@ typedef struct _TSG_PACKET DWORD TsProxySendToServer(handle_t IDL_handle, byte pRpcMessage[], uint32 count, uint32* lengths); -boolean tsg_connect(rdpTsg* tsg, const char* hostname, uint16 port); +BOOL tsg_connect(rdpTsg* tsg, const char* hostname, uint16 port); int tsg_write(rdpTsg* tsg, uint8* data, uint32 length); int tsg_read(rdpTsg* tsg, uint8* data, uint32 length); diff --git a/libfreerdp/core/update.c b/libfreerdp/core/update.c index e98bc9348..9825fb987 100644 --- a/libfreerdp/core/update.c +++ b/libfreerdp/core/update.c @@ -36,7 +36,7 @@ static const char* const UPDATE_TYPE_STRINGS[] = }; */ -boolean update_recv_orders(rdpUpdate* update, STREAM* s) +BOOL update_recv_orders(rdpUpdate* update, STREAM* s) { uint16 numberOrders; @@ -261,7 +261,7 @@ void update_recv_pointer(rdpUpdate* update, STREAM* s) } } -boolean update_recv(rdpUpdate* update, STREAM* s) +BOOL update_recv(rdpUpdate* update, STREAM* s) { uint16 updateType; rdpContext* context = update->context; @@ -544,7 +544,7 @@ static void update_send_pointer_cached(rdpContext* context, POINTER_CACHED_UPDAT fastpath_send_update_pdu(rdp->fastpath, FASTPATH_UPDATETYPE_CACHED, s); } -boolean update_read_refresh_rect(rdpUpdate* update, STREAM* s) +BOOL update_read_refresh_rect(rdpUpdate* update, STREAM* s) { int index; uint8 numberOfAreas; @@ -573,7 +573,7 @@ boolean update_read_refresh_rect(rdpUpdate* update, STREAM* s) return TRUE; } -boolean update_read_suppress_output(rdpUpdate* update, STREAM* s) +BOOL update_read_suppress_output(rdpUpdate* update, STREAM* s) { uint8 allowDisplayUpdates; diff --git a/libfreerdp/core/update.h b/libfreerdp/core/update.h index 8af08f3d7..32c2d1c89 100644 --- a/libfreerdp/core/update.h +++ b/libfreerdp/core/update.h @@ -44,7 +44,7 @@ void update_read_bitmap(rdpUpdate* update, STREAM* s, BITMAP_UPDATE* bitmap_upda void update_read_palette(rdpUpdate* update, STREAM* s, PALETTE_UPDATE* palette_update); void update_recv_play_sound(rdpUpdate* update, STREAM* s); void update_recv_pointer(rdpUpdate* update, STREAM* s); -boolean update_recv(rdpUpdate* update, STREAM* s); +BOOL update_recv(rdpUpdate* update, STREAM* s); void update_read_pointer_position(STREAM* s, POINTER_POSITION_UPDATE* pointer_position); void update_read_pointer_system(STREAM* s, POINTER_SYSTEM_UPDATE* pointer_system); @@ -52,8 +52,8 @@ void update_read_pointer_color(STREAM* s, POINTER_COLOR_UPDATE* pointer_color); void update_read_pointer_new(STREAM* s, POINTER_NEW_UPDATE* pointer_new); void update_read_pointer_cached(STREAM* s, POINTER_CACHED_UPDATE* pointer_cached); -boolean update_read_refresh_rect(rdpUpdate* update, STREAM* s); -boolean update_read_suppress_output(rdpUpdate* update, STREAM* s); +BOOL update_read_refresh_rect(rdpUpdate* update, STREAM* s); +BOOL update_read_suppress_output(rdpUpdate* update, STREAM* s); void update_register_server_callbacks(rdpUpdate* update); void update_register_client_callbacks(rdpUpdate* update); diff --git a/libfreerdp/crypto/ber.c b/libfreerdp/crypto/ber.c index 14dc2e3f8..b45b6f432 100644 --- a/libfreerdp/crypto/ber.c +++ b/libfreerdp/crypto/ber.c @@ -88,7 +88,7 @@ int ber_get_content_length(int length) * @return */ -boolean ber_read_universal_tag(STREAM* s, uint8 tag, boolean pc) +BOOL ber_read_universal_tag(STREAM* s, uint8 tag, BOOL pc) { uint8 byte; @@ -107,7 +107,7 @@ boolean ber_read_universal_tag(STREAM* s, uint8 tag, boolean pc) * @param pc primitive (FALSE) or constructed (TRUE) */ -void ber_write_universal_tag(STREAM* s, uint8 tag, boolean pc) +void ber_write_universal_tag(STREAM* s, uint8 tag, BOOL pc) { stream_write_uint8(s, (BER_CLASS_UNIV | BER_PC(pc)) | (BER_TAG_MASK & tag)); } @@ -119,7 +119,7 @@ void ber_write_universal_tag(STREAM* s, uint8 tag, boolean pc) * @param length length */ -boolean ber_read_application_tag(STREAM* s, uint8 tag, int* length) +BOOL ber_read_application_tag(STREAM* s, uint8 tag, int* length) { uint8 byte; @@ -172,7 +172,7 @@ void ber_write_application_tag(STREAM* s, uint8 tag, int length) } } -boolean ber_read_contextual_tag(STREAM* s, uint8 tag, int* length, boolean pc) +BOOL ber_read_contextual_tag(STREAM* s, uint8 tag, int* length, BOOL pc) { uint8 byte; @@ -189,7 +189,7 @@ boolean ber_read_contextual_tag(STREAM* s, uint8 tag, int* length, boolean pc) return TRUE; } -int ber_write_contextual_tag(STREAM* s, uint8 tag, int length, boolean pc) +int ber_write_contextual_tag(STREAM* s, uint8 tag, int length, BOOL pc) { stream_write_uint8(s, (BER_CLASS_CTXT | BER_PC(pc)) | (BER_TAG_MASK & tag)); return ber_write_length(s, length) + 1; @@ -200,7 +200,7 @@ int ber_skip_contextual_tag(int length) return _ber_skip_length(length) + 1; } -boolean ber_read_sequence_tag(STREAM* s, int* length) +BOOL ber_read_sequence_tag(STREAM* s, int* length) { uint8 byte; @@ -236,7 +236,7 @@ int ber_skip_sequence_tag(int length) return 1 + _ber_skip_length(length); } -boolean ber_read_enumerated(STREAM* s, uint8* enumerated, uint8 count) +BOOL ber_read_enumerated(STREAM* s, uint8* enumerated, uint8 count) { int length; @@ -262,7 +262,7 @@ void ber_write_enumerated(STREAM* s, uint8 enumerated, uint8 count) stream_write_uint8(s, enumerated); } -boolean ber_read_bit_string(STREAM* s, int* length, uint8* padding) +BOOL ber_read_bit_string(STREAM* s, int* length, uint8* padding) { ber_read_universal_tag(s, BER_TAG_BIT_STRING, FALSE); ber_read_length(s, length); @@ -285,7 +285,7 @@ void ber_write_octet_string(STREAM* s, const uint8* oct_str, int length) stream_write(s, oct_str, length); } -boolean ber_read_octet_string_tag(STREAM* s, int* length) +BOOL ber_read_octet_string_tag(STREAM* s, int* length) { ber_read_universal_tag(s, BER_TAG_OCTET_STRING, FALSE); ber_read_length(s, length); @@ -310,7 +310,7 @@ int ber_skip_octet_string(int length) * @param value */ -boolean ber_read_boolean(STREAM* s, boolean* value) +BOOL ber_read_BOOL(STREAM* s, BOOL* value) { int length; uint8 v; @@ -331,14 +331,14 @@ boolean ber_read_boolean(STREAM* s, boolean* value) * @param value */ -void ber_write_boolean(STREAM* s, boolean value) +void ber_write_BOOL(STREAM* s, BOOL value) { ber_write_universal_tag(s, BER_TAG_BOOLEAN, FALSE); ber_write_length(s, 1); stream_write_uint8(s, (value == TRUE) ? 0xFF : 0); } -boolean ber_read_integer(STREAM* s, uint32* value) +BOOL ber_read_integer(STREAM* s, uint32* value) { int length; @@ -427,7 +427,7 @@ int ber_skip_integer(uint32 value) return 0; } -boolean ber_read_integer_length(STREAM* s, int* length) +BOOL ber_read_integer_length(STREAM* s, int* length) { ber_read_universal_tag(s, BER_TAG_INTEGER, FALSE); ber_read_length(s, length); diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c index 1907c4cc7..bb6fb8fcf 100644 --- a/libfreerdp/crypto/crypto.c +++ b/libfreerdp/crypto/crypto.c @@ -166,11 +166,11 @@ void crypto_cert_free(CryptoCert cert) free(cert); } -boolean crypto_cert_get_public_key(CryptoCert cert, BYTE** PublicKey, DWORD* PublicKeyLength) +BOOL crypto_cert_get_public_key(CryptoCert cert, BYTE** PublicKey, DWORD* PublicKeyLength) { BYTE* ptr; int length; - boolean status = TRUE; + BOOL status = TRUE; EVP_PKEY* pkey = NULL; pkey = X509_get_pubkey(cert->px509); @@ -439,10 +439,10 @@ char* crypto_cert_issuer(X509* xcert) return crypto_print_name(X509_get_issuer_name(xcert)); } -boolean x509_verify_certificate(CryptoCert cert, char* certificate_store_path) +BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path) { X509_STORE_CTX* csc; - boolean status = FALSE; + BOOL status = FALSE; X509_STORE* cert_ctx = NULL; X509_LOOKUP* lookup = NULL; X509* xcert = cert->px509; diff --git a/libfreerdp/crypto/der.c b/libfreerdp/crypto/der.c index 59c2a7ff9..feb91565f 100644 --- a/libfreerdp/crypto/der.c +++ b/libfreerdp/crypto/der.c @@ -69,13 +69,13 @@ int der_skip_contextual_tag(int length) return _der_skip_length(length) + 1; } -int der_write_contextual_tag(STREAM* s, uint8 tag, int length, boolean pc) +int der_write_contextual_tag(STREAM* s, uint8 tag, int length, BOOL pc) { stream_write_uint8(s, (ER_CLASS_CTXT | ER_PC(pc)) | (ER_TAG_MASK & tag)); return der_write_length(s, length) + 1; } -void der_write_universal_tag(STREAM* s, uint8 tag, boolean pc) +void der_write_universal_tag(STREAM* s, uint8 tag, BOOL pc) { stream_write_uint8(s, (ER_CLASS_UNIV | ER_PC(pc)) | (ER_TAG_MASK & tag)); } diff --git a/libfreerdp/crypto/er.c b/libfreerdp/crypto/er.c index 18f11c8d7..ec540a295 100644 --- a/libfreerdp/crypto/er.c +++ b/libfreerdp/crypto/er.c @@ -53,7 +53,7 @@ void er_read_length(STREAM* s, int* length) * @param length length */ -int er_write_length(STREAM* s, int length, boolean flag) +int er_write_length(STREAM* s, int length, BOOL flag) { if (flag) return der_write_length(s, length); @@ -84,7 +84,7 @@ int er_get_content_length(int length) * @return */ -boolean er_read_universal_tag(STREAM* s, uint8 tag, boolean pc) +BOOL er_read_universal_tag(STREAM* s, uint8 tag, BOOL pc) { uint8 byte; @@ -103,7 +103,7 @@ boolean er_read_universal_tag(STREAM* s, uint8 tag, boolean pc) * @param pc primitive (FALSE) or constructed (TRUE) */ -void er_write_universal_tag(STREAM* s, uint8 tag, boolean pc) +void er_write_universal_tag(STREAM* s, uint8 tag, BOOL pc) { stream_write_uint8(s, (ER_CLASS_UNIV | ER_PC(pc)) | (ER_TAG_MASK & tag)); } @@ -115,7 +115,7 @@ void er_write_universal_tag(STREAM* s, uint8 tag, boolean pc) * @param length length */ -boolean er_read_application_tag(STREAM* s, uint8 tag, int* length) +BOOL er_read_application_tag(STREAM* s, uint8 tag, int* length) { uint8 byte; @@ -153,7 +153,7 @@ boolean er_read_application_tag(STREAM* s, uint8 tag, int* length) * @param length length */ -void er_write_application_tag(STREAM* s, uint8 tag, int length, boolean flag) +void er_write_application_tag(STREAM* s, uint8 tag, int length, BOOL flag) { if (tag > 30) { @@ -168,7 +168,7 @@ void er_write_application_tag(STREAM* s, uint8 tag, int length, boolean flag) } } -boolean er_read_contextual_tag(STREAM* s, uint8 tag, int* length, boolean pc) +BOOL er_read_contextual_tag(STREAM* s, uint8 tag, int* length, BOOL pc) { uint8 byte; @@ -185,7 +185,7 @@ boolean er_read_contextual_tag(STREAM* s, uint8 tag, int* length, boolean pc) return TRUE; } -int er_write_contextual_tag(STREAM* s, uint8 tag, int length, boolean pc, boolean flag) +int er_write_contextual_tag(STREAM* s, uint8 tag, int length, BOOL pc, BOOL flag) { stream_write_uint8(s, (ER_CLASS_CTXT | ER_PC(pc)) | (ER_TAG_MASK & tag)); return er_write_length(s, length, flag) + 1; @@ -196,7 +196,7 @@ int er_skip_contextual_tag(int length) return _er_skip_length(length) + 1; } -boolean er_read_sequence_tag(STREAM* s, int* length) +BOOL er_read_sequence_tag(STREAM* s, int* length) { uint8 byte; @@ -216,7 +216,7 @@ boolean er_read_sequence_tag(STREAM* s, int* length) * @param length length */ -int er_write_sequence_tag(STREAM* s, int length, boolean flag) +int er_write_sequence_tag(STREAM* s, int length, BOOL flag) { stream_write_uint8(s, (ER_CLASS_UNIV | ER_CONSTRUCT) | (ER_TAG_MASK & ER_TAG_SEQUENCE)); return er_write_length(s, length, flag) + 1; @@ -232,7 +232,7 @@ int er_skip_sequence_tag(int length) return 1 + _er_skip_length(length); } -boolean er_read_enumerated(STREAM* s, uint8* enumerated, uint8 count) +BOOL er_read_enumerated(STREAM* s, uint8* enumerated, uint8 count) { int length; @@ -251,14 +251,14 @@ boolean er_read_enumerated(STREAM* s, uint8* enumerated, uint8 count) return TRUE; } -void er_write_enumerated(STREAM* s, uint8 enumerated, uint8 count, boolean flag) +void er_write_enumerated(STREAM* s, uint8 enumerated, uint8 count, BOOL flag) { er_write_universal_tag(s, ER_TAG_ENUMERATED, FALSE); er_write_length(s, 1, flag); stream_write_uint8(s, enumerated); } -boolean er_read_bit_string(STREAM* s, int* length, uint8* padding) +BOOL er_read_bit_string(STREAM* s, int* length, uint8* padding) { er_read_universal_tag(s, ER_TAG_BIT_STRING, FALSE); er_read_length(s, length); @@ -267,7 +267,7 @@ boolean er_read_bit_string(STREAM* s, int* length, uint8* padding) return TRUE; } -boolean er_write_bit_string_tag(STREAM* s, uint32 length, uint8 padding, boolean flag) +BOOL er_write_bit_string_tag(STREAM* s, uint32 length, uint8 padding, BOOL flag) { er_write_universal_tag(s, ER_TAG_BIT_STRING, FALSE); er_write_length(s, length, flag); @@ -275,7 +275,7 @@ boolean er_write_bit_string_tag(STREAM* s, uint32 length, uint8 padding, boolean return TRUE; } -boolean er_read_octet_string(STREAM* s, int* length) +BOOL er_read_octet_string(STREAM* s, int* length) { if(!er_read_universal_tag(s, ER_TAG_OCTET_STRING, FALSE)) return FALSE; @@ -291,14 +291,14 @@ boolean er_read_octet_string(STREAM* s, int* length) * @param length string length */ -void er_write_octet_string(STREAM* s, uint8* oct_str, int length, boolean flag) +void er_write_octet_string(STREAM* s, uint8* oct_str, int length, BOOL flag) { er_write_universal_tag(s, ER_TAG_OCTET_STRING, FALSE); er_write_length(s, length, flag); stream_write(s, oct_str, length); } -int er_write_octet_string_tag(STREAM* s, int length, boolean flag) +int er_write_octet_string_tag(STREAM* s, int length, BOOL flag) { er_write_universal_tag(s, ER_TAG_OCTET_STRING, FALSE); er_write_length(s, length, flag); @@ -316,7 +316,7 @@ int er_skip_octet_string(int length) * @param value */ -boolean er_read_boolean(STREAM* s, boolean* value) +BOOL er_read_BOOL(STREAM* s, BOOL* value) { int length; uint8 v; @@ -337,14 +337,14 @@ boolean er_read_boolean(STREAM* s, boolean* value) * @param value */ -void er_write_boolean(STREAM* s, boolean value) +void er_write_BOOL(STREAM* s, BOOL value) { er_write_universal_tag(s, ER_TAG_BOOLEAN, FALSE); er_write_length(s, 1, FALSE); stream_write_uint8(s, (value == TRUE) ? 0xFF : 0); } -boolean er_read_integer(STREAM* s, uint32* value) +BOOL er_read_integer(STREAM* s, uint32* value) { int length; @@ -426,7 +426,7 @@ int er_skip_integer(sint32 value) return 0; } -boolean er_read_integer_length(STREAM* s, int* length) +BOOL er_read_integer_length(STREAM* s, int* length) { er_read_universal_tag(s, ER_TAG_INTEGER, FALSE); er_read_length(s, length); diff --git a/libfreerdp/crypto/nla.c b/libfreerdp/crypto/nla.c index 111ed9040..fb3e155a9 100644 --- a/libfreerdp/crypto/nla.c +++ b/libfreerdp/crypto/nla.c @@ -119,7 +119,7 @@ int credssp_ntlm_client_init(rdpCredssp* credssp) { if (instance->Authenticate) { - boolean proceed = instance->Authenticate(instance, + BOOL proceed = instance->Authenticate(instance, &settings->username, &settings->password, &settings->domain); if (!proceed) return 0; @@ -183,9 +183,9 @@ int credssp_client_authenticate(rdpCredssp* credssp) SecBuffer output_buffer; SecBufferDesc input_buffer_desc; SecBufferDesc output_buffer_desc; - boolean have_context; - boolean have_input_buffer; - boolean have_pub_key_auth; + BOOL have_context; + BOOL have_input_buffer; + BOOL have_pub_key_auth; sspi_GlobalInit(); @@ -385,9 +385,9 @@ int credssp_server_authenticate(rdpCredssp* credssp) SecBuffer output_buffer; SecBufferDesc input_buffer_desc; SecBufferDesc output_buffer_desc; - boolean have_context; - boolean have_input_buffer; - boolean have_pub_key_auth; + BOOL have_context; + BOOL have_input_buffer; + BOOL have_pub_key_auth; sspi_GlobalInit(); diff --git a/libfreerdp/crypto/per.c b/libfreerdp/crypto/per.c index 403807495..3d858f439 100644 --- a/libfreerdp/crypto/per.c +++ b/libfreerdp/crypto/per.c @@ -30,7 +30,7 @@ * @return */ -boolean per_read_length(STREAM* s, uint16* length) +BOOL per_read_length(STREAM* s, uint16* length) { uint8 byte; @@ -78,7 +78,7 @@ void per_write_length(STREAM* s, int length) * @return */ -boolean per_read_choice(STREAM* s, uint8* choice) +BOOL per_read_choice(STREAM* s, uint8* choice) { if (stream_get_left(s) < 1) return FALSE; @@ -105,7 +105,7 @@ void per_write_choice(STREAM* s, uint8 choice) * @return */ -boolean per_read_selection(STREAM* s, uint8* selection) +BOOL per_read_selection(STREAM* s, uint8* selection) { if (stream_get_left(s) < 1) return FALSE; @@ -132,7 +132,7 @@ void per_write_selection(STREAM* s, uint8 selection) * @return */ -boolean per_read_number_of_sets(STREAM* s, uint8* number) +BOOL per_read_number_of_sets(STREAM* s, uint8* number) { if (stream_get_left(s) < 1) return FALSE; @@ -158,7 +158,7 @@ void per_write_number_of_sets(STREAM* s, uint8 number) * @param length */ -boolean per_read_padding(STREAM* s, int length) +BOOL per_read_padding(STREAM* s, int length) { if (stream_get_left(s) < length) return FALSE; @@ -188,7 +188,7 @@ void per_write_padding(STREAM* s, int length) * @return */ -boolean per_read_integer(STREAM* s, uint32* integer) +BOOL per_read_integer(STREAM* s, uint32* integer) { uint16 length; @@ -241,7 +241,7 @@ void per_write_integer(STREAM* s, uint32 integer) * @return */ -boolean per_read_integer16(STREAM* s, uint16* integer, uint16 min) +BOOL per_read_integer16(STREAM* s, uint16* integer, uint16 min) { if (stream_get_left(s) < 2) return FALSE; @@ -276,7 +276,7 @@ void per_write_integer16(STREAM* s, uint16 integer, uint16 min) * @return */ -boolean per_read_enumerated(STREAM* s, uint8* enumerated, uint8 count) +BOOL per_read_enumerated(STREAM* s, uint8* enumerated, uint8 count) { if (stream_get_left(s) < 1) return FALSE; @@ -310,7 +310,7 @@ void per_write_enumerated(STREAM* s, uint8 enumerated, uint8 count) * @return */ -boolean per_read_object_identifier(STREAM* s, uint8 oid[6]) +BOOL per_read_object_identifier(STREAM* s, uint8 oid[6]) { uint8 t12; uint16 length; @@ -387,7 +387,7 @@ void per_write_string(STREAM* s, uint8* str, int length) * @return */ -boolean per_read_octet_string(STREAM* s, uint8* oct_str, int length, int min) +BOOL per_read_octet_string(STREAM* s, uint8* oct_str, int length, int min) { int i; uint16 mlength; @@ -443,7 +443,7 @@ void per_write_octet_string(STREAM* s, uint8* oct_str, int length, int min) * @param min minimum string length */ -boolean per_read_numeric_string(STREAM* s, int min) +BOOL per_read_numeric_string(STREAM* s, int min) { int length; uint16 mlength; diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c index f1ee966d2..f05067905 100644 --- a/libfreerdp/crypto/tls.c +++ b/libfreerdp/crypto/tls.c @@ -26,7 +26,7 @@ #include -static CryptoCert tls_get_certificate(rdpTls* tls, boolean peer) +static CryptoCert tls_get_certificate(rdpTls* tls, BOOL peer) { CryptoCert cert; X509* server_cert; @@ -56,7 +56,7 @@ static void tls_free_certificate(CryptoCert cert) free(cert); } -boolean tls_connect(rdpTls* tls) +BOOL tls_connect(rdpTls* tls) { CryptoCert cert; long options = 0; @@ -153,7 +153,7 @@ boolean tls_connect(rdpTls* tls) return TRUE; } -boolean tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_file) +BOOL tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_file) { CryptoCert cert; long options = 0; @@ -279,7 +279,7 @@ boolean tls_accept(rdpTls* tls, const char* cert_file, const char* privatekey_fi return TRUE; } -boolean tls_disconnect(rdpTls* tls) +BOOL tls_disconnect(rdpTls* tls) { if (tls->ssl) SSL_shutdown(tls->ssl); @@ -381,7 +381,7 @@ static void tls_errors(const char *prefix) printf("%s: %s\n", prefix, ERR_error_string(error, NULL)); } -boolean tls_print_error(char* func, SSL* connection, int value) +BOOL tls_print_error(char* func, SSL* connection, int value) { switch (SSL_get_error(connection, value)) { @@ -414,7 +414,7 @@ boolean tls_print_error(char* func, SSL* connection, int value) } } -boolean tls_verify_certificate(rdpTls* tls, CryptoCert cert, char* hostname) +BOOL tls_verify_certificate(rdpTls* tls, CryptoCert cert, char* hostname) { int match; int index; @@ -423,9 +423,9 @@ boolean tls_verify_certificate(rdpTls* tls, CryptoCert cert, char* hostname) char** alt_names = NULL; int alt_names_count = 0; int* alt_names_lengths = NULL; - boolean certificate_status; - boolean hostname_match = FALSE; - boolean verification_status = FALSE; + BOOL certificate_status; + BOOL hostname_match = FALSE; + BOOL verification_status = FALSE; rdpCertificateData* certificate_data; /* ignore certificate verification if user explicitly required it (discouraged) */ @@ -495,7 +495,7 @@ boolean tls_verify_certificate(rdpTls* tls, CryptoCert cert, char* hostname) char* subject; char* fingerprint; freerdp* instance = (freerdp*) tls->settings->instance; - boolean accept_certificate = FALSE; + BOOL accept_certificate = FALSE; issuer = crypto_cert_issuer(cert->px509); subject = crypto_cert_subject(cert->px509); diff --git a/libfreerdp/gdi/graphics.c b/libfreerdp/gdi/graphics.c index f915564e5..6886f7409 100644 --- a/libfreerdp/gdi/graphics.c +++ b/libfreerdp/gdi/graphics.c @@ -94,7 +94,7 @@ void gdi_Bitmap_Paint(rdpContext* context, rdpBitmap* bitmap) void gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, uint8* data, int width, int height, int bpp, int length, - boolean compressed, int codec_id) + BOOL compressed, int codec_id) { uint16 size; RFX_MESSAGE* msg; @@ -103,7 +103,7 @@ void gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, int yindex; int xindex; rdpGdi* gdi; - boolean status; + BOOL status; size = width * height * (bpp + 7) / 8; @@ -174,7 +174,7 @@ void gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, bitmap->bpp = bpp; } -void gdi_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, boolean primary) +void gdi_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL primary) { rdpGdi* gdi = context->gdi; diff --git a/libfreerdp/gdi/graphics.h b/libfreerdp/gdi/graphics.h index 968c1652e..796d97d96 100644 --- a/libfreerdp/gdi/graphics.h +++ b/libfreerdp/gdi/graphics.h @@ -29,7 +29,7 @@ void gdi_Bitmap_New(rdpContext* context, rdpBitmap* bitmap); void gdi_Bitmap_Free(rdpContext* context, rdpBitmap* bitmap); void gdi_Bitmap_Decompress(rdpContext* context, rdpBitmap* bitmap, uint8* data, int width, int height, int bpp, int length, - boolean compressed, int codec_id); + BOOL compressed, int codec_id); void gdi_register_graphics(rdpGraphics* graphics); #endif /* __GDI_GRAPHICS_H */ diff --git a/libfreerdp/locale/keyboard.c b/libfreerdp/locale/keyboard.c index a967ef2df..91252f45b 100644 --- a/libfreerdp/locale/keyboard.c +++ b/libfreerdp/locale/keyboard.c @@ -99,7 +99,7 @@ RDP_SCANCODE freerdp_keyboard_get_rdp_scancode_from_x11_keycode(uint32 keycode) return X11_KEYCODE_TO_RDP_SCANCODE[keycode]; } -uint32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(uint32 scancode, boolean extended) +uint32 freerdp_keyboard_get_x11_keycode_from_rdp_scancode(uint32 scancode, BOOL extended) { if (extended) return RDP_SCANCODE_TO_X11_KEYCODE[scancode][1]; diff --git a/libfreerdp/locale/keyboard_xkbfile.c b/libfreerdp/locale/keyboard_xkbfile.c index 74a7b0221..d2a02bf66 100644 --- a/libfreerdp/locale/keyboard_xkbfile.c +++ b/libfreerdp/locale/keyboard_xkbfile.c @@ -271,9 +271,9 @@ uint32 detect_keyboard_layout_from_xkbfile(void* display) int freerdp_keyboard_load_map_from_xkbfile(void* display, RDP_SCANCODE x11_keycode_to_rdp_scancode[256]) { int i, j; - boolean found; + BOOL found; XkbDescPtr xkb; - boolean status = FALSE; + BOOL status = FALSE; if (display && (xkb = XkbGetMap(display, 0, XkbUseCoreKbd))) { diff --git a/libfreerdp/locale/locale.c b/libfreerdp/locale/locale.c index 035001b88..ee1f0bfc9 100644 --- a/libfreerdp/locale/locale.c +++ b/libfreerdp/locale/locale.c @@ -629,7 +629,7 @@ static const LOCALE_KEYBOARD_LAYOUTS LOCALE_KEYBOARD_LAYOUTS_TABLE[] = { XHOSA, { 0x00000409, 0x00000409, 0x0, 0x0, 0x0 } }, }; -boolean freerdp_get_system_language_and_country_codes(char* language, char* country) +BOOL freerdp_get_system_language_and_country_codes(char* language, char* country) { int dot; int underscore; diff --git a/libfreerdp/locale/timezone.c b/libfreerdp/locale/timezone.c index 704433574..757ca2531 100644 --- a/libfreerdp/locale/timezone.c +++ b/libfreerdp/locale/timezone.c @@ -65,7 +65,7 @@ struct _TIME_ZONE_ENTRY { const char* Id; uint32 Bias; - boolean SupportsDST; + BOOL SupportsDST; const char* DisplayName; const char* StandardName; const char* DaylightName; @@ -1573,7 +1573,7 @@ char* freerdp_get_unix_timezone_identifier() #endif } -boolean freerdp_match_unix_timezone_identifier_with_list(const char* tzid, const char* list) +BOOL freerdp_match_unix_timezone_identifier_with_list(const char* tzid, const char* list) { char* p; char* list_copy; diff --git a/libfreerdp/rail/window.c b/libfreerdp/rail/window.c index c462993b0..5bfc9c722 100644 --- a/libfreerdp/rail/window.c +++ b/libfreerdp/rail/window.c @@ -36,7 +36,7 @@ struct _WINDOW_STYLE { uint32 style; const char* name; - boolean multi; + BOOL multi; }; typedef struct _WINDOW_STYLE WINDOW_STYLE; diff --git a/libfreerdp/rail/window_list.c b/libfreerdp/rail/window_list.c index f705ca29a..f225b5cb1 100644 --- a/libfreerdp/rail/window_list.c +++ b/libfreerdp/rail/window_list.c @@ -33,7 +33,7 @@ void window_list_rewind(rdpWindowList* list) list->iterator = list->head; } -boolean window_list_has_next(rdpWindowList* list) +BOOL window_list_has_next(rdpWindowList* list) { if (list->iterator != NULL) { diff --git a/libfreerdp/utils/file.c b/libfreerdp/utils/file.c index 16ffed6b9..4da37e791 100644 --- a/libfreerdp/utils/file.c +++ b/libfreerdp/utils/file.c @@ -74,7 +74,7 @@ void freerdp_mkdir(char* path) #endif } -boolean freerdp_check_file_exists(char* file) +BOOL freerdp_check_file_exists(char* file) { struct stat stat_info; @@ -205,7 +205,7 @@ char* freerdp_get_parent_path(char* base_path, int depth) return path; } -boolean freerdp_path_contains_separator(char* path) +BOOL freerdp_path_contains_separator(char* path) { if (path == NULL) return FALSE; @@ -218,12 +218,12 @@ boolean freerdp_path_contains_separator(char* path) /* detects if we are running from the source tree */ -boolean freerdp_detect_development_mode(rdpSettings* settings) +BOOL freerdp_detect_development_mode(rdpSettings* settings) { int depth = 0; char* current_path; char* development_path = NULL; - boolean development_mode = FALSE; + BOOL development_mode = FALSE; if (freerdp_check_file_exists(".git")) { diff --git a/libfreerdp/utils/load_plugin.c b/libfreerdp/utils/load_plugin.c index cd65c8b8d..be5b958e5 100644 --- a/libfreerdp/utils/load_plugin.c +++ b/libfreerdp/utils/load_plugin.c @@ -158,7 +158,7 @@ void* freerdp_load_plugin(const char* name, const char* entry_name) * * @return TRUE on success, otherwise FALSE. */ -boolean freerdp_register_static_plugin(const char* name, const char* entry_name, void* entry_addr) +BOOL freerdp_register_static_plugin(const char* name, const char* entry_name, void* entry_addr) { staticPlugin* plugin; diff --git a/libfreerdp/utils/pcap.c b/libfreerdp/utils/pcap.c index 7405125ef..3984c96b4 100644 --- a/libfreerdp/utils/pcap.c +++ b/libfreerdp/utils/pcap.c @@ -115,7 +115,7 @@ void pcap_add_record(rdpPcap* pcap, void* data, uint32 length) record->header.ts_usec = tp.tv_usec; } -boolean pcap_has_next_record(rdpPcap* pcap) +BOOL pcap_has_next_record(rdpPcap* pcap) { if (pcap->file_size - (ftell(pcap->fp)) <= 16) return FALSE; @@ -123,7 +123,7 @@ boolean pcap_has_next_record(rdpPcap* pcap) return TRUE; } -boolean pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record) +BOOL pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record) { if (pcap_has_next_record(pcap) != TRUE) return FALSE; @@ -134,13 +134,13 @@ boolean pcap_get_next_record_header(rdpPcap* pcap, pcap_record* record) return TRUE; } -boolean pcap_get_next_record_content(rdpPcap* pcap, pcap_record* record) +BOOL pcap_get_next_record_content(rdpPcap* pcap, pcap_record* record) { fread(record->data, record->length, 1, pcap->fp); return TRUE; } -boolean pcap_get_next_record(rdpPcap* pcap, pcap_record* record) +BOOL pcap_get_next_record(rdpPcap* pcap, pcap_record* record) { if (pcap_has_next_record(pcap) != TRUE) return FALSE; @@ -150,7 +150,7 @@ boolean pcap_get_next_record(rdpPcap* pcap, pcap_record* record) return TRUE; } -rdpPcap* pcap_open(char* name, boolean write) +rdpPcap* pcap_open(char* name, BOOL write) { rdpPcap* pcap; diff --git a/libfreerdp/utils/tcp.c b/libfreerdp/utils/tcp.c index 9825548e8..99b287e5b 100644 --- a/libfreerdp/utils/tcp.c +++ b/libfreerdp/utils/tcp.c @@ -183,7 +183,7 @@ int freerdp_tcp_disconnect(int sockfd) return 0; } -int freerdp_tcp_set_no_delay(int sockfd, boolean no_delay) +int freerdp_tcp_set_no_delay(int sockfd, BOOL no_delay) { uint32 option_value; socklen_t option_len; diff --git a/server/Sample/sf_rdpsnd.c b/server/Sample/sf_rdpsnd.c index 22cc3c026..ff901fef6 100644 --- a/server/Sample/sf_rdpsnd.c +++ b/server/Sample/sf_rdpsnd.c @@ -44,7 +44,7 @@ static void sf_peer_rdpsnd_activated(rdpsnd_server_context* context) printf("RDPSND Activated\n"); } -boolean sf_peer_rdpsnd_init(testPeerContext* context) +BOOL sf_peer_rdpsnd_init(testPeerContext* context) { context->rdpsnd = rdpsnd_server_context_new(context->vcm); context->rdpsnd->data = context; diff --git a/server/Sample/sf_rdpsnd.h b/server/Sample/sf_rdpsnd.h index f9ebef8a5..ce2875f17 100644 --- a/server/Sample/sf_rdpsnd.h +++ b/server/Sample/sf_rdpsnd.h @@ -26,7 +26,7 @@ #include "sfreerdp.h" -boolean sf_peer_rdpsnd_init(testPeerContext* context); +BOOL sf_peer_rdpsnd_init(testPeerContext* context); #endif /* SF_RDPSND_H */ diff --git a/server/Sample/sfreerdp.c b/server/Sample/sfreerdp.c index ee68219ea..82479b92f 100644 --- a/server/Sample/sfreerdp.c +++ b/server/Sample/sfreerdp.c @@ -43,7 +43,7 @@ #include "sfreerdp.h" static char* test_pcap_file = NULL; -static boolean test_dump_rfx_realtime = TRUE; +static BOOL test_dump_rfx_realtime = TRUE; /* HL1, LH1, HH1, HL2, LH2, HH2, HL3, LH3, HH3, LL3 */ static const unsigned int test_quantization_values[] = @@ -321,7 +321,7 @@ static void test_peer_draw_icon(freerdp_peer* client, int x, int y) test_peer_end_frame(client); } -static boolean test_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 new_sec, uint32 new_usec) +static BOOL test_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 new_sec, uint32 new_usec) { sint32 sec, usec; @@ -452,7 +452,7 @@ static void* tf_debug_channel_thread_func(void* arg) return 0; } -boolean tf_peer_post_connect(freerdp_peer* client) +BOOL tf_peer_post_connect(freerdp_peer* client) { int i; testPeerContext* context = (testPeerContext*) client->context; @@ -517,7 +517,7 @@ boolean tf_peer_post_connect(freerdp_peer* client) return TRUE; } -boolean tf_peer_activate(freerdp_peer* client) +BOOL tf_peer_activate(freerdp_peer* client) { testPeerContext* context = (testPeerContext*) client->context; diff --git a/server/Sample/sfreerdp.h b/server/Sample/sfreerdp.h index 35994d9fc..2ef6c1f64 100644 --- a/server/Sample/sfreerdp.h +++ b/server/Sample/sfreerdp.h @@ -42,12 +42,12 @@ struct test_peer_context int icon_height; int icon_x; int icon_y; - boolean activated; + BOOL activated; WTSVirtualChannelManager* vcm; void* debug_channel; freerdp_thread* debug_channel_thread; audin_server_context* audin; - boolean audin_open; + BOOL audin_open; uint32 frame_id; rdpsnd_server_context* rdpsnd; }; diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c index 030786bc1..df134f5eb 100644 --- a/server/Windows/wf_peer.c +++ b/server/Windows/wf_peer.c @@ -57,7 +57,7 @@ void wf_peer_init(freerdp_peer* client) freerdp_peer_context_new(client); } -boolean wf_peer_post_connect(freerdp_peer* client) +BOOL wf_peer_post_connect(freerdp_peer* client) { HDC hdc; wfInfo* wfi; @@ -88,7 +88,7 @@ boolean wf_peer_post_connect(freerdp_peer* client) return TRUE; } -boolean wf_peer_activate(freerdp_peer* client) +BOOL wf_peer_activate(freerdp_peer* client) { wfInfo* wfi; wfPeerContext* context = (wfPeerContext*) client->context; @@ -102,7 +102,7 @@ boolean wf_peer_activate(freerdp_peer* client) return TRUE; } -boolean wf_peer_logon(freerdp_peer* client, SEC_WINNT_AUTH_IDENTITY* identity, boolean automatic) +BOOL wf_peer_logon(freerdp_peer* client, SEC_WINNT_AUTH_IDENTITY* identity, BOOL automatic) { printf("PeerLogon\n"); diff --git a/server/Windows/wf_peer.h b/server/Windows/wf_peer.h index 7a5270fad..fb8a74c16 100644 --- a/server/Windows/wf_peer.h +++ b/server/Windows/wf_peer.h @@ -34,8 +34,8 @@ void wf_peer_init(freerdp_peer* client); void wf_dxgi_encode(freerdp_peer* client, UINT timeout); void wf_rfx_encode(freerdp_peer* client); -boolean wf_peer_post_connect(freerdp_peer* client); -boolean wf_peer_activate(freerdp_peer* client); +BOOL wf_peer_post_connect(freerdp_peer* client); +BOOL wf_peer_activate(freerdp_peer* client); void wf_peer_synchronize_event(rdpInput* input, uint32 flags); diff --git a/server/X11/xf_input.c b/server/X11/xf_input.c index 9abcfddb7..c1afbcae5 100644 --- a/server/X11/xf_input.c +++ b/server/X11/xf_input.c @@ -36,7 +36,7 @@ void xf_input_keyboard_event(rdpInput* input, uint16 flags, uint16 code) { #ifdef WITH_XTEST unsigned int keycode; - boolean extended = FALSE; + BOOL extended = FALSE; xfPeerContext* xfp = (xfPeerContext*) input->context; xfInfo* xfi = xfp->info; @@ -73,7 +73,7 @@ void xf_input_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y) #ifdef WITH_XTEST xfPeerContext* xfp = (xfPeerContext*) input->context; int button = 0; - boolean down = FALSE; + BOOL down = FALSE; xfInfo* xfi = xfp->info; pthread_mutex_lock(&(xfp->mutex)); @@ -81,7 +81,7 @@ void xf_input_mouse_event(rdpInput* input, uint16 flags, uint16 x, uint16 y) if (flags & PTR_FLAGS_WHEEL) { - boolean negative = FALSE; + BOOL negative = FALSE; if (flags & PTR_FLAGS_WHEEL_NEGATIVE) negative = TRUE; diff --git a/server/X11/xf_peer.c b/server/X11/xf_peer.c index 7c49530a9..36d062e3f 100644 --- a/server/X11/xf_peer.c +++ b/server/X11/xf_peer.c @@ -41,7 +41,7 @@ #include extern char* xf_pcap_file; -extern boolean xf_pcap_dump_realtime; +extern BOOL xf_pcap_dump_realtime; #include "xf_event.h" #include "xf_input.h" @@ -320,7 +320,7 @@ void xf_peer_live_rfx(freerdp_peer* client) pthread_create(&(xfp->thread), 0, xf_monitor_updates, (void*) client); } -static boolean xf_peer_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 new_sec, uint32 new_usec) +static BOOL xf_peer_sleep_tsdiff(uint32 *old_sec, uint32 *old_usec, uint32 new_sec, uint32 new_usec) { sint32 sec, usec; @@ -470,7 +470,7 @@ void xf_peer_rfx_update(freerdp_peer* client, int x, int y, int width, int heigh update->SurfaceBits(update->context, cmd); } -boolean xf_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) +BOOL xf_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) { xfPeerContext* xfp = (xfPeerContext*) client->context; @@ -483,7 +483,7 @@ boolean xf_peer_get_fds(freerdp_peer* client, void** rfds, int* rcount) return TRUE; } -boolean xf_peer_check_fds(freerdp_peer* client) +BOOL xf_peer_check_fds(freerdp_peer* client) { xfInfo* xfi; xfEvent* event; @@ -527,12 +527,12 @@ boolean xf_peer_check_fds(freerdp_peer* client) return TRUE; } -boolean xf_peer_capabilities(freerdp_peer* client) +BOOL xf_peer_capabilities(freerdp_peer* client) { return TRUE; } -boolean xf_peer_post_connect(freerdp_peer* client) +BOOL xf_peer_post_connect(freerdp_peer* client) { xfInfo* xfi; xfPeerContext* xfp; @@ -578,7 +578,7 @@ boolean xf_peer_post_connect(freerdp_peer* client) return TRUE; } -boolean xf_peer_activate(freerdp_peer* client) +BOOL xf_peer_activate(freerdp_peer* client) { xfPeerContext* xfp = (xfPeerContext*) client->context; diff --git a/server/X11/xf_peer.h b/server/X11/xf_peer.h index b93c8d94a..5e023513d 100644 --- a/server/X11/xf_peer.h +++ b/server/X11/xf_peer.h @@ -42,7 +42,7 @@ struct xf_peer_context xfInfo* info; int activations; pthread_t thread; - boolean activated; + BOOL activated; pthread_mutex_t mutex; RFX_CONTEXT* rfx_context; xfEventQueue* event_queue; diff --git a/server/X11/xfreerdp.c b/server/X11/xfreerdp.c index 4a3af1ca8..d6a28d806 100644 --- a/server/X11/xfreerdp.c +++ b/server/X11/xfreerdp.c @@ -36,7 +36,7 @@ #include "xfreerdp.h" char* xf_pcap_file = NULL; -boolean xf_pcap_dump_realtime = TRUE; +BOOL xf_pcap_dump_realtime = TRUE; void xf_server_main_loop(freerdp_listener* instance) { diff --git a/server/X11/xfreerdp.h b/server/X11/xfreerdp.h index 1d3844a8a..2fe8659dc 100644 --- a/server/X11/xfreerdp.h +++ b/server/X11/xfreerdp.h @@ -57,7 +57,7 @@ struct xf_info int scanline_pad; int bytesPerPixel; HCLRCONV clrconv; - boolean use_xshm; + BOOL use_xshm; XImage* fb_image; Pixmap fb_pixmap;