--- sourceforge.net/trunk/rdesktop/rdp.c	2003/06/19 11:46:30	426
+++ sourceforge.net/trunk/rdesktop/rdp.c	2003/10/28 01:44:48	513
@@ -2,17 +2,17 @@
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - RDP layer
    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
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -21,19 +21,20 @@
 #include "rdesktop.h"
 
 extern uint16 g_mcs_userid;
-extern char username[16];
-extern BOOL bitmap_compression;
-extern BOOL orders;
-extern BOOL encryption;
-extern BOOL desktop_save;
-extern BOOL use_rdp5;
-extern uint16 server_rdp_version;
+extern char g_username[16];
+extern BOOL g_bitmap_compression;
+extern BOOL g_orders;
+extern BOOL g_encryption;
+extern BOOL g_desktop_save;
+extern BOOL g_use_rdp5;
+extern uint16 g_server_rdp_version;
+extern int g_server_bpp;
 
-uint8 *next_packet;
-uint32 rdp_shareid;
+uint8 *g_next_packet;
+uint32 g_rdp_shareid;
 
 #if WITH_DEBUG
-static uint32 packetno;
+static uint32 g_packetno;
 #endif
 
 /* Receive an RDP packet */
@@ -43,24 +44,24 @@
 	static STREAM rdp_s;
 	uint16 length, pdu_type;
 
-	if ((rdp_s == NULL) || (next_packet >= rdp_s->end))
+	if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end))
 	{
 		rdp_s = sec_recv();
 		if (rdp_s == NULL)
 			return NULL;
 
-		next_packet = rdp_s->p;
+		g_next_packet = rdp_s->p;
 	}
 	else
 	{
-		rdp_s->p = next_packet;
+		rdp_s->p = g_next_packet;
 	}
 
 	in_uint16_le(rdp_s, length);
 	/* 32k packets are really 8, keepalive fix */
 	if (length == 0x8000)
 	{
-		next_packet += 8;
+		g_next_packet += 8;
 		*type = 0;
 		return rdp_s;
 	}
@@ -69,11 +70,11 @@
 	*type = pdu_type & 0xf;
 
 #if WITH_DEBUG
-	DEBUG(("RDP packet #%d, (type %x)\n", ++packetno, *type));
-	//      hexdump(next_packet, length);
+	DEBUG(("RDP packet #%d, (type %x)\n", ++g_packetno, *type));
+	hexdump(g_next_packet, length);
 #endif /*  */
 
-	next_packet += length;
+	g_next_packet += length;
 	return rdp_s;
 }
 
@@ -83,7 +84,7 @@
 {
 	STREAM s;
 
-	s = sec_init(encryption ? SEC_ENCRYPT : 0, maxlen + 18);
+	s = sec_init(g_encryption ? SEC_ENCRYPT : 0, maxlen + 18);
 	s_push_layer(s, rdp_hdr, 18);
 
 	return s;
@@ -102,7 +103,7 @@
 	out_uint16_le(s, (RDP_PDU_DATA | 0x10));
 	out_uint16_le(s, (g_mcs_userid + 1001));
 
-	out_uint32_le(s, rdp_shareid);
+	out_uint32_le(s, g_rdp_shareid);
 	out_uint8(s, 0);	/* pad */
 	out_uint8(s, 1);	/* streamid */
 	out_uint16_le(s, (length - 14));
@@ -110,7 +111,7 @@
 	out_uint8(s, 0);	/* compress_type */
 	out_uint16(s, 0);	/* compress_len */
 
-	sec_send(s, encryption ? SEC_ENCRYPT : 0);
+	sec_send(s, g_encryption ? SEC_ENCRYPT : 0);
 }
 
 /* Output a string in Unicode */
@@ -143,10 +144,10 @@
 	int len_ip = 2 * strlen("127.0.0.1");
 	int len_dll = 2 * strlen("C:\\WINNT\\System32\\mstscax.dll");
 	int packetlen = 0;
-	uint32 sec_flags = encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO;
+	uint32 sec_flags = g_encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO;
 	STREAM s;
 
-	if (!use_rdp5 || 1 == server_rdp_version)
+	if (!g_use_rdp5 || 1 == g_server_rdp_version)
 	{
 		DEBUG_RDP5(("Sending RDP4-style Logon packet\n"));
 
@@ -178,7 +179,7 @@
 			(flags & RDP_LOGON_BLOB ? 2 : 0) +	// Length of BLOB
 			2 +	// len_program
 			2 +	// len_directory
-			(0 < len_domain ? len_domain : 2) +	// domain 
+			(0 < len_domain ? len_domain : 2) +	// domain
 			len_user + (flags & RDP_LOGON_AUTO ? len_password : 0) + 0 +	// We have no 512 byte BLOB. Perhaps we must?
 			(flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO) ? 2 : 0) +	// After the BLOB is a unknown int16. If there is a BLOB, that is.
 			(0 < len_program ? len_program : 2) + (0 < len_directory ? len_directory : 2) + 2 +	// Unknown (2)
@@ -357,7 +358,7 @@
 	out_uint16_le(s, 0x200);	/* Protocol version */
 	out_uint16(s, 0);	/* Pad */
 	out_uint16(s, 0);	/* Compression types */
-	out_uint16_le(s, use_rdp5 ? 0x40d : 0);
+	out_uint16_le(s, g_use_rdp5 ? 0x40d : 0);
 	/* Pad, according to T.128. 0x40d seems to 
 	   trigger
 	   the server to start sending RDP5 packets. 
@@ -386,7 +387,7 @@
 	out_uint16_le(s, 600);	/* Desktop height */
 	out_uint16(s, 0);	/* Pad */
 	out_uint16(s, 0);	/* Allow resize */
-	out_uint16_le(s, bitmap_compression ? 1 : 0);	/* Support compression */
+	out_uint16_le(s, g_bitmap_compression ? 1 : 0);	/* Support compression */
 	out_uint16(s, 0);	/* Unknown */
 	out_uint16_le(s, 1);	/* Unknown */
 	out_uint16(s, 0);	/* Pad */
@@ -407,7 +408,7 @@
 	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[11] = (g_desktop_save == False ? 0 : 1);	/* desksave */
 	order_caps[13] = 1;	/* memblt */
 	order_caps[14] = 1;	/* triblt */
 	order_caps[22] = 1;	/* polyline */
@@ -425,7 +426,7 @@
 	out_uint8p(s, order_caps, 32);	/* Orders supported */
 	out_uint16_le(s, 0x6a1);	/* Text capability flags */
 	out_uint8s(s, 6);	/* Pad */
-	out_uint32_le(s, desktop_save == False ? 0 : 0x38400);	/* Desktop cache size */
+	out_uint32_le(s, g_desktop_save == False ? 0 : 0x38400);	/* Desktop cache size */
 	out_uint32(s, 0);	/* Unknown */
 	out_uint32_le(s, 0x4e4);	/* Unknown */
 }
@@ -434,16 +435,18 @@
 static void
 rdp_out_bmpcache_caps(STREAM s)
 {
+	int Bpp;
 	out_uint16_le(s, RDP_CAPSET_BMPCACHE);
 	out_uint16_le(s, RDP_CAPLEN_BMPCACHE);
 
+	Bpp = (g_server_bpp + 7) / 8;
 	out_uint8s(s, 24);	/* unused */
 	out_uint16_le(s, 0x258);	/* entries */
-	out_uint16_le(s, 0x100);	/* max cell size */
+	out_uint16_le(s, 0x100 * Bpp);	/* max cell size */
 	out_uint16_le(s, 0x12c);	/* entries */
-	out_uint16_le(s, 0x400);	/* max cell size */
+	out_uint16_le(s, 0x400 * Bpp);	/* max cell size */
 	out_uint16_le(s, 0x106);	/* entries */
-	out_uint16_le(s, 0x1000);	/* max cell size */
+	out_uint16_le(s, 0x1000 * Bpp);	/* max cell size */
 }
 
 /* Output control capability set */
@@ -543,7 +546,7 @@
 rdp_send_confirm_active(void)
 {
 	STREAM s;
-	uint32 sec_flags = encryption ? (RDP5_FLAG | SEC_ENCRYPT) : RDP5_FLAG;
+	uint32 sec_flags = g_encryption ? (RDP5_FLAG | SEC_ENCRYPT) : RDP5_FLAG;
 	uint16 caplen =
 		RDP_CAPLEN_GENERAL + RDP_CAPLEN_BITMAP + RDP_CAPLEN_ORDER +
 		RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE +
@@ -556,7 +559,7 @@
 	out_uint16_le(s, (RDP_PDU_CONFIRM_ACTIVE | 0x10));	/* Version 1 */
 	out_uint16_le(s, (g_mcs_userid + 1001));
 
-	out_uint32_le(s, rdp_shareid);
+	out_uint32_le(s, g_rdp_shareid);
 	out_uint16_le(s, 0x3ea);	/* userid */
 	out_uint16_le(s, sizeof(RDP_SOURCE));
 	out_uint16_le(s, caplen);
@@ -586,9 +589,9 @@
 {
 	uint8 type;
 
-	in_uint32_le(s, rdp_shareid);
+	in_uint32_le(s, g_rdp_shareid);
 
-	DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", rdp_shareid));
+	DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid));
 
 	rdp_send_confirm_active();
 	rdp_send_synchronise();
@@ -604,15 +607,6 @@
 	reset_order_state();
 }
 
-/* Process a null system pointer PDU */
-void
-process_null_system_pointer_pdu(STREAM s)
-{
-	// FIXME: We should probably set another cursor here, 
-	// like the X window system base cursor or something.
-	ui_set_cursor(cache_get_cursor(0));
-}
-
 /* Process a colour pointer PDU */
 void
 process_colour_pointer_pdu(STREAM s)
@@ -645,6 +639,23 @@
 	ui_set_cursor(cache_get_cursor(cache_idx));
 }
 
+/* Process a system pointer PDU */
+void
+process_system_pointer_pdu(STREAM s)
+{
+	uint16 system_pointer_type;
+
+	in_uint16(s, system_pointer_type);
+	switch (system_pointer_type)
+	{
+		case RDP_NULL_POINTER:
+			ui_set_null_cursor();
+			break;
+
+		default:
+			unimpl("System pointer message 0x%x\n", system_pointer_type);
+	}
+}
 
 /* Process a pointer PDU */
 static void
@@ -673,8 +684,12 @@
 			process_cached_pointer_pdu(s);
 			break;
 
+		case RDP_POINTER_SYSTEM:
+			process_system_pointer_pdu(s);
+			break;
+
 		default:
-			DEBUG(("Pointer message 0x%x\n", message_type));
+			unimpl("Pointer message 0x%x\n", message_type);
 	}
 }
 
@@ -762,7 +777,7 @@
 	in_uint16_le(s, map.ncolours);
 	in_uint8s(s, 2);	/* pad */
 
-	map.colours = (COLOURENTRY *) xmalloc(3 * map.ncolours);
+	map.colours = (COLOURENTRY *) xmalloc(sizeof(COLOURENTRY) * map.ncolours);
 
 	DEBUG(("PALETTE(c=%d)\n", map.ncolours));
 
@@ -886,8 +901,8 @@
 	}
 	return True;
 	/* We want to detect if we got a clean shutdown, but we
-	can't. Se above.  
-	return False;  */
+	   can't. Se above.  
+	   return False;  */
 }
 
 /* Establish a connection up to the RDP layer */
@@ -895,13 +910,10 @@
 rdp_connect(char *server, uint32 flags, char *domain, char *password,
 	    char *command, char *directory)
 {
-	if (use_rdp5)
-		channels_init();
-
-	if (!sec_connect(server, username))
+	if (!sec_connect(server, g_username))
 		return False;
 
-	rdp_send_logon_info(flags, domain, username, password, command, directory);
+	rdp_send_logon_info(flags, domain, g_username, password, command, directory);
 	return True;
 }