From 730f43a38019c8ef0ca0ce1d6d2f3c2b38849e68 Mon Sep 17 00:00:00 2001
From: Martin Fleisz <martin.fleisz@thincast.com>
Date: Tue, 27 Oct 2015 17:12:33 +0100
Subject: [PATCH] cliprdr/server: Provide the server with a possibility to
 configure capabilities

---
 channels/cliprdr/server/cliprdr_main.c | 37 ++++++++++++++------------
 channels/cliprdr/server/cliprdr_main.h |  5 ----
 include/freerdp/server/cliprdr.h       |  6 +++++
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/channels/cliprdr/server/cliprdr_main.c b/channels/cliprdr/server/cliprdr_main.c
index e672fd601..96d0dc79d 100644
--- a/channels/cliprdr/server/cliprdr_main.c
+++ b/channels/cliprdr/server/cliprdr_main.c
@@ -193,7 +193,7 @@ static UINT cliprdr_server_format_list(CliprdrServerContext* context, CLIPRDR_FO
 	CLIPRDR_FORMAT* format;
 	CliprdrServerPrivate* cliprdr = (CliprdrServerPrivate*) context->handle;
 
-	if (!cliprdr->useLongFormatNames)
+	if (!context->useLongFormatNames)
 	{
 		length = formatList->numFormats * 36;
 
@@ -504,22 +504,21 @@ static UINT cliprdr_server_receive_general_capability(CliprdrServerContext* cont
 {
 	UINT32 version;
 	UINT32 generalFlags;
-	CliprdrServerPrivate* cliprdr = (CliprdrServerPrivate*) context->handle;
 
 	Stream_Read_UINT32(s, version); /* version (4 bytes) */
 	Stream_Read_UINT32(s, generalFlags); /* generalFlags (4 bytes) */
 
-	if (generalFlags & CB_USE_LONG_FORMAT_NAMES)
-		cliprdr->useLongFormatNames = TRUE;
+	if (context->useLongFormatNames)
+		context->useLongFormatNames = (generalFlags & CB_USE_LONG_FORMAT_NAMES) ? TRUE : FALSE;
 
-	if (generalFlags & CB_STREAM_FILECLIP_ENABLED)
-		cliprdr->streamFileClipEnabled = TRUE;
+	if (context->streamFileClipEnabled)
+		context->streamFileClipEnabled = (generalFlags & CB_STREAM_FILECLIP_ENABLED) ? TRUE : FALSE;
 
-	if (generalFlags & CB_FILECLIP_NO_FILE_PATHS)
-		cliprdr->fileClipNoFilePaths = TRUE;
+	if (context->fileClipNoFilePaths)
+		context->fileClipNoFilePaths = (generalFlags & CB_FILECLIP_NO_FILE_PATHS) ? TRUE : FALSE;
 
-	if (generalFlags & CB_CAN_LOCK_CLIPDATA)
-		cliprdr->canLockClipData = TRUE;
+	if (context->canLockClipData)
+		context->canLockClipData = (generalFlags & CB_CAN_LOCK_CLIPDATA) ? TRUE : FALSE;
 
 	return CHANNEL_RC_OK;
 }
@@ -654,7 +653,7 @@ static UINT cliprdr_server_receive_format_list(CliprdrServerContext* context, wS
 		formatList.formats = NULL;
 		formatList.numFormats = 0;
 	}
-	else if (!cliprdr->useLongFormatNames)
+	else if (!context->useLongFormatNames)
 	{
 		formatList.numFormats = (dataLen / 36);
 
@@ -1103,9 +1102,18 @@ static UINT cliprdr_server_init(CliprdrServerContext* context)
 
 	generalFlags = 0;
 
-	if (cliprdr->useLongFormatNames)
+	if (context->useLongFormatNames)
 		generalFlags |= CB_USE_LONG_FORMAT_NAMES;
 
+	if (context->streamFileClipEnabled)
+		generalFlags |= CB_STREAM_FILECLIP_ENABLED;
+
+	if (context->fileClipNoFilePaths)
+		generalFlags |= CB_FILECLIP_NO_FILE_PATHS;
+
+	if (context->canLockClipData)
+		generalFlags |= CB_CAN_LOCK_CLIPDATA;
+
 	capabilities.msgType = CB_CLIP_CAPS;
 	capabilities.msgFlags = 0;
 	capabilities.dataLen = 4 + CB_CAPSTYPE_GENERAL_LEN;
@@ -1527,11 +1535,6 @@ CliprdrServerContext* cliprdr_server_context_new(HANDLE vcm)
 		{
 			cliprdr->vcm = vcm;
 
-			cliprdr->useLongFormatNames = TRUE;
-			cliprdr->streamFileClipEnabled = TRUE;
-			cliprdr->fileClipNoFilePaths = TRUE;
-			cliprdr->canLockClipData = TRUE;
-
 			cliprdr->s = Stream_New(NULL, 4096);
 
 			if(!cliprdr->s)
diff --git a/channels/cliprdr/server/cliprdr_main.h b/channels/cliprdr/server/cliprdr_main.h
index 0c51e5c99..362d85a83 100644
--- a/channels/cliprdr/server/cliprdr_main.h
+++ b/channels/cliprdr/server/cliprdr_main.h
@@ -40,11 +40,6 @@ struct _cliprdr_server_private
 	void* ChannelHandle;
 	HANDLE ChannelEvent;
 
-	BOOL useLongFormatNames;
-	BOOL streamFileClipEnabled;
-	BOOL fileClipNoFilePaths;
-	BOOL canLockClipData;
-
 	wStream* s;
 	char* temporaryDirectory;
 };
diff --git a/include/freerdp/server/cliprdr.h b/include/freerdp/server/cliprdr.h
index e111c1533..d2e7efcb3 100644
--- a/include/freerdp/server/cliprdr.h
+++ b/include/freerdp/server/cliprdr.h
@@ -68,6 +68,12 @@ struct _cliprdr_server_context
 	void* handle;
 	void* custom;
 
+	/* clipboard capabilities - set by server */
+	BOOL useLongFormatNames;
+	BOOL streamFileClipEnabled;
+	BOOL fileClipNoFilePaths;
+	BOOL canLockClipData;
+
 	psCliprdrOpen Open;
 	psCliprdrClose Close;
 	psCliprdrStart Start;