--- sourceforge.net/trunk/rdesktop/rdp.c	2005/03/06 21:11:18	828
+++ sourceforge.net/trunk/rdesktop/rdp.c	2005/03/13 13:58:23	858
@@ -19,14 +19,28 @@
 */
 
 #include <time.h>
+#include <errno.h>
+#include <unistd.h>
 #include "rdesktop.h"
 
+#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
+#endif
+
+#ifndef ICONV_CONST
+#define ICONV_CONST ""
+#endif
+#endif
+
 extern uint16 g_mcs_userid;
-extern char g_username[16];
+extern char g_username[64];
+extern char g_codepage[16];
 extern BOOL g_bitmap_compression;
 extern BOOL g_orders;
 extern BOOL g_encryption;
 extern BOOL g_desktop_save;
+extern BOOL g_polygon_ellipse_orders;
 extern BOOL g_use_rdp5;
 extern uint16 g_server_rdp_version;
 extern uint32 g_rdp5_performanceflags;
@@ -140,6 +154,54 @@
 void
 rdp_out_unistr(STREAM s, char *string, int len)
 {
+#ifdef HAVE_ICONV
+	size_t ibl = strlen(string), obl = len + 2;
+	static iconv_t iconv_h = (iconv_t)-1;
+	char   *pin = string, *pout;
+#ifdef B_ENDIAN
+	char ss[4096];	// FIXME: global MAX_BUF_SIZE macro need
+
+	pout = ss;
+#else
+	pout = s->p;
+#endif
+
+	memset(pout, 0, len + 4);
+
+	if (iconv_h == (iconv_t)-1)
+	{
+		size_t i = 1, o = 4;
+		if ((iconv_h = iconv_open(WINDOWS_CODEPAGE, g_codepage)) == (iconv_t)-1)
+		{
+			printf("rdp_out_unistr: iconv_open[%s -> %s] fail %d\n",
+				g_codepage, WINDOWS_CODEPAGE, (int)iconv_h);
+			return;
+		}
+		if (iconv(iconv_h, (ICONV_CONST char**)&pin, &i, &pout, &o) == (size_t)-1)
+		{
+			iconv_close(iconv_h);
+			iconv_h = (iconv_t)-1;
+			printf("rdp_out_unistr: iconv(1) fail, errno %d\n", errno);
+			return;
+		}
+		pin = string; pout = s->p;
+	}
+
+	if (iconv(iconv_h, (ICONV_CONST char**)&pin, &ibl, &pout, &obl) == (size_t)-1)
+	{
+		iconv_close(iconv_h);
+		iconv_h = (iconv_t)-1;
+		printf("rdp_out_unistr: iconv(2) fail, errno %d\n", errno);
+		return;
+	}
+
+#ifdef B_ENDIAN
+	swab(ss, s->p, len + 4);
+#endif
+
+	s->p += len + 2;
+
+#else /*HAVE_ICONV undef*/
 	int i = 0, j = 0;
 
 	len += 2;
@@ -149,8 +211,9 @@
 		s->p[i++] = string[j++];
 		s->p[i++] = 0;
 	}
-
+	
 	s->p += len;
+#endif
 }
 
 /* Input a string in Unicode
@@ -160,6 +223,38 @@
 int
 rdp_in_unistr(STREAM s, char *string, int uni_len)
 {
+#ifdef HAVE_ICONV
+	size_t ibl = uni_len, obl = uni_len;
+	char *pin, *pout = string;
+	static iconv_t iconv_h = (iconv_t)-1;
+#ifdef B_ENDIAN
+	char ss[4096];	// FIXME: global MAX_BUF_SIZE macro need
+
+	swab(s->p, ss, uni_len);
+	pin = ss;
+#else
+	pin = s->p;
+#endif
+
+	if (iconv_h == (iconv_t)-1)
+	{
+		if ((iconv_h = iconv_open(g_codepage, WINDOWS_CODEPAGE)) == (iconv_t)-1)
+		{
+			printf("rdp_in_unistr: iconv_open[%s -> %s] fail %d\n",
+				WINDOWS_CODEPAGE, g_codepage, (int)iconv_h);
+			return 0;
+		}
+	}
+
+	if (iconv(iconv_h, (ICONV_CONST char**)&pin, &ibl, &pout, &obl) == (size_t)-1)
+	{
+		iconv_close(iconv_h);
+		iconv_h = (iconv_t)-1;
+		printf("rdp_in_unistr: iconv fail, errno %d\n", errno);
+		return 0;
+	}
+	return pout - string;
+#else /* HAVE_ICONV undef */
 	int i = 0;
 
 	while (i < uni_len / 2)
@@ -169,6 +264,7 @@
 	}
 
 	return i - 1;
+#endif
 }
 
 
@@ -386,22 +482,22 @@
 rdp_enum_bmpcache2(void)
 {
 	STREAM s;
-	uint8 idlist[BMPCACHE2_NUM_PSTCELLS * sizeof(BITMAP_ID)];
-	uint32 nids, offset, count, flags;
+	HASH_KEY keylist[BMPCACHE2_NUM_PSTCELLS];
+	uint32 num_keys, offset, count, flags;
 
 	offset = 0;
-	nids = pstcache_enumerate(2, idlist);
+	num_keys = pstcache_enumerate(2, keylist);
 
-	while (offset < nids)
+	while (offset < num_keys)
 	{
-		count = MIN(nids - offset, 169);
+		count = MIN(num_keys - offset, 169);
 
-		s = rdp_init_data(24 + count * sizeof(BITMAP_ID));
+		s = rdp_init_data(24 + count * sizeof(HASH_KEY));
 
 		flags = 0;
 		if (offset == 0)
 			flags |= PDU_FLAG_FIRST;
-		if (nids - offset <= 169)
+		if (num_keys - offset <= 169)
 			flags |= PDU_FLAG_LAST;
 
 		/* header */
@@ -411,12 +507,12 @@
 		out_uint16_le(s, 0);
 		out_uint16_le(s, 0);
 		out_uint16_le(s, 0);
-		out_uint16_le(s, nids);
+		out_uint16_le(s, num_keys);
 		out_uint32_le(s, 0);
 		out_uint32_le(s, flags);
 
 		/* list */
-		out_uint8a(s, idlist + offset * sizeof(BITMAP_ID), count * sizeof(BITMAP_ID));
+		out_uint8a(s, keylist[offset], count * sizeof(HASH_KEY));
 
 		s_mark_end(s);
 		rdp_send_data(s, 0x2b);
@@ -495,19 +591,23 @@
 {
 	uint8 order_caps[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] = (g_bitmap_cache ? 1 : 0);	/* memblt */
+	order_caps[4] = 0;	/* triblt */
 	order_caps[8] = 1;	/* line */
 	order_caps[9] = 1;	/* line */
 	order_caps[10] = 1;	/* rect */
-	order_caps[11] = (g_desktop_save == False ? 0 : 1);	/* desksave */
+	order_caps[11] = (g_desktop_save ? 1 : 0);	/* desksave */
 	order_caps[13] = 1;	/* memblt */
 	order_caps[14] = 1;	/* triblt */
+	order_caps[20] = (g_polygon_ellipse_orders ? 1 : 0);	/* polygon */
+	order_caps[21] = (g_polygon_ellipse_orders ? 1 : 0);	/* polygon2 */
 	order_caps[22] = 1;	/* polyline */
+	order_caps[25] = (g_polygon_ellipse_orders ? 1 : 0);	/* ellipse */
+	order_caps[26] = (g_polygon_ellipse_orders ? 1 : 0);	/* ellipse2 */
 	order_caps[27] = 1;	/* text2 */
 	out_uint16_le(s, RDP_CAPSET_ORDER);
 	out_uint16_le(s, RDP_CAPLEN_ORDER);