--- sourceforge.net/trunk/rdesktop/constants.h	2005/04/17 23:14:20	889
+++ sourceforge.net/trunk/rdesktop/constants.h	2008/07/11 03:51:23	1475
@@ -1,8 +1,8 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Miscellaneous protocol constants
-   Copyright (C) Matthew Chapman 1999-2005
-   
+   Copyright (C) Matthew Chapman 1999-2008
+
    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
@@ -62,6 +62,7 @@
 /* RDP secure transport constants */
 #define SEC_RANDOM_SIZE		32
 #define SEC_MODULUS_SIZE	64
+#define SEC_MAX_MODULUS_SIZE	256
 #define SEC_PADDING_SIZE	8
 #define SEC_EXPONENT_SIZE	4
 
@@ -69,6 +70,7 @@
 #define SEC_ENCRYPT		0x0008
 #define SEC_LOGON_INFO		0x0040
 #define SEC_LICENCE_NEG		0x0080
+#define SEC_REDIRECT_ENCRYPT	0x0C00
 
 #define SEC_TAG_SRV_INFO	0x0c01
 #define SEC_TAG_SRV_CRYPT	0x0c02
@@ -106,6 +108,7 @@
 {
 	RDP_PDU_DEMAND_ACTIVE = 1,
 	RDP_PDU_CONFIRM_ACTIVE = 3,
+	RDP_PDU_REDIRECT = 4,	/* MS Server 2003 Session Redirect */
 	RDP_PDU_DEACTIVATE = 6,
 	RDP_PDU_DATA = 7
 };
@@ -118,6 +121,7 @@
 	RDP_DATA_PDU_INPUT = 28,
 	RDP_DATA_PDU_SYNCHRONISE = 31,
 	RDP_DATA_PDU_BELL = 34,
+	RDP_DATA_PDU_CLIENT_WINDOW_STATUS = 35,
 	RDP_DATA_PDU_LOGON = 38,
 	RDP_DATA_PDU_FONT2 = 39,
 	RDP_DATA_PDU_KEYBOARD_INDICATORS = 41,
@@ -247,6 +251,9 @@
 #define RDP_CAPSET_COLCACHE	10
 #define RDP_CAPLEN_COLCACHE	0x08
 
+#define RDP_CAPSET_BRUSHCACHE	15
+#define RDP_CAPLEN_BRUSHCACHE	0x08
+
 #define RDP_CAPSET_BMPCACHE2	19
 #define RDP_CAPLEN_BMPCACHE2	0x28
 #define BMPCACHE2_FLAG_PERSIST	((uint32)1<<31)
@@ -308,8 +315,10 @@
 #define MASK_CHANGE_BIT(var, mask, active) (var = ((var & ~mask) | (active ? mask : 0)))
 
 /* Clipboard constants, "borrowed" from GCC system headers in 
-   the w32 cross compiler */
+   the w32 cross compiler
+   this is the CF_ set when WINVER is 0x0400 */
 
+#ifndef CF_TEXT
 #define CF_TEXT         1
 #define CF_BITMAP       2
 #define CF_METAFILEPICT 3
@@ -336,6 +345,7 @@
 #define CF_PRIVATELAST  767
 #define CF_GDIOBJFIRST  768
 #define CF_GDIOBJLAST   1023
+#endif
 
 /* Sound format constants */
 #define WAVE_FORMAT_PCM		1
@@ -350,28 +360,28 @@
 #define CHANNEL_OPTION_SHOW_PROTOCOL	0x00200000
 
 /* NT status codes for RDPDR */
-#define STATUS_SUCCESS			0x00000000
-#define STATUS_NOT_IMPLEMENTED          0x00000001
-#define STATUS_PENDING                  0x00000103
-
-#define STATUS_NO_MORE_FILES            0x80000006
-#define STATUS_DEVICE_PAPER_EMPTY       0x8000000e
-#define STATUS_DEVICE_POWERED_OFF       0x8000000f
-#define STATUS_DEVICE_OFF_LINE          0x80000010
-#define STATUS_DEVICE_BUSY              0x80000011
-
-#define STATUS_INVALID_HANDLE           0xc0000008
-#define STATUS_INVALID_PARAMETER	0xc000000d
-#define STATUS_NO_SUCH_FILE             0xc000000f
-#define STATUS_INVALID_DEVICE_REQUEST	0xc0000010
-#define STATUS_ACCESS_DENIED		0xc0000022
-#define STATUS_OBJECT_NAME_COLLISION    0xc0000035
-#define STATUS_DISK_FULL                0xc000007f
-#define STATUS_FILE_IS_A_DIRECTORY      0xc00000ba
-#define STATUS_NOT_SUPPORTED            0xc00000bb
-#define STATUS_TIMEOUT                  0xc0000102
-#define STATUS_NOTIFY_ENUM_DIR          0xc000010c
-#define STATUS_CANCELLED                0xc0000120
+#define RD_STATUS_SUCCESS                  0x00000000
+#define RD_STATUS_NOT_IMPLEMENTED          0x00000001
+#define RD_STATUS_PENDING                  0x00000103
+
+#define RD_STATUS_NO_MORE_FILES            0x80000006
+#define RD_STATUS_DEVICE_PAPER_EMPTY       0x8000000e
+#define RD_STATUS_DEVICE_POWERED_OFF       0x8000000f
+#define RD_STATUS_DEVICE_OFF_LINE          0x80000010
+#define RD_STATUS_DEVICE_BUSY              0x80000011
+
+#define RD_STATUS_INVALID_HANDLE           0xc0000008
+#define RD_STATUS_INVALID_PARAMETER        0xc000000d
+#define RD_STATUS_NO_SUCH_FILE             0xc000000f
+#define RD_STATUS_INVALID_DEVICE_REQUEST   0xc0000010
+#define RD_STATUS_ACCESS_DENIED            0xc0000022
+#define RD_STATUS_OBJECT_NAME_COLLISION    0xc0000035
+#define RD_STATUS_DISK_FULL                0xc000007f
+#define RD_STATUS_FILE_IS_A_DIRECTORY      0xc00000ba
+#define RD_STATUS_NOT_SUPPORTED            0xc00000bb
+#define RD_STATUS_TIMEOUT                  0xc0000102
+#define RD_STATUS_NOTIFY_ENUM_DIR          0xc000010c
+#define RD_STATUS_CANCELLED                0xc0000120
 
 
 /* RDPDR constants */
@@ -409,3 +419,23 @@
 #define exDiscReasonLicenseErrClientEncryption		0x0108
 #define exDiscReasonLicenseCantUpgradeLicense		0x0109
 #define exDiscReasonLicenseNoRemoteConnections		0x010a
+
+/* SeamlessRDP constants */
+#define SEAMLESSRDP_NOTYETMAPPED -1
+#define SEAMLESSRDP_NORMAL 0
+#define SEAMLESSRDP_MINIMIZED 1
+#define SEAMLESSRDP_MAXIMIZED 2
+#define SEAMLESSRDP_POSITION_TIMER 200000
+
+#define SEAMLESSRDP_CREATE_MODAL	0x0001
+#define SEAMLESSRDP_CREATE_TOPMOST	0x0002
+
+#define SEAMLESSRDP_HELLO_RECONNECT	0x0001
+#define SEAMLESSRDP_HELLO_HIDDEN	0x0002
+
+/* Smartcard constants */
+#define SCARD_LOCK_TCP		0
+#define SCARD_LOCK_SEC		1
+#define SCARD_LOCK_CHANNEL	2
+#define SCARD_LOCK_RDPDR	3
+#define SCARD_LOCK_LAST		4