--- sourceforge.net/trunk/rdesktop/orders.c	2002/07/30 07:18:48	82
+++ sourceforge.net/trunk/rdesktop/orders.c	2003/02/07 23:43:37	314
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    RDP order processing
-   Copyright (C) Matthew Chapman 1999-2001
+   Copyright (C) Matthew Chapman 1999-2002
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -56,12 +56,12 @@
 static void
 rdp_in_coord(STREAM s, uint16 * coord, BOOL delta)
 {
-	uint8 change;
+	sint8 change;
 
 	if (delta)
 	{
 		in_uint8(s, change);
-		*coord += (signed char) change;
+		*coord += change;
 	}
 	else
 	{
@@ -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));
 
@@ -475,7 +496,7 @@
 		rdp_in_coord(s, &os->y, delta);
 
 	if (present & 0x04)
-		in_uint8(s, os->flags);
+		in_uint8(s, os->opcode);
 
 	if (present & 0x10)
 		rdp_in_colour(s, &os->fgcolour);
@@ -488,13 +509,9 @@
 		in_uint8(s, os->datasize);
 		in_uint8a(s, os->data, os->datasize);
 	}
-	if (os->flags & 1)
-		opcode = ROP2_COPY;
-	else
-		opcode = ROP2_NXOR;
 
-	DEBUG(("POLYLINE(x=%d,y=%d,fl=0x%x,fg=0x%x,n=%d,sz=%d)\n",
-	       os->x, os->y, os->flags, os->fgcolour, os->lines, os->datasize));
+	DEBUG(("POLYLINE(x=%d,y=%d,op=0x%x,fg=0x%x,n=%d,sz=%d)\n",
+	       os->x, os->y, os->opcode, os->fgcolour, os->lines, os->datasize));
 
 	DEBUG(("Data: "));
 
@@ -503,6 +520,13 @@
 
 	DEBUG(("\n"));
 
+	if (os->opcode < 0x01 || os->opcode > 0x10)
+	{
+		error("bad ROP2 0x%x\n", os->opcode);
+		return;
+	}
+
+	opcode = os->opcode - 1;
 	x = os->x;
 	y = os->y;
 	pen.style = pen.width = 0;
@@ -617,7 +641,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;
 
@@ -626,15 +650,16 @@
 	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);
@@ -648,7 +673,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);
@@ -656,6 +681,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 */
@@ -665,9 +691,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);
@@ -907,7 +933,7 @@
 
 /* Reset order state */
 void
-reset_order_state()
+reset_order_state(void)
 {
 	memset(&order_state, 0, sizeof(order_state));
 	order_state.order_type = RDP_ORDER_PATBLT;