summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libxrdp/xrdp_rdp.c2
-rw-r--r--sesman/chansrv/clipboard.c2
-rw-r--r--sesman/chansrv/rail.c2
-rw-r--r--xrdp/xrdp_wm.c1
4 files changed, 5 insertions, 2 deletions
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c
index 45cb1db0..02a6b6fb 100644
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@@ -785,7 +785,7 @@ xrdp_rdp_send_demand_active(struct xrdp_rdp *self)
INPUT_FLAG_FASTPATH_INPUT2 0x0020 */
flags = 0x0001 | 0x0004;
if (self->client_info.use_fast_path & 2)
- flags |= 0x0008 | 0x0020
+ flags |= 0x0008 | 0x0020;
out_uint16_le(s, flags);
out_uint8s(s, 82);
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c
index 769fa814..b8a978a3 100644
--- a/sesman/chansrv/clipboard.c
+++ b/sesman/chansrv/clipboard.c
@@ -277,6 +277,8 @@ static int g_num_formatIds = 0;
static int g_file_format_id = -1;
+static char g_last_atom_name[256] = "";
+
/*****************************************************************************/
static char* APP_CC
get_atom_text(Atom atom)
diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c
index 10a67f07..3b8b2a0c 100644
--- a/sesman/chansrv/rail.c
+++ b/sesman/chansrv/rail.c
@@ -69,6 +69,8 @@ static Window g_focus_win = 0;
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 */
#define RWD_X (1 << 0)
#define RWD_Y (1 << 1)
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index ebe97d9d..caa74347 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -1545,7 +1545,6 @@ xrdp_wm_process_input_mouse(struct xrdp_wm *self, int device_flags,
}
if (device_flags & 0x200) /* PTRFLAGS_WHEEL */
- device_flags == 0x0278)
{
if (device_flags & 0x100) /* PTRFLAGS_WHEEL_NEGATIVE */
{