diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2012-07-17 10:05:26 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2012-07-17 10:05:26 -0700 |
| commit | b211b9be91a2775e31a0821d31d5e0a2ec942f60 (patch) | |
| tree | 6fa58e65650ab73987a37df3287870318c5fed6e | |
| parent | d8b8ca93b06be88836a491fa66b717272a090566 (diff) | |
| download | xrdp-proprietary-b211b9be91a2775e31a0821d31d5e0a2ec942f60.tar.gz xrdp-proprietary-b211b9be91a2775e31a0821d31d5e0a2ec942f60.zip | |
fix a define conflict with freerdp
| -rw-r--r-- | common/xrdp_constants.h | 17 | ||||
| -rw-r--r-- | libxrdp/xrdp_channel.c | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h index 035ba663..8de85cf0 100644 --- a/common/xrdp_constants.h +++ b/common/xrdp_constants.h @@ -323,16 +323,22 @@ #define CF_GDIOBJLAST 1023 /* Sound format constants */ -#define WAVE_FORMAT_PCM 1 +#define WAVE_FORMAT_PCM 1 #define WAVE_FORMAT_ADPCM 2 #define WAVE_FORMAT_ALAW 6 #define WAVE_FORMAT_MULAW 7 /* Virtual channel options */ -#define CHANNEL_OPTION_INITIALIZED 0x80000000 -#define CHANNEL_OPTION_ENCRYPT_RDP 0x40000000 -#define CHANNEL_OPTION_COMPRESS_RDP 0x00800000 -#define CHANNEL_OPTION_SHOW_PROTOCOL 0x00200000 +#define XR_CHANNEL_OPTION_SHOW_PROTOCOL 0x00200000 +#define XR_CHANNEL_OPTION_COMPRESS 0x00400000 +#define XR_CHANNEL_OPTION_COMPRESS_RDP 0x00800000 +#define XR_CHANNEL_OPTION_PRI_LOW 0x02000000 +#define XR_CHANNEL_OPTION_PRI_MED 0x04000000 +#define XR_CHANNEL_OPTION_PRI_HIGH 0x08000000 +#define XR_CHANNEL_OPTION_ENCRYPT_CS 0x10000000 +#define XR_CHANNEL_OPTION_ENCRYPT_SC 0x20000000 +#define XR_CHANNEL_OPTION_ENCRYPT_RDP 0x40000000 +#define XR_CHANNEL_OPTION_INITIALIZED 0x80000000 /* NT status codes for RDPDR */ #define STATUS_SUCCESS 0x00000000 @@ -417,6 +423,7 @@ #define RDP_ORDER_RAW_BMPCACHE2 4 #define RDP_ORDER_BMPCACHE2 5 #define RDP_ORDER_BRUSHCACHE 7 +#define RDP_ORDER_BMPCACHE3 8 /* drawable types */ #define WND_TYPE_BITMAP 0 diff --git a/libxrdp/xrdp_channel.c b/libxrdp/xrdp_channel.c index 092cefa4..2b3d23a5 100644 --- a/libxrdp/xrdp_channel.c +++ b/libxrdp/xrdp_channel.c @@ -95,19 +95,19 @@ xrdp_channel_send(struct xrdp_channel* self, struct stream* s, int channel_id, channel = xrdp_channel_get_item(self, channel_id); if (channel == NULL) { - g_writeln("xrdp_channel_send - no such channel"); + g_writeln("xrdp_channel_send - no such channel"); return 1; } s_pop_layer(s, channel_hdr); out_uint32_le(s, total_data_len); - if (channel->flags & CHANNEL_OPTION_SHOW_PROTOCOL) + if (channel->flags & XR_CHANNEL_OPTION_SHOW_PROTOCOL) { flags |= CHANNEL_FLAG_SHOW_PROTOCOL; } out_uint32_le(s, flags); if (xrdp_sec_send(self->sec_layer, s, channel->chanid) != 0) { - g_writeln("xrdp_channel_send - failure sending data"); + g_writeln("xrdp_channel_send - failure sending data"); return 1; } return 0; |