Merge pull request #4288 from hardening/disp_channel

Disp channel changes and improvements
2017-12-05 10:56:14 +01:00 · 2017-12-05 10:56:14 +01:00 · ed9a4b7d45
commit ed9a4b7d45
parent 22c71c0034 1e48405d19
5 changed files with 104 additions and 62 deletions
--- a/channels/disp/client/disp_main.c
+++ b/channels/disp/client/disp_main.c
@ -176,8 +176,11 @@ UINT disp_send_display_control_monitor_layout_pdu(DISP_CHANNEL_CALLBACK* callbac
 UINT disp_recv_display_control_caps_pdu(DISP_CHANNEL_CALLBACK* callback, wStream* s)
 {
 	DISP_PLUGIN* disp;
+	DispClientContext *context;
+	UINT ret = CHANNEL_RC_OK;

 	disp = (DISP_PLUGIN*) callback->plugin;
+	context = (DispClientContext *)disp->iface.pInterface;

 	if (Stream_GetRemainingLength(s) < 12)
 	{
@ -188,10 +191,11 @@ UINT disp_recv_display_control_caps_pdu(DISP_CHANNEL_CALLBACK* callback, wStream
 	Stream_Read_UINT32(s, disp->MaxNumMonitors); /* MaxNumMonitors (4 bytes) */
 	Stream_Read_UINT32(s, disp->MaxMonitorAreaFactorA); /* MaxMonitorAreaFactorA (4 bytes) */
 	Stream_Read_UINT32(s, disp->MaxMonitorAreaFactorB); /* MaxMonitorAreaFactorB (4 bytes) */
-	//WLog_ERR(TAG,  "DisplayControlCapsPdu: MaxNumMonitors: %"PRIu32" MaxMonitorAreaFactorA: %"PRIu32" MaxMonitorAreaFactorB: %"PRIu32"",
-	//       disp->MaxNumMonitors, disp->MaxMonitorAreaFactorA, disp->MaxMonitorAreaFactorB);

-	return CHANNEL_RC_OK;
+	if (context->DisplayControlCaps)
+		ret = context->DisplayControlCaps(context, disp->MaxNumMonitors, disp->MaxMonitorAreaFactorA, disp->MaxMonitorAreaFactorB);
+
+	return ret;
 }

 /**
--- a/channels/drdynvc/client/drdynvc_main.c
+++ b/channels/drdynvc/client/drdynvc_main.c
@ -486,7 +486,7 @@ static UINT dvcman_create_channel(IWTSVirtualChannelManager* pChannelMgr,
 				          listener->iface.pInterface);

 				if (error)
-					WLog_ERR(TAG, "context.ReceiveSamples failed with error %"PRIu32"", error);
+					WLog_ERR(TAG, "context.OnChannelConnected failed with error %"PRIu32"", error);

 				return error;
 			}
@ -520,8 +520,8 @@ static UINT dvcman_open_channel(IWTSVirtualChannelManager* pChannelMgr,
 	DVCMAN_CHANNEL* channel;
 	IWTSVirtualChannelCallback* pCallback;
 	UINT error;
-	channel = (DVCMAN_CHANNEL*) dvcman_find_channel_by_id(pChannelMgr, ChannelId);

+	channel = (DVCMAN_CHANNEL*) dvcman_find_channel_by_id(pChannelMgr, ChannelId);
 	if (!channel)
 	{
 		WLog_ERR(TAG, "ChannelId %"PRIu32" not found!", ChannelId);
@ -948,11 +948,9 @@ static UINT drdynvc_process_create_request(drdynvcPlugin* drdynvc, int Sp,
 	WLog_Print(drdynvc->log, WLOG_DEBUG, "process_create_request: ChannelId=%"PRIu32" ChannelName=%s",
 	           ChannelId,
 	           Stream_Pointer(s));
-	channel_status = dvcman_create_channel(drdynvc->channel_mgr, ChannelId,
-	                                       (char*) Stream_Pointer(s));
+	channel_status = dvcman_create_channel(drdynvc->channel_mgr, ChannelId, (char*) Stream_Pointer(s));
 	data_out = Stream_New(NULL, pos + 4);
-
-	if (!s)
+	if (!data_out)
 	{
 		WLog_Print(drdynvc->log, WLOG_ERROR, "Stream_New failed!");
 		return CHANNEL_RC_NO_MEMORY;
@ -970,12 +968,10 @@ static UINT drdynvc_process_create_request(drdynvcPlugin* drdynvc, int Sp,
 	else
 	{
 		WLog_Print(drdynvc->log, WLOG_DEBUG, "no listener");
-		Stream_Write_UINT32(data_out,
-		                    (UINT32) 0xC0000001); /* same code used by mstsc */
+		Stream_Write_UINT32(data_out, (UINT32)0xC0000001); /* same code used by mstsc */
 	}

 	status = drdynvc_send(drdynvc, data_out);
-
 	if (status != CHANNEL_RC_OK)
 	{
 		WLog_ERR(TAG, "VirtualChannelWriteEx failed with %s [%08"PRIX32"]",
@ -1063,7 +1059,6 @@ static UINT drdynvc_process_close_request(drdynvcPlugin* drdynvc, int Sp,
 	}

 	data_out = Stream_New(NULL, 4);
-
 	if (!data_out)
 	{
 		WLog_ERR(TAG, "Stream_New failed!");
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@ -145,6 +145,10 @@ set(XRENDER_FEATURE_TYPE "RECOMMENDED")
 set(XRENDER_FEATURE_PURPOSE "rendering")
 set(XRENDER_FEATURE_DESCRIPTION "X11 render extension") 

+set(XRANDR_FEATURE_TYPE "RECOMMENDED")
+set(XRANDR_FEATURE_PURPOSE "tracking output configuration")
+set(XRANDR_FEATURE_DESCRIPTION "X11 randr extension")
+
 set(XFIXES_FEATURE_TYPE "RECOMMENDED")
 set(XFIXES_FEATURE_PURPOSE "X11 xfixes extension")
 set(XFIXES_FEATURE_DESCRIPTION "Useful additions to the X11 core protocol")
@ -156,6 +160,7 @@ find_feature(Xcursor ${XCURSOR_FEATURE_TYPE} ${XCURSOR_FEATURE_PURPOSE} ${XCURSO
 find_feature(Xv ${XV_FEATURE_TYPE} ${XV_FEATURE_PURPOSE} ${XV_FEATURE_DESCRIPTION})
 find_feature(Xi ${XI_FEATURE_TYPE} ${XI_FEATURE_PURPOSE} ${XI_FEATURE_DESCRIPTION})
 find_feature(Xrender ${XRENDER_FEATURE_TYPE} ${XRENDER_FEATURE_PURPOSE} ${XRENDER_FEATURE_DESCRIPTION})
+find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
 find_feature(Xfixes ${XFIXES_FEATURE_TYPE} ${XFIXES_FEATURE_PURPOSE} ${XFIXES_FEATURE_DESCRIPTION})

 if(WITH_XINERAMA)
@ -194,6 +199,12 @@ if(WITH_XRENDER)
 	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XRENDER_LIBRARIES})
 endif()

+if(NOT APPLE AND WITH_XRANDR)
+	add_definitions(-DWITH_XRANDR)
+	include_directories(${XRANDR_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XRANDR_LIBRARIES})
+endif()
+
 if(WITH_XFIXES)
 	add_definitions(-DWITH_XFIXES)
 	include_directories(${XFIXES_INCLUDE_DIRS})
--- a/client/X11/xf_monitor.c
+++ b/client/X11/xf_monitor.c
@ -3,6 +3,7 @@
 * X11 Monitor Handling
 *
 * Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ * Copyright 2017 David Fort <contact@hardening-consulting.com>
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@ -37,30 +38,50 @@
 #include <X11/extensions/Xinerama.h>
 #endif

+#ifdef WITH_XRANDR
+#include <X11/extensions/Xrandr.h>
+#include <X11/extensions/randr.h>
+#endif
+
 #include "xf_monitor.h"

 /* See MSDN Section on Multiple Display Monitors: http://msdn.microsoft.com/en-us/library/dd145071 */

 int xf_list_monitors(xfContext* xfc)
 {
-#ifdef WITH_XINERAMA
 	Display* display;
 	int major, minor;
 	int i, nmonitors = 0;
-	XineramaScreenInfo* screen = NULL;
-	display = XOpenDisplay(NULL);

+	display = XOpenDisplay(NULL);
 	if (!display)
 	{
 		WLog_ERR(TAG, "failed to open X display");
 		return -1;
 	}

+#ifdef WITH_XRANDR
+	if (XRRQueryExtension(xfc->display, &major, &minor))
+	{
+		XRRMonitorInfo *monitors = XRRGetMonitors(xfc->display, DefaultRootWindow(xfc->display), 1, &nmonitors);
+
+		for (i = 0; i < nmonitors; i++)
+		{
+			printf("      %s [%d] %hdx%hd\t+%hd+%hd\n",
+				   monitors[i].primary ? "*" : " ", i,
+				   monitors[i].width, monitors[i].height,
+				   monitors[i].x, monitors[i].y);
+		}
+		XRRFreeMonitors(monitors);
+	} else
+#endif
+
+#ifdef WITH_XINERAMA
 	if (XineramaQueryExtension(display, &major, &minor))
 	{
 		if (XineramaIsActive(display))
 		{
-			screen = XineramaQueryScreens(display, &nmonitors);
+			XineramaScreenInfo* screen = XineramaQueryScreens(display, &nmonitors);

 			for (i = 0; i < nmonitors; i++)
 			{
@ -72,25 +93,16 @@ int xf_list_monitors(xfContext* xfc)

 			XFree(screen);
 		}
-	}
+	} else

-	XCloseDisplay(display);
 #else
-	Screen* screen;
-	Display* display;
-	display = XOpenDisplay(NULL);
-
-	if (!display)
 	{
-		WLog_ERR(TAG, "failed to open X display");
-		return -1;
+		Screen* screen = ScreenOfDisplay(display, DefaultScreen(display));
+		printf("      * [0] %dx%d\t+0+0\n", WidthOfScreen(screen), HeightOfScreen(screen));
 	}
-
-	screen = ScreenOfDisplay(display, DefaultScreen(display));
-	printf("      * [0] %dx%d\t+0+0\n", WidthOfScreen(screen),
-	       HeightOfScreen(screen));
-	XCloseDisplay(display);
 #endif
+
+	XCloseDisplay(display);
 	return 0;
 }

@ -123,9 +135,8 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight)
 	Window _dummy_w;
 	int current_monitor = 0;
 	Screen* screen;
-#ifdef WITH_XINERAMA
+#if defined WITH_XINERAMA || defined WITH_XRANDR
 	int major, minor;
-	XineramaScreenInfo* screenInfo = NULL;
 #endif
 	vscreen = &xfc->vscreen;
 	*pMaxWidth = settings->DesktopWidth;
@ -137,41 +148,59 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight)
 	                   &_dummy_i, &_dummy_i, (void*) &_dummy_i))
 		mouse_x = mouse_y = 0;

-#ifdef WITH_XINERAMA
-
-	if (XineramaQueryExtension(xfc->display, &major, &minor))
+#ifdef WITH_XRANDR
+	if (XRRQueryExtension(xfc->display, &major, &minor))
 	{
-		if (XineramaIsActive(xfc->display))
+		XRRMonitorInfo *monitors = XRRGetMonitors(xfc->display, DefaultRootWindow(xfc->display), 1, &vscreen->nmonitors);
+
+		if (vscreen->nmonitors > 16)
+			vscreen->nmonitors = 0;
+
+		if (vscreen->nmonitors)
 		{
-			screenInfo = XineramaQueryScreens(xfc->display, &vscreen->nmonitors);
-
-			if (vscreen->nmonitors > 16)
-				vscreen->nmonitors = 0;
-
-			if (vscreen->nmonitors)
+			for (i = 0; i < vscreen->nmonitors; i++)
 			{
-				for (i = 0; i < vscreen->nmonitors; i++)
-				{
-					vscreen->monitors[i].area.left = screenInfo[i].x_org;
-					vscreen->monitors[i].area.top = screenInfo[i].y_org;
-					vscreen->monitors[i].area.right = screenInfo[i].x_org + screenInfo[i].width - 1;
-					vscreen->monitors[i].area.bottom = screenInfo[i].y_org + screenInfo[i].height -
-					                                   1;
-
-					/* Determine which monitor that the mouse cursor is on */
-					if ((mouse_x >= vscreen->monitors[i].area.left) &&
-					    (mouse_x <= vscreen->monitors[i].area.right) &&
-					    (mouse_y >= vscreen->monitors[i].area.top) &&
-					    (mouse_y <= vscreen->monitors[i].area.bottom))
-						current_monitor = i;
-				}
+				vscreen->monitors[i].area.left = monitors[i].x;
+				vscreen->monitors[i].area.top = monitors[i].y;
+				vscreen->monitors[i].area.right = monitors[i].x + monitors[i].width - 1;
+				vscreen->monitors[i].area.bottom = monitors[i].y + monitors[i].height - 1;
+				vscreen->monitors[i].primary = monitors[i].primary > 0;
 			}
-
-			XFree(screenInfo);
 		}
-	}
-
+		XRRFreeMonitors(monitors);
+	} else
 #endif
+
+#ifdef WITH_XINERAMA
+	if (XineramaQueryExtension(xfc->display, &major, &minor) && XineramaIsActive(xfc->display))
+	{
+		XineramaScreenInfo* screenInfo = XineramaQueryScreens(xfc->display, &vscreen->nmonitors);
+
+		if (vscreen->nmonitors > 16)
+			vscreen->nmonitors = 0;
+
+		if (vscreen->nmonitors)
+		{
+			for (i = 0; i < vscreen->nmonitors; i++)
+			{
+				vscreen->monitors[i].area.left = screenInfo[i].x_org;
+				vscreen->monitors[i].area.top = screenInfo[i].y_org;
+				vscreen->monitors[i].area.right = screenInfo[i].x_org + screenInfo[i].width - 1;
+				vscreen->monitors[i].area.bottom = screenInfo[i].y_org + screenInfo[i].height - 1;
+
+				/* Determine which monitor that the mouse cursor is on */
+				if ((mouse_x >= vscreen->monitors[i].area.left) &&
+					(mouse_x <= vscreen->monitors[i].area.right) &&
+					(mouse_y >= vscreen->monitors[i].area.top) &&
+					(mouse_y <= vscreen->monitors[i].area.bottom))
+					current_monitor = i;
+			}
+		}
+
+		XFree(screenInfo);
+	}
+#endif
+
 	xfc->fullscreenMonitors.top = xfc->fullscreenMonitors.bottom =
 	                                  xfc->fullscreenMonitors.left = xfc->fullscreenMonitors.right = 0;

--- a/include/freerdp/client/disp.h
+++ b/include/freerdp/client/disp.h
@ -52,6 +52,8 @@ typedef struct _DISPLAY_CONTROL_MONITOR_LAYOUT DISPLAY_CONTROL_MONITOR_LAYOUT;

 typedef struct _disp_client_context DispClientContext;

+typedef UINT (*pcDispCaps)(DispClientContext* context, UINT32 MaxNumMonitors, UINT32 MaxMonitorAreaFactorA,
+							UINT32 MaxMonitorAreaFactorB);
 typedef UINT (*pcDispSendMonitorLayout)(DispClientContext* context, UINT32 NumMonitors, DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors);

 struct _disp_client_context
@ -59,6 +61,7 @@ struct _disp_client_context
 	void* handle;
 	void* custom;

+	pcDispCaps DisplayControlCaps;
 	pcDispSendMonitorLayout SendMonitorLayout;
 };