Attachment #187989 for bug #223512

Lines 1-7 Link Here

(-)net/xrdp-devel/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1500361123	1	TIMESTAMP = 1510103629
2	SHA256 (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 36f096d013b2cf09324cc1bf9c27caadc733001f2bcbe24e67f93233260afe5b	2	SHA256 (xrdp/neutrinolabs-xrdp-v0.9.4_GH0.tar.gz) = 962d9d14b9062654e4adc1c9aa1b1bd89d3707e57f20ef0c1b6e619dd025c5df
3	SIZE (xrdp/neutrinolabs-xrdp-v0.9.3_GH0.tar.gz) = 1866654	3	SIZE (xrdp/neutrinolabs-xrdp-v0.9.4_GH0.tar.gz) = 1868159
4	SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = f4aa7f4247a42f6f5e49fc56eb70589a1d26cae7c8d5d4e32f75200d5c473a42	4	SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.3_GH0.tar.gz) = 9a4612691d35431b17d2f8059e7be1cabbedd4823f84608e80ca64fdc869f272
5	SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.2_GH0.tar.gz) = 46139	5	SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.3_GH0.tar.gz) = 46782
6	SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6	6	SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
7	SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929	7	SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929

Lines 1-6 Link Here

(-)net/xrdp-devel/files/patch-configure.ac (-2 / +2 lines)
1	--- configure.ac.orig 2017-07-14 12:22:02 UTC	1	--- configure.ac.orig 2017-09-28 02:25:19 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -152,11 +152,35 @@ AC_CHECK_FUNC(dlopen, [],	3	@@ -156,11 +156,35 @@ AC_CHECK_FUNC(dlopen, [],
4	AC_SUBST(DLOPEN_LIBS)	4	AC_SUBST(DLOPEN_LIBS)
5		5
6	# checking for openssl	6	# checking for openssl




--- common/xrdp_constants.h.orig	2017-09-28 02:25:19 UTC
+++ common/xrdp_constants.h
@@ -189,13 +189,21 @@
 #define RDP_KEYPRESS                   0
 #define RDP_KEYRELEASE                 (KBD_FLAG_DOWN | KBD_FLAG_UP)
 
-#define MOUSE_FLAG_MOVE                0x0800
-#define MOUSE_FLAG_BUTTON1             0x1000
-#define MOUSE_FLAG_BUTTON2             0x2000
-#define MOUSE_FLAG_BUTTON3             0x4000
-#define MOUSE_FLAG_BUTTON4             0x0280
-#define MOUSE_FLAG_BUTTON5             0x0380
-#define MOUSE_FLAG_DOWN                0x8000
+/* Mouse Event (MS-RDPBCGR 2.2.8.1.1.3.1.1.3) */
+#define PTRFLAGS_HWHEEL                0x0400
+#define PTRFLAGS_WHEEL                 0x0200
+#define PTRFLAGS_WHEEL_NEGATIVE        0x0100
+#define WheelRotationMask              0x01FF
+#define PTRFLAGS_MOVE                  0x0800
+#define PTRFLAGS_DOWN                  0x8000
+#define PTRFLAGS_BUTTON1               0x1000
+#define PTRFLAGS_BUTTON2               0x2000
+#define PTRFLAGS_BUTTON3               0x4000
+
+/* Mouse Event (MS-RDPBCGR 2.2.8.1.1.3.1.1.4) */
+#define PTRXFLAGS_DOWN                 0x8000
+#define PTRXFLAGS_BUTTON1              0x0001
+#define PTRXFLAGS_BUTTON2              0x0002
 
 /* Raster operation masks */
 #define ROP2_S(rop3)                   (rop3 & 0xf)
@@ -594,11 +602,16 @@
 #define  SOLIDPATTERNBRUSHONLY         0x0040
 #define  ORDERFLAGS_EXTRA_FLAGS        0x0080
 
-#define  INPUT_FLAG_SCANCODES       0x0001
-#define  INPUT_FLAG_MOUSEX          0x0004
-#define  INPUT_FLAG_FASTPATH_INPUT  0x0008
-#define  INPUT_FLAG_UNICODE         0x0010
-#define  INPUT_FLAG_FASTPATH_INPUT2 0x0020
+/* Input Capability Set (MS-RDPBCGR 2.2.7.1.6) */
+#define  INPUT_FLAG_SCANCODES          0x0001
+#define  INPUT_FLAG_MOUSEX             0x0004
+#define  INPUT_FLAG_FASTPATH_INPUT     0x0008
+#define  INPUT_FLAG_UNICODE            0x0010
+#define  INPUT_FLAG_FASTPATH_INPUT2    0x0020
+#define  INPUT_FLAG_UNUSED1            0x0040
+#define  INPUT_FLAG_UNUSED2            0x0080
+#define  TS_INPUT_FLAG_MOUSE_HWHEEL    0x0100
+#define  TS_INPUT_FLAG_QOE_TIMESTAMPS  0x0200
 
 #define  COMPDESK_NOT_SUPPORTED      0x0000
 #define  COMPDESK_SUPPORTED          0x0001
--- libxrdp/xrdp_caps.c.orig	2017-09-28 02:25:19 UTC
+++ libxrdp/xrdp_caps.c
@@ -924,7 +924,11 @@ xrdp_caps_send_demand_active(struct xrdp
     out_uint16_le(s, RDP_CAPSET_INPUT); /* 13(0xd) */
     out_uint16_le(s, RDP_CAPLEN_INPUT); /* 88(0x58) */
 
-    flags = INPUT_FLAG_SCANCODES | INPUT_FLAG_MOUSEX | INPUT_FLAG_UNICODE;
+    flags = INPUT_FLAG_SCANCODES |
+            INPUT_FLAG_MOUSEX    |
+            INPUT_FLAG_UNICODE   |
+            TS_INPUT_FLAG_MOUSE_HWHEEL;
+
     if (self->client_info.use_fast_path & 2)
     {
         flags |= INPUT_FLAG_FASTPATH_INPUT | INPUT_FLAG_FASTPATH_INPUT2;
--- xrdp/xrdp_wm.c.orig	2017-09-28 02:25:19 UTC
+++ xrdp/xrdp_wm.c
@@ -1264,6 +1264,8 @@ xrdp_wm_mouse_click(struct xrdp_wm *self
                     self->mm->mod->mod_event(self->mm->mod, WM_BUTTON3UP, x, y, 0, 0);
                 }
 
+                /* vertical scroll */
+
                 if (but == 4)
                 {
                     self->mm->mod->mod_event(self->mm->mod, WM_BUTTON4DOWN,
@@ -1279,21 +1281,23 @@ xrdp_wm_mouse_click(struct xrdp_wm *self
                     self->mm->mod->mod_event(self->mm->mod, WM_BUTTON5UP,
                                              self->mouse_x, self->mouse_y, 0, 0);
                 }
-                if (but == 6 && down)
-                {
-                    self->mm->mod->mod_event(self->mm->mod, WM_BUTTON6DOWN, x, y, 0, 0);
-                }
-                else if (but == 6 && !down)
-                {
-                    self->mm->mod->mod_event(self->mm->mod, WM_BUTTON6UP, x, y, 0, 0);
-                }
-                if (but == 7 && down)
+
+                /* horizontal scroll */
+
+                if (but == 6)
                 {
-                    self->mm->mod->mod_event(self->mm->mod, WM_BUTTON7DOWN, x, y, 0, 0);
+                    self->mm->mod->mod_event(self->mm->mod, WM_BUTTON6DOWN,
+                                             self->mouse_x, self->mouse_y, 0, 0);
+                    self->mm->mod->mod_event(self->mm->mod, WM_BUTTON6UP,
+                                             self->mouse_x, self->mouse_y, 0, 0);
                 }
-                else if (but == 7 && !down)
+
+                if (but == 7)
                 {
-                    self->mm->mod->mod_event(self->mm->mod, WM_BUTTON7UP, x, y, 0, 0);
+                    self->mm->mod->mod_event(self->mm->mod, WM_BUTTON7DOWN,
+                                             self->mouse_x, self->mouse_y, 0, 0);
+                    self->mm->mod->mod_event(self->mm->mod, WM_BUTTON7UP,
+                                             self->mouse_x, self->mouse_y, 0, 0);
                 }
             }
         }
@@ -1638,14 +1642,14 @@ xrdp_wm_process_input_mouse(struct xrdp_
 {
     DEBUG(("mouse event flags %4.4x x %d y %d", device_flags, x, y));
 
-    if (device_flags & MOUSE_FLAG_MOVE) /* 0x0800 */
+    if (device_flags & PTRFLAGS_MOVE)
     {
         xrdp_wm_mouse_move(self, x, y);
     }
 
-    if (device_flags & MOUSE_FLAG_BUTTON1) /* 0x1000 */
+    if (device_flags & PTRFLAGS_BUTTON1)
     {
-        if (device_flags & MOUSE_FLAG_DOWN) /* 0x8000 */
+        if (device_flags & PTRFLAGS_DOWN)
         {
             xrdp_wm_mouse_click(self, x, y, 1, 1);
         }
@@ -1655,9 +1659,9 @@ xrdp_wm_process_input_mouse(struct xrdp_
         }
     }
 
-    if (device_flags & MOUSE_FLAG_BUTTON2) /* 0x2000 */
+    if (device_flags & PTRFLAGS_BUTTON2)
     {
-        if (device_flags & MOUSE_FLAG_DOWN) /* 0x8000 */
+        if (device_flags & PTRFLAGS_DOWN)
         {
             xrdp_wm_mouse_click(self, x, y, 2, 1);
         }
@@ -1667,9 +1671,9 @@ xrdp_wm_process_input_mouse(struct xrdp_
         }
     }
 
-    if (device_flags & MOUSE_FLAG_BUTTON3) /* 0x4000 */
+    if (device_flags & PTRFLAGS_BUTTON3)
     {
-        if (device_flags & MOUSE_FLAG_DOWN) /* 0x8000 */
+        if (device_flags & PTRFLAGS_DOWN)
         {
             xrdp_wm_mouse_click(self, x, y, 3, 1);
         }
@@ -1679,9 +1683,10 @@ xrdp_wm_process_input_mouse(struct xrdp_
         }
     }
 
-    if (device_flags & 0x200) /* PTRFLAGS_WHEEL */
+    /* vertical mouse wheel */
+    if (device_flags & PTRFLAGS_WHEEL)
     {
-        if (device_flags & 0x100) /* PTRFLAGS_WHEEL_NEGATIVE */
+        if (device_flags & PTRFLAGS_WHEEL_NEGATIVE)
         {
             xrdp_wm_mouse_click(self, 0, 0, 5, 0);
         }
@@ -1691,6 +1696,24 @@ xrdp_wm_process_input_mouse(struct xrdp_
         }
     }
 
+    /* horizontal mouse wheel */
+
+    /**
+     * As mstsc does MOUSE not MOUSEX for horizontal scrolling,
+     * PTRFLAGS_HWHEEL must be handled here.
+     */
+    if (device_flags & PTRFLAGS_HWHEEL)
+    {
+        if (device_flags & PTRFLAGS_WHEEL_NEGATIVE)
+        {
+            xrdp_wm_mouse_click(self, 0, 0, 6, 0);
+        }
+        else
+        {
+            xrdp_wm_mouse_click(self, 0, 0, 7, 0);
+        }
+    }
+
     return 0;
 }
 
@@ -1699,24 +1722,24 @@ static int
 xrdp_wm_process_input_mousex(struct xrdp_wm* self, int device_flags,
                              int x, int y)
 {
-    if (device_flags & 0x8000) /* PTRXFLAGS_DOWN */
+    if (device_flags & PTRXFLAGS_DOWN)
     {
-        if (device_flags & 0x0001) /* PTRXFLAGS_BUTTON1 */
+        if (device_flags & PTRXFLAGS_BUTTON1)
         {
             xrdp_wm_mouse_click(self, x, y, 6, 1);
         }
-        else if (device_flags & 0x0002) /* PTRXFLAGS_BUTTON2 */
+        else if (device_flags & PTRXFLAGS_BUTTON2)
         {
             xrdp_wm_mouse_click(self, x, y, 7, 1);
         }
     }
     else
     {
-        if (device_flags & 0x0001) /* PTRXFLAGS_BUTTON1 */
+        if (device_flags & PTRXFLAGS_BUTTON1)
         {
             xrdp_wm_mouse_click(self, x, y, 6, 0);
         }
-        else if (device_flags & 0x0002) /* PTRXFLAGS_BUTTON2 */
+        else if (device_flags & PTRXFLAGS_BUTTON2)
         {
             xrdp_wm_mouse_click(self, x, y, 7, 0);
         }




--- sesman/chansrv/sound.c.orig	2017-09-28 02:25:19 UTC
+++ sesman/chansrv/sound.c
@@ -400,19 +400,16 @@ sound_process_output_format(int aindex, 
             LOG(0, ("wFormatTag, fdk aac"));
             g_client_does_fdk_aac = 1;
             g_client_fdk_aac_index = aindex;
-            g_bbuf_size = 4096;
             break;
         case WAVE_FORMAT_MPEGLAYER3:
             LOG(0, ("wFormatTag, mp3"));
             g_client_does_mp3lame = 1;
             g_client_mp3lame_index = aindex;
-            g_bbuf_size = 11520;
             break;
         case WAVE_FORMAT_OPUS:
             LOG(0, ("wFormatTag, opus"));
             g_client_does_opus = 1;
             g_client_opus_index = aindex;
-            g_bbuf_size = 11520;
             break;
     }
 
@@ -840,14 +837,17 @@ sound_wave_compress(char *data, int data
 {
     if (g_client_does_fdk_aac)
     {
+        g_bbuf_size = 4096;
         return sound_wave_compress_fdk_aac(data, data_bytes, format_index);
     }
     else if (g_client_does_opus)
     {
+        g_bbuf_size = 11520;
         return sound_wave_compress_opus(data, data_bytes, format_index);
     }
     else if (g_client_does_mp3lame)
     {
+        g_bbuf_size = 11520;
         return sound_wave_compress_mp3lame(data, data_bytes, format_index);
     }
     return data_bytes;




--- sesman/chansrv/sound.c.orig	2017-09-28 02:25:19 UTC
+++ sesman/chansrv/sound.c
@@ -400,19 +400,16 @@ sound_process_output_format(int aindex, 
             LOG(0, ("wFormatTag, fdk aac"));
             g_client_does_fdk_aac = 1;
             g_client_fdk_aac_index = aindex;
-            g_bbuf_size = 4096;
             break;
         case WAVE_FORMAT_MPEGLAYER3:
             LOG(0, ("wFormatTag, mp3"));
             g_client_does_mp3lame = 1;
             g_client_mp3lame_index = aindex;
-            g_bbuf_size = 11520;
             break;
         case WAVE_FORMAT_OPUS:
             LOG(0, ("wFormatTag, opus"));
             g_client_does_opus = 1;
             g_client_opus_index = aindex;
-            g_bbuf_size = 11520;
             break;
     }
 
@@ -840,14 +837,17 @@ sound_wave_compress(char *data, int data
 {
     if (g_client_does_fdk_aac)
     {
+        g_bbuf_size = 4096;
         return sound_wave_compress_fdk_aac(data, data_bytes, format_index);
     }
     else if (g_client_does_opus)
     {
+        g_bbuf_size = 11520;
         return sound_wave_compress_opus(data, data_bytes, format_index);
     }
     else if (g_client_does_mp3lame)
     {
+        g_bbuf_size = 11520;
         return sound_wave_compress_mp3lame(data, data_bytes, format_index);
     }
     return data_bytes;

Lines 2-8 Link Here

(-)net/xrdp-devel/Makefile (-5 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xrdp	4	PORTNAME= xrdp
5	PORTVERSION= 0.9.3	5	PORTVERSION= 0.9.4
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= net	8	CATEGORIES= net
Lines 27-33 Link Here
27	USE_GITHUB= yes	27	USE_GITHUB= yes
28	GH_ACCOUNT= neutrinolabs	28	GH_ACCOUNT= neutrinolabs
29	GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter	29	GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter
30	GH_TAGNAME= v0.1.2:librfxcodec v0.1.1:libpainter	30	GH_TAGNAME= v0.1.3:librfxcodec v0.1.1:libpainter
31		31
32	CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \	32	CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \
33	--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \	33	--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
Lines 39-54 Link Here
39	SUB_FILES= pkg-install pkg-message	39	SUB_FILES= pkg-install pkg-message
40	SUB_LIST= OPENSSLBASE=${OPENSSLBASE}	40	SUB_LIST= OPENSSLBASE=${OPENSSLBASE}
41		41
42	OPTIONS_DEFINE= DEBUG FUSE IPV6 MP3LAME OPUS	42	OPTIONS_DEFINE= DEBUG FUSE IPV6
43	OPTIONS_DEFAULT= OPUS MP3LAME	43	OPTIONS_DEFAULT= FDKAAC MP3LAME OPUS
		44	OPTIONS_GROUP= AUDIO_CODEC
		45	OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS
		46	FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection
44	FUSE_DESC= Enable drive redirection via FUSE (experimental)	47	FUSE_DESC= Enable drive redirection via FUSE (experimental)
45	MP3LAME_DESC= Enable MP3 Lame for audio redirection	48	MP3LAME_DESC= Enable MP3 Lame for audio redirection
46	OPUS_DESC= Enable Opus for audio redirection	49	OPUS_DESC= Enable Opus for audio redirection
47		50
48	IPV6_CONFIGURE_ENABLE= ipv6
49	DEBUG_CONFIGURE_ENABLE= xrdpdebug	51	DEBUG_CONFIGURE_ENABLE= xrdpdebug
		52	FDKAAC_CONFIGURE_ENABLE= fdkaac
		53	FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac
50	FUSE_CONFIGURE_ENABLE= fuse	54	FUSE_CONFIGURE_ENABLE= fuse
51	FUSE_USES= fuse	55	FUSE_USES= fuse
		56	IPV6_CONFIGURE_ENABLE= ipv6
52	MP3LAME_CONFIGURE_ENABLE= mp3lame	57	MP3LAME_CONFIGURE_ENABLE= mp3lame
53	MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame	58	MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
54	OPUS_CONFIGURE_ENABLE= opus	59	OPUS_CONFIGURE_ENABLE= opus

Return to bug 223512

Line 0 Link Here

(-)net/xrdp-devel/files/patch-issue-730 (+225 lines)
		1	--- common/xrdp_constants.h.orig 2017-09-28 02:25:19 UTC
		2	+++ common/xrdp_constants.h
		3	@@ -189,13 +189,21 @@
		4	#define RDP_KEYPRESS 0
		5	#define RDP_KEYRELEASE (KBD_FLAG_DOWN \| KBD_FLAG_UP)
		6
		7	-#define MOUSE_FLAG_MOVE 0x0800
		8	-#define MOUSE_FLAG_BUTTON1 0x1000
		9	-#define MOUSE_FLAG_BUTTON2 0x2000
		10	-#define MOUSE_FLAG_BUTTON3 0x4000
		11	-#define MOUSE_FLAG_BUTTON4 0x0280
		12	-#define MOUSE_FLAG_BUTTON5 0x0380
		13	-#define MOUSE_FLAG_DOWN 0x8000
		14	+/* Mouse Event (MS-RDPBCGR 2.2.8.1.1.3.1.1.3) */
		15	+#define PTRFLAGS_HWHEEL 0x0400
		16	+#define PTRFLAGS_WHEEL 0x0200
		17	+#define PTRFLAGS_WHEEL_NEGATIVE 0x0100
		18	+#define WheelRotationMask 0x01FF
		19	+#define PTRFLAGS_MOVE 0x0800
		20	+#define PTRFLAGS_DOWN 0x8000
		21	+#define PTRFLAGS_BUTTON1 0x1000
		22	+#define PTRFLAGS_BUTTON2 0x2000
		23	+#define PTRFLAGS_BUTTON3 0x4000
		24	+
		25	+/* Mouse Event (MS-RDPBCGR 2.2.8.1.1.3.1.1.4) */
		26	+#define PTRXFLAGS_DOWN 0x8000
		27	+#define PTRXFLAGS_BUTTON1 0x0001
		28	+#define PTRXFLAGS_BUTTON2 0x0002
		29
		30	/* Raster operation masks */
		31	#define ROP2_S(rop3) (rop3 & 0xf)
		32	@@ -594,11 +602,16 @@
		33	#define SOLIDPATTERNBRUSHONLY 0x0040
		34	#define ORDERFLAGS_EXTRA_FLAGS 0x0080
		35
		36	-#define INPUT_FLAG_SCANCODES 0x0001
		37	-#define INPUT_FLAG_MOUSEX 0x0004
		38	-#define INPUT_FLAG_FASTPATH_INPUT 0x0008
		39	-#define INPUT_FLAG_UNICODE 0x0010
		40	-#define INPUT_FLAG_FASTPATH_INPUT2 0x0020
		41	+/* Input Capability Set (MS-RDPBCGR 2.2.7.1.6) */
		42	+#define INPUT_FLAG_SCANCODES 0x0001
		43	+#define INPUT_FLAG_MOUSEX 0x0004
		44	+#define INPUT_FLAG_FASTPATH_INPUT 0x0008
		45	+#define INPUT_FLAG_UNICODE 0x0010
		46	+#define INPUT_FLAG_FASTPATH_INPUT2 0x0020
		47	+#define INPUT_FLAG_UNUSED1 0x0040
		48	+#define INPUT_FLAG_UNUSED2 0x0080
		49	+#define TS_INPUT_FLAG_MOUSE_HWHEEL 0x0100
		50	+#define TS_INPUT_FLAG_QOE_TIMESTAMPS 0x0200
		51
		52	#define COMPDESK_NOT_SUPPORTED 0x0000
		53	#define COMPDESK_SUPPORTED 0x0001
		54	--- libxrdp/xrdp_caps.c.orig 2017-09-28 02:25:19 UTC
		55	+++ libxrdp/xrdp_caps.c
		56	@@ -924,7 +924,11 @@ xrdp_caps_send_demand_active(struct xrdp
		57	out_uint16_le(s, RDP_CAPSET_INPUT); /* 13(0xd) */
		58	out_uint16_le(s, RDP_CAPLEN_INPUT); /* 88(0x58) */
		59
		60	- flags = INPUT_FLAG_SCANCODES \| INPUT_FLAG_MOUSEX \| INPUT_FLAG_UNICODE;
		61	+ flags = INPUT_FLAG_SCANCODES \|
		62	+ INPUT_FLAG_MOUSEX \|
		63	+ INPUT_FLAG_UNICODE \|
		64	+ TS_INPUT_FLAG_MOUSE_HWHEEL;
65	+
66	if (self->client_info.use_fast_path & 2)
67	{
68	flags \|= INPUT_FLAG_FASTPATH_INPUT \| INPUT_FLAG_FASTPATH_INPUT2;
69	--- xrdp/xrdp_wm.c.orig 2017-09-28 02:25:19 UTC
70	+++ xrdp/xrdp_wm.c
71	@@ -1264,6 +1264,8 @@ xrdp_wm_mouse_click(struct xrdp_wm *self
72	self->mm->mod->mod_event(self->mm->mod, WM_BUTTON3UP, x, y, 0, 0);
73	}
74
75	+ /* vertical scroll */
76	+
77	if (but == 4)
78	{
79	self->mm->mod->mod_event(self->mm->mod, WM_BUTTON4DOWN,
80	@@ -1279,21 +1281,23 @@ xrdp_wm_mouse_click(struct xrdp_wm *self
81	self->mm->mod->mod_event(self->mm->mod, WM_BUTTON5UP,
82	self->mouse_x, self->mouse_y, 0, 0);
83	}
84	- if (but == 6 && down)
85	- {
86	- self->mm->mod->mod_event(self->mm->mod, WM_BUTTON6DOWN, x, y, 0, 0);
87	- }
88	- else if (but == 6 && !down)
89	- {
90	- self->mm->mod->mod_event(self->mm->mod, WM_BUTTON6UP, x, y, 0, 0);
91	- }
92	- if (but == 7 && down)
93	+
94	+ /* horizontal scroll */
95	+
96	+ if (but == 6)
97	{
98	- self->mm->mod->mod_event(self->mm->mod, WM_BUTTON7DOWN, x, y, 0, 0);
99	+ self->mm->mod->mod_event(self->mm->mod, WM_BUTTON6DOWN,
100	+ self->mouse_x, self->mouse_y, 0, 0);
101	+ self->mm->mod->mod_event(self->mm->mod, WM_BUTTON6UP,
102	+ self->mouse_x, self->mouse_y, 0, 0);
103	}
104	- else if (but == 7 && !down)
105	+
106	+ if (but == 7)
107	{
108	- self->mm->mod->mod_event(self->mm->mod, WM_BUTTON7UP, x, y, 0, 0);
109	+ self->mm->mod->mod_event(self->mm->mod, WM_BUTTON7DOWN,
110	+ self->mouse_x, self->mouse_y, 0, 0);
111	+ self->mm->mod->mod_event(self->mm->mod, WM_BUTTON7UP,
112	+ self->mouse_x, self->mouse_y, 0, 0);
113	}
114	}
115	}
116	@@ -1638,14 +1642,14 @@ xrdp_wm_process_input_mouse(struct xrdp_
117	{
118	DEBUG(("mouse event flags %4.4x x %d y %d", device_flags, x, y));
119
120	- if (device_flags & MOUSE_FLAG_MOVE) /* 0x0800 */
121	+ if (device_flags & PTRFLAGS_MOVE)
122	{
123	xrdp_wm_mouse_move(self, x, y);
124	}
125
126	- if (device_flags & MOUSE_FLAG_BUTTON1) /* 0x1000 */
127	+ if (device_flags & PTRFLAGS_BUTTON1)
128	{
129	- if (device_flags & MOUSE_FLAG_DOWN) /* 0x8000 */
130	+ if (device_flags & PTRFLAGS_DOWN)
131	{
132	xrdp_wm_mouse_click(self, x, y, 1, 1);
133	}
134	@@ -1655,9 +1659,9 @@ xrdp_wm_process_input_mouse(struct xrdp_
135	}
136	}
137
138	- if (device_flags & MOUSE_FLAG_BUTTON2) /* 0x2000 */
139	+ if (device_flags & PTRFLAGS_BUTTON2)
140	{
141	- if (device_flags & MOUSE_FLAG_DOWN) /* 0x8000 */
142	+ if (device_flags & PTRFLAGS_DOWN)
143	{
144	xrdp_wm_mouse_click(self, x, y, 2, 1);
145	}
146	@@ -1667,9 +1671,9 @@ xrdp_wm_process_input_mouse(struct xrdp_
147	}
148	}
149
150	- if (device_flags & MOUSE_FLAG_BUTTON3) /* 0x4000 */
151	+ if (device_flags & PTRFLAGS_BUTTON3)
152	{
153	- if (device_flags & MOUSE_FLAG_DOWN) /* 0x8000 */
154	+ if (device_flags & PTRFLAGS_DOWN)
155	{
156	xrdp_wm_mouse_click(self, x, y, 3, 1);
157	}
158	@@ -1679,9 +1683,10 @@ xrdp_wm_process_input_mouse(struct xrdp_
159	}
160	}
161
162	- if (device_flags & 0x200) /* PTRFLAGS_WHEEL */
163	+ /* vertical mouse wheel */
164	+ if (device_flags & PTRFLAGS_WHEEL)
165	{
166	- if (device_flags & 0x100) /* PTRFLAGS_WHEEL_NEGATIVE */
167	+ if (device_flags & PTRFLAGS_WHEEL_NEGATIVE)
168	{
169	xrdp_wm_mouse_click(self, 0, 0, 5, 0);
170	}
171	@@ -1691,6 +1696,24 @@ xrdp_wm_process_input_mouse(struct xrdp_
172	}
173	}
174
175	+ /* horizontal mouse wheel */
176	+
177	+ /**
178	+ * As mstsc does MOUSE not MOUSEX for horizontal scrolling,
179	+ * PTRFLAGS_HWHEEL must be handled here.
180	+ */
181	+ if (device_flags & PTRFLAGS_HWHEEL)
182	+ {
183	+ if (device_flags & PTRFLAGS_WHEEL_NEGATIVE)
184	+ {
185	+ xrdp_wm_mouse_click(self, 0, 0, 6, 0);
186	+ }
187	+ else
188	+ {
189	+ xrdp_wm_mouse_click(self, 0, 0, 7, 0);
190	+ }
191	+ }
192	+
193	return 0;
194	}
195
196	@@ -1699,24 +1722,24 @@ static int
197	xrdp_wm_process_input_mousex(struct xrdp_wm* self, int device_flags,
198	int x, int y)
199	{
200	- if (device_flags & 0x8000) /* PTRXFLAGS_DOWN */
201	+ if (device_flags & PTRXFLAGS_DOWN)
202	{
203	- if (device_flags & 0x0001) /* PTRXFLAGS_BUTTON1 */
204	+ if (device_flags & PTRXFLAGS_BUTTON1)
205	{
206	xrdp_wm_mouse_click(self, x, y, 6, 1);
207	}
208	- else if (device_flags & 0x0002) /* PTRXFLAGS_BUTTON2 */
209	+ else if (device_flags & PTRXFLAGS_BUTTON2)
210	{
211	xrdp_wm_mouse_click(self, x, y, 7, 1);
212	}
213	}
214	else
215	{
216	- if (device_flags & 0x0001) /* PTRXFLAGS_BUTTON1 */
217	+ if (device_flags & PTRXFLAGS_BUTTON1)
218	{
219	xrdp_wm_mouse_click(self, x, y, 6, 0);
220	}
221	- else if (device_flags & 0x0002) /* PTRXFLAGS_BUTTON2 */
222	+ else if (device_flags & PTRXFLAGS_BUTTON2)
223	{
224	xrdp_wm_mouse_click(self, x, y, 7, 0);
225	}

Line 0 Link Here

(-)net/xrdp-devel/files/patch-issue-910 (+40 lines)
	1	--- sesman/chansrv/sound.c.orig 2017-09-28 02:25:19 UTC
	2	+++ sesman/chansrv/sound.c
	3	@@ -400,19 +400,16 @@ sound_process_output_format(int aindex,
	4	LOG(0, ("wFormatTag, fdk aac"));
	5	g_client_does_fdk_aac = 1;
	6	g_client_fdk_aac_index = aindex;
	7	- g_bbuf_size = 4096;
	8	break;
	9	case WAVE_FORMAT_MPEGLAYER3:
	10	LOG(0, ("wFormatTag, mp3"));
	11	g_client_does_mp3lame = 1;
	12	g_client_mp3lame_index = aindex;
	13	- g_bbuf_size = 11520;
	14	break;
	15	case WAVE_FORMAT_OPUS:
	16	LOG(0, ("wFormatTag, opus"));
	17	g_client_does_opus = 1;
	18	g_client_opus_index = aindex;
	19	- g_bbuf_size = 11520;
	20	break;
	21	}
	22
	23	@@ -840,14 +837,17 @@ sound_wave_compress(char *data, int data
	24	{
	25	if (g_client_does_fdk_aac)
	26	{
	27	+ g_bbuf_size = 4096;
	28	return sound_wave_compress_fdk_aac(data, data_bytes, format_index);
	29	}
	30	else if (g_client_does_opus)
	31	{
	32	+ g_bbuf_size = 11520;
	33	return sound_wave_compress_opus(data, data_bytes, format_index);
	34	}
	35	else if (g_client_does_mp3lame)
	36	{
	37	+ g_bbuf_size = 11520;
	38	return sound_wave_compress_mp3lame(data, data_bytes, format_index);
	39	}
	40	return data_bytes;

Line 0 Link Here

(-)net/xrdp-devel/files/patch-sesman_chansrv_sound.c (+40 lines)
	1	--- sesman/chansrv/sound.c.orig 2017-09-28 02:25:19 UTC
	2	+++ sesman/chansrv/sound.c
	3	@@ -400,19 +400,16 @@ sound_process_output_format(int aindex,
	4	LOG(0, ("wFormatTag, fdk aac"));
	5	g_client_does_fdk_aac = 1;
	6	g_client_fdk_aac_index = aindex;
	7	- g_bbuf_size = 4096;
	8	break;
	9	case WAVE_FORMAT_MPEGLAYER3:
	10	LOG(0, ("wFormatTag, mp3"));
	11	g_client_does_mp3lame = 1;
	12	g_client_mp3lame_index = aindex;
	13	- g_bbuf_size = 11520;
	14	break;
	15	case WAVE_FORMAT_OPUS:
	16	LOG(0, ("wFormatTag, opus"));
	17	g_client_does_opus = 1;
	18	g_client_opus_index = aindex;
	19	- g_bbuf_size = 11520;
	20	break;
	21	}
	22
	23	@@ -840,14 +837,17 @@ sound_wave_compress(char *data, int data
	24	{
	25	if (g_client_does_fdk_aac)
	26	{
	27	+ g_bbuf_size = 4096;
	28	return sound_wave_compress_fdk_aac(data, data_bytes, format_index);
	29	}
	30	else if (g_client_does_opus)
	31	{
	32	+ g_bbuf_size = 11520;
	33	return sound_wave_compress_opus(data, data_bytes, format_index);
	34	}
	35	else if (g_client_does_mp3lame)
	36	{
	37	+ g_bbuf_size = 11520;
	38	return sound_wave_compress_mp3lame(data, data_bytes, format_index);
	39	}
	40	return data_bytes;