--- sourceforge.net/trunk/rdesktop/proto.h	2004/07/12 21:07:39	738
+++ sourceforge.net/trunk/rdesktop/proto.h	2005/03/10 22:48:15	844
@@ -1,8 +1,9 @@
 /* bitmap.c */
 BOOL bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp);
 /* cache.c */
+void cache_rebuild_bmpcache_linked_list(uint8 cache_id, sint16 * cache_idx, int count);
 HBITMAP cache_get_bitmap(uint8 cache_id, uint16 cache_idx);
-void cache_put_bitmap(uint8 cache_id, uint16 cache_idx, HBITMAP bitmap, uint32 stamp);
+void cache_put_bitmap(uint8 cache_id, uint16 cache_idx, 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,
@@ -28,10 +29,12 @@
 BOOL cliprdr_init(void);
 /* disk.c */
 int disk_enum_devices(uint32 * id, char *optarg);
-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);
+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_query_volume_information(NTHANDLE handle, uint32 info_class, STREAM out);
+NTSTATUS disk_query_directory(NTHANDLE handle, uint32 info_class, char *pattern, STREAM out);
+NTSTATUS disk_create_notify(NTHANDLE handle, uint32 info_class);
+NTSTATUS disk_check_notify(NTHANDLE handle);
 /* mppc.c */
 int mppc_expand(uint8 * data, uint32 clen, uint8 ctype, uint32 * roff, uint32 * rlen);
 /* ewmhints.c */
@@ -64,9 +67,9 @@
 /* pstcache.c */
 void pstcache_touch_bitmap(uint8 id, uint16 idx, uint32 stamp);
 BOOL pstcache_load_bitmap(uint8 id, uint16 idx);
-BOOL pstcache_put_bitmap(uint8 id, uint16 idx, uint8 * bmp_id, uint16 wd,
-			 uint16 ht, uint16 len, uint8 * data);
-int pstcache_enumerate(uint8 id, uint8 * list);
+BOOL pstcache_save_bitmap(uint8 id, uint16 idx, uint8 * hash_key, uint16 wd,
+			  uint16 ht, uint16 len, uint8 * data);
+int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
 BOOL pstcache_init(uint8 id);
 /* rdesktop.c */
 int main(int argc, char *argv[]);
@@ -108,7 +111,7 @@
 		 char *directory);
 void rdp_disconnect(void);
 /* rdpdr.c */
-int get_device_index(HANDLE handle);
+int get_device_index(NTHANDLE handle);
 void convert_to_unix_filename(char *filename);
 BOOL rdpdr_init(void);
 void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout);
@@ -143,7 +146,8 @@
 void sec_disconnect(void);
 /* serial.c */
 int serial_enum_devices(uint32 * id, char *optarg);
-BOOL serial_get_timeout(HANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
+BOOL serial_get_timeout(NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
+BOOL serial_get_event(NTHANDLE handle, uint32 * result);
 /* tcp.c */
 STREAM tcp_init(uint32 maxlen);
 void tcp_send(STREAM s);
@@ -207,10 +211,16 @@
 	       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,
+		int bgcolour, int fgcolour);
+void ui_polyline(uint8 opcode, POINT * point, 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,
 		   int bgcolour, int fgcolour);
-void ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, int y, int clipx, int clipy,
-		  int clipcx, int clipcy, int boxx, int boxy, int boxcx, int boxcy, int bgcolour,
-		  int fgcolour, uint8 * text, uint8 length);
+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, BRUSH * brush, int bgcolour, int fgcolour,
+		  uint8 * text, uint8 length);
 void ui_desktop_save(uint32 offset, int x, int y, int cx, int cy);
 void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy);