--- sourceforge.net/trunk/rdesktop/orders.c 2001/01/06 03:47:04 25 +++ 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-2000 + 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 @@ -21,12 +21,12 @@ #include "rdesktop.h" #include "orders.h" -extern unsigned char *next_packet; +extern uint8 *next_packet; static RDP_ORDER_STATE order_state; /* Read field indicating which parameters are present */ static void -rdp_in_present(STREAM s, uint32 *present, uint8 flags, int size) +rdp_in_present(STREAM s, uint32 * present, uint8 flags, int size) { uint8 bits; int i; @@ -54,14 +54,14 @@ /* Read a co-ordinate (16-bit, or 8-bit delta) */ static void -rdp_in_coord(STREAM s, uint16 *coord, BOOL delta) +rdp_in_coord(STREAM s, uint16 * coord, BOOL delta) { - uint8 change; + sint8 change; if (delta) { in_uint8(s, change); - *coord += (char) change; + *coord += change; } else { @@ -71,15 +71,20 @@ /* 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 */ static BOOL -rdp_parse_bounds(STREAM s, BOUNDS *bounds) +rdp_parse_bounds(STREAM s, BOUNDS * bounds) { uint8 present; @@ -110,7 +115,7 @@ /* Parse a pen */ static BOOL -rdp_parse_pen(STREAM s, PEN *pen, uint32 present) +rdp_parse_pen(STREAM s, PEN * pen, uint32 present) { if (present & 1) in_uint8(s, pen->style); @@ -126,7 +131,7 @@ /* Parse a brush */ static BOOL -rdp_parse_brush(STREAM s, BRUSH *brush, uint32 present) +rdp_parse_brush(STREAM s, BRUSH * brush, uint32 present) { if (present & 1) in_uint8(s, brush->xorigin); @@ -148,7 +153,7 @@ /* Process a destination blt order */ static void -process_destblt(STREAM s, DESTBLT_ORDER *os, uint32 present, BOOL delta) +process_destblt(STREAM s, DESTBLT_ORDER * os, uint32 present, BOOL delta) { if (present & 0x01) rdp_in_coord(s, &os->x, delta); @@ -165,15 +170,15 @@ if (present & 0x10) in_uint8(s, os->opcode); - DEBUG("DESTBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d)\n", - os->opcode, os->x, os->y, os->cx, os->cy); + DEBUG(("DESTBLT(op=0x%x,x=%d,y=%d,cx=%d,cy=%d)\n", + os->opcode, os->x, os->y, os->cx, os->cy)); ui_destblt(ROP2_S(os->opcode), os->x, os->y, os->cx, os->cy); } /* Process a pattern blt order */ static void -process_patblt(STREAM s, PATBLT_ORDER *os, uint32 present, BOOL delta) +process_patblt(STREAM s, PATBLT_ORDER * os, uint32 present, BOOL delta) { if (present & 0x0001) rdp_in_coord(s, &os->x, delta); @@ -198,9 +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); @@ -208,7 +212,7 @@ /* Process a screen blt order */ static void -process_screenblt(STREAM s, SCREENBLT_ORDER *os, uint32 present, BOOL delta) +process_screenblt(STREAM s, SCREENBLT_ORDER * os, uint32 present, BOOL delta) { if (present & 0x0001) rdp_in_coord(s, &os->x, delta); @@ -231,16 +235,15 @@ if (present & 0x0040) rdp_in_coord(s, &os->srcy, delta); - 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); + 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 */ static void -process_line(STREAM s, LINE_ORDER *os, uint32 present, BOOL delta) +process_line(STREAM s, LINE_ORDER * os, uint32 present, BOOL delta) { if (present & 0x0001) in_uint16_le(s, os->mixmode); @@ -265,24 +268,23 @@ 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); + 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)); if (os->opcode < 0x01 || os->opcode > 0x10) { - ERROR("bad ROP2 0x%x\n", os->opcode); + error("bad ROP2 0x%x\n", os->opcode); 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) +process_rect(STREAM s, RECT_ORDER * os, uint32 present, BOOL delta) { + uint32 i; if (present & 0x01) rdp_in_coord(s, &os->x, delta); @@ -296,17 +298,31 @@ 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); } /* Process a desktop save order */ static void -process_desksave(STREAM s, DESKSAVE_ORDER *os, uint32 present, BOOL delta) +process_desksave(STREAM s, DESKSAVE_ORDER * os, uint32 present, BOOL delta) { int width, height; @@ -328,9 +344,8 @@ if (present & 0x20) 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); + 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)); width = os->right - os->left + 1; height = os->bottom - os->top + 1; @@ -338,13 +353,12 @@ 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 */ static void -process_memblt(STREAM s, MEMBLT_ORDER *os, uint32 present, BOOL delta) +process_memblt(STREAM s, MEMBLT_ORDER * os, uint32 present, BOOL delta) { HBITMAP bitmap; @@ -378,21 +392,19 @@ if (present & 0x0100) 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); + 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)); 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 */ static void -process_triblt(STREAM s, TRIBLT_ORDER *os, uint32 present, BOOL delta) +process_triblt(STREAM s, TRIBLT_ORDER * os, uint32 present, BOOL delta) { HBITMAP bitmap; @@ -437,23 +449,21 @@ 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 */ static int -parse_delta(uint8 *buffer, int *offset) +parse_delta(uint8 * buffer, int *offset) { int value = buffer[(*offset)++]; int two_byte = value & 0x80; @@ -471,12 +481,13 @@ /* Process a polyline order */ static void -process_polyline(STREAM s, POLYLINE_ORDER *os, uint32 present, BOOL delta) +process_polyline(STREAM s, POLYLINE_ORDER * os, uint32 present, BOOL delta) { int index, line, data; int x, y, xfrom, yfrom; uint8 flags = 0; PEN pen; + uint8 opcode; if (present & 0x01) rdp_in_coord(s, &os->x, delta); @@ -485,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); @@ -499,16 +510,23 @@ in_uint8a(s, os->data, os->datasize); } - 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: "); + DEBUG(("Data: ")); for (index = 0; index < os->datasize; index++) - DEBUG("%02x ", os->data[index]); + DEBUG(("%02x ", os->data[index])); + + DEBUG(("\n")); - 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; @@ -533,7 +551,7 @@ if (flags & 0x80) y += parse_delta(os->data, &data); - ui_line(ROP2_COPY, xfrom, yfrom, x, y, &pen); + ui_line(opcode, xfrom, yfrom, x, y, &pen); flags <<= 2; } @@ -541,9 +559,8 @@ /* Process a text order */ static void -process_text2(STREAM s, TEXT2_ORDER *os, uint32 present, BOOL delta) +process_text2(STREAM s, TEXT2_ORDER * os, uint32 present, BOOL delta) { - DATABLOB *entry; int i; if (present & 0x000001) @@ -600,37 +617,14 @@ in_uint8a(s, os->text, os->length); } - DEBUG - ("TEXT2(x=%d,y=%d,cl=%d,ct=%d,cr=%d,cb=%d,bl=%d,bt=%d,bb=%d,br=%d,fg=0x%x,bg=0x%x,font=%d,fl=0x%x,mix=%d,unk=0x%x,n=%d)\n", - os->x, os->y, os->clipleft, os->cliptop, os->clipright, - os->clipbottom, os->boxleft, os->boxtop, os->boxright, - os->boxbottom, os->fgcolour, os->bgcolour, os->font, - os->flags, os->mixmode, os->unknown, os->length); + DEBUG(("TEXT2(x=%d,y=%d,cl=%d,ct=%d,cr=%d,cb=%d,bl=%d,bt=%d,bb=%d,br=%d,fg=0x%x,bg=0x%x,font=%d,fl=0x%x,mix=%d,unk=0x%x,n=%d)\n", os->x, os->y, os->clipleft, os->cliptop, os->clipright, os->clipbottom, os->boxleft, os->boxtop, os->boxright, os->boxbottom, os->fgcolour, os->bgcolour, os->font, os->flags, os->mixmode, os->unknown, os->length)); - DEBUG("Text: "); + DEBUG(("Text: ")); for (i = 0; i < os->length; i++) - DEBUG("%02x ", os->text[i]); - - DEBUG("\n"); + DEBUG(("%02x ", os->text[i])); - /* Process special cache strings */ - if ((os->length >= 2) && (os->text[0] == 0xfe)) - { - entry = cache_get_text(os->text[1]); - - if (entry == NULL) - return; - - memcpy(os->text, entry->data, entry->size); - os->length = entry->size; - } - else if ((os->length >= 3) && (os->text[os->length - 3] == 0xff)) - { - os->length -= 3; - cache_put_text(os->text[os->length + 1], os->text, - os->length); - } + DEBUG(("\n")); ui_draw_text(os->font, os->flags, os->mixmode, os->x, os->y, os->clipleft, os->cliptop, @@ -638,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 */ @@ -649,7 +642,8 @@ HBITMAP bitmap; uint16 cache_idx, bufsize; uint8 cache_id, width, height, bpp; - uint8 *data; + uint8 *data, *inverted; + int y; in_uint8(s, cache_id); in_uint8s(s, 1); /* pad */ @@ -659,11 +653,18 @@ 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); + } - bitmap = ui_create_bitmap(width, height, data); + bitmap = ui_create_bitmap(width, height, inverted); + xfree(inverted); cache_put_bitmap(cache_id, cache_idx, bitmap); } @@ -687,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); @@ -726,7 +728,7 @@ in_uint8s(s, 1); /* pad */ } - DEBUG("COLCACHE(id=%d,n=%d)\n", cache_id, map.ncolours); + DEBUG(("COLCACHE(id=%d,n=%d)\n", cache_id, map.ncolours)); hmap = ui_create_colourmap(&map); ui_set_colourmap(hmap); @@ -747,7 +749,7 @@ in_uint8(s, font); in_uint8(s, nglyphs); - DEBUG("FONTCACHE(font=%d,n=%d)\n", font, nglyphs); + DEBUG(("FONTCACHE(font=%d,n=%d)\n", font, nglyphs)); for (i = 0; i < nglyphs; i++) { @@ -761,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); } } @@ -799,7 +800,7 @@ break; default: - NOTIMP("secondary order %d\n", type); + unimpl("secondary order %d\n", type); } s->p = next_order; @@ -826,7 +827,7 @@ if (!(order_flags & RDP_ORDER_STANDARD)) { - ERROR("order parsing failed\n"); + error("order parsing failed\n"); break; } @@ -869,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; @@ -878,57 +878,47 @@ 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: - NOTIMP("order %d\n", os->order_type); + unimpl("order %d\n", os->order_type); return; } @@ -940,12 +930,13 @@ } if (s->p != next_packet) - WARN("%d bytes remaining\n", (int) (next_packet - s->p)); + error("%d bytes remaining\n", (int) (next_packet - s->p)); } /* 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; }