--- sourceforge.net/trunk/rdesktop/orders.c	2002/07/18 16:38:31	64
+++ sourceforge.net/trunk/rdesktop/orders.c	2003/02/04 05:32:13	309
@@ -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 */
@@ -198,7 +203,8 @@
 
 	rdp_parse_brush(s, &os->brush, present >> 7);
 
-	DEBUG(("PATBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d,bs=%d,bg=0x%x,fg=0x%x)\n", os->opcode, os->x, os->y, os->cx, os->cy, os->brush.style, os->bgcolour, os->fgcolour));
+	DEBUG(("PATBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d,bs=%d,bg=0x%x,fg=0x%x)\n", os->opcode, os->x,
+	       os->y, os->cx, os->cy, os->brush.style, os->bgcolour, os->fgcolour));
 
 	ui_patblt(ROP2_P(os->opcode), os->x, os->y, os->cx, os->cy,
 		  &os->brush, os->bgcolour, os->fgcolour);
@@ -232,8 +238,7 @@
 	DEBUG(("SCREENBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d,srcx=%d,srcy=%d)\n",
 	       os->opcode, os->x, os->y, os->cx, os->cy, os->srcx, os->srcy));
 
-	ui_screenblt(ROP2_S(os->opcode), os->x, os->y, os->cx, os->cy,
-		     os->srcx, os->srcy);
+	ui_screenblt(ROP2_S(os->opcode), os->x, os->y, os->cx, os->cy, os->srcx, os->srcy);
 }
 
 /* Process a line order */
@@ -264,8 +269,7 @@
 	rdp_parse_pen(s, &os->pen, present >> 7);
 
 	DEBUG(("LINE(op=0x%x,sx=%d,sy=%d,dx=%d,dx=%d,fg=0x%x)\n",
-	       os->opcode, os->startx, os->starty, os->endx, os->endy,
-	       os->pen.colour));
+	       os->opcode, os->startx, os->starty, os->endx, os->endy, os->pen.colour));
 
 	if (os->opcode < 0x01 || os->opcode > 0x10)
 	{
@@ -273,14 +277,14 @@
 		return;
 	}
 
-	ui_line(os->opcode - 1, os->startx, os->starty,
-		os->endx, os->endy, &os->pen);
+	ui_line(os->opcode - 1, os->startx, os->starty, os->endx, os->endy, &os->pen);
 }
 
 /* Process an opaque rectangle order */
 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);
 
@@ -294,10 +298,24 @@
 		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;
+	}
 
-	DEBUG(("RECT(x=%d,y=%d,cx=%d,cy=%d,fg=0x%x)\n",
-	       os->x, os->y, os->cx, os->cy, os->colour));
+	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));
 
 	ui_rect(os->x, os->y, os->cx, os->cy, os->colour);
 }
@@ -327,8 +345,7 @@
 		in_uint8(s, os->action);
 
 	DEBUG(("DESKSAVE(l=%d,t=%d,r=%d,b=%d,off=%d,op=%d)\n",
-	       os->left, os->top, os->right, os->bottom, os->offset,
-	       os->action));
+	       os->left, os->top, os->right, os->bottom, os->offset, os->action));
 
 	width = os->right - os->left + 1;
 	height = os->bottom - os->top + 1;
@@ -336,8 +353,7 @@
 	if (os->action == 0)
 		ui_desktop_save(os->offset, os->left, os->top, width, height);
 	else
-		ui_desktop_restore(os->offset, os->left, os->top, width,
-				   height);
+		ui_desktop_restore(os->offset, os->left, os->top, width, height);
 }
 
 /* Process a memory blt order */
@@ -377,15 +393,13 @@
 		in_uint16_le(s, os->cache_idx);
 
 	DEBUG(("MEMBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d,id=%d,idx=%d)\n",
-	       os->opcode, os->x, os->y, os->cx, os->cy, os->cache_id,
-	       os->cache_idx));
+	       os->opcode, os->x, os->y, os->cx, os->cy, os->cache_id, os->cache_idx));
 
 	bitmap = cache_get_bitmap(os->cache_id, os->cache_idx);
 	if (bitmap == NULL)
 		return;
 
-	ui_memblt(ROP2_S(os->opcode), os->x, os->y, os->cx, os->cy,
-		  bitmap, os->srcx, os->srcy);
+	ui_memblt(ROP2_S(os->opcode), os->x, os->y, os->cx, os->cy, bitmap, os->srcx, os->srcy);
 }
 
 /* Process a 3-way blt order */
@@ -435,15 +449,16 @@
 	if (present & 0x010000)
 		in_uint16_le(s, os->unknown);
 
-	DEBUG(("TRIBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d,id=%d,idx=%d,bs=%d,bg=0x%x,fg=0x%x)\n", os->opcode, os->x, os->y, os->cx, os->cy, os->cache_id, os->cache_idx, os->brush.style, os->bgcolour, os->fgcolour));
+	DEBUG(("TRIBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d,id=%d,idx=%d,bs=%d,bg=0x%x,fg=0x%x)\n",
+	       os->opcode, os->x, os->y, os->cx, os->cy, os->cache_id, os->cache_idx,
+	       os->brush.style, os->bgcolour, os->fgcolour));
 
 	bitmap = cache_get_bitmap(os->cache_id, os->cache_idx);
 	if (bitmap == NULL)
 		return;
 
 	ui_triblt(os->opcode, os->x, os->y, os->cx, os->cy,
-		  bitmap, os->srcx, os->srcy,
-		  &os->brush, os->bgcolour, os->fgcolour);
+		  bitmap, os->srcx, os->srcy, &os->brush, os->bgcolour, os->fgcolour);
 }
 
 /* Parse a delta co-ordinate in polyline order form */
@@ -481,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);
@@ -494,14 +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: "));
 
@@ -510,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;
@@ -615,8 +632,7 @@
 		     os->clipbottom - os->cliptop,
 		     os->boxleft, os->boxtop,
 		     os->boxright - os->boxleft,
-		     os->boxbottom - os->boxtop,
-		     os->bgcolour, os->fgcolour, os->text, os->length);
+		     os->boxbottom - os->boxtop, os->bgcolour, os->fgcolour, os->text, os->length);
 }
 
 /* Process a raw bitmap cache order */
@@ -637,14 +653,14 @@
 	in_uint16_le(s, bufsize);
 	in_uint16_le(s, cache_idx);
 	in_uint8p(s, data, bufsize);
+	if (bpp != 8) /* todo */
+		return;
 
-	DEBUG(("RAW_BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d)\n",
-	       width, height, cache_id, cache_idx));
+	DEBUG(("RAW_BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d)\n", width, height, cache_id, cache_idx));
 	inverted = xmalloc(width * height);
 	for (y = 0; y < height; y++)
 	{
-		memcpy(&inverted[(height - y - 1) * width], &data[y * width],
-		       width);
+		memcpy(&inverted[(height - y - 1) * width], &data[y * width], width);
 	}
 
 	bitmap = ui_create_bitmap(width, height, inverted);
@@ -672,13 +688,14 @@
 	in_uint16_le(s, size);
 	in_uint8s(s, 4);	/* row_size, final_size */
 	in_uint8p(s, data, size);
+	if (bpp != 8) /* todo */
+		return;
 
-	DEBUG(("BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d)\n",
-	       width, height, cache_id, cache_idx));
+	DEBUG(("BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d)\n", width, height, cache_id, cache_idx));
 
 	bmpdata = xmalloc(width * height);
 
-	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);
@@ -746,8 +763,7 @@
 		in_uint8p(s, data, datasize);
 
 		bitmap = ui_create_glyph(width, height, data);
-		cache_put_font(font, character, offset, baseline,
-			       width, height, bitmap);
+		cache_put_font(font, character, offset, baseline, width, height, bitmap);
 	}
 }
 
@@ -854,8 +870,7 @@
 					    os->bounds.top,
 					    os->bounds.right -
 					    os->bounds.left + 1,
-					    os->bounds.bottom -
-					    os->bounds.top + 1);
+					    os->bounds.bottom - os->bounds.top + 1);
 			}
 
 			delta = order_flags & RDP_ORDER_DELTA;
@@ -863,53 +878,43 @@
 			switch (os->order_type)
 			{
 				case RDP_ORDER_DESTBLT:
-					process_destblt(s, &os->destblt,
-							present, delta);
+					process_destblt(s, &os->destblt, present, delta);
 					break;
 
 				case RDP_ORDER_PATBLT:
-					process_patblt(s, &os->patblt,
-						       present, delta);
+					process_patblt(s, &os->patblt, present, delta);
 					break;
 
 				case RDP_ORDER_SCREENBLT:
-					process_screenblt(s, &os->screenblt,
-							  present, delta);
+					process_screenblt(s, &os->screenblt, present, delta);
 					break;
 
 				case RDP_ORDER_LINE:
-					process_line(s, &os->line,
-						     present, delta);
+					process_line(s, &os->line, present, delta);
 					break;
 
 				case RDP_ORDER_RECT:
-					process_rect(s, &os->rect,
-						     present, delta);
+					process_rect(s, &os->rect, present, delta);
 					break;
 
 				case RDP_ORDER_DESKSAVE:
-					process_desksave(s, &os->desksave,
-							 present, delta);
+					process_desksave(s, &os->desksave, present, delta);
 					break;
 
 				case RDP_ORDER_MEMBLT:
-					process_memblt(s, &os->memblt,
-						       present, delta);
+					process_memblt(s, &os->memblt, present, delta);
 					break;
 
 				case RDP_ORDER_TRIBLT:
-					process_triblt(s, &os->triblt,
-						       present, delta);
+					process_triblt(s, &os->triblt, present, delta);
 					break;
 
 				case RDP_ORDER_POLYLINE:
-					process_polyline(s, &os->polyline,
-							 present, delta);
+					process_polyline(s, &os->polyline, present, delta);
 					break;
 
 				case RDP_ORDER_TEXT2:
-					process_text2(s, &os->text2,
-						      present, delta);
+					process_text2(s, &os->text2, present, delta);
 					break;
 
 				default:
@@ -930,7 +935,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;