diff options
Diffstat (limited to 'libxrdp')
| -rw-r--r-- | libxrdp/libxrdp.c | 8 | ||||
| -rw-r--r-- | libxrdp/libxrdp.h | 188 | ||||
| -rw-r--r-- | libxrdp/libxrdpinc.h | 90 | ||||
| -rw-r--r-- | libxrdp/xrdp_bitmap32_compress.c | 16 | ||||
| -rw-r--r-- | libxrdp/xrdp_bitmap_compress.c | 2 | ||||
| -rw-r--r-- | libxrdp/xrdp_caps.c | 36 | ||||
| -rw-r--r-- | libxrdp/xrdp_channel.c | 14 | ||||
| -rw-r--r-- | libxrdp/xrdp_fastpath.c | 26 | ||||
| -rw-r--r-- | libxrdp/xrdp_iso.c | 19 | ||||
| -rw-r--r-- | libxrdp/xrdp_jpeg_compress.c | 34 | ||||
| -rw-r--r-- | libxrdp/xrdp_mcs.c | 48 | ||||
| -rw-r--r-- | libxrdp/xrdp_mppc_enc.c | 10 | ||||
| -rw-r--r-- | libxrdp/xrdp_orders.c | 62 | ||||
| -rw-r--r-- | libxrdp/xrdp_orders_rail.c | 18 | ||||
| -rw-r--r-- | libxrdp/xrdp_orders_rail.h | 14 | ||||
| -rw-r--r-- | libxrdp/xrdp_rdp.c | 58 | ||||
| -rw-r--r-- | libxrdp/xrdp_sec.c | 78 | ||||
| -rw-r--r-- | libxrdp/xrdp_surface.c | 12 |
18 files changed, 366 insertions, 367 deletions
diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c index 074e4ddd..41ff1472 100644 --- a/libxrdp/libxrdp.c +++ b/libxrdp/libxrdp.c @@ -112,7 +112,7 @@ libxrdp_get_pdu_bytes(const char *aheader) /******************************************************************************/ /* only used during connection */ -struct stream * APP_CC +struct stream * libxrdp_force_read(struct trans* trans) { int bytes; @@ -967,7 +967,7 @@ libxrdp_orders_mem_blt(struct xrdp_session *session, int cache_id, } /******************************************************************************/ -int DEFAULT_CC +int libxrdp_orders_composite_blt(struct xrdp_session* session, int srcidx, int srcformat, int srcwidth, int srcrepeat, int* srctransform, int mskflags, @@ -1356,7 +1356,7 @@ libxrdp_notify_new_update(struct xrdp_session *session, } /*****************************************************************************/ -int DEFAULT_CC +int libxrdp_notify_delete(struct xrdp_session *session, int window_id, int notify_id) { @@ -1367,7 +1367,7 @@ libxrdp_notify_delete(struct xrdp_session *session, } /*****************************************************************************/ -int DEFAULT_CC +int libxrdp_monitored_desktop(struct xrdp_session *session, struct rail_monitored_desktop_order *mdo, int flags) diff --git a/libxrdp/libxrdp.h b/libxrdp/libxrdp.h index 53993599..1e0f7c96 100644 --- a/libxrdp/libxrdp.h +++ b/libxrdp/libxrdp.h @@ -287,166 +287,166 @@ struct xrdp_mppc_enc }; -int APP_CC +int compress_rdp(struct xrdp_mppc_enc *enc, tui8 *srcData, int len); -struct xrdp_mppc_enc * APP_CC +struct xrdp_mppc_enc * mppc_enc_new(int protocol_type); -void APP_CC +void mppc_enc_free(struct xrdp_mppc_enc *enc); /* xrdp_tcp.c */ -struct xrdp_tcp * APP_CC +struct xrdp_tcp * xrdp_tcp_create(struct xrdp_iso *owner, struct trans *trans); -void APP_CC +void xrdp_tcp_delete(struct xrdp_tcp *self); -int APP_CC +int xrdp_tcp_init(struct xrdp_tcp *self, struct stream *s); -int APP_CC +int xrdp_tcp_recv(struct xrdp_tcp *self, struct stream *s, int len); -int APP_CC +int xrdp_tcp_send(struct xrdp_tcp *self, struct stream *s); /* xrdp_iso.c */ -struct xrdp_iso * APP_CC +struct xrdp_iso * xrdp_iso_create(struct xrdp_mcs *owner, struct trans *trans); -void APP_CC +void xrdp_iso_delete(struct xrdp_iso *self); -int APP_CC +int xrdp_iso_init(struct xrdp_iso *self, struct stream *s); -int APP_CC +int xrdp_iso_recv(struct xrdp_iso *self, struct stream *s); -int APP_CC +int xrdp_iso_send(struct xrdp_iso *self, struct stream *s); -int APP_CC +int xrdp_iso_incoming(struct xrdp_iso *self); -int APP_CC +int xrdp_iso_detect_tpkt(struct xrdp_iso *self, struct stream *s); /* xrdp_mcs.c */ -struct xrdp_mcs * APP_CC +struct xrdp_mcs * xrdp_mcs_create(struct xrdp_sec *owner, struct trans *trans, struct stream *client_mcs_data, struct stream *server_mcs_data); -void APP_CC +void xrdp_mcs_delete(struct xrdp_mcs *self); -int APP_CC +int xrdp_mcs_init(struct xrdp_mcs *self, struct stream *s); -int APP_CC +int xrdp_mcs_recv(struct xrdp_mcs *self, struct stream *s, int *chan); -int APP_CC +int xrdp_mcs_send(struct xrdp_mcs *self, struct stream *s, int chan); -int APP_CC +int xrdp_mcs_incoming(struct xrdp_mcs *self); -int APP_CC +int xrdp_mcs_disconnect(struct xrdp_mcs *self); /* xrdp_sec.c */ -struct xrdp_sec *APP_CC +struct xrdp_sec * xrdp_sec_create(struct xrdp_rdp *owner, struct trans *trans); -void APP_CC +void xrdp_sec_delete(struct xrdp_sec *self); -int APP_CC +int xrdp_sec_init(struct xrdp_sec *self, struct stream *s); -int APP_CC +int xrdp_sec_get_fastpath_bytes(struct xrdp_sec *self); -int APP_CC +int xrdp_sec_init_fastpath(struct xrdp_sec *self, struct stream *s); -int APP_CC +int xrdp_sec_send_fastpath(struct xrdp_sec *self, struct stream *s); -int APP_CC +int xrdp_sec_recv_fastpath(struct xrdp_sec *self, struct stream *s); -int APP_CC +int xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan); -int APP_CC +int xrdp_sec_send(struct xrdp_sec *self, struct stream *s, int chan); -int APP_CC +int xrdp_sec_process_mcs_data(struct xrdp_sec *self); -int APP_CC +int xrdp_sec_incoming(struct xrdp_sec *self); -int APP_CC +int xrdp_sec_disconnect(struct xrdp_sec *self); /* xrdp_rdp.c */ -struct xrdp_rdp * APP_CC +struct xrdp_rdp * xrdp_rdp_create(struct xrdp_session *session, struct trans *trans); -void APP_CC +void xrdp_rdp_delete(struct xrdp_rdp *self); -int APP_CC +int xrdp_rdp_init(struct xrdp_rdp *self, struct stream *s); -int APP_CC +int xrdp_rdp_init_data(struct xrdp_rdp *self, struct stream *s); -int APP_CC +int xrdp_rdp_get_fastpath_bytes(struct xrdp_rdp *self); -int APP_CC +int xrdp_rdp_init_fastpath(struct xrdp_rdp *self, struct stream *s); -int APP_CC +int xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code); -int APP_CC +int xrdp_rdp_send(struct xrdp_rdp *self, struct stream *s, int pdu_type); -int APP_CC +int xrdp_rdp_send_data(struct xrdp_rdp *self, struct stream *s, int data_pdu_type); -int APP_CC +int xrdp_rdp_send_fastpath(struct xrdp_rdp *self, struct stream *s, int data_pdu_type); -int APP_CC +int xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self); -int APP_CC +int xrdp_rdp_incoming(struct xrdp_rdp *self); -int APP_CC +int xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s); -int APP_CC +int xrdp_rdp_disconnect(struct xrdp_rdp *self); -int APP_CC +int xrdp_rdp_send_deactivate(struct xrdp_rdp *self); -int APP_CC +int xrdp_rdp_send_session_info(struct xrdp_rdp *self, const char *data, int data_bytes); /* xrdp_orders.c */ -struct xrdp_orders * APP_CC +struct xrdp_orders * xrdp_orders_create(struct xrdp_session *session, struct xrdp_rdp *rdp_layer); -void APP_CC +void xrdp_orders_delete(struct xrdp_orders *self); -int APP_CC +int xrdp_orders_reset(struct xrdp_orders *self); -int APP_CC +int xrdp_orders_init(struct xrdp_orders *self); -int APP_CC +int xrdp_orders_send(struct xrdp_orders *self); -int APP_CC +int xrdp_orders_force_send(struct xrdp_orders *self); -int APP_CC +int xrdp_orders_check(struct xrdp_orders *self, int max_size); -int APP_CC +int xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy, int color, struct xrdp_rect *rect); -int APP_CC +int xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y, int cx, int cy, int srcx, int srcy, int rop, struct xrdp_rect *rect); -int APP_CC +int xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y, int cx, int cy, int rop, int bg_color, int fg_color, struct xrdp_brush *brush, struct xrdp_rect *rect); -int APP_CC +int xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y, int cx, int cy, int rop, struct xrdp_rect *rect); -int APP_CC +int xrdp_orders_line(struct xrdp_orders *self, int mix_mode, int startx, int starty, int endx, int endy, int rop, int bg_color, struct xrdp_pen *pen, struct xrdp_rect *rect); -int APP_CC +int xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id, int color_table, int x, int y, int cx, int cy, int rop, int srcx, int srcy, int cache_idx, struct xrdp_rect *rect); -int APP_CC +int xrdp_orders_composite_blt(struct xrdp_orders *self, int srcidx, int srcformat, int srcwidth, int srcrepeat, int *srctransform, int mskflags, @@ -455,7 +455,7 @@ xrdp_orders_composite_blt(struct xrdp_orders *self, int srcidx, int mskx, int msky, int dstx, int dsty, int width, int height, int dstformat, struct xrdp_rect *rect); -int APP_CC +int xrdp_orders_text(struct xrdp_orders *self, int font, int flags, int mixmode, int fg_color, int bg_color, @@ -465,61 +465,61 @@ xrdp_orders_text(struct xrdp_orders *self, int box_right, int box_bottom, int x, int y, char *data, int data_len, struct xrdp_rect *rect); -int APP_CC +int xrdp_orders_send_palette(struct xrdp_orders *self, int *palette, int cache_id); -int APP_CC +int xrdp_orders_send_raw_bitmap(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx); -int APP_CC +int xrdp_orders_send_bitmap(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx); -int APP_CC +int xrdp_orders_send_font(struct xrdp_orders *self, struct xrdp_font_char *font_char, int font_index, int char_index); -int APP_CC +int xrdp_orders_send_raw_bitmap2(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx); -int APP_CC +int xrdp_orders_send_bitmap2(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx, int hints); -int APP_CC +int xrdp_orders_send_bitmap3(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx, int hints); -int APP_CC +int xrdp_orders_send_brush(struct xrdp_orders *self, int width, int height, int bpp, int type, int size, char *data, int cache_id); -int APP_CC +int xrdp_orders_send_create_os_surface(struct xrdp_orders *self, int id, int width, int height, struct list *del_list); -int APP_CC +int xrdp_orders_send_switch_os_surface(struct xrdp_orders *self, int id); /* xrdp_bitmap_compress.c */ -int APP_CC +int xrdp_bitmap_compress(char *in_data, int width, int height, struct stream *s, int bpp, int byte_limit, int start_line, struct stream *temp_s, int e); -int APP_CC +int xrdp_bitmap32_compress(char *in_data, int width, int height, struct stream *s, int bpp, int byte_limit, int start_line, struct stream *temp_s, int e, int flags); -int APP_CC +int xrdp_jpeg_compress(void *handle, char *in_data, int width, int height, struct stream *s, int bpp, int byte_limit, int start_line, struct stream *temp_s, int e, int quality); -int APP_CC +int xrdp_codec_jpeg_compress(void *handle, int format, /* input data format */ char *inp_data, /* input data */ @@ -536,42 +536,42 @@ xrdp_codec_jpeg_compress(void *handle, /* len of compressed data */ ); -void *APP_CC +void * xrdp_jpeg_init(void); -int APP_CC +int xrdp_jpeg_deinit(void *handle); /* xrdp_channel.c */ -struct xrdp_channel* APP_CC +struct xrdp_channel* xrdp_channel_create(struct xrdp_sec *owner, struct xrdp_mcs *mcs_layer); -void APP_CC +void xrdp_channel_delete(struct xrdp_channel *self); -int APP_CC +int xrdp_channel_init(struct xrdp_channel *self, struct stream *s); -int APP_CC +int xrdp_channel_send(struct xrdp_channel *self, struct stream *s, int channel_id, int total_data_len, int flags); -int APP_CC +int xrdp_channel_process(struct xrdp_channel *self, struct stream *s, int chanid); /* xrdp_fastpath.c */ -struct xrdp_fastpath *APP_CC +struct xrdp_fastpath * xrdp_fastpath_create(struct xrdp_sec *owner, struct trans *trans); -void APP_CC +void xrdp_fastpath_delete(struct xrdp_fastpath *self); -int APP_CC +int xrdp_fastpath_recv(struct xrdp_fastpath *self, struct stream *s); -int APP_CC +int xrdp_fastpath_process_input_event(struct xrdp_fastpath *self, struct stream *s); -int APP_CC +int xrdp_fastpath_init(struct xrdp_fastpath *self, struct stream *s); -int APP_CC +int xrdp_fastpath_send(struct xrdp_fastpath *self, struct stream *s); /* xrdp_caps.c */ -int APP_CC +int xrdp_caps_send_demand_active(struct xrdp_rdp *self); -int APP_CC +int xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s); #endif diff --git a/libxrdp/libxrdpinc.h b/libxrdp/libxrdpinc.h index 86ec8201..38bd4b34 100644 --- a/libxrdp/libxrdpinc.h +++ b/libxrdp/libxrdpinc.h @@ -76,66 +76,66 @@ struct xrdp_session struct source_info si; }; -struct xrdp_session * DEFAULT_CC +struct xrdp_session * libxrdp_init(tbus id, struct trans *trans); -int DEFAULT_CC +int libxrdp_exit(struct xrdp_session *session); -int DEFAULT_CC +int libxrdp_disconnect(struct xrdp_session *session); -int DEFAULT_CC +int libxrdp_process_incoming(struct xrdp_session *session); int EXPORT_CC libxrdp_get_pdu_bytes(const char *aheader); -struct stream * APP_CC +struct stream * libxrdp_force_read(struct trans *trans); -int DEFAULT_CC +int libxrdp_process_data(struct xrdp_session *session, struct stream *s); -int DEFAULT_CC +int libxrdp_send_palette(struct xrdp_session *session, int *palette); -int DEFAULT_CC +int libxrdp_send_bell(struct xrdp_session *session); -int DEFAULT_CC +int libxrdp_send_bitmap(struct xrdp_session *session, int width, int height, int bpp, char *data, int x, int y, int cx, int cy); -int DEFAULT_CC +int libxrdp_send_pointer(struct xrdp_session *session, int cache_idx, char *data, char *mask, int x, int y, int bpp); -int DEFAULT_CC +int libxrdp_set_pointer(struct xrdp_session *session, int cache_idx); -int DEFAULT_CC +int libxrdp_orders_init(struct xrdp_session *session); -int DEFAULT_CC +int libxrdp_orders_send(struct xrdp_session *session); -int DEFAULT_CC +int libxrdp_orders_force_send(struct xrdp_session *session); -int DEFAULT_CC +int libxrdp_orders_rect(struct xrdp_session *session, int x, int y, int cx, int cy, int color, struct xrdp_rect *rect); -int DEFAULT_CC +int libxrdp_orders_screen_blt(struct xrdp_session *session, int x, int y, int cx, int cy, int srcx, int srcy, int rop, struct xrdp_rect *rect); -int DEFAULT_CC +int libxrdp_orders_pat_blt(struct xrdp_session *session, int x, int y, int cx, int cy, int rop, int bg_color, int fg_color, struct xrdp_brush *brush, struct xrdp_rect *rect); -int DEFAULT_CC +int libxrdp_orders_dest_blt(struct xrdp_session *session, int x, int y, int cx, int cy, int rop, struct xrdp_rect *rect); -int DEFAULT_CC +int libxrdp_orders_line(struct xrdp_session *session, int mix_mode, int startx, int starty, int endx, int endy, int rop, int bg_color, struct xrdp_pen *pen, struct xrdp_rect *rect); -int DEFAULT_CC +int libxrdp_orders_mem_blt(struct xrdp_session *session, int cache_id, int color_table, int x, int y, int cx, int cy, int rop, int srcx, int srcy, int cache_idx, struct xrdp_rect *rect); -int DEFAULT_CC +int libxrdp_orders_composite_blt(struct xrdp_session *session, int srcidx, int srcformat, int srcwidth, int srcrepeat, int *srctransform, int mskflags, @@ -145,7 +145,7 @@ libxrdp_orders_composite_blt(struct xrdp_session *session, int srcidx, int width, int height, int dstformat, struct xrdp_rect *rect); -int DEFAULT_CC +int libxrdp_orders_text(struct xrdp_session *session, int font, int flags, int mixmode, int fg_color, int bg_color, @@ -155,89 +155,89 @@ libxrdp_orders_text(struct xrdp_session *session, int box_right, int box_bottom, int x, int y, char *data, int data_len, struct xrdp_rect *rect); -int DEFAULT_CC +int libxrdp_orders_send_palette(struct xrdp_session *session, int *palette, int cache_id); -int DEFAULT_CC +int libxrdp_orders_send_raw_bitmap(struct xrdp_session *session, int width, int height, int bpp, char *data, int cache_id, int cache_idx); -int DEFAULT_CC +int libxrdp_orders_send_bitmap(struct xrdp_session *session, int width, int height, int bpp, char *data, int cache_id, int cache_idx); -int DEFAULT_CC +int libxrdp_orders_send_font(struct xrdp_session *session, struct xrdp_font_char *font_char, int font_index, int char_index); -int DEFAULT_CC +int libxrdp_reset(struct xrdp_session *session, int width, int height, int bpp); -int DEFAULT_CC +int libxrdp_orders_send_raw_bitmap2(struct xrdp_session *session, int width, int height, int bpp, char *data, int cache_id, int cache_idx); -int DEFAULT_CC +int libxrdp_orders_send_bitmap2(struct xrdp_session *session, int width, int height, int bpp, char *data, int cache_id, int cache_idx, int hints); -int DEFAULT_CC +int libxrdp_orders_send_bitmap3(struct xrdp_session *session, int width, int height, int bpp, char *data, int cache_id, int cache_idx, int hints); -int DEFAULT_CC +int libxrdp_query_channel(struct xrdp_session *session, int index, char *channel_name, int *channel_flags); -int DEFAULT_CC +int libxrdp_get_channel_id(struct xrdp_session *session, const char *name); -int DEFAULT_CC +int libxrdp_send_to_channel(struct xrdp_session *session, int channel_id, char *data, int data_len, int total_data_len, int flags); -int DEFAULT_CC +int libxrdp_orders_send_brush(struct xrdp_session *session, int width, int height, int bpp, int type, int size, char *data, int cache_id); -int DEFAULT_CC +int libxrdp_orders_send_create_os_surface(struct xrdp_session *session, int id, int width, int height, struct list *del_list); -int DEFAULT_CC +int libxrdp_orders_send_switch_os_surface(struct xrdp_session *session, int id); -int DEFAULT_CC +int libxrdp_window_new_update(struct xrdp_session *session, int window_id, struct rail_window_state_order *window_state, int flags); -int DEFAULT_CC +int libxrdp_window_delete(struct xrdp_session *session, int window_id); -int DEFAULT_CC +int libxrdp_window_icon(struct xrdp_session *session, int window_id, int cache_entry, int cache_id, struct rail_icon_info *icon_info, int flags); -int DEFAULT_CC +int libxrdp_window_cached_icon(struct xrdp_session *session, int window_id, int cache_entry, int cache_id, int flags); -int DEFAULT_CC +int libxrdp_notify_new_update(struct xrdp_session *session, int window_id, int notify_id, struct rail_notify_state_order *notify_state, int flags); -int DEFAULT_CC +int libxrdp_notify_delete(struct xrdp_session *session, int window_id, int notify_id); -int DEFAULT_CC +int libxrdp_monitored_desktop(struct xrdp_session *session, struct rail_monitored_desktop_order *mdo, int flags); -int DEFAULT_CC +int libxrdp_codec_jpeg_compress(struct xrdp_session *session, int format, char *inp_data, int width, int height, int stride, int x, int y, int cx, int cy, int quality, char *out_data, int *io_len); -int DEFAULT_CC +int libxrdp_fastpath_send_surface(struct xrdp_session *session, char *data_pad, int pad_bytes, int data_bytes, diff --git a/libxrdp/xrdp_bitmap32_compress.c b/libxrdp/xrdp_bitmap32_compress.c index 4f6cf253..332c2a2b 100644 --- a/libxrdp/xrdp_bitmap32_compress.c +++ b/libxrdp/xrdp_bitmap32_compress.c @@ -41,7 +41,7 @@ http://msdn.microsoft.com/en-us/library/cc241877.aspx /*****************************************************************************/ /* split RGB */ -static int APP_CC +static int fsplit3(char *in_data, int start_line, int width, int e, char *r_data, char *g_data, char *b_data) { @@ -121,7 +121,7 @@ fsplit3(char *in_data, int start_line, int width, int e, /*****************************************************************************/ /* split ARGB */ -static int APP_CC +static int fsplit4(char *in_data, int start_line, int width, int e, char *a_data, char *r_data, char *g_data, char *b_data) { @@ -218,7 +218,7 @@ do { \ } while (0) /*****************************************************************************/ -static int APP_CC +static int fdelta(char *in_plane, char *out_plane, int cx, int cy) { char delta; @@ -250,7 +250,7 @@ fdelta(char *in_plane, char *out_plane, int cx, int cy) } /*****************************************************************************/ -static int APP_CC +static int fout(int collen, int replen, char *colptr, struct stream *s) { int code; @@ -315,7 +315,7 @@ fout(int collen, int replen, char *colptr, struct stream *s) } /*****************************************************************************/ -static int APP_CC +static int fpack(char *plane, int cx, int cy, struct stream *s) { char *ptr8; @@ -382,7 +382,7 @@ fpack(char *plane, int cx, int cy, struct stream *s) } /*****************************************************************************/ -static int APP_CC +static int foutraw3(struct stream *s, int bytes, int header, char *r_data, char *g_data, char *b_data) { @@ -396,7 +396,7 @@ foutraw3(struct stream *s, int bytes, int header, } /*****************************************************************************/ -static int APP_CC +static int foutraw4(struct stream *s, int bytes, int header, char *a_data, char *r_data, char *g_data, char *b_data) { @@ -412,7 +412,7 @@ foutraw4(struct stream *s, int bytes, int header, /*****************************************************************************/ /* returns the number of lines compressed */ -int APP_CC +int xrdp_bitmap32_compress(char *in_data, int width, int height, struct stream *s, int bpp, int byte_limit, int start_line, struct stream *temp_s, diff --git a/libxrdp/xrdp_bitmap_compress.c b/libxrdp/xrdp_bitmap_compress.c index 91eea60a..3cbdb9e4 100644 --- a/libxrdp/xrdp_bitmap_compress.c +++ b/libxrdp/xrdp_bitmap_compress.c @@ -648,7 +648,7 @@ } while (0) /*****************************************************************************/ -int APP_CC +int xrdp_bitmap_compress(char *in_data, int width, int height, struct stream *s, int bpp, int byte_limit, int start_line, struct stream *temp_s, diff --git a/libxrdp/xrdp_caps.c b/libxrdp/xrdp_caps.c index 43d5d949..91c25813 100644 --- a/libxrdp/xrdp_caps.c +++ b/libxrdp/xrdp_caps.c @@ -26,7 +26,7 @@ #include "libxrdp.h" /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_send_monitorlayout(struct xrdp_rdp *self) { struct stream *s; @@ -66,7 +66,7 @@ xrdp_caps_send_monitorlayout(struct xrdp_rdp *self) } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_general(struct xrdp_rdp *self, struct stream *s, int len) { @@ -101,7 +101,7 @@ xrdp_caps_process_general(struct xrdp_rdp *self, struct stream *s, } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_order(struct xrdp_rdp *self, struct stream *s, int len) { @@ -178,7 +178,7 @@ xrdp_caps_process_order(struct xrdp_rdp *self, struct stream *s, /*****************************************************************************/ /* get the bitmap cache size */ -static int APP_CC +static int xrdp_caps_process_bmpcache(struct xrdp_rdp *self, struct stream *s, int len) { @@ -220,7 +220,7 @@ xrdp_caps_process_bmpcache(struct xrdp_rdp *self, struct stream *s, /*****************************************************************************/ /* get the bitmap cache size */ -static int APP_CC +static int xrdp_caps_process_bmpcache2(struct xrdp_rdp *self, struct stream *s, int len) { @@ -263,7 +263,7 @@ xrdp_caps_process_bmpcache2(struct xrdp_rdp *self, struct stream *s, } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_cache_v3_codec_id(struct xrdp_rdp *self, struct stream *s, int len) { @@ -283,7 +283,7 @@ xrdp_caps_process_cache_v3_codec_id(struct xrdp_rdp *self, struct stream *s, /*****************************************************************************/ /* get the number of client cursor cache */ -static int APP_CC +static int xrdp_caps_process_pointer(struct xrdp_rdp *self, struct stream *s, int len) { @@ -325,7 +325,7 @@ xrdp_caps_process_pointer(struct xrdp_rdp *self, struct stream *s, } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_input(struct xrdp_rdp *self, struct stream *s, int len) { @@ -344,7 +344,7 @@ xrdp_caps_process_input(struct xrdp_rdp *self, struct stream *s, /*****************************************************************************/ /* get the type of client brush cache */ -int APP_CC +int xrdp_caps_process_brushcache(struct xrdp_rdp *self, struct stream *s, int len) { @@ -361,7 +361,7 @@ xrdp_caps_process_brushcache(struct xrdp_rdp *self, struct stream *s, } /*****************************************************************************/ -int APP_CC +int xrdp_caps_process_offscreen_bmpcache(struct xrdp_rdp *self, struct stream *s, int len) { @@ -387,7 +387,7 @@ xrdp_caps_process_offscreen_bmpcache(struct xrdp_rdp *self, struct stream *s, } /*****************************************************************************/ -int APP_CC +int xrdp_caps_process_rail(struct xrdp_rdp *self, struct stream *s, int len) { int i32; @@ -405,7 +405,7 @@ xrdp_caps_process_rail(struct xrdp_rdp *self, struct stream *s, int len) } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_window(struct xrdp_rdp *self, struct stream *s, int len) { int i32; @@ -430,7 +430,7 @@ xrdp_caps_process_window(struct xrdp_rdp *self, struct stream *s, int len) } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len) { int codec_id; @@ -525,7 +525,7 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len) } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_multifragmentupdate(struct xrdp_rdp *self, struct stream *s, int len) { @@ -537,7 +537,7 @@ xrdp_caps_process_multifragmentupdate(struct xrdp_rdp *self, struct stream *s, } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_frame_ack(struct xrdp_rdp *self, struct stream *s, int len) { g_writeln("xrdp_caps_process_frame_ack:"); @@ -554,7 +554,7 @@ xrdp_caps_process_frame_ack(struct xrdp_rdp *self, struct stream *s, int len) } /*****************************************************************************/ -static int APP_CC +static int xrdp_caps_process_surface_cmds(struct xrdp_rdp *self, struct stream *s, int len) { int cmdFlags; @@ -566,7 +566,7 @@ xrdp_caps_process_surface_cmds(struct xrdp_rdp *self, struct stream *s, int len) } /*****************************************************************************/ -int APP_CC +int xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s) { int cap_len; @@ -717,7 +717,7 @@ xrdp_caps_process_confirm_active(struct xrdp_rdp *self, struct stream *s) return 0; } /*****************************************************************************/ -int APP_CC +int xrdp_caps_send_demand_active(struct xrdp_rdp *self) { struct stream *s; diff --git a/libxrdp/xrdp_channel.c b/libxrdp/xrdp_channel.c index 9fd9feab..4f4f3ef3 100644 --- a/libxrdp/xrdp_channel.c +++ b/libxrdp/xrdp_channel.c @@ -33,7 +33,7 @@ /*****************************************************************************/ /* returns pointer or nil on error */ -static struct mcs_channel_item *APP_CC +static struct mcs_channel_item * xrdp_channel_get_item(struct xrdp_channel *self, int channel_id) { struct mcs_channel_item *channel; @@ -50,7 +50,7 @@ xrdp_channel_get_item(struct xrdp_channel *self, int channel_id) } /*****************************************************************************/ -struct xrdp_channel *APP_CC +struct xrdp_channel * xrdp_channel_create(struct xrdp_sec *owner, struct xrdp_mcs *mcs_layer) { struct xrdp_channel *self; @@ -63,7 +63,7 @@ xrdp_channel_create(struct xrdp_sec *owner, struct xrdp_mcs *mcs_layer) /*****************************************************************************/ /* returns error */ -void APP_CC +void xrdp_channel_delete(struct xrdp_channel *self) { if (self == 0) @@ -77,7 +77,7 @@ xrdp_channel_delete(struct xrdp_channel *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_channel_init(struct xrdp_channel *self, struct stream *s) { if (xrdp_sec_init(self->sec_layer, s) != 0) @@ -92,7 +92,7 @@ xrdp_channel_init(struct xrdp_channel *self, struct stream *s) /*****************************************************************************/ /* returns error */ /* This sends data out to the secure layer. */ -int APP_CC +int xrdp_channel_send(struct xrdp_channel *self, struct stream *s, int channel_id, int total_data_len, int flags) { @@ -140,7 +140,7 @@ xrdp_channel_send(struct xrdp_channel *self, struct stream *s, int channel_id, /* returns error */ /* this will inform the callback, whatever it is that some channel data is ready. the default for this is a call to xrdp_wm.c. */ -static int APP_CC +static int xrdp_channel_call_callback(struct xrdp_channel *self, struct stream *s, int channel_id, int total_data_len, int flags) @@ -181,7 +181,7 @@ xrdp_channel_call_callback(struct xrdp_channel *self, struct stream *s, channel packet. 'chanid' passed in here is the mcs channel id so it MCS_GLOBAL_CHANNEL plus something. */ -int APP_CC +int xrdp_channel_process(struct xrdp_channel *self, struct stream *s, int chanid) { diff --git a/libxrdp/xrdp_fastpath.c b/libxrdp/xrdp_fastpath.c index 41f6340b..ba9e1182 100644 --- a/libxrdp/xrdp_fastpath.c +++ b/libxrdp/xrdp_fastpath.c @@ -24,7 +24,7 @@ #include "libxrdp.h" /*****************************************************************************/ -struct xrdp_fastpath *APP_CC +struct xrdp_fastpath * xrdp_fastpath_create(struct xrdp_sec *owner, struct trans *trans) { struct xrdp_fastpath *self; @@ -39,7 +39,7 @@ xrdp_fastpath_create(struct xrdp_sec *owner, struct trans *trans) } /*****************************************************************************/ -void APP_CC +void xrdp_fastpath_delete(struct xrdp_fastpath *self) { if (self == 0) @@ -51,14 +51,14 @@ xrdp_fastpath_delete(struct xrdp_fastpath *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_fastpath_reset(struct xrdp_fastpath *self) { return 0; } /*****************************************************************************/ -int APP_CC +int xrdp_fastpath_recv(struct xrdp_fastpath *self, struct stream *s) { int fp_hdr; @@ -102,7 +102,7 @@ xrdp_fastpath_recv(struct xrdp_fastpath *self, struct stream *s) /*****************************************************************************/ /* no fragmentation */ -int APP_CC +int xrdp_fastpath_init(struct xrdp_fastpath *self, struct stream *s) { int bytes; @@ -117,7 +117,7 @@ xrdp_fastpath_init(struct xrdp_fastpath *self, struct stream *s) } /*****************************************************************************/ -static int APP_CC +static int xrdp_fastpath_session_callback(struct xrdp_fastpath *self, int msg, long param1, long param2, long param3, long param4) @@ -138,7 +138,7 @@ xrdp_fastpath_session_callback(struct xrdp_fastpath *self, int msg, /*****************************************************************************/ /* no fragmentation */ -int APP_CC +int xrdp_fastpath_send(struct xrdp_fastpath *self, struct stream *s) { if (trans_write_copy_s(self->trans, s) != 0) @@ -151,7 +151,7 @@ xrdp_fastpath_send(struct xrdp_fastpath *self, struct stream *s) /*****************************************************************************/ /* FASTPATH_INPUT_EVENT_SCANCODE */ -static int APP_CC +static int xrdp_fastpath_process_EVENT_SCANCODE(struct xrdp_fastpath *self, int eventFlags, struct stream *s) { @@ -185,7 +185,7 @@ xrdp_fastpath_process_EVENT_SCANCODE(struct xrdp_fastpath *self, /*****************************************************************************/ /* FASTPATH_INPUT_EVENT_MOUSE */ -static int APP_CC +static int xrdp_fastpath_process_EVENT_MOUSE(struct xrdp_fastpath *self, int eventFlags, struct stream *s) { @@ -215,7 +215,7 @@ xrdp_fastpath_process_EVENT_MOUSE(struct xrdp_fastpath *self, /*****************************************************************************/ /* FASTPATH_INPUT_EVENT_MOUSEX */ -static int APP_CC +static int xrdp_fastpath_process_EVENT_MOUSEX(struct xrdp_fastpath *self, int eventFlags, struct stream *s) { @@ -245,7 +245,7 @@ xrdp_fastpath_process_EVENT_MOUSEX(struct xrdp_fastpath *self, /*****************************************************************************/ /* FASTPATH_INPUT_EVENT_SYNC */ -static int APP_CC +static int xrdp_fastpath_process_EVENT_SYNC(struct xrdp_fastpath *self, int eventFlags, struct stream *s) { @@ -265,7 +265,7 @@ xrdp_fastpath_process_EVENT_SYNC(struct xrdp_fastpath *self, /*****************************************************************************/ /* FASTPATH_INPUT_EVENT_UNICODE */ -static int APP_CC +static int xrdp_fastpath_process_EVENT_UNICODE(struct xrdp_fastpath *self, int eventFlags, struct stream *s) { @@ -297,7 +297,7 @@ xrdp_fastpath_process_EVENT_UNICODE(struct xrdp_fastpath *self, /*****************************************************************************/ /* FASTPATH_INPUT_EVENT */ -int APP_CC +int xrdp_fastpath_process_input_event(struct xrdp_fastpath *self, struct stream *s) { diff --git a/libxrdp/xrdp_iso.c b/libxrdp/xrdp_iso.c index 861a5e5d..7cff94a3 100644 --- a/libxrdp/xrdp_iso.c +++ b/libxrdp/xrdp_iso.c @@ -37,7 +37,6 @@ /*****************************************************************************/ struct xrdp_iso * -APP_CC xrdp_iso_create(struct xrdp_mcs *owner, struct trans *trans) { struct xrdp_iso *self; @@ -51,7 +50,7 @@ xrdp_iso_create(struct xrdp_mcs *owner, struct trans *trans) } /*****************************************************************************/ -void APP_CC +void xrdp_iso_delete(struct xrdp_iso *self) { if (self == 0) @@ -64,7 +63,7 @@ xrdp_iso_delete(struct xrdp_iso *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_iso_negotiate_security(struct xrdp_iso *self) { int rv = 0; @@ -123,7 +122,7 @@ xrdp_iso_negotiate_security(struct xrdp_iso *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_iso_process_rdp_neg_req(struct xrdp_iso *self, struct stream *s) { int flags; @@ -155,7 +154,7 @@ xrdp_iso_process_rdp_neg_req(struct xrdp_iso *self, struct stream *s) } /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_iso_recv_msg(struct xrdp_iso *self, struct stream *s, int *code, int *len) { int ver; @@ -216,7 +215,7 @@ xrdp_iso_recv_msg(struct xrdp_iso *self, struct stream *s, int *code, int *len) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_iso_recv(struct xrdp_iso *self, struct stream *s) { int code; @@ -240,7 +239,7 @@ xrdp_iso_recv(struct xrdp_iso *self, struct stream *s) return 0; } /*****************************************************************************/ -static int APP_CC +static int xrdp_iso_send_cc(struct xrdp_iso *self) { struct stream *s; @@ -304,7 +303,7 @@ xrdp_iso_send_cc(struct xrdp_iso *self) } /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_iso_incoming(struct xrdp_iso *self) { int rv = 0; @@ -398,7 +397,7 @@ xrdp_iso_incoming(struct xrdp_iso *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_iso_init(struct xrdp_iso *self, struct stream *s) { init_stream(s, 8192 * 4); /* 32 KB */ @@ -408,7 +407,7 @@ xrdp_iso_init(struct xrdp_iso *self, struct stream *s) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_iso_send(struct xrdp_iso *self, struct stream *s) { int len; diff --git a/libxrdp/xrdp_jpeg_compress.c b/libxrdp/xrdp_jpeg_compress.c index e516861d..dbd4d73f 100644 --- a/libxrdp/xrdp_jpeg_compress.c +++ b/libxrdp/xrdp_jpeg_compress.c @@ -35,7 +35,7 @@ #include "log.h" /*****************************************************************************/ -int APP_CC +int xrdp_jpeg_compress(void *handle, char *in_data, int width, int height, struct stream *s, int bpp, int byte_limit, int start_line, struct stream *temp_s, @@ -118,7 +118,7 @@ xrdp_jpeg_compress(void *handle, char *in_data, int width, int height, * frame buffer (inp_data) *****************************************************************************/ -int APP_CC +int xrdp_codec_jpeg_compress(void *handle, int format, /* input data format */ char *inp_data, /* input data */ @@ -198,7 +198,7 @@ xrdp_codec_jpeg_compress(void *handle, } /*****************************************************************************/ -void *APP_CC +void * xrdp_jpeg_init(void) { tjhandle tj_han; @@ -208,7 +208,7 @@ xrdp_jpeg_init(void) } /*****************************************************************************/ -int APP_CC +int xrdp_jpeg_deinit(void *handle) { tjhandle tj_han; @@ -243,7 +243,7 @@ struct mydata_comp /*****************************************************************************/ /* called at beginning */ -static void DEFAULT_CC +static void my_init_destination(j_compress_ptr cinfo) { struct mydata_comp *md; @@ -257,7 +257,7 @@ my_init_destination(j_compress_ptr cinfo) /*****************************************************************************/ /* called when buffer is full and we need more space */ -static int DEFAULT_CC +static int my_empty_output_buffer(j_compress_ptr cinfo) { struct mydata_comp *md; @@ -274,7 +274,7 @@ my_empty_output_buffer(j_compress_ptr cinfo) /*****************************************************************************/ /* called at end */ -static void DEFAULT_CC +static void my_term_destination(j_compress_ptr cinfo) { struct mydata_comp *md; @@ -286,7 +286,7 @@ my_term_destination(j_compress_ptr cinfo) } /*****************************************************************************/ -static int APP_CC +static int jp_do_compress(JOCTET *data, int width, int height, int bpp, int quality, JOCTET *comp_data, int *comp_data_bytes) { @@ -353,7 +353,7 @@ jp_do_compress(JOCTET *data, int width, int height, int bpp, int quality, } /*****************************************************************************/ -static int APP_CC +static int jpeg_compress(char *in_data, int width, int height, struct stream *s, struct stream *temp_s, int bpp, int byte_limit, int e, int quality) @@ -411,7 +411,7 @@ jpeg_compress(char *in_data, int width, int height, } /*****************************************************************************/ -int APP_CC +int xrdp_jpeg_compress(void *handle, char *in_data, int width, int height, struct stream *s, int bpp, int byte_limit, int start_line, struct stream *temp_s, @@ -423,7 +423,7 @@ xrdp_jpeg_compress(void *handle, char *in_data, int width, int height, } /*****************************************************************************/ -int APP_CC +int xrdp_codec_jpeg_compress(void *handle, int format, char *inp_data, int width, int height, int stride, int x, int y, int cx, int cy, int quality, char *out_data, int *io_len) @@ -432,14 +432,14 @@ xrdp_codec_jpeg_compress(void *handle, int format, char *inp_data, int width, } /*****************************************************************************/ -void *APP_CC +void * xrdp_jpeg_init(void) { return 0; } /*****************************************************************************/ -int APP_CC +int xrdp_jpeg_deinit(void *handle) { return 0; @@ -448,7 +448,7 @@ xrdp_jpeg_deinit(void *handle) #else /*****************************************************************************/ -int APP_CC +int xrdp_jpeg_compress(void *handle, char *in_data, int width, int height, struct stream *s, int bpp, int byte_limit, int start_line, struct stream *temp_s, @@ -458,7 +458,7 @@ xrdp_jpeg_compress(void *handle, char *in_data, int width, int height, } /*****************************************************************************/ -int APP_CC +int xrdp_codec_jpeg_compress(void *handle, int format, char *inp_data, int width, int height, int stride, int x, int y, int cx, int cy, int quality, char *out_data, int *io_len) @@ -467,14 +467,14 @@ xrdp_codec_jpeg_compress(void *handle, int format, char *inp_data, int width, } /*****************************************************************************/ -void *APP_CC +void * xrdp_jpeg_init(void) { return 0; } /*****************************************************************************/ -int APP_CC +int xrdp_jpeg_deinit(void *handle) { return 0; diff --git a/libxrdp/xrdp_mcs.c b/libxrdp/xrdp_mcs.c index f66398ed..8438dbba 100644 --- a/libxrdp/xrdp_mcs.c +++ b/libxrdp/xrdp_mcs.c @@ -26,7 +26,7 @@ #include "log.h" /*****************************************************************************/ -struct xrdp_mcs *APP_CC +struct xrdp_mcs * xrdp_mcs_create(struct xrdp_sec *owner, struct trans *trans, struct stream *client_mcs_data, struct stream *server_mcs_data) @@ -47,7 +47,7 @@ xrdp_mcs_create(struct xrdp_sec *owner, struct trans *trans, } /*****************************************************************************/ -void APP_CC +void xrdp_mcs_delete(struct xrdp_mcs *self) { struct mcs_channel_item *channel_item; @@ -81,7 +81,7 @@ xrdp_mcs_delete(struct xrdp_mcs *self) /*****************************************************************************/ /* This function sends channel join confirm */ /* returns error = 1 ok = 0 */ -static int APP_CC +static int xrdp_mcs_send_cjcf(struct xrdp_mcs *self, int userid, int chanid) { struct stream *s; @@ -118,7 +118,7 @@ xrdp_mcs_send_cjcf(struct xrdp_mcs *self, int userid, int chanid) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_mcs_recv(struct xrdp_mcs *self, struct stream *s, int *chan) { int appid; @@ -224,7 +224,7 @@ xrdp_mcs_recv(struct xrdp_mcs *self, struct stream *s, int *chan) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_ber_parse_header(struct xrdp_mcs *self, struct stream *s, int tag_val, int *len) { @@ -294,7 +294,7 @@ xrdp_mcs_ber_parse_header(struct xrdp_mcs *self, struct stream *s, /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_parse_domain_params(struct xrdp_mcs *self, struct stream *s) { int len; @@ -323,7 +323,7 @@ xrdp_mcs_parse_domain_params(struct xrdp_mcs *self, struct stream *s) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_recv_connect_initial(struct xrdp_mcs *self) { int len; @@ -430,7 +430,7 @@ xrdp_mcs_recv_connect_initial(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_recv_edrq(struct xrdp_mcs *self) { int opcode; @@ -489,7 +489,7 @@ xrdp_mcs_recv_edrq(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_recv_aurq(struct xrdp_mcs *self) { int opcode; @@ -540,7 +540,7 @@ xrdp_mcs_recv_aurq(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_send_aucf(struct xrdp_mcs *self) { struct stream *s; @@ -575,7 +575,7 @@ xrdp_mcs_send_aucf(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_recv_cjrq(struct xrdp_mcs *self) { int opcode; @@ -630,7 +630,7 @@ xrdp_mcs_recv_cjrq(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_ber_out_header(struct xrdp_mcs *self, struct stream *s, int tag_val, int len) { @@ -658,7 +658,7 @@ xrdp_mcs_ber_out_header(struct xrdp_mcs *self, struct stream *s, /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_ber_out_int8(struct xrdp_mcs *self, struct stream *s, int value) { xrdp_mcs_ber_out_header(self, s, BER_TAG_INTEGER, 1); @@ -669,7 +669,7 @@ xrdp_mcs_ber_out_int8(struct xrdp_mcs *self, struct stream *s, int value) #if 0 /* not used */ /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_ber_out_int16(struct xrdp_mcs *self, struct stream *s, int value) { xrdp_mcs_ber_out_header(self, s, BER_TAG_INTEGER, 2); @@ -681,7 +681,7 @@ xrdp_mcs_ber_out_int16(struct xrdp_mcs *self, struct stream *s, int value) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_ber_out_int24(struct xrdp_mcs *self, struct stream *s, int value) { xrdp_mcs_ber_out_header(self, s, BER_TAG_INTEGER, 3); @@ -693,7 +693,7 @@ xrdp_mcs_ber_out_int24(struct xrdp_mcs *self, struct stream *s, int value) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_out_domain_params(struct xrdp_mcs *self, struct stream *s, int max_channels, int max_users, int max_tokens, @@ -712,7 +712,7 @@ xrdp_mcs_out_domain_params(struct xrdp_mcs *self, struct stream *s, } /*****************************************************************************/ /* prepare server gcc data to send in mcs response msg */ -int APP_CC +int xrdp_mcs_out_gcc_data(struct xrdp_sec *self) { struct stream *s; @@ -869,7 +869,7 @@ xrdp_mcs_out_gcc_data(struct xrdp_sec *self) } /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_mcs_send_connect_response(struct xrdp_mcs *self) { int data_len; @@ -907,7 +907,7 @@ xrdp_mcs_send_connect_response(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_mcs_incoming(struct xrdp_mcs *self) { int index; @@ -970,7 +970,7 @@ xrdp_mcs_incoming(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_mcs_init(struct xrdp_mcs *self, struct stream *s) { xrdp_iso_init(self->iso_layer, s); @@ -982,7 +982,7 @@ xrdp_mcs_init(struct xrdp_mcs *self, struct stream *s) /* returns error */ /* Inform the callback that an mcs packet has been sent. This is needed so the module can send any high priority mcs packets like audio. */ -static int APP_CC +static int xrdp_mcs_call_callback(struct xrdp_mcs *self) { int rv; @@ -1014,7 +1014,7 @@ xrdp_mcs_call_callback(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_mcs_send(struct xrdp_mcs *self, struct stream *s, int chan) { int len; @@ -1083,7 +1083,7 @@ xrdp_mcs_send(struct xrdp_mcs *self, struct stream *s, int chan) * Internal help function to close the socket * @param self */ -void APP_CC +void close_rdp_socket(struct xrdp_mcs *self) { if (self->iso_layer != 0) @@ -1102,7 +1102,7 @@ close_rdp_socket(struct xrdp_mcs *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_mcs_disconnect(struct xrdp_mcs *self) { struct stream *s; diff --git a/libxrdp/xrdp_mppc_enc.c b/libxrdp/xrdp_mppc_enc.c index 93ff84a2..0420876a 100644 --- a/libxrdp/xrdp_mppc_enc.c +++ b/libxrdp/xrdp_mppc_enc.c @@ -431,7 +431,7 @@ do \ * @return struct xrdp_mppc_enc* or nil on failure */ -struct xrdp_mppc_enc * APP_CC +struct xrdp_mppc_enc * mppc_enc_new(int protocol_type) { struct xrdp_mppc_enc *enc; @@ -498,7 +498,7 @@ mppc_enc_new(int protocol_type) * @param enc struct to be deinited */ -void APP_CC +void mppc_enc_free(struct xrdp_mppc_enc *enc) { if (enc == 0) @@ -521,7 +521,7 @@ mppc_enc_free(struct xrdp_mppc_enc *enc) * @return TRUE on success, FALSE on failure */ -static int APP_CC +static int compress_rdp_4(struct xrdp_mppc_enc *enc, tui8 *srcData, int len) { /* RDP 4.0 encoding not yet implemented */ @@ -538,7 +538,7 @@ compress_rdp_4(struct xrdp_mppc_enc *enc, tui8 *srcData, int len) * @return TRUE on success, FALSE on failure */ -static int APP_CC +static int compress_rdp_5(struct xrdp_mppc_enc *enc, tui8 *srcData, int len) { char *outputBuffer; /* points to enc->outputBuffer */ @@ -1007,7 +1007,7 @@ compress_rdp_5(struct xrdp_mppc_enc *enc, tui8 *srcData, int len) * @return TRUE on success, FALSE on failure */ -int APP_CC +int compress_rdp(struct xrdp_mppc_enc *enc, tui8 *srcData, int len) { if ((enc == 0) || (srcData == 0) || (len <= 0) || (len > enc->buf_len)) diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c index 3ce0ecb5..7ce5a21b 100644 --- a/libxrdp/xrdp_orders.c +++ b/libxrdp/xrdp_orders.c @@ -41,7 +41,7 @@ #define MAX_ORDERS_SIZE (16 * 1024 - 256) /*****************************************************************************/ -struct xrdp_orders *APP_CC +struct xrdp_orders * xrdp_orders_create(struct xrdp_session *session, struct xrdp_rdp *rdp_layer) { struct xrdp_orders *self; @@ -65,7 +65,7 @@ xrdp_orders_create(struct xrdp_session *session, struct xrdp_rdp *rdp_layer) } /*****************************************************************************/ -void APP_CC +void xrdp_orders_delete(struct xrdp_orders *self) { if (self == 0) @@ -83,7 +83,7 @@ xrdp_orders_delete(struct xrdp_orders *self) /*****************************************************************************/ /* set all values to zero */ /* returns error */ -int APP_CC +int xrdp_orders_reset(struct xrdp_orders *self) { if (xrdp_orders_force_send(self) != 0) @@ -102,7 +102,7 @@ xrdp_orders_reset(struct xrdp_orders *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_orders_init(struct xrdp_orders *self) { self->order_level++; @@ -138,7 +138,7 @@ xrdp_orders_init(struct xrdp_orders *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_orders_send(struct xrdp_orders *self) { int rv; @@ -177,7 +177,7 @@ xrdp_orders_send(struct xrdp_orders *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_orders_force_send(struct xrdp_orders *self) { if (self == 0) @@ -216,7 +216,7 @@ xrdp_orders_force_send(struct xrdp_orders *self) /* check if the current order will fit in packet size of 16384, if not */ /* send what we got and init a new one */ /* returns error */ -int APP_CC +int xrdp_orders_check(struct xrdp_orders *self, int max_size) { int size; @@ -270,7 +270,7 @@ xrdp_orders_check(struct xrdp_orders *self, int max_size) /*****************************************************************************/ /* check if rect is the same as the last one sent */ /* returns boolean */ -static int APP_CC +static int xrdp_orders_last_bounds(struct xrdp_orders *self, struct xrdp_rect *rect) { if (rect == 0) @@ -292,7 +292,7 @@ xrdp_orders_last_bounds(struct xrdp_orders *self, struct xrdp_rect *rect) /*****************************************************************************/ /* check if all coords are within 256 bytes */ /* returns boolean */ -static int APP_CC +static int xrdp_orders_send_delta(struct xrdp_orders *self, int *vals, int count) { int i; @@ -310,7 +310,7 @@ xrdp_orders_send_delta(struct xrdp_orders *self, int *vals, int count) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_orders_out_bounds(struct xrdp_orders *self, struct xrdp_rect *rect) { char *bounds_flags_ptr; @@ -428,7 +428,7 @@ xrdp_orders_out_bounds(struct xrdp_orders *self, struct xrdp_rect *rect) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_order_pack_small_or_tiny(struct xrdp_orders *self, char *order_flags_ptr, int orders_flags, char *present_ptr, int present, @@ -485,7 +485,7 @@ xrdp_order_pack_small_or_tiny(struct xrdp_orders *self, /* returns error */ /* send a solid rect to client */ /* max size 23 */ -int APP_CC +int xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy, int color, struct xrdp_rect *rect) { @@ -655,7 +655,7 @@ xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy, /* returns error */ /* send a screen blt order */ /* max size 25 */ -int APP_CC +int xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y, int cx, int cy, int srcx, int srcy, int rop, struct xrdp_rect *rect) @@ -845,7 +845,7 @@ xrdp_orders_screen_blt(struct xrdp_orders *self, int x, int y, /* returns error */ /* send a pat blt order */ /* max size 39 */ -int APP_CC +int xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y, int cx, int cy, int rop, int bg_color, int fg_color, struct xrdp_brush *brush, @@ -1064,7 +1064,7 @@ xrdp_orders_pat_blt(struct xrdp_orders *self, int x, int y, /* returns error */ /* send a dest blt order */ /* max size 21 */ -int APP_CC +int xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y, int cx, int cy, int rop, struct xrdp_rect *rect) @@ -1218,7 +1218,7 @@ xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y, /* returns error */ /* send a line order */ /* max size 32 */ -int APP_CC +int xrdp_orders_line(struct xrdp_orders *self, int mix_mode, int startx, int starty, int endx, int endy, int rop, int bg_color, @@ -1436,7 +1436,7 @@ xrdp_orders_line(struct xrdp_orders *self, int mix_mode, /* returns error */ /* send a mem blt order */ /* max size 30 */ -int APP_CC +int xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id, int color_table, int x, int y, int cx, int cy, int rop, int srcx, int srcy, @@ -1642,7 +1642,7 @@ xrdp_orders_mem_blt(struct xrdp_orders *self, int cache_id, /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat, int srcwidth, int srcrepeat, int* srctransform, int mskflags, int mskidx, int mskformat, @@ -1971,7 +1971,7 @@ xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, int srcformat, /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_orders_text(struct xrdp_orders *self, int font, int flags, int mixmode, int fg_color, int bg_color, @@ -2168,7 +2168,7 @@ xrdp_orders_text(struct xrdp_orders *self, /*****************************************************************************/ /* returns error */ /* when a palette gets sent, send the main palette too */ -int APP_CC +int xrdp_orders_send_palette(struct xrdp_orders *self, int *palette, int cache_id) { @@ -2204,7 +2204,7 @@ xrdp_orders_send_palette(struct xrdp_orders *self, int *palette, /*****************************************************************************/ /* returns error */ /* max size width * height * Bpp + 16 */ -int APP_CC +int xrdp_orders_send_raw_bitmap(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx) @@ -2324,7 +2324,7 @@ xrdp_orders_send_raw_bitmap(struct xrdp_orders *self, /*****************************************************************************/ /* returns error */ /* max size width * height * Bpp + 16 */ -int APP_CC +int xrdp_orders_send_bitmap(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx) @@ -2432,7 +2432,7 @@ xrdp_orders_send_bitmap(struct xrdp_orders *self, /* returns error */ /* max size datasize + 18*/ /* todo, only sends one for now */ -int APP_CC +int xrdp_orders_send_font(struct xrdp_orders *self, struct xrdp_font_char *font_char, int font_index, int char_index) @@ -2477,7 +2477,7 @@ xrdp_orders_send_font(struct xrdp_orders *self, /*****************************************************************************/ /* returns error */ /* max size width * height * Bpp + 14 */ -int APP_CC +int xrdp_orders_send_raw_bitmap2(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx) @@ -2599,7 +2599,7 @@ xrdp_orders_send_raw_bitmap2(struct xrdp_orders *self, /*****************************************************************************/ /* returns error */ /* max size width * height * Bpp + 14 */ -int APP_CC +int xrdp_orders_send_bitmap2(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx, int hints) @@ -2712,7 +2712,7 @@ xrdp_orders_send_as_jpeg(struct xrdp_orders *self, #if defined(XRDP_NEUTRINORDP) /*****************************************************************************/ /* secondary drawing order (bitmap v3) using remotefx compression */ -static int APP_CC +static int xrdp_orders_send_as_rfx(struct xrdp_orders *self, int width, int height, int bpp, int hints) @@ -2740,7 +2740,7 @@ xrdp_orders_send_as_rfx(struct xrdp_orders *self, #if defined(XRDP_JPEG) || defined(XRDP_NEUTRINORDP) /*****************************************************************************/ -static int APP_CC +static int xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx, char *buf, int bufsize, int width, int height, int bpp, int codec_id) @@ -2783,7 +2783,7 @@ xrdp_orders_out_v3(struct xrdp_orders *self, int cache_id, int cache_idx, /*****************************************************************************/ /* secondary drawing order (bitmap v3) using remotefx compression */ -int APP_CC +int xrdp_orders_send_bitmap3(struct xrdp_orders *self, int width, int height, int bpp, char *data, int cache_id, int cache_idx, int hints) @@ -2891,7 +2891,7 @@ xrdp_orders_send_bitmap3(struct xrdp_orders *self, /*****************************************************************************/ /* returns error */ /* send a brush cache entry */ -int APP_CC +int xrdp_orders_send_brush(struct xrdp_orders *self, int width, int height, int bpp, int type, int size, char *data, int cache_id) { @@ -2922,7 +2922,7 @@ xrdp_orders_send_brush(struct xrdp_orders *self, int width, int height, /*****************************************************************************/ /* returns error */ /* send an off screen bitmap entry */ -int APP_CC +int xrdp_orders_send_create_os_surface(struct xrdp_orders *self, int id, int width, int height, struct list *del_list) @@ -2981,7 +2981,7 @@ xrdp_orders_send_create_os_surface(struct xrdp_orders *self, int id, /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_orders_send_switch_os_surface(struct xrdp_orders *self, int id) { int order_flags; diff --git a/libxrdp/xrdp_orders_rail.c b/libxrdp/xrdp_orders_rail.c index 19da4c2c..9bbd9e12 100644 --- a/libxrdp/xrdp_orders_rail.c +++ b/libxrdp/xrdp_orders_rail.c @@ -30,7 +30,7 @@ /*****************************************************************************/ /* RAIL */ /* returns error */ -int APP_CC +int xrdp_orders_send_window_delete(struct xrdp_orders *self, int window_id) { int order_size; @@ -61,7 +61,7 @@ xrdp_orders_send_window_delete(struct xrdp_orders *self, int window_id) /* returns error */ /* flags can contain WINDOW_ORDER_STATE_NEW and/or WINDOW_ORDER_FIELD_ICON_BIG */ -int APP_CC +int xrdp_orders_send_window_cached_icon(struct xrdp_orders *self, int window_id, int cache_entry, int cache_id, int flags) @@ -97,7 +97,7 @@ xrdp_orders_send_window_cached_icon(struct xrdp_orders *self, /*****************************************************************************/ /* RAIL */ /* returns error */ -static int APP_CC +static int xrdp_orders_send_ts_icon(struct stream *s, int cache_entry, int cache_id, struct rail_icon_info *icon_info) { @@ -140,7 +140,7 @@ xrdp_orders_send_ts_icon(struct stream *s, int cache_entry, int cache_id, /* returns error */ /* flags can contain WINDOW_ORDER_STATE_NEW and/or WINDOW_ORDER_FIELD_ICON_BIG */ -int APP_CC +int xrdp_orders_send_window_icon(struct xrdp_orders *self, int window_id, int cache_entry, int cache_id, struct rail_icon_info *icon_info, @@ -189,7 +189,7 @@ xrdp_orders_send_window_icon(struct xrdp_orders *self, /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_orders_send_as_unicode(struct stream *s, const char *text) { int str_chars; @@ -222,7 +222,7 @@ xrdp_orders_send_as_unicode(struct stream *s, const char *text) /* RAIL */ /* returns error */ /* flags can contain WINDOW_ORDER_STATE_NEW */ -int APP_CC +int xrdp_orders_send_window_new_update(struct xrdp_orders *self, int window_id, struct rail_window_state_order *window_state, int flags) @@ -478,7 +478,7 @@ xrdp_orders_send_window_new_update(struct xrdp_orders *self, int window_id, /*****************************************************************************/ /* RAIL */ /* returns error */ -int APP_CC +int xrdp_orders_send_notify_delete(struct xrdp_orders *self, int window_id, int notify_id) { @@ -511,7 +511,7 @@ xrdp_orders_send_notify_delete(struct xrdp_orders *self, int window_id, /* RAIL */ /* returns error */ /* flags can contain WINDOW_ORDER_STATE_NEW */ -int APP_CC +int xrdp_orders_send_notify_new_update(struct xrdp_orders *self, int window_id, int notify_id, struct rail_notify_state_order *notify_state, @@ -652,7 +652,7 @@ xrdp_orders_send_notify_new_update(struct xrdp_orders *self, /* RAIL */ /* returns error */ /* used for both Non-Monitored Desktop and Actively Monitored Desktop */ -int APP_CC +int xrdp_orders_send_monitored_desktop(struct xrdp_orders *self, struct rail_monitored_desktop_order *mdo, int flags) diff --git a/libxrdp/xrdp_orders_rail.h b/libxrdp/xrdp_orders_rail.h index 475b8f17..db8a785f 100644 --- a/libxrdp/xrdp_orders_rail.h +++ b/libxrdp/xrdp_orders_rail.h @@ -19,30 +19,30 @@ #if !defined(_XRDP_ORDERS_RAIL_H) #define _XRDP_ORDERS_RAIL_H -int APP_CC +int xrdp_orders_send_window_delete(struct xrdp_orders *self, int window_id); -int APP_CC +int xrdp_orders_send_window_cached_icon(struct xrdp_orders *self, int window_id, int cache_entry, int cache_id, int flags); -int APP_CC +int xrdp_orders_send_window_icon(struct xrdp_orders *self, int window_id, int cache_entry, int cache_id, struct rail_icon_info *icon_info, int flags); -int APP_CC +int xrdp_orders_send_window_new_update(struct xrdp_orders *self, int window_id, struct rail_window_state_order *window_state, int flags); -int APP_CC +int xrdp_orders_send_notify_delete(struct xrdp_orders *self, int window_id, int notify_id); -int APP_CC +int xrdp_orders_send_notify_new_update(struct xrdp_orders *self, int window_id, int notify_id, struct rail_notify_state_order *notify_state, int flags); -int APP_CC +int xrdp_orders_send_monitored_desktop(struct xrdp_orders *self, struct rail_monitored_desktop_order *mdo, int flags); diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index ff53cb80..adb66d99 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -40,7 +40,7 @@ #define FASTPATH_FRAG_SIZE (16 * 1024 - 128) /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_read_config(struct xrdp_client_info *client_info) { int index = 0; @@ -357,7 +357,7 @@ xrdp_rdp_detect_cpu(void) #endif /*****************************************************************************/ -struct xrdp_rdp *APP_CC +struct xrdp_rdp * xrdp_rdp_create(struct xrdp_session *session, struct trans *trans) { struct xrdp_rdp *self = (struct xrdp_rdp *)NULL; @@ -392,7 +392,7 @@ xrdp_rdp_create(struct xrdp_session *session, struct trans *trans) } /*****************************************************************************/ -void APP_CC +void xrdp_rdp_delete(struct xrdp_rdp *self) { if (self == 0) @@ -409,7 +409,7 @@ xrdp_rdp_delete(struct xrdp_rdp *self) } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_init(struct xrdp_rdp *self, struct stream *s) { if (xrdp_sec_init(self->sec_layer, s) != 0) @@ -422,7 +422,7 @@ xrdp_rdp_init(struct xrdp_rdp *self, struct stream *s) } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_init_data(struct xrdp_rdp *self, struct stream *s) { if (xrdp_sec_init(self->sec_layer, s) != 0) @@ -436,7 +436,7 @@ xrdp_rdp_init_data(struct xrdp_rdp *self, struct stream *s) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code) { int error = 0; @@ -535,7 +535,7 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code) } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_send(struct xrdp_rdp *self, struct stream *s, int pdu_type) { int len = 0; @@ -558,7 +558,7 @@ xrdp_rdp_send(struct xrdp_rdp *self, struct stream *s, int pdu_type) } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_send_data(struct xrdp_rdp *self, struct stream *s, int data_pdu_type) { @@ -647,7 +647,7 @@ xrdp_rdp_send_data(struct xrdp_rdp *self, struct stream *s, /*****************************************************************************/ /* returns the fastpath rdp byte count */ -int APP_CC +int xrdp_rdp_get_fastpath_bytes(struct xrdp_rdp *self) { if (self->client_info.rdp_compression) @@ -658,7 +658,7 @@ xrdp_rdp_get_fastpath_bytes(struct xrdp_rdp *self) } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_init_fastpath(struct xrdp_rdp *self, struct stream *s) { if (xrdp_sec_init_fastpath(self->sec_layer, s) != 0) @@ -680,7 +680,7 @@ xrdp_rdp_init_fastpath(struct xrdp_rdp *self, struct stream *s) /* returns error */ /* 2.2.9.1.2.1 Fast-Path Update (TS_FP_UPDATE) * http://msdn.microsoft.com/en-us/library/cc240622.aspx */ -int APP_CC +int xrdp_rdp_send_fastpath(struct xrdp_rdp *self, struct stream *s, int data_pdu_type) { @@ -805,7 +805,7 @@ xrdp_rdp_send_fastpath(struct xrdp_rdp *self, struct stream *s, } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self) { struct stream *s = (struct stream *)NULL; @@ -863,7 +863,7 @@ xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self) } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_incoming(struct xrdp_rdp *self) { struct xrdp_iso *iso; @@ -907,7 +907,7 @@ xrdp_rdp_incoming(struct xrdp_rdp *self) } /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_process_data_pointer(struct xrdp_rdp *self, struct stream *s) { return 0; @@ -915,7 +915,7 @@ xrdp_rdp_process_data_pointer(struct xrdp_rdp *self, struct stream *s) /*****************************************************************************/ /* RDP_DATA_PDU_INPUT */ -static int APP_CC +static int xrdp_rdp_process_data_input(struct xrdp_rdp *self, struct stream *s) { int num_events; @@ -966,7 +966,7 @@ xrdp_rdp_process_data_input(struct xrdp_rdp *self, struct stream *s) } /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_send_synchronise(struct xrdp_rdp *self) { struct stream *s; @@ -995,7 +995,7 @@ xrdp_rdp_send_synchronise(struct xrdp_rdp *self) } /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_send_control(struct xrdp_rdp *self, int action) { struct stream *s; @@ -1025,7 +1025,7 @@ xrdp_rdp_send_control(struct xrdp_rdp *self, int action) } /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_process_data_control(struct xrdp_rdp *self, struct stream *s) { int action; @@ -1054,7 +1054,7 @@ xrdp_rdp_process_data_control(struct xrdp_rdp *self, struct stream *s) } /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_process_data_sync(struct xrdp_rdp *self) { DEBUG(("xrdp_rdp_process_data_sync")); @@ -1062,7 +1062,7 @@ xrdp_rdp_process_data_sync(struct xrdp_rdp *self) } /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_process_screen_update(struct xrdp_rdp *self, struct stream *s) { int left; @@ -1089,7 +1089,7 @@ xrdp_rdp_process_screen_update(struct xrdp_rdp *self, struct stream *s) } /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_send_fontmap(struct xrdp_rdp *self) { struct stream *s; @@ -1121,7 +1121,7 @@ xrdp_rdp_send_fontmap(struct xrdp_rdp *self) } /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_process_data_font(struct xrdp_rdp *self, struct stream *s) { int seq; @@ -1151,7 +1151,7 @@ xrdp_rdp_process_data_font(struct xrdp_rdp *self, struct stream *s) /*****************************************************************************/ /* sent 37 pdu */ -static int APP_CC +static int xrdp_rdp_send_disconnect_query_response(struct xrdp_rdp *self) { struct stream *s; @@ -1180,7 +1180,7 @@ xrdp_rdp_send_disconnect_query_response(struct xrdp_rdp *self) #if 0 /* not used */ /*****************************************************************************/ /* sent RDP_DATA_PDU_DISCONNECT 47 pdu */ -static int APP_CC +static int xrdp_rdp_send_disconnect_reason(struct xrdp_rdp *self, int reason) { struct stream *s; @@ -1209,7 +1209,7 @@ xrdp_rdp_send_disconnect_reason(struct xrdp_rdp *self, int reason) #endif /*****************************************************************************/ -static int APP_CC +static int xrdp_rdp_process_frame_ack(struct xrdp_rdp *self, struct stream *s) { int frame_id; @@ -1228,7 +1228,7 @@ xrdp_rdp_process_frame_ack(struct xrdp_rdp *self, struct stream *s) /*****************************************************************************/ /* RDP_PDU_DATA */ -int APP_CC +int xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s) { int data_type; @@ -1283,7 +1283,7 @@ xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s) return 0; } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_disconnect(struct xrdp_rdp *self) { int rv; @@ -1295,7 +1295,7 @@ xrdp_rdp_disconnect(struct xrdp_rdp *self) } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_send_deactivate(struct xrdp_rdp *self) { struct stream *s; @@ -1326,7 +1326,7 @@ xrdp_rdp_send_deactivate(struct xrdp_rdp *self) } /*****************************************************************************/ -int APP_CC +int xrdp_rdp_send_session_info(struct xrdp_rdp *self, const char *data, int data_bytes) { diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c index 2ef51d49..1cb038e9 100644 --- a/libxrdp/xrdp_sec.c +++ b/libxrdp/xrdp_sec.c @@ -190,7 +190,7 @@ static const tui8 g_fips_ivec[8] = }; /*****************************************************************************/ -static void APP_CC +static void hex_str_to_bin(char *in, char *out, int out_len) { int in_index; @@ -225,7 +225,7 @@ hex_str_to_bin(char *in, char *out, int out_len) } /*****************************************************************************/ -static void APP_CC +static void xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) { int fd; @@ -440,7 +440,7 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) } /*****************************************************************************/ -struct xrdp_sec *APP_CC +struct xrdp_sec * xrdp_sec_create(struct xrdp_rdp *owner, struct trans *trans) { struct xrdp_sec *self; @@ -461,7 +461,7 @@ xrdp_sec_create(struct xrdp_rdp *owner, struct trans *trans) } /*****************************************************************************/ -void APP_CC +void xrdp_sec_delete(struct xrdp_sec *self) { if (self == 0) @@ -487,7 +487,7 @@ xrdp_sec_delete(struct xrdp_sec *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_sec_init(struct xrdp_sec *self, struct stream *s) { if (xrdp_mcs_init(self->mcs_layer, s) != 0) @@ -516,7 +516,7 @@ xrdp_sec_init(struct xrdp_sec *self, struct stream *s) /*****************************************************************************/ /* Reduce key entropy from 64 to 40 bits */ -static void APP_CC +static void xrdp_sec_make_40bit(char *key) { key[0] = 0xd1; @@ -527,7 +527,7 @@ xrdp_sec_make_40bit(char *key) /*****************************************************************************/ /* returns error */ /* update an encryption key */ -static int APP_CC +static int xrdp_sec_update(char *key, char *update_key, int key_len) { char shasig[20]; @@ -563,7 +563,7 @@ xrdp_sec_update(char *key, char *update_key, int key_len) } /*****************************************************************************/ -static void APP_CC +static void xrdp_sec_fips_decrypt(struct xrdp_sec *self, char *data, int len) { LLOGLN(10, ("xrdp_sec_fips_decrypt:")); @@ -572,7 +572,7 @@ xrdp_sec_fips_decrypt(struct xrdp_sec *self, char *data, int len) } /*****************************************************************************/ -static void APP_CC +static void xrdp_sec_decrypt(struct xrdp_sec *self, char *data, int len) { LLOGLN(10, ("xrdp_sec_decrypt:")); @@ -589,7 +589,7 @@ xrdp_sec_decrypt(struct xrdp_sec *self, char *data, int len) } /*****************************************************************************/ -static void APP_CC +static void xrdp_sec_fips_encrypt(struct xrdp_sec *self, char *data, int len) { LLOGLN(10, ("xrdp_sec_fips_encrypt:")); @@ -598,7 +598,7 @@ xrdp_sec_fips_encrypt(struct xrdp_sec *self, char *data, int len) } /*****************************************************************************/ -static void APP_CC +static void xrdp_sec_encrypt(struct xrdp_sec *self, char *data, int len) { LLOGLN(10, ("xrdp_sec_encrypt:")); @@ -616,7 +616,7 @@ xrdp_sec_encrypt(struct xrdp_sec *self, char *data, int len) } /*****************************************************************************/ -static int APP_CC +static int unicode_in(struct stream *s, int uni_len, char *dst, int dst_len) { int dst_index; @@ -652,7 +652,7 @@ unicode_in(struct stream *s, int uni_len, char *dst, int dst_len) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s) { int flags = 0; @@ -865,7 +865,7 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_sec_send_lic_initial(struct xrdp_sec *self) { struct stream *s; @@ -895,7 +895,7 @@ xrdp_sec_send_lic_initial(struct xrdp_sec *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_sec_send_lic_response(struct xrdp_sec *self) { struct stream *s; @@ -924,7 +924,7 @@ xrdp_sec_send_lic_response(struct xrdp_sec *self) /*****************************************************************************/ /* returns error */ -static int APP_CC +static int xrdp_sec_send_media_lic_response(struct xrdp_sec *self) { struct stream *s; @@ -952,7 +952,7 @@ xrdp_sec_send_media_lic_response(struct xrdp_sec *self) } /*****************************************************************************/ -static void APP_CC +static void xrdp_sec_rsa_op(struct xrdp_sec *self, char *out, char *in, int in_bytes, char *mod, char *exp) { @@ -962,7 +962,7 @@ xrdp_sec_rsa_op(struct xrdp_sec *self, char *out, char *in, int in_bytes, } /*****************************************************************************/ -static void APP_CC +static void xrdp_sec_hash_48(char *out, char *in, char *salt1, char *salt2, int salt) { int i; @@ -996,7 +996,7 @@ xrdp_sec_hash_48(char *out, char *in, char *salt1, char *salt2, int salt) } /*****************************************************************************/ -static void APP_CC +static void xrdp_sec_hash_16(char *out, char *in, char *salt1, char *salt2) { void *md5_info; @@ -1011,7 +1011,7 @@ xrdp_sec_hash_16(char *out, char *in, char *salt1, char *salt2) } /*****************************************************************************/ -static void APP_CC +static void fips_expand_key_bits(const char *in, char *out) { tui8 buf[32]; @@ -1055,7 +1055,7 @@ fips_expand_key_bits(const char *in, char *out) } /****************************************************************************/ -static void APP_CC +static void xrdp_sec_fips_establish_keys(struct xrdp_sec *self) { char server_encrypt_key[32]; @@ -1100,7 +1100,7 @@ xrdp_sec_fips_establish_keys(struct xrdp_sec *self) } /****************************************************************************/ -static void APP_CC +static void xrdp_sec_establish_keys(struct xrdp_sec *self) { char session_key[48]; @@ -1141,7 +1141,7 @@ xrdp_sec_establish_keys(struct xrdp_sec *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_sec_recv_fastpath(struct xrdp_sec *self, struct stream *s) { int ver; @@ -1203,7 +1203,7 @@ xrdp_sec_recv_fastpath(struct xrdp_sec *self, struct stream *s) } /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan) { int flags; @@ -1368,7 +1368,7 @@ buf_out_uint32(char *buffer, int value) /*****************************************************************************/ /* Generate a MAC hash (5.2.3.1), using a combination of SHA1 and MD5 */ -static void APP_CC +static void xrdp_sec_fips_sign(struct xrdp_sec *self, char *out, int out_len, char *data, int data_len) { @@ -1385,7 +1385,7 @@ xrdp_sec_fips_sign(struct xrdp_sec *self, char *out, int out_len, /*****************************************************************************/ /* Generate a MAC hash (5.2.3.1), using a combination of SHA1 and MD5 */ -static void APP_CC +static void xrdp_sec_sign(struct xrdp_sec *self, char *out, int out_len, char *data, int data_len) { @@ -1416,7 +1416,7 @@ xrdp_sec_sign(struct xrdp_sec *self, char *out, int out_len, /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_sec_send(struct xrdp_sec *self, struct stream *s, int chan) { int datalen; @@ -1466,7 +1466,7 @@ xrdp_sec_send(struct xrdp_sec *self, struct stream *s, int chan) /*****************************************************************************/ /* returns the fastpath sec byte count */ -int APP_CC +int xrdp_sec_get_fastpath_bytes(struct xrdp_sec *self) { if (self->crypt_level == CRYPT_LEVEL_FIPS) @@ -1482,7 +1482,7 @@ xrdp_sec_get_fastpath_bytes(struct xrdp_sec *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_sec_init_fastpath(struct xrdp_sec *self, struct stream *s) { if (xrdp_fastpath_init(self->fastpath_layer, s) != 0) @@ -1508,7 +1508,7 @@ xrdp_sec_init_fastpath(struct xrdp_sec *self, struct stream *s) /* returns error */ /* 2.2.9.1.2 Server Fast-Path Update PDU (TS_FP_UPDATE_PDU) * http://msdn.microsoft.com/en-us/library/cc240621.aspx */ -int APP_CC +int xrdp_sec_send_fastpath(struct xrdp_sec *self, struct stream *s) { int secFlags; @@ -1581,7 +1581,7 @@ xrdp_sec_send_fastpath(struct xrdp_sec *self, struct stream *s) /*****************************************************************************/ /* http://msdn.microsoft.com/en-us/library/cc240510.aspx 2.2.1.3.2 Client Core Data (TS_UD_CS_CORE) */ -static int APP_CC +static int xrdp_sec_process_mcs_data_CS_CORE(struct xrdp_sec* self, struct stream* s) { int colorDepth; @@ -1724,7 +1724,7 @@ xrdp_sec_process_mcs_data_CS_CORE(struct xrdp_sec* self, struct stream* s) } /*****************************************************************************/ -static int APP_CC +static int xrdp_sec_process_mcs_data_CS_SECURITY(struct xrdp_sec *self, struct stream* s) { int crypt_method; @@ -1823,7 +1823,7 @@ xrdp_sec_process_mcs_data_CS_SECURITY(struct xrdp_sec *self, struct stream* s) /*****************************************************************************/ /* this adds the mcs channels in the list of channels to be used when creating the server mcs data */ -static int APP_CC +static int xrdp_sec_process_mcs_data_channels(struct xrdp_sec *self, struct stream *s) { int num_channels; @@ -1884,7 +1884,7 @@ xrdp_sec_process_mcs_data_channels(struct xrdp_sec *self, struct stream *s) /*****************************************************************************/ /* reads the client monitors data */ -static int APP_CC +static int xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s) { int index; @@ -2014,7 +2014,7 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s) /*****************************************************************************/ /* process client mcs data, we need some things in here to create the server mcs data */ -int APP_CC +int xrdp_sec_process_mcs_data(struct xrdp_sec *self) { struct stream *s = (struct stream *)NULL; @@ -2112,7 +2112,7 @@ xrdp_sec_process_mcs_data(struct xrdp_sec *self) /*****************************************************************************/ /* process the mcs client data we received from the mcs layer */ -static int APP_CC +static int xrdp_sec_in_mcs_data(struct xrdp_sec *self) { struct stream *s = (struct stream *)NULL; @@ -2176,7 +2176,7 @@ xrdp_sec_in_mcs_data(struct xrdp_sec *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_sec_init_rdp_security(struct xrdp_sec *self) { switch (self->rdp_layer->client_info.crypt_level) @@ -2228,7 +2228,7 @@ xrdp_sec_init_rdp_security(struct xrdp_sec *self) } /*****************************************************************************/ -int APP_CC +int xrdp_sec_incoming(struct xrdp_sec *self) { struct list *items = NULL; @@ -2364,7 +2364,7 @@ xrdp_sec_incoming(struct xrdp_sec *self) } /*****************************************************************************/ -int APP_CC +int xrdp_sec_disconnect(struct xrdp_sec *self) { int rv; diff --git a/libxrdp/xrdp_surface.c b/libxrdp/xrdp_surface.c index 85978c0a..73c7465a 100644 --- a/libxrdp/xrdp_surface.c +++ b/libxrdp/xrdp_surface.c @@ -25,7 +25,7 @@ #include "freerdp/codec/rfx.h" /*****************************************************************************/ -struct xrdp_surface *APP_CC +struct xrdp_surface * xrdp_surface_create(struct xrdp_session *session, struct xrdp_fastpath *fastpath) { struct xrdp_surface *self; @@ -39,7 +39,7 @@ xrdp_surface_create(struct xrdp_session *session, struct xrdp_fastpath *fastpath } /*****************************************************************************/ -void APP_CC +void xrdp_surface_delete(struct xrdp_surface *self) { STREAM *s; @@ -60,14 +60,14 @@ xrdp_surface_delete(struct xrdp_surface *self) /*****************************************************************************/ /* returns error */ -int APP_CC +int xrdp_surface_reset(struct xrdp_surface *self) { return 0; } /*****************************************************************************/ -int APP_CC +int xrdp_surface_init(struct xrdp_surface *self) { int width; @@ -89,7 +89,7 @@ xrdp_surface_init(struct xrdp_surface *self) } /*****************************************************************************/ -int APP_CC +int xrdp_surface_send_surface_bits(struct xrdp_surface *self, int bpp, char *data, int x, int y, int cx, int cy) { @@ -153,7 +153,7 @@ xrdp_surface_send_surface_bits(struct xrdp_surface *self, int bpp, char *data, } /*****************************************************************************/ -int APP_CC +int xrdp_surface_send_frame_marker(struct xrdp_surface *self, uint16 frameAction, uint32 frameId) { |