mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix errors cause by previous merge (2361914)

This commit is contained in:
Jim Grandy 2013-08-08 09:21:40 -07:00
parent b7b3d9ef28
commit a308d2e25c
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libxrdp/xrdp_rdp.c
View File

@ -785,7 +785,7 @@ xrdp_rdp_send_demand_active(struct xrdp_rdp *self)
INPUT_FLAG_FASTPATH_INPUT2 0x0020 */ INPUT_FLAG_FASTPATH_INPUT2 0x0020 */
flags = 0x0001 | 0x0004; flags = 0x0001 | 0x0004;
if (self->client_info.use_fast_path & 2) if (self->client_info.use_fast_path & 2)
flags |= 0x0008 | 0x0020 flags |= 0x0008 | 0x0020;
out_uint16_le(s, flags); out_uint16_le(s, flags);
out_uint8s(s, 82); out_uint8s(s, 82);

2
sesman/chansrv/clipboard.c
View File

@ -277,6 +277,8 @@ static int g_num_formatIds = 0;
static int g_file_format_id = -1; static int g_file_format_id = -1;
static char g_last_atom_name[256] = "";
/*****************************************************************************/ /*****************************************************************************/
static char* APP_CC static char* APP_CC
get_atom_text(Atom atom) get_atom_text(Atom atom)

2
sesman/chansrv/rail.c
View File

@ -69,6 +69,8 @@ static Window g_focus_win = 0;
static int g_xrr_event_base = 0; /* non zero means we got extension */ static int g_xrr_event_base = 0; /* non zero means we got extension */
static Cursor g_default_cursor = 0;
/* used in valid field of struct rail_window_data */ /* used in valid field of struct rail_window_data */
#define RWD_X (1 << 0) #define RWD_X (1 << 0)
#define RWD_Y (1 << 1) #define RWD_Y (1 << 1)

1
xrdp/xrdp_wm.c
View File

@ -1545,7 +1545,6 @@ xrdp_wm_process_input_mouse(struct xrdp_wm *self, int device_flags,
} }
if (device_flags & 0x200) /* PTRFLAGS_WHEEL */ if (device_flags & 0x200) /* PTRFLAGS_WHEEL */
device_flags == 0x0278)
{ {
if (device_flags & 0x100) /* PTRFLAGS_WHEEL_NEGATIVE */ if (device_flags & 0x100) /* PTRFLAGS_WHEEL_NEGATIVE */
{ {