--- sourceforge.net/trunk/rdesktop/rdp.c 2002/07/18 16:38:31 64 +++ sourceforge.net/trunk/rdesktop/rdp.c 2003/02/04 05:32:13 309 @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. Protocol services - RDP layer - 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 @@ -79,6 +79,13 @@ } in_uint16_le(rdp_s, length); + /* 32k packets are really 8, keepalive fix */ + if (length == 0x8000) + { + next_packet += 8; + *type = 0; + return rdp_s; + } in_uint16_le(rdp_s, pdu_type); in_uint8s(rdp_s, 2); /* userid */ *type = pdu_type & 0xf; @@ -120,7 +127,7 @@ out_uint32_le(s, rdp_shareid); out_uint8(s, 0); /* pad */ out_uint8(s, 1); /* streamid */ - out_uint16(s, (length - 14)); + out_uint16_le(s, (length - 14)); out_uint8(s, data_pdu_type); out_uint8(s, 0); /* compress_type */ out_uint16(s, 0); /* compress_len */ @@ -155,8 +162,7 @@ int len_password = 2 * strlen(password); int len_program = 2 * strlen(program); int len_directory = 2 * strlen(directory); - uint32 sec_flags = encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) - : SEC_LOGON_INFO; + uint32 sec_flags = encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO; STREAM s; s = sec_init(sec_flags, 18 + len_domain + len_user + len_password @@ -197,7 +203,7 @@ /* Send a synchronisation PDU */ static void -rdp_send_synchronise() +rdp_send_synchronise(void) { STREAM s; @@ -212,8 +218,7 @@ /* Send a single input event */ void -rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, - uint16 param1, uint16 param2) +rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1, uint16 param2) { STREAM s; @@ -276,8 +281,8 @@ out_uint16_le(s, RDP_CAPLEN_BITMAP); out_uint16_le(s, 8); /* Preferred BPP */ - out_uint16(s, 1); /* Receive 1 BPP */ - out_uint16(s, 1); /* Receive 4 BPP */ + out_uint16_le(s, 1); /* Receive 1 BPP */ + out_uint16_le(s, 1); /* Receive 4 BPP */ out_uint16_le(s, 1); /* Receive 8 BPP */ out_uint16_le(s, 800); /* Desktop width */ out_uint16_le(s, 600); /* Desktop height */ @@ -300,6 +305,7 @@ order_caps[0] = 1; /* dest blt */ order_caps[1] = 1; /* pat blt */ order_caps[2] = 1; /* screen blt */ + order_caps[3] = 1; /* required for memblt? */ order_caps[8] = 1; /* line */ order_caps[9] = 1; /* line */ order_caps[10] = 1; /* rect */ @@ -321,9 +327,9 @@ out_uint8p(s, order_caps, 32); /* Orders supported */ out_uint16_le(s, 0x6a1); /* Text capability flags */ out_uint8s(s, 6); /* Pad */ - out_uint32(s, desktop_save == False ? 0 : 0x38400); /* Desktop cache size */ + out_uint32_le(s, desktop_save == False ? 0 : 0x38400); /* Desktop cache size */ out_uint32(s, 0); /* Unknown */ - out_uint32(s, 0x4e4); /* Unknown */ + out_uint32_le(s, 0x4e4); /* Unknown */ } /* Output bitmap cache capability set */ @@ -435,15 +441,14 @@ /* Send a confirm active PDU */ static void -rdp_send_confirm_active() +rdp_send_confirm_active(void) { STREAM s; uint16 caplen = RDP_CAPLEN_GENERAL + RDP_CAPLEN_BITMAP + RDP_CAPLEN_ORDER + RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE + RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL + - RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE + RDP_CAPLEN_UNKNOWN - + 4 /* w2k fix, why? */ ; + RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE + RDP_CAPLEN_UNKNOWN + 4 /* w2k fix, why? */ ; s = rdp_init(14 + caplen + sizeof(RDP_SOURCE)); @@ -526,8 +531,7 @@ in_uint16_le(s, datalen); in_uint8p(s, data, datalen); in_uint8p(s, mask, masklen); - cursor = ui_create_cursor(x, y, width, height, mask, - data); + cursor = ui_create_cursor(x, y, width, height, mask, data); ui_set_cursor(cursor); cache_put_cursor(cache_idx, cursor); break; @@ -575,15 +579,12 @@ if (!compress) { int y; - bmpdata = xmalloc(width * height); + bmpdata = xmalloc(width * height * (bpp / 8)); for (y = 0; y < height; y++) { - in_uint8a(s, - &bmpdata[(height - y - 1) * width], - width); + in_uint8a(s, &bmpdata[(height - y - 1) * (width * (bpp / 8))], width * (bpp / 8)); } - ui_paint_bitmap(left, top, cx, cy, width, height, - bmpdata); + ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); xfree(bmpdata); continue; } @@ -592,14 +593,11 @@ in_uint16_le(s, size); in_uint8s(s, 4); /* line_size, final_size */ in_uint8p(s, data, size); - - bmpdata = xmalloc(width * height); - if (bitmap_decompress(bmpdata, width, height, data, size)) + bmpdata = xmalloc(width * height * (bpp / 8)); + if (bitmap_decompress(bmpdata, width, height, data, size, bpp)) { - ui_paint_bitmap(left, top, cx, cy, width, height, - bmpdata); + ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); } - xfree(bmpdata); } } @@ -608,18 +606,29 @@ static void process_palette(STREAM s) { - HCOLOURMAP hmap; + COLOURENTRY *entry; COLOURMAP map; - uint8 *colours; + HCOLOURMAP hmap; + int i; in_uint8s(s, 2); /* pad */ in_uint16_le(s, map.ncolours); in_uint8s(s, 2); /* pad */ - in_uint8p(s, colours, (map.ncolours * 3)); - map.colours = (COLOURENTRY *) colours; + + map.colours = xmalloc(3 * map.ncolours); + + for (i = 0; i < map.ncolours; i++) + { + entry = &map.colours[i]; + in_uint8(s, entry->red); + in_uint8(s, entry->green); + in_uint8(s, entry->blue); + } hmap = ui_create_colourmap(&map); ui_set_colourmap(hmap); + + xfree(map.colours); } /* Process an update PDU */ @@ -688,7 +697,7 @@ /* Process incoming packets */ void -rdp_main_loop() +rdp_main_loop(void) { uint8 type; STREAM s; @@ -708,6 +717,9 @@ process_data_pdu(s); break; + case 0: + break; + default: unimpl("PDU %d\n", type); } @@ -722,14 +734,13 @@ if (!sec_connect(server)) return False; - rdp_send_logon_info(flags, domain, username, password, - command, directory); + rdp_send_logon_info(flags, domain, username, password, command, directory); return True; } /* Disconnect from the RDP layer */ void -rdp_disconnect() +rdp_disconnect(void) { sec_disconnect(); }