diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2014-06-02 22:00:51 -0700 | 
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2014-06-02 22:00:51 -0700 | 
| commit | d672eb8995b646198bae3c5bcb1683dfa0318143 (patch) | |
| tree | f060bd6d8ffb3b3e3de0f075178103fccb487d46 | |
| parent | eb478200bf9b6b367b59ec8da0ec1770426e4d06 (diff) | |
| download | xrdp-proprietary-d672eb8995b646198bae3c5bcb1683dfa0318143.tar.gz xrdp-proprietary-d672eb8995b646198bae3c5bcb1683dfa0318143.zip | |
no logic change, indent
| -rw-r--r-- | libxrdp/libxrdp.h | 570 | ||||
| -rw-r--r-- | libxrdp/libxrdpinc.h | 204 | ||||
| -rw-r--r-- | libxrdp/xrdp_orders_rail.h | 24 | 
3 files changed, 399 insertions, 399 deletions
| diff --git a/libxrdp/libxrdp.h b/libxrdp/libxrdp.h index b909dd72..2ea8b61d 100644 --- a/libxrdp/libxrdp.h +++ b/libxrdp/libxrdp.h @@ -41,40 +41,40 @@  /* iso */  struct xrdp_iso  { -  struct xrdp_mcs* mcs_layer; /* owner */ -  int requestedProtocol; -  int selectedProtocol; -  struct trans* trans; +    struct xrdp_mcs *mcs_layer; /* owner */ +    int requestedProtocol; +    int selectedProtocol; +    struct trans *trans;  };  /* used in mcs */  struct mcs_channel_item  { -  char name[16]; -  int flags; -  int chanid; +    char name[16]; +    int flags; +    int chanid;  };  /* mcs */  struct xrdp_mcs  { -  struct xrdp_sec* sec_layer; /* owner */ -  struct xrdp_iso* iso_layer; -  int userid; -  int chanid; -  struct stream* client_mcs_data; -  struct stream* server_mcs_data; -  struct list* channel_list; +    struct xrdp_sec *sec_layer; /* owner */ +    struct xrdp_iso *iso_layer; +    int userid; +    int chanid; +    struct stream *client_mcs_data; +    struct stream *server_mcs_data; +    struct list *channel_list;  };  /* fastpath */  struct xrdp_fastpath  { -  struct xrdp_sec* sec_layer; /* owner */ -  struct trans* trans; -  struct xrdp_session* session; -  int numEvents; -  int secFlags; +    struct xrdp_sec *sec_layer; /* owner */ +    struct trans *trans; +    struct xrdp_session *session; +    int numEvents; +    int secFlags;  };  /* Encryption Methods */ @@ -95,175 +95,175 @@ struct xrdp_fastpath  /* sec */  struct xrdp_sec  { -  struct xrdp_rdp* rdp_layer; /* owner */ -  struct xrdp_mcs* mcs_layer; -  struct xrdp_fastpath* fastpath_layer; -  struct xrdp_channel* chan_layer; -  char server_random[32]; -  char client_random[64]; -  char client_crypt_random[72]; -  struct stream client_mcs_data; -  struct stream server_mcs_data; -  int decrypt_use_count; -  int encrypt_use_count; -  char decrypt_key[16]; -  char encrypt_key[16]; -  char decrypt_update_key[16]; -  char encrypt_update_key[16]; -  int crypt_method; -  int rc4_key_len; /* 8 = 40 bit, 16 = 128 bit */ -  int crypt_level; -  char sign_key[16]; -  void* decrypt_rc4_info; -  void* encrypt_rc4_info; -  char pub_exp[4]; -  char pub_mod[64]; -  char pub_sig[64]; -  char pri_exp[64]; -  int channel_code; -  int multimon; -  char fips_encrypt_key[24]; -  char fips_decrypt_key[24]; -  char fips_sign_key[20]; -  void* encrypt_fips_info; -  void* decrypt_fips_info; -  void* sign_fips_info; +    struct xrdp_rdp *rdp_layer; /* owner */ +    struct xrdp_mcs *mcs_layer; +    struct xrdp_fastpath *fastpath_layer; +    struct xrdp_channel *chan_layer; +    char server_random[32]; +    char client_random[64]; +    char client_crypt_random[72]; +    struct stream client_mcs_data; +    struct stream server_mcs_data; +    int decrypt_use_count; +    int encrypt_use_count; +    char decrypt_key[16]; +    char encrypt_key[16]; +    char decrypt_update_key[16]; +    char encrypt_update_key[16]; +    int crypt_method; +    int rc4_key_len; /* 8 = 40 bit, 16 = 128 bit */ +    int crypt_level; +    char sign_key[16]; +    void *decrypt_rc4_info; +    void *encrypt_rc4_info; +    char pub_exp[4]; +    char pub_mod[64]; +    char pub_sig[64]; +    char pri_exp[64]; +    int channel_code; +    int multimon; +    char fips_encrypt_key[24]; +    char fips_decrypt_key[24]; +    char fips_sign_key[20]; +    void *encrypt_fips_info; +    void *decrypt_fips_info; +    void *sign_fips_info;  };  /* channel */  struct xrdp_channel  { -  struct xrdp_sec* sec_layer; -  struct xrdp_mcs* mcs_layer; +    struct xrdp_sec *sec_layer; +    struct xrdp_mcs *mcs_layer;  };  /* rdp */  struct xrdp_rdp  { -  struct xrdp_session* session; -  struct xrdp_sec* sec_layer; -  int share_id; -  int mcs_channel; -  struct xrdp_client_info client_info; -  struct xrdp_mppc_enc* mppc_enc; -  void* rfx_enc; +    struct xrdp_session *session; +    struct xrdp_sec *sec_layer; +    int share_id; +    int mcs_channel; +    struct xrdp_client_info client_info; +    struct xrdp_mppc_enc *mppc_enc; +    void *rfx_enc;  };  /* state */  struct xrdp_orders_state  { -  int last_order; /* last order sent */ - -  int clip_left;  /* RDP_ORDER_BOUNDS, RDP_ORDER_LASTBOUNDS */ -  int clip_top; -  int clip_right; -  int clip_bottom; - -  int rect_x; /* RDP_ORDER_RECT */ -  int rect_y; -  int rect_cx; -  int rect_cy; -  int rect_color; - -  int scr_blt_x; /* RDP_ORDER_SCREENBLT */ -  int scr_blt_y; -  int scr_blt_cx; -  int scr_blt_cy; -  int scr_blt_rop; -  int scr_blt_srcx; -  int scr_blt_srcy; - -  int pat_blt_x; /* RDP_ORDER_PATBLT */ -  int pat_blt_y; -  int pat_blt_cx; -  int pat_blt_cy; -  int pat_blt_rop; -  int pat_blt_bg_color; -  int pat_blt_fg_color; -  struct xrdp_brush pat_blt_brush; - -  int dest_blt_x; /* RDP_ORDER_DESTBLT */ -  int dest_blt_y; -  int dest_blt_cx; -  int dest_blt_cy; -  int dest_blt_rop; - -  int line_mix_mode; /* RDP_ORDER_LINE */ -  int line_startx; -  int line_starty; -  int line_endx; -  int line_endy; -  int line_bg_color; -  int line_rop; -  struct xrdp_pen line_pen; - -  int mem_blt_color_table; /* RDP_ORDER_MEMBLT */ -  int mem_blt_cache_id; -  int mem_blt_x; -  int mem_blt_y; -  int mem_blt_cx; -  int mem_blt_cy; -  int mem_blt_rop; -  int mem_blt_srcx; -  int mem_blt_srcy; -  int mem_blt_cache_idx; - -  int text_font; /* RDP_ORDER_TEXT2 */ -  int text_flags; -  int text_unknown; -  int text_mixmode; -  int text_fg_color; -  int text_bg_color; -  int text_clip_left; -  int text_clip_top; -  int text_clip_right; -  int text_clip_bottom; -  int text_box_left; -  int text_box_top; -  int text_box_right; -  int text_box_bottom; -  int text_x; -  int text_y; -  int text_len; -  char* text_data; - -  int com_blt_srcidx;    /* RDP_ORDER_COMPOSITE */  /* 2 */ -  int com_blt_srcformat;                            /* 2 */ -  int com_blt_srcwidth;                             /* 2 */ -  int com_blt_srcrepeat;                            /* 1 */ -  int com_blt_srctransform[10];                     /* 40 */ -  int com_blt_mskflags;                             /* 1 */ -  int com_blt_mskidx;                               /* 2 */ -  int com_blt_mskformat;                            /* 2 */ -  int com_blt_mskwidth;                             /* 2 */ -  int com_blt_mskrepeat;                            /* 1 */ -  int com_blt_op;                                   /* 1 */ -  int com_blt_srcx;                                 /* 2 */ -  int com_blt_srcy;                                 /* 2 */ -  int com_blt_mskx;                                 /* 2 */ -  int com_blt_msky;                                 /* 2 */ -  int com_blt_dstx;                                 /* 2 */ -  int com_blt_dsty;                                 /* 2 */ -  int com_blt_width;                                /* 2 */ -  int com_blt_height;                               /* 2 */ -  int com_blt_dstformat;                            /* 2 */ +    int last_order; /* last order sent */ + +    int clip_left;  /* RDP_ORDER_BOUNDS, RDP_ORDER_LASTBOUNDS */ +    int clip_top; +    int clip_right; +    int clip_bottom; + +    int rect_x; /* RDP_ORDER_RECT */ +    int rect_y; +    int rect_cx; +    int rect_cy; +    int rect_color; + +    int scr_blt_x; /* RDP_ORDER_SCREENBLT */ +    int scr_blt_y; +    int scr_blt_cx; +    int scr_blt_cy; +    int scr_blt_rop; +    int scr_blt_srcx; +    int scr_blt_srcy; + +    int pat_blt_x; /* RDP_ORDER_PATBLT */ +    int pat_blt_y; +    int pat_blt_cx; +    int pat_blt_cy; +    int pat_blt_rop; +    int pat_blt_bg_color; +    int pat_blt_fg_color; +    struct xrdp_brush pat_blt_brush; + +    int dest_blt_x; /* RDP_ORDER_DESTBLT */ +    int dest_blt_y; +    int dest_blt_cx; +    int dest_blt_cy; +    int dest_blt_rop; + +    int line_mix_mode; /* RDP_ORDER_LINE */ +    int line_startx; +    int line_starty; +    int line_endx; +    int line_endy; +    int line_bg_color; +    int line_rop; +    struct xrdp_pen line_pen; + +    int mem_blt_color_table; /* RDP_ORDER_MEMBLT */ +    int mem_blt_cache_id; +    int mem_blt_x; +    int mem_blt_y; +    int mem_blt_cx; +    int mem_blt_cy; +    int mem_blt_rop; +    int mem_blt_srcx; +    int mem_blt_srcy; +    int mem_blt_cache_idx; + +    int text_font; /* RDP_ORDER_TEXT2 */ +    int text_flags; +    int text_unknown; +    int text_mixmode; +    int text_fg_color; +    int text_bg_color; +    int text_clip_left; +    int text_clip_top; +    int text_clip_right; +    int text_clip_bottom; +    int text_box_left; +    int text_box_top; +    int text_box_right; +    int text_box_bottom; +    int text_x; +    int text_y; +    int text_len; +    char *text_data; + +    int com_blt_srcidx;    /* RDP_ORDER_COMPOSITE */  /* 2 */ +    int com_blt_srcformat;                            /* 2 */ +    int com_blt_srcwidth;                             /* 2 */ +    int com_blt_srcrepeat;                            /* 1 */ +    int com_blt_srctransform[10];                     /* 40 */ +    int com_blt_mskflags;                             /* 1 */ +    int com_blt_mskidx;                               /* 2 */ +    int com_blt_mskformat;                            /* 2 */ +    int com_blt_mskwidth;                             /* 2 */ +    int com_blt_mskrepeat;                            /* 1 */ +    int com_blt_op;                                   /* 1 */ +    int com_blt_srcx;                                 /* 2 */ +    int com_blt_srcy;                                 /* 2 */ +    int com_blt_mskx;                                 /* 2 */ +    int com_blt_msky;                                 /* 2 */ +    int com_blt_dstx;                                 /* 2 */ +    int com_blt_dsty;                                 /* 2 */ +    int com_blt_width;                                /* 2 */ +    int com_blt_height;                               /* 2 */ +    int com_blt_dstformat;                            /* 2 */  };  /* orders */  struct xrdp_orders  { -  struct stream* out_s; -  struct xrdp_rdp* rdp_layer; -  struct xrdp_session* session; -  struct xrdp_wm* wm; - -  char* order_count_ptr; /* pointer to count, set when sending */ -  int order_count; -  int order_level; /* inc for every call to xrdp_orders_init */ -  struct xrdp_orders_state orders_state; -  void* jpeg_han; -  int rfx_min_pixel; +    struct stream *out_s; +    struct xrdp_rdp *rdp_layer; +    struct xrdp_session *session; +    struct xrdp_wm *wm; + +    char *order_count_ptr; /* pointer to count, set when sending */ +    int order_count; +    int order_level; /* inc for every call to xrdp_orders_init */ +    struct xrdp_orders_state orders_state; +    void *jpeg_han; +    int rfx_min_pixel;  };  #define PROTO_RDP_40 1 @@ -271,17 +271,17 @@ struct xrdp_orders  struct xrdp_mppc_enc  { -  int    protocol_type;    /* PROTO_RDP_40, PROTO_RDP_50 etc */ -  char  *historyBuffer;    /* contains uncompressed data */ -  char  *outputBuffer;     /* contains compressed data */ -  char  *outputBufferPlus; -  int    historyOffset;    /* next free slot in historyBuffer */ -  int    buf_len;          /* length of historyBuffer, protocol dependant */ -  int    bytes_in_opb;     /* compressed bytes available in outputBuffer */ -  int    flags;            /* PACKET_COMPRESSED, PACKET_AT_FRONT, PACKET_FLUSHED etc */ -  int    flagsHold; -  int    first_pkt;        /* this is the first pkt passing through enc */ -  tui16 *hash_table; +    int    protocol_type;    /* PROTO_RDP_40, PROTO_RDP_50 etc */ +    char  *historyBuffer;    /* contains uncompressed data */ +    char  *outputBuffer;     /* contains compressed data */ +    char  *outputBufferPlus; +    int    historyOffset;    /* next free slot in historyBuffer */ +    int    buf_len;          /* length of historyBuffer, protocol dependant */ +    int    bytes_in_opb;     /* compressed bytes available in outputBuffer */ +    int    flags;            /* PACKET_COMPRESSED, PACKET_AT_FRONT, PACKET_FLUSHED etc */ +    int    flagsHold; +    int    first_pkt;        /* this is the first pkt passing through enc */ +    tui16 *hash_table;  };  int APP_CC @@ -292,59 +292,59 @@ void APP_CC  mppc_enc_free(struct xrdp_mppc_enc *enc);  /* xrdp_tcp.c */ -struct xrdp_tcp* APP_CC -xrdp_tcp_create(struct xrdp_iso* owner, struct trans* trans); +struct xrdp_tcp * APP_CC +xrdp_tcp_create(struct xrdp_iso *owner, struct trans *trans);  void APP_CC -xrdp_tcp_delete(struct xrdp_tcp* self); +xrdp_tcp_delete(struct xrdp_tcp *self);  int APP_CC -xrdp_tcp_init(struct xrdp_tcp* self, struct stream* s); +xrdp_tcp_init(struct xrdp_tcp *self, struct stream *s);  int APP_CC -xrdp_tcp_recv(struct xrdp_tcp* self, struct stream* s, int len); +xrdp_tcp_recv(struct xrdp_tcp *self, struct stream *s, int len);  int APP_CC -xrdp_tcp_send(struct xrdp_tcp* self, struct stream* s); +xrdp_tcp_send(struct xrdp_tcp *self, struct stream *s);  /* xrdp_iso.c */ -struct xrdp_iso* APP_CC -xrdp_iso_create(struct xrdp_mcs* owner, struct trans* trans); +struct xrdp_iso * APP_CC +xrdp_iso_create(struct xrdp_mcs *owner, struct trans *trans);  void APP_CC -xrdp_iso_delete(struct xrdp_iso* self); +xrdp_iso_delete(struct xrdp_iso *self);  int APP_CC -xrdp_iso_init(struct xrdp_iso* self, struct stream* s); +xrdp_iso_init(struct xrdp_iso *self, struct stream *s);  int APP_CC -xrdp_iso_recv(struct xrdp_iso* self, struct stream* s); +xrdp_iso_recv(struct xrdp_iso *self, struct stream *s);  int APP_CC -xrdp_iso_send(struct xrdp_iso* self, struct stream* s); +xrdp_iso_send(struct xrdp_iso *self, struct stream *s);  int APP_CC -xrdp_iso_incoming(struct xrdp_iso* self); +xrdp_iso_incoming(struct xrdp_iso *self);  int APP_CC  xrdp_iso_detect_tpkt(struct xrdp_iso *self, struct stream *s);  /* xrdp_mcs.c */ -struct xrdp_mcs* APP_CC -xrdp_mcs_create(struct xrdp_sec* owner, struct trans* trans, -                struct stream* client_mcs_data, -                struct stream* server_mcs_data); +struct xrdp_mcs * APP_CC +xrdp_mcs_create(struct xrdp_sec *owner, struct trans *trans, +                struct stream *client_mcs_data, +                struct stream *server_mcs_data);  void APP_CC -xrdp_mcs_delete(struct xrdp_mcs* self); +xrdp_mcs_delete(struct xrdp_mcs *self);  int APP_CC -xrdp_mcs_init(struct xrdp_mcs* self, struct stream* s); +xrdp_mcs_init(struct xrdp_mcs *self, struct stream *s);  int APP_CC -xrdp_mcs_recv(struct xrdp_mcs* self, struct stream* s, int* chan); +xrdp_mcs_recv(struct xrdp_mcs *self, struct stream *s, int *chan);  int APP_CC -xrdp_mcs_send(struct xrdp_mcs* self, struct stream* s, int chan); +xrdp_mcs_send(struct xrdp_mcs *self, struct stream *s, int chan);  int APP_CC -xrdp_mcs_incoming(struct xrdp_mcs* self); +xrdp_mcs_incoming(struct xrdp_mcs *self);  int APP_CC -xrdp_mcs_disconnect(struct xrdp_mcs* self); +xrdp_mcs_disconnect(struct xrdp_mcs *self);  /* xrdp_sec.c */ -struct xrdp_sec* APP_CC -xrdp_sec_create(struct xrdp_rdp* owner, struct trans* trans, int crypt_level, +struct xrdp_sec * APP_CC +xrdp_sec_create(struct xrdp_rdp *owner, struct trans *trans, int crypt_level,                  int channel_code, int multimon);  void APP_CC -xrdp_sec_delete(struct xrdp_sec* self); +xrdp_sec_delete(struct xrdp_sec *self);  int APP_CC -xrdp_sec_init(struct xrdp_sec* self, struct stream* s); +xrdp_sec_init(struct xrdp_sec *self, struct stream *s);  int APP_CC  xrdp_sec_get_fastpath_bytes(struct xrdp_sec *self);  int APP_CC @@ -354,166 +354,166 @@ xrdp_sec_send_fastpath(struct xrdp_sec *self, struct stream *s);  int APP_CC  xrdp_sec_recv_fastpath(struct xrdp_sec *self, struct stream *s);  int APP_CC -xrdp_sec_recv(struct xrdp_sec* self, struct stream* s, int* chan); +xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan);  int APP_CC -xrdp_sec_send(struct xrdp_sec* self, struct stream* s, int chan); +xrdp_sec_send(struct xrdp_sec *self, struct stream *s, int chan);  int APP_CC -xrdp_sec_process_mcs_data(struct xrdp_sec* self); +xrdp_sec_process_mcs_data(struct xrdp_sec *self);  int APP_CC -xrdp_sec_out_mcs_data(struct xrdp_sec* self); +xrdp_sec_out_mcs_data(struct xrdp_sec *self);  int APP_CC -xrdp_sec_incoming(struct xrdp_sec* self); +xrdp_sec_incoming(struct xrdp_sec *self);  int APP_CC -xrdp_sec_disconnect(struct xrdp_sec* self); +xrdp_sec_disconnect(struct xrdp_sec *self);  /* xrdp_rdp.c */ -struct xrdp_rdp* APP_CC -xrdp_rdp_create(struct xrdp_session* session, struct trans* trans); +struct xrdp_rdp * APP_CC +xrdp_rdp_create(struct xrdp_session *session, struct trans *trans);  void APP_CC -xrdp_rdp_delete(struct xrdp_rdp* self); +xrdp_rdp_delete(struct xrdp_rdp *self);  int APP_CC -xrdp_rdp_init(struct xrdp_rdp* self, struct stream* s); +xrdp_rdp_init(struct xrdp_rdp *self, struct stream *s);  int APP_CC -xrdp_rdp_init_data(struct xrdp_rdp* self, struct stream* s); +xrdp_rdp_init_data(struct xrdp_rdp *self, struct stream *s);  int APP_CC  xrdp_rdp_get_fastpath_bytes(struct xrdp_rdp *self);  int APP_CC  xrdp_rdp_init_fastpath(struct xrdp_rdp *self, struct stream *s);  int APP_CC -xrdp_rdp_recv(struct xrdp_rdp* self, struct stream* s, int* code); +xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code);  int APP_CC -xrdp_rdp_send(struct xrdp_rdp* self, struct stream* s, int pdu_type); +xrdp_rdp_send(struct xrdp_rdp *self, struct stream *s, int pdu_type);  int APP_CC -xrdp_rdp_send_data(struct xrdp_rdp* self, struct stream* s, +xrdp_rdp_send_data(struct xrdp_rdp *self, struct stream *s,                     int data_pdu_type);  int APP_CC  xrdp_rdp_send_fastpath(struct xrdp_rdp *self, struct stream *s,                         int data_pdu_type);  int APP_CC -xrdp_rdp_send_data_update_sync(struct xrdp_rdp* self); +xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self);  int APP_CC -xrdp_rdp_incoming(struct xrdp_rdp* self); +xrdp_rdp_incoming(struct xrdp_rdp *self);  int APP_CC -xrdp_rdp_process_data(struct xrdp_rdp* self, struct stream* s); +xrdp_rdp_process_data(struct xrdp_rdp *self, struct stream *s);  int APP_CC -xrdp_rdp_disconnect(struct xrdp_rdp* self); +xrdp_rdp_disconnect(struct xrdp_rdp *self);  int APP_CC -xrdp_rdp_send_deactive(struct xrdp_rdp* self); +xrdp_rdp_send_deactive(struct xrdp_rdp *self);  /* xrdp_orders.c */ -struct xrdp_orders* APP_CC -xrdp_orders_create(struct xrdp_session* session, -                   struct xrdp_rdp* rdp_layer); +struct xrdp_orders * APP_CC +xrdp_orders_create(struct xrdp_session *session, +                   struct xrdp_rdp *rdp_layer);  void APP_CC -xrdp_orders_delete(struct xrdp_orders* self); +xrdp_orders_delete(struct xrdp_orders *self);  int APP_CC -xrdp_orders_reset(struct xrdp_orders* self); +xrdp_orders_reset(struct xrdp_orders *self);  int APP_CC -xrdp_orders_init(struct xrdp_orders* self); +xrdp_orders_init(struct xrdp_orders *self);  int APP_CC -xrdp_orders_send(struct xrdp_orders* self); +xrdp_orders_send(struct xrdp_orders *self);  int APP_CC -xrdp_orders_force_send(struct xrdp_orders* self); +xrdp_orders_force_send(struct xrdp_orders *self);  int APP_CC -xrdp_orders_check(struct xrdp_orders* self, int max_size); +xrdp_orders_check(struct xrdp_orders *self, int max_size);  int APP_CC -xrdp_orders_rect(struct xrdp_orders* self, int x, int y, int cx, int cy, -                 int color, struct xrdp_rect* rect); +xrdp_orders_rect(struct xrdp_orders *self, int x, int y, int cx, int cy, +                 int color, struct xrdp_rect *rect);  int APP_CC -xrdp_orders_screen_blt(struct xrdp_orders* self, int x, int y, +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 rop, struct xrdp_rect *rect);  int APP_CC -xrdp_orders_pat_blt(struct xrdp_orders* self, int x, int y, +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 fg_color, struct xrdp_brush *brush, +                    struct xrdp_rect *rect);  int APP_CC -xrdp_orders_dest_blt(struct xrdp_orders* self, int x, int y, +xrdp_orders_dest_blt(struct xrdp_orders *self, int x, int y,                       int cx, int cy, int rop, -                     struct xrdp_rect* rect); +                     struct xrdp_rect *rect);  int APP_CC -xrdp_orders_line(struct xrdp_orders* self, int mix_mode, +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); +                 struct xrdp_pen *pen, +                 struct xrdp_rect *rect);  int APP_CC -xrdp_orders_mem_blt(struct xrdp_orders* self, int cache_id, +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 cache_idx, struct xrdp_rect *rect);  int APP_CC -xrdp_orders_composite_blt(struct xrdp_orders* self, int srcidx, +xrdp_orders_composite_blt(struct xrdp_orders *self, int srcidx,                            int srcformat, int srcwidth, -                          int srcrepeat, int* srctransform, int mskflags, +                          int srcrepeat, int *srctransform, int mskflags,                            int mskidx, int mskformat, int mskwidth,                            int mskrepeat, int op, int srcx, int srcy,                            int mskx, int msky, int dstx, int dsty,                            int width, int height, int dstformat, -                          struct xrdp_rect* rect); +                          struct xrdp_rect *rect);  int APP_CC -xrdp_orders_text(struct xrdp_orders* self, +xrdp_orders_text(struct xrdp_orders *self,                   int font, int flags, int mixmode,                   int fg_color, int bg_color,                   int clip_left, int clip_top,                   int clip_right, int clip_bottom,                   int box_left, int box_top,                   int box_right, int box_bottom, -                 int x, int y, char* data, int data_len, -                 struct xrdp_rect* rect); +                 int x, int y, char *data, int data_len, +                 struct xrdp_rect *rect);  int APP_CC -xrdp_orders_send_palette(struct xrdp_orders* self, int* palette, +xrdp_orders_send_palette(struct xrdp_orders *self, int *palette,                           int cache_id);  int APP_CC -xrdp_orders_send_raw_bitmap(struct xrdp_orders* self, -                            int width, int height, int bpp, char* data, +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 -xrdp_orders_send_bitmap(struct xrdp_orders* self, -                        int width, int height, int bpp, char* data, +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 -xrdp_orders_send_font(struct xrdp_orders* self, -                      struct xrdp_font_char* font_char, +xrdp_orders_send_font(struct xrdp_orders *self, +                      struct xrdp_font_char *font_char,                        int font_index, int char_index);  int APP_CC -xrdp_orders_send_raw_bitmap2(struct xrdp_orders* self, -                             int width, int height, int bpp, char* data, +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 -xrdp_orders_send_bitmap2(struct xrdp_orders* self, -                         int width, int height, int bpp, char* data, +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 -xrdp_orders_send_bitmap3(struct xrdp_orders* self, -                         int width, int height, int bpp, char* data, +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 -xrdp_orders_send_brush(struct xrdp_orders* self, int width, int height, -                       int bpp, int type, int size, char* data, int cache_id); +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 -xrdp_orders_send_create_os_surface(struct xrdp_orders* self, int id, +xrdp_orders_send_create_os_surface(struct xrdp_orders *self, int id,                                     int width, int height, -                                   struct list* del_list); +                                   struct list *del_list);  int APP_CC -xrdp_orders_send_switch_os_surface(struct xrdp_orders* self, int id); +xrdp_orders_send_switch_os_surface(struct xrdp_orders *self, int id);  /* xrdp_bitmap_compress.c */  int APP_CC -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, +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 -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, +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 APP_CC -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, +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 @@ -540,16 +540,16 @@ xrdp_jpeg_deinit(void *handle);  /* xrdp_channel.c */  struct xrdp_channel* APP_CC -xrdp_channel_create(struct xrdp_sec* owner, struct xrdp_mcs* mcs_layer); +xrdp_channel_create(struct xrdp_sec *owner, struct xrdp_mcs *mcs_layer);  void APP_CC -xrdp_channel_delete(struct xrdp_channel* self); +xrdp_channel_delete(struct xrdp_channel *self);  int APP_CC -xrdp_channel_init(struct xrdp_channel* self, struct stream* s); +xrdp_channel_init(struct xrdp_channel *self, struct stream *s);  int APP_CC -xrdp_channel_send(struct xrdp_channel* self, struct stream* s, int channel_id, +xrdp_channel_send(struct xrdp_channel *self, struct stream *s, int channel_id,                    int total_data_len, int flags);  int APP_CC -xrdp_channel_process(struct xrdp_channel* self, struct stream* s, +xrdp_channel_process(struct xrdp_channel *self, struct stream *s,                       int chanid);  /* xrdp_fastpath.c */ diff --git a/libxrdp/libxrdpinc.h b/libxrdp/libxrdpinc.h index 8617f605..2262f66f 100644 --- a/libxrdp/libxrdpinc.h +++ b/libxrdp/libxrdpinc.h @@ -1,7 +1,7 @@  /**   * xrdp: A Remote Desktop Protocol server.   * - * Copyright (C) Jay Sorg 2004-2013 + * Copyright (C) Jay Sorg 2004-2014   *   * Licensed under the Apache License, Version 2.0 (the "License");   * you may not use this file except in compliance with the License. @@ -27,206 +27,206 @@  struct xrdp_brush  { -  int x_orgin; -  int y_orgin; -  int style; -  char pattern[8]; +    int x_orgin; +    int y_orgin; +    int style; +    char pattern[8];  };  struct xrdp_pen  { -  int style; -  int width; -  int color; +    int style; +    int width; +    int color;  };  /* 2.2.2.2.1.2.5.1 Cache Glyph Data (TS_CACHE_GLYPH_DATA) */  struct xrdp_font_char  { -  int offset;    /* x */ -  int baseline;  /* y */ -  int width;     /* cx */ -  int height;    /* cy */ -  int incby; -  int bpp; -  char* data; +    int offset;    /* x */ +    int baseline;  /* y */ +    int width;     /* cx */ +    int height;    /* cy */ +    int incby; +    int bpp; +    char *data;  };  struct xrdp_rect  { -  int left; -  int top; -  int right; -  int bottom; +    int left; +    int top; +    int right; +    int bottom;  };  struct xrdp_session  { -  long id; -  struct trans* trans; -  int (*callback)(long id, int msg, long param1, long param2, long param3, -                  long param4); -  void* rdp; -  void* orders; -  struct xrdp_client_info* client_info; -  int up_and_running; -  int (*is_term)(void); -  int in_process_data; /* inc / dec libxrdp_process_data calls */ +    tintptr id; +    struct trans *trans; +    int (*callback)(tintptr id, int msg, tintptr param1, tintptr param2, +                    tintptr param3, tintptr param4); +    void *rdp; +    void *orders; +    struct xrdp_client_info *client_info; +    int up_and_running; +    int (*is_term)(void); +    int in_process_data; /* inc / dec libxrdp_process_data calls */  }; -struct xrdp_session* DEFAULT_CC -libxrdp_init(tbus id, struct trans* trans); +struct xrdp_session * DEFAULT_CC +libxrdp_init(tbus id, struct trans *trans);  int DEFAULT_CC -libxrdp_exit(struct xrdp_session* session); +libxrdp_exit(struct xrdp_session *session);  int DEFAULT_CC -libxrdp_disconnect(struct xrdp_session* session); +libxrdp_disconnect(struct xrdp_session *session);  int DEFAULT_CC -libxrdp_process_incomming(struct xrdp_session* session); +libxrdp_process_incomming(struct xrdp_session *session);  int EXPORT_CC  libxrdp_get_pdu_bytes(const char *aheader);  struct stream * APP_CC -libxrdp_force_read(struct trans* trans); +libxrdp_force_read(struct trans *trans);  int DEFAULT_CC -libxrdp_process_data(struct xrdp_session* session, struct stream *s); +libxrdp_process_data(struct xrdp_session *session, struct stream *s);  int DEFAULT_CC -libxrdp_send_palette(struct xrdp_session* session, int* palette); +libxrdp_send_palette(struct xrdp_session *session, int *palette);  int DEFAULT_CC -libxrdp_send_bell(struct xrdp_session* session); +libxrdp_send_bell(struct xrdp_session *session);  int DEFAULT_CC -libxrdp_send_bitmap(struct xrdp_session* session, int width, int height, -                    int bpp, char* data, int x, int y, int cx, int cy); +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 -libxrdp_send_pointer(struct xrdp_session* session, int cache_idx, -                     char* data, char* mask, int x, int y, int bpp); +libxrdp_send_pointer(struct xrdp_session *session, int cache_idx, +                     char *data, char *mask, int x, int y, int bpp);  int DEFAULT_CC -libxrdp_set_pointer(struct xrdp_session* session, int cache_idx); +libxrdp_set_pointer(struct xrdp_session *session, int cache_idx);  int DEFAULT_CC -libxrdp_orders_init(struct xrdp_session* session); +libxrdp_orders_init(struct xrdp_session *session);  int DEFAULT_CC -libxrdp_orders_send(struct xrdp_session* session); +libxrdp_orders_send(struct xrdp_session *session);  int DEFAULT_CC -libxrdp_orders_force_send(struct xrdp_session* session); +libxrdp_orders_force_send(struct xrdp_session *session);  int DEFAULT_CC -libxrdp_orders_rect(struct xrdp_session* session, int x, int y, -                    int cx, int cy, int color, struct xrdp_rect* rect); +libxrdp_orders_rect(struct xrdp_session *session, int x, int y, +                    int cx, int cy, int color, struct xrdp_rect *rect);  int DEFAULT_CC -libxrdp_orders_screen_blt(struct xrdp_session* session, int x, int y, +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 rop, struct xrdp_rect *rect);  int DEFAULT_CC -libxrdp_orders_pat_blt(struct xrdp_session* session, int x, int y, +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 fg_color, struct xrdp_brush *brush, +                       struct xrdp_rect *rect);  int DEFAULT_CC -libxrdp_orders_dest_blt(struct xrdp_session* session, int x, int y, +libxrdp_orders_dest_blt(struct xrdp_session *session, int x, int y,                          int cx, int cy, int rop, -                        struct xrdp_rect* rect); +                        struct xrdp_rect *rect);  int DEFAULT_CC -libxrdp_orders_line(struct xrdp_session* session, int mix_mode, +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); +                    struct xrdp_pen *pen, +                    struct xrdp_rect *rect);  int DEFAULT_CC -libxrdp_orders_mem_blt(struct xrdp_session* session, int cache_id, +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 cache_idx, struct xrdp_rect *rect);  int DEFAULT_CC -libxrdp_orders_composite_blt(struct xrdp_session* session, int srcidx, +libxrdp_orders_composite_blt(struct xrdp_session *session, int srcidx,                               int srcformat, int srcwidth, int srcrepeat, -                             int* srctransform, int mskflags, +                             int *srctransform, int mskflags,                               int mskidx, int mskformat, int mskwidth,                               int mskrepeat, int op, int srcx, int srcy,                               int mskx, int msky, int dstx, int dsty,                               int width, int height, int dstformat, -                             struct xrdp_rect* rect); +                             struct xrdp_rect *rect);  int DEFAULT_CC -libxrdp_orders_text(struct xrdp_session* session, +libxrdp_orders_text(struct xrdp_session *session,                      int font, int flags, int mixmode,                      int fg_color, int bg_color,                      int clip_left, int clip_top,                      int clip_right, int clip_bottom,                      int box_left, int box_top,                      int box_right, int box_bottom, -                    int x, int y, char* data, int data_len, -                    struct xrdp_rect* rect); +                    int x, int y, char *data, int data_len, +                    struct xrdp_rect *rect);  int DEFAULT_CC -libxrdp_orders_send_palette(struct xrdp_session* session, int* palette, +libxrdp_orders_send_palette(struct xrdp_session *session, int *palette,                              int cache_id);  int DEFAULT_CC -libxrdp_orders_send_raw_bitmap(struct xrdp_session* session, -                               int width, int height, int bpp, char* data, +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 -libxrdp_orders_send_bitmap(struct xrdp_session* session, -                           int width, int height, int bpp, char* data, +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 -libxrdp_orders_send_font(struct xrdp_session* session, -                         struct xrdp_font_char* font_char, +libxrdp_orders_send_font(struct xrdp_session *session, +                         struct xrdp_font_char *font_char,                           int font_index, int char_index);  int DEFAULT_CC -libxrdp_reset(struct xrdp_session* session, +libxrdp_reset(struct xrdp_session *session,                int width, int height, int bpp);  int DEFAULT_CC -libxrdp_orders_send_raw_bitmap2(struct xrdp_session* session, -                                int width, int height, int bpp, char* data, +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 -libxrdp_orders_send_bitmap2(struct xrdp_session* session, -                            int width, int height, int bpp, char* data, +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 -libxrdp_orders_send_bitmap3(struct xrdp_session* session, -                            int width, int height, int bpp, char* data, +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 -libxrdp_query_channel(struct xrdp_session* session, int index, -                      char* channel_name, int* channel_flags); +libxrdp_query_channel(struct xrdp_session *session, int index, +                      char *channel_name, int *channel_flags);  int DEFAULT_CC -libxrdp_get_channel_id(struct xrdp_session* session, char* name); +libxrdp_get_channel_id(struct xrdp_session *session, char *name);  int DEFAULT_CC -libxrdp_send_to_channel(struct xrdp_session* session, int channel_id, -                        char* data, int data_len, +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 -libxrdp_orders_send_brush(struct xrdp_session* session, +libxrdp_orders_send_brush(struct xrdp_session *session,                            int width, int height, int bpp, int type, -                          int size, char* data, int cache_id); +                          int size, char *data, int cache_id);  int DEFAULT_CC -libxrdp_orders_send_create_os_surface(struct xrdp_session* session, int id, +libxrdp_orders_send_create_os_surface(struct xrdp_session *session, int id,                                        int width, int height, -                                      struct list* del_list); +                                      struct list *del_list);  int DEFAULT_CC -libxrdp_orders_send_switch_os_surface(struct xrdp_session* session, int id); +libxrdp_orders_send_switch_os_surface(struct xrdp_session *session, int id);  int DEFAULT_CC -libxrdp_window_new_update(struct xrdp_session* session, int window_id, -                          struct rail_window_state_order* window_state, +libxrdp_window_new_update(struct xrdp_session *session, int window_id, +                          struct rail_window_state_order *window_state,                            int flags);  int DEFAULT_CC -libxrdp_window_delete(struct xrdp_session* session, int window_id); +libxrdp_window_delete(struct xrdp_session *session, int window_id);  int DEFAULT_CC -libxrdp_window_icon(struct xrdp_session* session, int window_id, +libxrdp_window_icon(struct xrdp_session *session, int window_id,                      int cache_entry, int cache_id, -                    struct rail_icon_info* icon_info, int flags); +                    struct rail_icon_info *icon_info, int flags);  int DEFAULT_CC -libxrdp_window_cached_icon(struct xrdp_session* session, int window_id, +libxrdp_window_cached_icon(struct xrdp_session *session, int window_id,                             int cache_entry, int cache_id,                             int flags);  int DEFAULT_CC -libxrdp_notify_new_update(struct xrdp_session* session, +libxrdp_notify_new_update(struct xrdp_session *session,                            int window_id, int notify_id, -                          struct rail_notify_state_order* notify_state, +                          struct rail_notify_state_order *notify_state,                            int flags);  int DEFAULT_CC -libxrdp_notify_delete(struct xrdp_session* session, +libxrdp_notify_delete(struct xrdp_session *session,                        int window_id, int notify_id);  int DEFAULT_CC -libxrdp_monitored_desktop(struct xrdp_session* session, -                          struct rail_monitored_desktop_order* mdo, +libxrdp_monitored_desktop(struct xrdp_session *session, +                          struct rail_monitored_desktop_order *mdo,                            int flags);  int DEFAULT_CC  libxrdp_codec_jpeg_compress(struct xrdp_session *session, @@ -237,7 +237,7 @@ libxrdp_codec_jpeg_compress(struct xrdp_session *session,                              char *out_data, int *io_len);  int DEFAULT_CC  libxrdp_fastpath_send_surface(struct xrdp_session *session, -                              char* data_pad, int pad_bytes, +                              char *data_pad, int pad_bytes,                                int data_bytes,                                int destLeft, int dst_Top,                                int destRight, int destBottom, int bpp, diff --git a/libxrdp/xrdp_orders_rail.h b/libxrdp/xrdp_orders_rail.h index 8f5b402f..475b8f17 100644 --- a/libxrdp/xrdp_orders_rail.h +++ b/libxrdp/xrdp_orders_rail.h @@ -1,7 +1,7 @@  /**   * xrdp: A Remote Desktop Protocol server.   * - * Copyright (C) Jay Sorg 2012 + * Copyright (C) Jay Sorg 2012-2014   *   * Licensed under the Apache License, Version 2.0 (the "License");   * you may not use this file except in compliance with the License. @@ -20,31 +20,31 @@  #define _XRDP_ORDERS_RAIL_H  int APP_CC -xrdp_orders_send_window_delete(struct xrdp_orders* self, int window_id); +xrdp_orders_send_window_delete(struct xrdp_orders *self, int window_id);  int APP_CC -xrdp_orders_send_window_cached_icon(struct xrdp_orders* self, +xrdp_orders_send_window_cached_icon(struct xrdp_orders *self,                                      int window_id, int cache_entry,                                      int cache_id, int flags);  int APP_CC -xrdp_orders_send_window_icon(struct xrdp_orders* self, +xrdp_orders_send_window_icon(struct xrdp_orders *self,                               int window_id, int cache_entry, int cache_id, -                             struct rail_icon_info* icon_info, +                             struct rail_icon_info *icon_info,                               int flags);  int APP_CC -xrdp_orders_send_window_new_update(struct xrdp_orders* self, int window_id, -                                   struct rail_window_state_order* window_state, +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 -xrdp_orders_send_notify_delete(struct xrdp_orders* self, int window_id, +xrdp_orders_send_notify_delete(struct xrdp_orders *self, int window_id,                                 int notify_id);  int APP_CC -xrdp_orders_send_notify_new_update(struct xrdp_orders* self, +xrdp_orders_send_notify_new_update(struct xrdp_orders *self,                                     int window_id, int notify_id, -                                   struct rail_notify_state_order* notify_state, +                                   struct rail_notify_state_order *notify_state,                                     int flags);  int APP_CC -xrdp_orders_send_monitored_desktop(struct xrdp_orders* self, -                                   struct rail_monitored_desktop_order* mdo, +xrdp_orders_send_monitored_desktop(struct xrdp_orders *self, +                                   struct rail_monitored_desktop_order *mdo,                                     int flags);  #endif | 
