mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a define conflict with freerdp

Browse Source
This commit is contained in:
Jay Sorg 2012-07-17 10:05:26 -07:00
parent d8b8ca93b0
commit b211b9be91
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/xrdp_constants.h
View File

@ -323,16 +323,22 @@
#define CF_GDIOBJLAST 1023 #define CF_GDIOBJLAST 1023
/* Sound format constants */ /* Sound format constants */
#define WAVE_FORMAT_PCM 1 #define WAVE_FORMAT_PCM 1
#define WAVE_FORMAT_ADPCM 2 #define WAVE_FORMAT_ADPCM 2
#define WAVE_FORMAT_ALAW 6 #define WAVE_FORMAT_ALAW 6
#define WAVE_FORMAT_MULAW 7 #define WAVE_FORMAT_MULAW 7
/* Virtual channel options */ /* Virtual channel options */
#define CHANNEL_OPTION_INITIALIZED 0x80000000 #define XR_CHANNEL_OPTION_SHOW_PROTOCOL 0x00200000
#define CHANNEL_OPTION_ENCRYPT_RDP 0x40000000 #define XR_CHANNEL_OPTION_COMPRESS 0x00400000
#define CHANNEL_OPTION_COMPRESS_RDP 0x00800000 #define XR_CHANNEL_OPTION_COMPRESS_RDP 0x00800000
#define CHANNEL_OPTION_SHOW_PROTOCOL 0x00200000 #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 */ /* NT status codes for RDPDR */
#define STATUS_SUCCESS 0x00000000 #define STATUS_SUCCESS 0x00000000
@ -417,6 +423,7 @@
#define RDP_ORDER_RAW_BMPCACHE2 4 #define RDP_ORDER_RAW_BMPCACHE2 4
#define RDP_ORDER_BMPCACHE2 5 #define RDP_ORDER_BMPCACHE2 5
#define RDP_ORDER_BRUSHCACHE 7 #define RDP_ORDER_BRUSHCACHE 7
#define RDP_ORDER_BMPCACHE3 8
/* drawable types */ /* drawable types */
#define WND_TYPE_BITMAP 0 #define WND_TYPE_BITMAP 0

6
libxrdp/xrdp_channel.c
View File

@ -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); channel = xrdp_channel_get_item(self, channel_id);
if (channel == NULL) if (channel == NULL)
{ {
g_writeln("xrdp_channel_send - no such channel"); g_writeln("xrdp_channel_send - no such channel");
return 1; return 1;
} }
s_pop_layer(s, channel_hdr); s_pop_layer(s, channel_hdr);
out_uint32_le(s, total_data_len); 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; flags |= CHANNEL_FLAG_SHOW_PROTOCOL;
} }
out_uint32_le(s, flags); out_uint32_le(s, flags);
if (xrdp_sec_send(self->sec_layer, s, channel->chanid) != 0) 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 1;
} }
return 0; return 0;