--- sourceforge.net/trunk/rdesktop/orders.c	2003/01/30 11:15:00	299
+++ sourceforge.net/trunk/rdesktop/orders.c	2003/03/02 23:45:34	336
@@ -71,10 +71,15 @@
 
 /* Read a colour entry */
 static void
-rdp_in_colour(STREAM s, uint8 * colour)
+rdp_in_colour(STREAM s, uint32 * colour)
 {
-	in_uint8(s, *colour);
-	s->p += 2;
+	uint32 i;
+	in_uint8(s, i);
+	*colour = i;
+	in_uint8(s, i);
+	*colour |= i << 8;
+	in_uint8(s, i);
+	*colour |= i << 16;
 }
 
 /* Parse bounds information */
@@ -279,6 +284,7 @@
 static void
 process_rect(STREAM s, RECT_ORDER * os, uint32 present, BOOL delta)
 {
+	uint32 i;
 	if (present & 0x01)
 		rdp_in_coord(s, &os->x, delta);
 
@@ -292,7 +298,22 @@
 		rdp_in_coord(s, &os->cy, delta);
 
 	if (present & 0x10)
-		in_uint8(s, os->colour);
+	{
+		in_uint8(s, i);
+		os->colour = (os->colour & 0xffffff00) | i;
+	}
+
+	if (present & 0x20)
+	{
+		in_uint8(s, i);
+		os->colour = (os->colour & 0xffff00ff) | (i << 8);
+	}
+
+	if (present & 0x40)
+	{
+		in_uint8(s, i);
+		os->colour = (os->colour & 0xff00ffff) | (i << 16);
+	}
 
 	DEBUG(("RECT(x=%d,y=%d,cx=%d,cy=%d,fg=0x%x)\n", os->x, os->y, os->cx, os->cy, os->colour));
 
@@ -584,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);
 
@@ -620,7 +645,7 @@
 {
 	HBITMAP bitmap;
 	uint16 cache_idx, bufsize;
-	uint8 cache_id, width, height, bpp;
+	uint8 cache_id, width, height, bpp, Bpp;
 	uint8 *data, *inverted;
 	int y;
 
@@ -629,15 +654,17 @@
 	in_uint8(s, width);
 	in_uint8(s, height);
 	in_uint8(s, bpp);
+	Bpp = (bpp + 7) / 8;
 	in_uint16_le(s, bufsize);
 	in_uint16_le(s, cache_idx);
 	in_uint8p(s, data, bufsize);
 
 	DEBUG(("RAW_BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d)\n", width, height, cache_id, cache_idx));
-	inverted = xmalloc(width * height);
+	inverted = xmalloc(width * height * Bpp);
 	for (y = 0; y < height; y++)
 	{
-		memcpy(&inverted[(height - y - 1) * width], &data[y * width], width);
+		memcpy(&inverted[(height - y - 1) * (width * Bpp)], &data[y * (width * Bpp)],
+		       width * Bpp);
 	}
 
 	bitmap = ui_create_bitmap(width, height, inverted);
@@ -651,7 +678,7 @@
 {
 	HBITMAP bitmap;
 	uint16 cache_idx, size;
-	uint8 cache_id, width, height, bpp;
+	uint8 cache_id, width, height, bpp, Bpp;
 	uint8 *data, *bmpdata;
 
 	in_uint8(s, cache_id);
@@ -659,6 +686,7 @@
 	in_uint8(s, width);
 	in_uint8(s, height);
 	in_uint8(s, bpp);
+	Bpp = (bpp + 7) / 8;
 	in_uint8s(s, 2);	/* bufsize */
 	in_uint16_le(s, cache_idx);
 	in_uint8s(s, 2);	/* pad */
@@ -668,9 +696,9 @@
 
 	DEBUG(("BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d)\n", width, height, cache_id, cache_idx));
 
-	bmpdata = xmalloc(width * height);
+	bmpdata = xmalloc(width * height * Bpp);
 
-	if (bitmap_decompress(bmpdata, width, height, data, size))
+	if (bitmap_decompress(bmpdata, width, height, data, size, Bpp))
 	{
 		bitmap = ui_create_bitmap(width, height, bmpdata);
 		cache_put_bitmap(cache_id, cache_idx, bitmap);