--- sourceforge.net/trunk/rdesktop/proto.h	2003/10/15 14:01:32	499
+++ sourceforge.net/trunk/rdesktop/proto.h	2004/01/21 18:02:38	570
@@ -26,6 +26,12 @@
 void cliprdr_send_data_request(uint32 format);
 void cliprdr_send_data(uint8 * data, uint32 length);
 BOOL cliprdr_init(void);
+/* disk.c */
+NTSTATUS disk_query_information(HANDLE handle, uint32 info_class, STREAM out);
+NTSTATUS disk_set_information(HANDLE handle, uint32 info_class, STREAM in, STREAM out);
+NTSTATUS disk_query_volume_information(HANDLE handle, uint32 info_class, STREAM out);
+NTSTATUS disk_query_directory(HANDLE handle, uint32 info_class, char *pattern, STREAM out);
+int disk_enum_devices(int *id, char *optarg);
 /* ewmhints.c */
 int get_current_workarea(uint32 * x, uint32 * y, uint32 * width, uint32 * height);
 /* iso.c */
@@ -46,7 +52,13 @@
 /* orders.c */
 void process_orders(STREAM s, uint16 num_orders);
 void reset_order_state(void);
+/* parallel.c */
+int parallel_enum_devices(int *id, char *optarg);
 /* printer.c */
+int printer_enum_devices(int *id, char *optarg);
+/* printercache.c */
+int printercache_load_blob(char *printer_name, uint8 ** data);
+void printercache_process(STREAM s);
 /* rdesktop.c */
 int main(int argc, char *argv[]);
 void generate_random(uint8 * random);
@@ -56,36 +68,44 @@
 void error(char *format, ...);
 void warning(char *format, ...);
 void unimpl(char *format, ...);
-void hexdump(unsigned char *p, int len);
+void hexdump(unsigned char *p, unsigned int len);
+void toupper_str(char* p);
+char *ltoa(long N, int base);
 int load_licence(unsigned char **data);
 void save_licence(unsigned char *data, int length);
+char *next_arg(char *src, char needle);
+/* rdp5.c */
+void rdp5_process(STREAM s, BOOL encryption);
 /* rdp.c */
 void rdp_out_unistr(STREAM s, char *string, int len);
+int rdp_in_unistr(STREAM s, char *string, int uni_len);
 void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1,
 		    uint16 param2);
-void process_null_system_pointer_pdu(STREAM s);
 void process_colour_pointer_pdu(STREAM s);
 void process_cached_pointer_pdu(STREAM s);
+void process_system_pointer_pdu(STREAM s);
 void process_bitmap_updates(STREAM s);
 void process_palette(STREAM s);
 BOOL rdp_main_loop(void);
 BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command,
 		 char *directory);
 void rdp_disconnect(void);
-/* rdp5.c */
-void rdp5_process(STREAM s, BOOL encryption);
 /* rdpdr.c */
+void convert_to_unix_filename(char *filename);
 void rdpdr_send_connect(void);
 void rdpdr_send_name(void);
 void rdpdr_send_available(void);
 void rdpdr_send_completion(uint32 device, uint32 id, uint32 status, uint32 result, uint8 * buffer,
 			   uint32 length);
-BOOL rdpdr_init(void);
+BOOL rdpdr_init();
+int get_device_index(HANDLE handle);
+BOOL rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status);
 /* rdpsnd.c */
 STREAM rdpsnd_init_packet(uint16 type, uint16 size);
 void rdpsnd_send(STREAM s);
 void rdpsnd_send_completion(uint16 tick, uint8 packet_index);
 void rdpsnd_process_negotiate(STREAM in);
+void rdpsnd_process_unknown6(STREAM in);
 void rdpsnd_process(STREAM s);
 BOOL rdpsnd_init(void);
 /* rdpsnd_oss.c */
@@ -93,9 +113,9 @@
 void wave_out_close(void);
 BOOL wave_out_format_supported(WAVEFORMATEX * pwfx);
 BOOL wave_out_set_format(WAVEFORMATEX * pwfx);
+void wave_out_volume(uint16 left, uint16 right);
 void wave_out_write(STREAM s, uint16 tick, uint8 index);
 void wave_out_play(void);
-void wave_out_volume(uint16 left, uint16 right);
 /* secure.c */
 void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt);
 void sec_hash_16(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2);
@@ -111,6 +131,8 @@
 BOOL sec_connect(char *server, char *username);
 void sec_disconnect(void);
 /* serial.c */
+BOOL serial_get_timeout(uint32 handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
+int serial_enum_devices(int *id, char *optarg);
 /* tcp.c */
 STREAM tcp_init(uint32 maxlen);
 void tcp_send(STREAM s);
@@ -118,8 +140,8 @@
 BOOL tcp_connect(char *server);
 void tcp_disconnect(void);
 /* xclip.c */
-void ui_clip_format_announce(char *data, uint32 length);
-void ui_clip_handle_data(char *data, uint32 length);
+void ui_clip_format_announce(uint8 * data, uint32 length);
+void ui_clip_handle_data(uint8 * data, uint32 length);
 void ui_clip_request_data(uint32 format);
 void ui_clip_sync(void);
 void xclip_init(void);
@@ -132,7 +154,9 @@
 void save_remote_modifiers(uint8 scancode);
 void restore_remote_modifiers(uint32 ev_time, uint8 scancode);
 void ensure_remote_modifiers(uint32 ev_time, key_translation tr);
-void reset_modifier_keys(unsigned int state);
+unsigned int read_keyboard_state(void);
+uint16 ui_get_numlock_state(unsigned int state);
+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);
@@ -152,6 +176,7 @@
 			 uint8 * xormask);
 void ui_set_cursor(HCURSOR cursor);
 void ui_destroy_cursor(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);