--- sourceforge.net/trunk/rdesktop/orders.c	2003/02/10 12:58:51	318
+++ sourceforge.net/trunk/rdesktop/orders.c	2003/03/27 13:17:26	349
@@ -605,6 +605,10 @@
 	if (present & 0x002000)
 		in_uint16_le(s, os->boxbottom);
 
+	if (present & 0x004000)	/* fix for connecting to a server that */
+		in_uint8s(s, 10);	/* was disconnected with mstsc.exe */
+	/* 0x008000, 0x020000, and 0x040000 are present too ??? */
+
 	if (present & 0x080000)
 		in_uint16_le(s, os->x);
 
@@ -699,6 +703,10 @@
 		bitmap = ui_create_bitmap(width, height, bmpdata);
 		cache_put_bitmap(cache_id, cache_idx, bitmap);
 	}
+	else
+	{
+		DEBUG(("Failed to decompress bitmap data\n"));
+	}
 
 	xfree(bmpdata);
 }
@@ -807,19 +815,14 @@
 
 /* Process an order PDU */
 void
-process_orders(STREAM s)
+process_orders(STREAM s, uint16 num_orders)
 {
 	RDP_ORDER_STATE *os = &order_state;
 	uint32 present;
-	uint16 num_orders;
 	uint8 order_flags;
 	int size, processed = 0;
 	BOOL delta;
 
-	in_uint8s(s, 2);	/* pad */
-	in_uint16_le(s, num_orders);
-	in_uint8s(s, 2);	/* pad */
-
 	while (processed < num_orders)
 	{
 		in_uint8(s, order_flags);