--- sourceforge.net/trunk/rdesktop/proto.h 2007/01/02 16:30:06 1359 +++ sourceforge.net/trunk/rdesktop/proto.h 2007/01/08 04:47:06 1372 @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. - Copyright (C) Matthew Chapman 1999-2005 + Copyright (C) Matthew Chapman 1999-2007 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,24 +26,24 @@ #endif /* *INDENT-ON* */ /* bitmap.c */ -BOOL bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp); +RD_BOOL bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp); /* cache.c */ void cache_rebuild_bmpcache_linked_list(uint8 id, sint16 * idx, int count); void cache_bump_bitmap(uint8 id, uint16 idx, int bump); void cache_evict_bitmap(uint8 id); -HBITMAP cache_get_bitmap(uint8 id, uint16 idx); -void cache_put_bitmap(uint8 id, uint16 idx, HBITMAP bitmap); +RD_HBITMAP cache_get_bitmap(uint8 id, uint16 idx); +void cache_put_bitmap(uint8 id, uint16 idx, RD_HBITMAP bitmap); void cache_save_state(void); FONTGLYPH *cache_get_font(uint8 font, uint16 character); void cache_put_font(uint8 font, uint16 character, uint16 offset, uint16 baseline, uint16 width, - uint16 height, HGLYPH pixmap); + uint16 height, RD_HGLYPH pixmap); DATABLOB *cache_get_text(uint8 cache_id); void cache_put_text(uint8 cache_id, void *data, int length); uint8 *cache_get_desktop(uint32 offset, int cx, int cy, int bytes_per_pixel); void cache_put_desktop(uint32 offset, int cx, int cy, int scanline, int bytes_per_pixel, uint8 * data); -HCURSOR cache_get_cursor(uint16 cache_idx); -void cache_put_cursor(uint16 cache_idx, HCURSOR cursor); +RD_HCURSOR cache_get_cursor(uint16 cache_idx); +void cache_put_cursor(uint16 cache_idx, RD_HCURSOR cursor); /* channels.c */ VCHANNEL *channel_register(char *name, uint32 flags, void (*callback) (STREAM)); STREAM channel_init(VCHANNEL * channel, uint32 length); @@ -55,15 +55,15 @@ void cliprdr_send_data_request(uint32 format); void cliprdr_send_data(uint8 * data, uint32 length); void cliprdr_set_mode(const char *optarg); -BOOL cliprdr_init(void); +RD_BOOL cliprdr_init(void); /* disk.c */ int disk_enum_devices(uint32 * id, char *optarg); -NTSTATUS disk_query_information(NTHANDLE handle, uint32 info_class, STREAM out); -NTSTATUS disk_set_information(NTHANDLE handle, uint32 info_class, STREAM in, STREAM out); -NTSTATUS disk_check_notify(NTHANDLE handle); -NTSTATUS disk_create_notify(NTHANDLE handle, uint32 info_class); -NTSTATUS disk_query_volume_information(NTHANDLE handle, uint32 info_class, STREAM out); -NTSTATUS disk_query_directory(NTHANDLE handle, uint32 info_class, char *pattern, STREAM out); +RD_NTSTATUS disk_query_information(RD_NTHANDLE handle, uint32 info_class, STREAM out); +RD_NTSTATUS disk_set_information(RD_NTHANDLE handle, uint32 info_class, STREAM in, STREAM out); +RD_NTSTATUS disk_check_notify(RD_NTHANDLE handle); +RD_NTSTATUS disk_create_notify(RD_NTHANDLE handle, uint32 info_class); +RD_NTSTATUS disk_query_volume_information(RD_NTHANDLE handle, uint32 info_class, STREAM out); +RD_NTSTATUS disk_query_directory(RD_NTHANDLE handle, uint32 info_class, char *pattern, STREAM out); /* mppc.c */ int mppc_expand(uint8 * data, uint32 clen, uint8 ctype, uint32 * roff, uint32 * rlen); /* ewmhints.c */ @@ -73,8 +73,8 @@ STREAM iso_init(int length); void iso_send(STREAM s); STREAM iso_recv(uint8 * rdpver); -BOOL iso_connect(char *server, char *username); -BOOL iso_reconnect(char *server); +RD_BOOL iso_connect(char *server, char *username); +RD_BOOL iso_reconnect(char *server); void iso_disconnect(void); void iso_reset_state(void); /* licence.c */ @@ -84,8 +84,8 @@ void mcs_send_to_channel(STREAM s, uint16 channel); void mcs_send(STREAM s); STREAM mcs_recv(uint16 * channel, uint8 * rdpver); -BOOL mcs_connect(char *server, STREAM mcs_data, char *username); -BOOL mcs_reconnect(char *server, STREAM mcs_data); +RD_BOOL mcs_connect(char *server, STREAM mcs_data, char *username); +RD_BOOL mcs_reconnect(char *server, STREAM mcs_data); void mcs_disconnect(void); void mcs_reset_state(void); /* orders.c */ @@ -100,11 +100,11 @@ void printercache_process(STREAM s); /* pstcache.c */ void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp); -BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx); -BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width, uint8 height, - uint16 length, uint8 * data); +RD_BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx); +RD_BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width, uint8 height, + uint16 length, uint8 * data); int pstcache_enumerate(uint8 id, HASH_KEY * keylist); -BOOL pstcache_init(uint8 cache_id); +RD_BOOL pstcache_init(uint8 cache_id); /* rdesktop.c */ int main(int argc, char *argv[]); void generate_random(uint8 * random); @@ -119,19 +119,19 @@ void hexdump(unsigned char *p, unsigned int len); char *next_arg(char *src, char needle); void toupper_str(char *p); -BOOL str_startswith(const char *s, const char *prefix); -BOOL str_handle_lines(const char *input, char **rest, str_handle_lines_t linehandler, void *data); -BOOL subprocess(char *const argv[], str_handle_lines_t linehandler, void *data); +RD_BOOL str_startswith(const char *s, const char *prefix); +RD_BOOL str_handle_lines(const char *input, char **rest, str_handle_lines_t linehandler, void *data); +RD_BOOL subprocess(char *const argv[], str_handle_lines_t linehandler, void *data); char *l_to_a(long N, int base); int load_licence(unsigned char **data); void save_licence(unsigned char *data, int length); -BOOL rd_pstcache_mkdir(void); +RD_BOOL rd_pstcache_mkdir(void); int rd_open_file(char *filename); void rd_close_file(int fd); int rd_read_file(int fd, void *ptr, int len); int rd_write_file(int fd, void *ptr, int len); int rd_lseek_file(int fd, int offset); -BOOL rd_lock_file(int fd, int start, int len); +RD_BOOL rd_lock_file(int fd, int start, int len); /* rdp5.c */ void rdp5_process(STREAM s); /* rdp.c */ @@ -146,33 +146,33 @@ void process_bitmap_updates(STREAM s); void process_palette(STREAM s); void process_disconnect_pdu(STREAM s, uint32 * ext_disc_reason); -void rdp_main_loop(BOOL * deactivated, uint32 * ext_disc_reason); -BOOL rdp_loop(BOOL * deactivated, uint32 * ext_disc_reason); -BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command, - char *directory); -BOOL rdp_reconnect(char *server, uint32 flags, char *domain, char *password, char *command, - char *directory, char *cookie); +void rdp_main_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason); +RD_BOOL rdp_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason); +RD_BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command, + char *directory); +RD_BOOL rdp_reconnect(char *server, uint32 flags, char *domain, char *password, char *command, + char *directory, char *cookie); void rdp_reset_state(void); void rdp_disconnect(void); /* rdpdr.c */ -int get_device_index(NTHANDLE handle); +int get_device_index(RD_NTHANDLE handle); void convert_to_unix_filename(char *filename); void rdpdr_send_completion(uint32 device, uint32 id, uint32 status, uint32 result, uint8 * buffer, uint32 length); -BOOL rdpdr_init(void); -void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout); +RD_BOOL rdpdr_init(void); +void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, RD_BOOL * timeout); struct async_iorequest *rdpdr_remove_iorequest(struct async_iorequest *prev, struct async_iorequest *iorq); -void rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out); -BOOL rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status); +void rdpdr_check_fds(fd_set * rfds, fd_set * wfds, RD_BOOL timed_out); +RD_BOOL rdpdr_abort_io(uint32 fd, uint32 major, RD_NTSTATUS status); /* rdpsnd.c */ void rdpsnd_record(const void *data, unsigned int size); -BOOL rdpsnd_init(char *optarg); +RD_BOOL rdpsnd_init(char *optarg); void rdpsnd_show_help(void); void rdpsnd_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv); void rdpsnd_check_fds(fd_set * rfds, fd_set * wfds); struct audio_packet *rdpsnd_queue_current_packet(void); -BOOL rdpsnd_queue_empty(void); +RD_BOOL rdpsnd_queue_empty(void); void rdpsnd_queue_next(unsigned long completed_in_us); int rdpsnd_queue_next_tick(void); /* secure.c */ @@ -187,19 +187,19 @@ void sec_send(STREAM s, uint32 flags); void sec_process_mcs_data(STREAM s); STREAM sec_recv(uint8 * rdpver); -BOOL sec_connect(char *server, char *username); -BOOL sec_reconnect(char *server); +RD_BOOL sec_connect(char *server, char *username); +RD_BOOL sec_reconnect(char *server); void sec_disconnect(void); void sec_reset_state(void); /* serial.c */ int serial_enum_devices(uint32 * id, char *optarg); -BOOL serial_get_event(NTHANDLE handle, uint32 * result); -BOOL serial_get_timeout(NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout); +RD_BOOL serial_get_event(RD_NTHANDLE handle, uint32 * result); +RD_BOOL serial_get_timeout(RD_NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout); /* tcp.c */ STREAM tcp_init(uint32 maxlen); void tcp_send(STREAM s); STREAM tcp_recv(STREAM s, uint32 length); -BOOL tcp_connect(char *server); +RD_BOOL tcp_connect(char *server); void tcp_disconnect(void); char *tcp_get_address(void); void tcp_reset_state(void); @@ -213,13 +213,13 @@ void xclip_init(void); void xclip_deinit(void); /* xkeymap.c */ -BOOL xkeymap_from_locale(const char *locale); +RD_BOOL xkeymap_from_locale(const char *locale); FILE *xkeymap_open(const char *filename); void xkeymap_init(void); -BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pressed); +RD_BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, RD_BOOL pressed); key_translation xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state); void xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time, - BOOL pressed, uint8 nesting); + RD_BOOL pressed, uint8 nesting); uint16 xkeymap_translate_button(unsigned int button); char *get_ksname(uint32 keysym); void save_remote_modifiers(uint8 scancode); @@ -230,28 +230,28 @@ void reset_modifier_keys(void); void rdp_send_scancode(uint32 time, uint16 flags, uint8 scancode); /* xwin.c */ -BOOL get_key_state(unsigned int state, uint32 keysym); -BOOL ui_init(void); +RD_BOOL get_key_state(unsigned int state, uint32 keysym); +RD_BOOL ui_init(void); void ui_deinit(void); -BOOL ui_create_window(void); +RD_BOOL ui_create_window(void); void ui_resize_window(void); void ui_destroy_window(void); void xwin_toggle_fullscreen(void); int ui_select(int rdp_socket); void ui_move_pointer(int x, int y); -HBITMAP ui_create_bitmap(int width, int height, uint8 * data); +RD_HBITMAP ui_create_bitmap(int width, int height, uint8 * data); void ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height, uint8 * data); -void ui_destroy_bitmap(HBITMAP bmp); -HGLYPH ui_create_glyph(int width, int height, uint8 * data); -void ui_destroy_glyph(HGLYPH glyph); -HCURSOR ui_create_cursor(unsigned int x, unsigned int y, int width, int height, uint8 * andmask, - uint8 * xormask); -void ui_set_cursor(HCURSOR cursor); -void ui_destroy_cursor(HCURSOR cursor); +void ui_destroy_bitmap(RD_HBITMAP bmp); +RD_HGLYPH ui_create_glyph(int width, int height, uint8 * data); +void ui_destroy_glyph(RD_HGLYPH glyph); +RD_HCURSOR ui_create_cursor(unsigned int x, unsigned int y, int width, int height, uint8 * andmask, + uint8 * xormask); +void ui_set_cursor(RD_HCURSOR cursor); +void ui_destroy_cursor(RD_HCURSOR cursor); void ui_set_null_cursor(void); -HCOLOURMAP ui_create_colourmap(COLOURMAP * colours); -void ui_destroy_colourmap(HCOLOURMAP map); -void ui_set_colourmap(HCOLOURMAP map); +RD_HCOLOURMAP ui_create_colourmap(COLOURMAP * colours); +void ui_destroy_colourmap(RD_HCOLOURMAP map); +void ui_set_colourmap(RD_HCOLOURMAP map); void ui_set_clip(int x, int y, int cx, int cy); void ui_reset_clip(void); void ui_bell(void); @@ -259,17 +259,17 @@ void ui_patblt(uint8 opcode, int x, int y, int cx, int cy, BRUSH * brush, int bgcolour, int fgcolour); void ui_screenblt(uint8 opcode, int x, int y, int cx, int cy, int srcx, int srcy); -void ui_memblt(uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy); -void ui_triblt(uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy, +void ui_memblt(uint8 opcode, int x, int y, int cx, int cy, RD_HBITMAP src, int srcx, int srcy); +void ui_triblt(uint8 opcode, int x, int y, int cx, int cy, RD_HBITMAP src, int srcx, int srcy, BRUSH * brush, int bgcolour, int fgcolour); void ui_line(uint8 opcode, int startx, int starty, int endx, int endy, PEN * pen); void ui_rect(int x, int y, int cx, int cy, int colour); -void ui_polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints, BRUSH * brush, +void ui_polygon(uint8 opcode, uint8 fillmode, RD_POINT * point, int npoints, BRUSH * brush, int bgcolour, int fgcolour); -void ui_polyline(uint8 opcode, POINT * points, int npoints, PEN * pen); +void ui_polyline(uint8 opcode, RD_POINT * points, int npoints, PEN * pen); void ui_ellipse(uint8 opcode, uint8 fillmode, int x, int y, int cx, int cy, BRUSH * brush, int bgcolour, int fgcolour); -void ui_draw_glyph(int mixmode, int x, int y, int cx, int cy, HGLYPH glyph, int srcx, int srcy, +void ui_draw_glyph(int mixmode, int x, int y, int cx, int cy, RD_HGLYPH glyph, int srcx, int srcy, int bgcolour, int fgcolour); void ui_draw_text(uint8 font, uint8 flags, uint8 opcode, int mixmode, int x, int y, int clipx, int clipy, int clipcx, int clipcy, int boxx, int boxy, int boxcx, int boxcy, @@ -278,7 +278,7 @@ void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy); void ui_begin_update(void); void ui_end_update(void); -void ui_seamless_begin(BOOL hidden); +void ui_seamless_begin(RD_BOOL hidden); void ui_seamless_hide_desktop(void); void ui_seamless_unhide_desktop(void); void ui_seamless_toggle(void); @@ -294,9 +294,9 @@ void ui_seamless_syncbegin(unsigned long flags); void ui_seamless_ack(unsigned int serial); /* lspci.c */ -BOOL lspci_init(void); +RD_BOOL lspci_init(void); /* seamless.c */ -BOOL seamless_init(void); +RD_BOOL seamless_init(void); unsigned int seamless_send_sync(void); unsigned int seamless_send_state(unsigned long id, unsigned int state, unsigned long flags); unsigned int seamless_send_position(unsigned long id, int x, int y, int width, int height,