--- sourceforge.net/trunk/rdesktop/rdp.c	2001/01/06 03:47:04	25
+++ sourceforge.net/trunk/rdesktop/rdp.c	2002/12/10 17:24:27	283
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - RDP layer
-   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
@@ -22,9 +22,12 @@
 
 extern uint16 mcs_userid;
 extern char username[16];
+extern BOOL bitmap_compression;
 extern BOOL orders;
+extern BOOL encryption;
+extern BOOL desktop_save;
 
-unsigned char *next_packet;
+uint8 *next_packet;
 uint32 rdp_shareid;
 
 /* Initialise an RDP packet */
@@ -33,7 +36,7 @@
 {
 	STREAM s;
 
-	s = sec_init(SEC_ENCRYPT, maxlen + 6);
+	s = sec_init(encryption ? SEC_ENCRYPT : 0, maxlen + 6);
 	s_push_layer(s, rdp_hdr, 6);
 
 	return s;
@@ -52,12 +55,12 @@
 	out_uint16_le(s, (pdu_type | 0x10));	/* Version 1 */
 	out_uint16_le(s, (mcs_userid + 1001));
 
-	sec_send(s, SEC_ENCRYPT);
+	sec_send(s, encryption ? SEC_ENCRYPT : 0);
 }
 
 /* Receive an RDP packet */
 static STREAM
-rdp_recv(uint8 *type)
+rdp_recv(uint8 * type)
 {
 	static STREAM rdp_s;
 	uint16 length, pdu_type;
@@ -76,17 +79,23 @@
 	}
 
 	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 */
-
-	next_packet += length;
 	*type = pdu_type & 0xf;
 
-#if RDP_DEBUG
-	DEBUG("RDP packet (type %x):\n", *type);
-	hexdump(rdp_s->p, length);
-#endif
+#if WITH_DEBUG
+	DEBUG(("RDP packet (type %x):\n", *type));
+	hexdump(next_packet, length);
+#endif /*  */
 
+	next_packet += length;
 	return rdp_s;
 }
 
@@ -96,7 +105,7 @@
 {
 	STREAM s;
 
-	s = sec_init(SEC_ENCRYPT, maxlen + 18);
+	s = sec_init(encryption ? SEC_ENCRYPT : 0, maxlen + 18);
 	s_push_layer(s, rdp_hdr, 18);
 
 	return s;
@@ -118,12 +127,12 @@
 	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 */
 
-	sec_send(s, SEC_ENCRYPT);
+	sec_send(s, encryption ? SEC_ENCRYPT : 0);
 }
 
 /* Output a string in Unicode */
@@ -153,7 +162,7 @@
 	int len_password = 2 * strlen(password);
 	int len_program = 2 * strlen(program);
 	int len_directory = 2 * strlen(directory);
-	uint32 sec_flags = SEC_LOGON_INFO | SEC_ENCRYPT;
+	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
@@ -194,7 +203,7 @@
 
 /* Send a synchronisation PDU */
 static void
-rdp_send_synchronise()
+rdp_send_synchronise(void)
 {
 	STREAM s;
 
@@ -209,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;
 
@@ -273,14 +281,14 @@
 	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 */
 	out_uint16(s, 0);	/* Pad */
 	out_uint16(s, 0);	/* Allow resize */
-	out_uint16_le(s, 1);	/* Support compression */
+	out_uint16_le(s, bitmap_compression ? 1 : 0);	/* Support compression */
 	out_uint16(s, 0);	/* Unknown */
 	out_uint16_le(s, 1);	/* Unknown */
 	out_uint16(s, 0);	/* Pad */
@@ -292,8 +300,20 @@
 {
 	uint8 order_caps[32];
 
-	memset(order_caps, orders, 32);
 
+	memset(order_caps, 0, 32);
+	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 */
+	order_caps[11] = (desktop_save == False ? 0 : 1);	/* desksave */
+	order_caps[13] = 1;	/* memblt */
+	order_caps[14] = 1;	/* triblt */
+	order_caps[22] = 1;	/* polyline */
+	order_caps[27] = 1;	/* text2 */
 	out_uint16_le(s, RDP_CAPSET_ORDER);
 	out_uint16_le(s, RDP_CAPLEN_ORDER);
 
@@ -307,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, 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 */
@@ -421,14 +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;
+		RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE + RDP_CAPLEN_UNKNOWN + 4 /* w2k fix, why? */ ;
 
 	s = rdp_init(14 + caplen + sizeof(RDP_SOURCE));
 
@@ -464,19 +484,19 @@
 
 	in_uint32_le(s, rdp_shareid);
 
-	DEBUG("DEMAND_ACTIVE(id=0x%x)\n", rdp_shareid);
+	DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", rdp_shareid));
 
 	rdp_send_confirm_active();
 	rdp_send_synchronise();
 	rdp_send_control(RDP_CTL_COOPERATE);
 	rdp_send_control(RDP_CTL_REQUEST_CONTROL);
-	rdp_recv(&type);	// RDP_PDU_SYNCHRONIZE
-	rdp_recv(&type);	// RDP_CTL_COOPERATE
-	rdp_recv(&type);	// RDP_CTL_GRANT_CONTROL
+	rdp_recv(&type);	/* RDP_PDU_SYNCHRONIZE */
+	rdp_recv(&type);	/* RDP_CTL_COOPERATE */
+	rdp_recv(&type);	/* RDP_CTL_GRANT_CONTROL */
 	rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, 0, 0);
 	rdp_send_fonts(1);
 	rdp_send_fonts(2);
-	rdp_recv(&type);	// RDP_PDU_UNKNOWN 0x28
+	rdp_recv(&type);	/* RDP_PDU_UNKNOWN 0x28 */
 	reset_order_state();
 }
 
@@ -485,7 +505,9 @@
 process_pointer_pdu(STREAM s)
 {
 	uint16 message_type;
-	uint16 x, y;
+	uint16 x, y, width, height, cache_idx, masklen, datalen;
+	uint8 *mask, *data;
+	HCURSOR cursor;
 
 	in_uint16_le(s, message_type);
 	in_uint8s(s, 2);	/* pad */
@@ -499,8 +521,28 @@
 				ui_move_pointer(x, y);
 			break;
 
+		case RDP_POINTER_COLOR:
+			in_uint16_le(s, cache_idx);
+			in_uint16_le(s, x);
+			in_uint16_le(s, y);
+			in_uint16_le(s, width);
+			in_uint16_le(s, height);
+			in_uint16_le(s, masklen);
+			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);
+			ui_set_cursor(cursor);
+			cache_put_cursor(cache_idx, cursor);
+			break;
+
+		case RDP_POINTER_CACHED:
+			in_uint16_le(s, cache_idx);
+			ui_set_cursor(cache_get_cursor(cache_idx));
+			break;
+
 		default:
-			DEBUG("Pointer message 0x%x\n", message_type);
+			DEBUG(("Pointer message 0x%x\n", message_type));
 	}
 }
 
@@ -511,7 +553,7 @@
 	uint16 num_updates;
 	uint16 left, top, right, bottom, width, height;
 	uint16 cx, cy, bpp, compress, bufsize, size;
-	uint8 *data, *rawdata;
+	uint8 *data, *bmpdata;
 	int i;
 
 	in_uint16_le(s, num_updates);
@@ -531,15 +573,20 @@
 		cx = right - left + 1;
 		cy = bottom - top + 1;
 
-		DEBUG("UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,cmp=%d)\n",
-		      left, top, right, bottom, width, height, compress);
+		DEBUG(("UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,cmp=%d)\n",
+		       left, top, right, bottom, width, height, compress));
 
 		if (!compress)
 		{
-			in_uint8p(s, data, bufsize);
-			ui_paint_bitmap(left, top, cx, cy, width, height,
-					data);
-			return;
+			int y;
+			bmpdata = xmalloc(width * height);
+			for (y = 0; y < height; y++)
+			{
+				in_uint8a(s, &bmpdata[(height - y - 1) * width], width);
+			}
+			ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata);
+			xfree(bmpdata);
+			continue;
 		}
 
 		in_uint8s(s, 2);	/* pad */
@@ -547,14 +594,13 @@
 		in_uint8s(s, 4);	/* line_size, final_size */
 		in_uint8p(s, data, size);
 
-		rawdata = xmalloc(width * height);
-		if (bitmap_decompress(rawdata, width, height, data, size))
+		bmpdata = xmalloc(width * height);
+		if (bitmap_decompress(bmpdata, width, height, data, size))
 		{
-			ui_paint_bitmap(left, top, cx, cy, width, height,
-					rawdata);
+			ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata);
 		}
 
-		xfree(rawdata);
+		xfree(bmpdata);
 	}
 }
 
@@ -562,16 +608,29 @@
 static void
 process_palette(STREAM s)
 {
-	HCOLOURMAP hmap;
+	COLOURENTRY *entry;
 	COLOURMAP map;
+	HCOLOURMAP hmap;
+	int i;
 
 	in_uint8s(s, 2);	/* pad */
 	in_uint16_le(s, map.ncolours);
 	in_uint8s(s, 2);	/* pad */
-	in_uint8p(s, (uint8 *) map.colours, (map.ncolours * 3));
+
+	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 */
@@ -600,7 +659,7 @@
 			break;
 
 		default:
-			NOTIMP("update %d\n", update_type);
+			unimpl("update %d\n", update_type);
 	}
 
 }
@@ -634,13 +693,13 @@
 			break;
 
 		default:
-			NOTIMP("data PDU %d\n", data_pdu_type);
+			unimpl("data PDU %d\n", data_pdu_type);
 	}
 }
 
 /* Process incoming packets */
 void
-rdp_main_loop()
+rdp_main_loop(void)
 {
 	uint8 type;
 	STREAM s;
@@ -660,8 +719,11 @@
 				process_data_pdu(s);
 				break;
 
+			case 0:
+				break;
+
 			default:
-				NOTIMP("PDU %d\n", type);
+				unimpl("PDU %d\n", type);
 		}
 	}
 }
@@ -674,14 +736,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();
 }