--- sourceforge.net/trunk/rdesktop/constants.h	2003/03/27 13:10:16	346
+++ sourceforge.net/trunk/rdesktop/constants.h	2003/06/06 10:40:14	404
@@ -54,6 +54,7 @@
 #define MCS_TAG_DOMAIN_PARAMS	0x30
 
 #define MCS_GLOBAL_CHANNEL	1003
+#define MCS_USERCHANNEL_BASE    1001
 
 /* RDP secure transport constants */
 #define SEC_RANDOM_SIZE		32
@@ -85,14 +86,14 @@
 #define LICENCE_HWID_SIZE	20
 #define LICENCE_SIGNATURE_SIZE	16
 
-#define LICENCE_TAG_DEMAND	0x0201
-#define LICENCE_TAG_AUTHREQ	0x0202
-#define LICENCE_TAG_ISSUE	0x0203
-#define LICENCE_TAG_REISSUE	0x0204
-#define LICENCE_TAG_PRESENT	0x0212
-#define LICENCE_TAG_REQUEST	0x0213
-#define LICENCE_TAG_AUTHRESP	0x0215
-#define LICENCE_TAG_RESULT	0x02ff
+#define LICENCE_TAG_DEMAND	0x01
+#define LICENCE_TAG_AUTHREQ	0x02
+#define LICENCE_TAG_ISSUE	0x03
+#define LICENCE_TAG_REISSUE	0x04
+#define LICENCE_TAG_PRESENT	0x12
+#define LICENCE_TAG_REQUEST	0x13
+#define LICENCE_TAG_AUTHRESP	0x15
+#define LICENCE_TAG_RESULT	0xff
 
 #define LICENCE_TAG_USER	0x000f
 #define LICENCE_TAG_HOST	0x0010
@@ -230,6 +231,7 @@
 /* Logon flags */
 #define RDP_LOGON_NORMAL	0x33
 #define RDP_LOGON_AUTO		0x8
+#define RDP_LOGON_BLOB		0x100
 
 /* Keymap flags */
 #define MapRightShiftMask   (1<<0)
@@ -259,3 +261,45 @@
 #define MASK_REMOVE_BITS(var, mask) (var &= ~mask)
 #define MASK_HAS_BITS(var, mask) ((var & mask)>0)
 #define MASK_CHANGE_BIT(var, mask, active) (var = ((var & ~mask) | (active ? mask : 0)))
+
+/* RDP5 channel constants */
+#define MAX_RDP5_CHANNELS 10
+#define CHANNEL_TAGDATA_SIZE 12
+
+/* Clipboard constants, "borrowed" from GCC system headers in 
+   the w32 cross compiler */
+
+#define CF_TEXT         1
+#define CF_BITMAP       2
+#define CF_METAFILEPICT 3
+#define CF_SYLK         4
+#define CF_DIF          5
+#define CF_TIFF         6
+#define CF_OEMTEXT      7
+#define CF_DIB          8
+#define CF_PALETTE      9
+#define CF_PENDATA      10
+#define CF_RIFF         11
+#define CF_WAVE         12
+#define CF_UNICODETEXT  13
+#define CF_ENHMETAFILE  14
+#define CF_HDROP        15
+#define CF_LOCALE       16
+#define CF_MAX          17
+#define CF_OWNERDISPLAY 128
+#define CF_DSPTEXT      129
+#define CF_DSPBITMAP    130
+#define CF_DSPMETAFILEPICT      131
+#define CF_DSPENHMETAFILE       142
+#define CF_PRIVATEFIRST 512
+#define CF_PRIVATELAST  767
+#define CF_GDIOBJFIRST  768
+#define CF_GDIOBJLAST   1023
+
+#define NUM_TARGETS  6
+#define MAX_CLIPRDR_STANDALONE_DATASIZE 1592
+#define MAX_CLIPRDR_CONTINUATION_DATASIZE 1600
+
+#define RDESKTOP_IPC_VERSION 1
+#define RDESKTOP_IPC_CLIPRDR_FORMAT_ANNOUNCE 2
+#define RDESKTOP_IPC_CLIPRDR_PRIMARY_LOST 3