--- sourceforge.net/trunk/rdesktop/proto.h	2006/03/27 09:20:24	1207
+++ sourceforge.net/trunk/rdesktop/proto.h	2007/01/02 16:30:06	1359
@@ -101,14 +101,15 @@
 /* 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, uint16 width,
-			  uint16 height, uint16 length, uint8 * data);
+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);
 /* rdesktop.c */
 int main(int argc, char *argv[]);
 void generate_random(uint8 * random);
 void *xmalloc(int size);
+void exit_if_null(void *ptr);
 char *xstrdup(const char *s);
 void *xrealloc(void *oldmem, int size);
 void xfree(void *mem);
@@ -156,6 +157,8 @@
 /* rdpdr.c */
 int get_device_index(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);
 struct async_iorequest *rdpdr_remove_iorequest(struct async_iorequest *prev,
@@ -163,16 +166,15 @@
 void rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out);
 BOOL rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status);
 /* rdpsnd.c */
-void rdpsnd_send_completion(uint16 tick, uint8 packet_index);
-BOOL rdpsnd_init(void);
-/* rdpsnd_oss.c */
-BOOL wave_out_open(void);
-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 rdpsnd_record(const void *data, unsigned int size);
+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);
+void rdpsnd_queue_next(unsigned long completed_in_us);
+int rdpsnd_queue_next_tick(void);
 /* 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);
@@ -204,10 +206,12 @@
 /* xclip.c */
 void ui_clip_format_announce(uint8 * data, uint32 length);
 void ui_clip_handle_data(uint8 * data, uint32 length);
+void ui_clip_request_failed(void);
 void ui_clip_request_data(uint32 format);
 void ui_clip_sync(void);
 void ui_clip_set_mode(const char *optarg);
 void xclip_init(void);
+void xclip_deinit(void);
 /* xkeymap.c */
 BOOL xkeymap_from_locale(const char *locale);
 FILE *xkeymap_open(const char *filename);
@@ -281,6 +285,7 @@
 void ui_seamless_create_window(unsigned long id, unsigned long group, unsigned long parent,
 			       unsigned long flags);
 void ui_seamless_destroy_window(unsigned long id, unsigned long flags);
+void ui_seamless_destroy_group(unsigned long id, unsigned long flags);
 void ui_seamless_move_window(unsigned long id, int x, int y, int width, int height,
 			     unsigned long flags);
 void ui_seamless_restack_window(unsigned long id, unsigned long behind, unsigned long flags);
@@ -299,6 +304,14 @@
 void seamless_select_timeout(struct timeval *tv);
 unsigned int seamless_send_zchange(unsigned long id, unsigned long below, unsigned long flags);
 unsigned int seamless_send_focus(unsigned long id, unsigned long flags);
+/* scard.c */
+void scardSetInfo(uint32 device, uint32 id, uint32 bytes_out);
+int scard_enum_devices(uint32 * id, char *optarg);
+void scard_lock(int lock);
+void scard_unlock(int lock);
+STREAM scard_tcp_init(void);
+void scard_tcp_connect(void);
+void scard_tcp_reset_state(void);
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus