Merge pull request #1354 from awakecoding/master

Multitouch, MacFreeRDP, PubSub
2013-07-16 11:57:34 -07:00 · 2013-07-16 11:57:34 -07:00 · 18a3f37d06
commit 18a3f37d06
parent 738cd19478 67b972a021
48 changed files with 2763 additions and 372 deletions
--- a/buildx/client/Mac/cli/Info.plist
+++ b/buildx/client/Mac/cli/Info.plist
@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string>FreeRDP</string>
-	<key>CFBundleIdentifier</key>
-	<string>FreeRDP.Mac</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string></string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string></string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>
--- a/channels/client/channels.c
+++ b/channels/client/channels.c
@ -441,10 +441,14 @@ int freerdp_channels_load_plugin(rdpChannels* channels, rdpSettings* settings, c
 int freerdp_drdynvc_on_channel_connected(DrdynvcClientContext* context, const char* name, void* pInterface)
 {
 	int status = 0;
+	ChannelConnectedEventArgs e;
 	rdpChannels* channels = (rdpChannels*) context->custom;
 	freerdp* instance = channels->instance;

-	IFCALLRET(instance->OnChannelConnected, status, instance, name, pInterface);
+	EventArgsInit(&e, "freerdp");
+	e.name = name;
+	e.pInterface = pInterface;
+	PubSub_OnChannelConnected(instance->context->pubSub, instance->context, &e);

 	return status;
 }
@ -452,10 +456,14 @@ int freerdp_drdynvc_on_channel_connected(DrdynvcClientContext* context, const ch
 int freerdp_drdynvc_on_channel_disconnected(DrdynvcClientContext* context, const char* name, void* pInterface)
 {
 	int status = 0;
+	ChannelDisconnectedEventArgs e;
 	rdpChannels* channels = (rdpChannels*) context->custom;
 	freerdp* instance = channels->instance;

-	IFCALLRET(instance->OnChannelDisconnected, status, instance, name, pInterface);
+	EventArgsInit(&e, "freerdp");
+	e.name = name;
+	e.pInterface = pInterface;
+	PubSub_OnChannelDisconnected(instance->context->pubSub, instance->context, &e);

 	return status;
 }
--- a/channels/disp/CMakeLists.txt
+++ b/channels/disp/CMakeLists.txt
@ -0,0 +1,22 @@
+# FreeRDP: A Remote Desktop Protocol Implementation
+# FreeRDP cmake build script
+#
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+define_channel("disp")
+
+if(WITH_CLIENT_CHANNELS)
+	add_channel_client(${MODULE_PREFIX} ${CHANNEL_NAME})
+endif()
--- a/channels/disp/ChannelOptions.cmake
+++ b/channels/disp/ChannelOptions.cmake
@ -0,0 +1,12 @@
+
+set(OPTION_DEFAULT OFF)
+set(OPTION_CLIENT_DEFAULT ON)
+set(OPTION_SERVER_DEFAULT OFF)
+
+define_channel_options(NAME "disp" TYPE "dynamic"
+	DESCRIPTION "Display Update Virtual Channel Extension"
+	SPECIFICATIONS "[MS-RDPEDISP]"
+	DEFAULT ${OPTION_DEFAULT})
+
+define_channel_client_options(${OPTION_CLIENT_DEFAULT})
+define_channel_server_options(${OPTION_SERVER_DEFAULT})
--- a/channels/disp/client/CMakeLists.txt
+++ b/channels/disp/client/CMakeLists.txt
@ -0,0 +1,47 @@
+# FreeRDP: A Remote Desktop Protocol Implementation
+# FreeRDP cmake build script
+#
+# Copyright 2013 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+define_channel_client("disp")
+
+set(${MODULE_PREFIX}_SRCS
+	disp_main.c
+	disp_main.h)
+
+include_directories(..)
+
+add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DVCPluginEntry")
+
+set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
+
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+	MONOLITHIC ${MONOLITHIC_BUILD}
+	MODULE freerdp
+	MODULES freerdp-common freerdp-utils)
+	
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+	MONOLITHIC ${MONOLITHIC_BUILD}
+	MODULE winpr
+	MODULES winpr-sysinfo)	
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+
+if(NOT STATIC_CHANNELS)
+	install(TARGETS ${MODULE_NAME} DESTINATION ${FREERDP_PLUGIN_PATH})
+endif()
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Channels/${CHANNEL_NAME}/Client")
+
--- a/channels/disp/client/disp_main.c
+++ b/channels/disp/client/disp_main.c
@ -0,0 +1,341 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Display Update Virtual Channel Extension
+ *
+ * Copyright 2013 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <winpr/crt.h>
+#include <winpr/synch.h>
+#include <winpr/print.h>
+#include <winpr/thread.h>
+#include <winpr/stream.h>
+#include <winpr/sysinfo.h>
+#include <winpr/cmdline.h>
+#include <winpr/collections.h>
+
+#include <freerdp/addin.h>
+
+#include "disp_main.h"
+
+struct _DISP_CHANNEL_CALLBACK
+{
+	IWTSVirtualChannelCallback iface;
+
+	IWTSPlugin* plugin;
+	IWTSVirtualChannelManager* channel_mgr;
+	IWTSVirtualChannel* channel;
+};
+typedef struct _DISP_CHANNEL_CALLBACK DISP_CHANNEL_CALLBACK;
+
+struct _DISP_LISTENER_CALLBACK
+{
+	IWTSListenerCallback iface;
+
+	IWTSPlugin* plugin;
+	IWTSVirtualChannelManager* channel_mgr;
+	DISP_CHANNEL_CALLBACK* channel_callback;
+};
+typedef struct _DISP_LISTENER_CALLBACK DISP_LISTENER_CALLBACK;
+
+struct _DISP_PLUGIN
+{
+	IWTSPlugin iface;
+
+	IWTSListener* listener;
+	DISP_LISTENER_CALLBACK* listener_callback;
+
+	UINT32 MaxNumMonitors;
+	UINT32 MaxMonitorWidth;
+	UINT32 MaxMonitorHeight;
+};
+typedef struct _DISP_PLUGIN DISP_PLUGIN;
+
+int disp_send_display_control_monitor_layout_pdu(DISP_CHANNEL_CALLBACK* callback, UINT32 NumMonitors, DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors)
+{
+	int index;
+	int status;
+	wStream* s;
+	UINT32 type;
+	UINT32 length;
+	DISP_PLUGIN* disp;
+	UINT32 MonitorLayoutSize;
+
+	disp = (DISP_PLUGIN*) callback->plugin;
+
+#ifdef DISP_PREVIEW
+	MonitorLayoutSize = 32;
+#else
+	MonitorLayoutSize = 40;
+#endif
+
+	length = 8 + 8 + (NumMonitors * MonitorLayoutSize);
+
+	type = DISPLAY_CONTROL_PDU_TYPE_MONITOR_LAYOUT;
+
+	s = Stream_New(NULL, length);
+
+	Stream_Write_UINT32(s, type); /* Type (4 bytes) */
+	Stream_Write_UINT32(s, length); /* Length (4 bytes) */
+
+	if (NumMonitors > disp->MaxNumMonitors)
+		NumMonitors = disp->MaxNumMonitors;
+
+#ifdef DISP_PREVIEW
+	Stream_Write_UINT32(s, NumMonitors); /* NumMonitors (4 bytes) */
+#else
+	Stream_Write_UINT32(s, MonitorLayoutSize); /* MonitorLayoutSize (4 bytes) */
+#endif
+
+	Stream_Write_UINT32(s, NumMonitors); /* NumMonitors (4 bytes) */
+
+	//fprintf(stderr, "NumMonitors: %d\n", NumMonitors);
+
+	for (index = 0; index < NumMonitors; index++)
+	{
+		Monitors[index].Width -= (Monitors[index].Width % 2);
+
+		if (Monitors[index].Width < 200)
+			Monitors[index].Width = 200;
+
+		if (Monitors[index].Width > disp->MaxMonitorWidth)
+			Monitors[index].Width = disp->MaxMonitorWidth;
+
+		if (Monitors[index].Height < 200)
+			Monitors[index].Height = 200;
+
+		if (Monitors[index].Height > disp->MaxMonitorHeight)
+			Monitors[index].Height = disp->MaxMonitorHeight;
+
+		Stream_Write_UINT32(s, Monitors[index].Flags); /* Flags (4 bytes) */
+		Stream_Write_UINT32(s, Monitors[index].Left); /* Left (4 bytes) */
+		Stream_Write_UINT32(s, Monitors[index].Top); /* Top (4 bytes) */
+		Stream_Write_UINT32(s, Monitors[index].Width); /* Width (4 bytes) */
+		Stream_Write_UINT32(s, Monitors[index].Height); /* Height (4 bytes) */
+		Stream_Write_UINT32(s, Monitors[index].PhysicalWidth); /* PhysicalWidth (4 bytes) */
+		Stream_Write_UINT32(s, Monitors[index].PhysicalHeight); /* PhysicalHeight (4 bytes) */
+		Stream_Write_UINT32(s, Monitors[index].Orientation); /* Orientation (4 bytes) */
+
+#if 0
+		fprintf(stderr, "\t: Flags: 0x%04X\n", Monitors[index].Flags);
+		fprintf(stderr, "\t: Left: %d\n", Monitors[index].Left);
+		fprintf(stderr, "\t: Top: %d\n", Monitors[index].Top);
+		fprintf(stderr, "\t: Width: %d\n", Monitors[index].Width);
+		fprintf(stderr, "\t: Height: %d\n", Monitors[index].Height);
+		fprintf(stderr, "\t: PhysicalWidth: %d\n", Monitors[index].PhysicalWidth);
+		fprintf(stderr, "\t: PhysicalHeight: %d\n", Monitors[index].PhysicalHeight);
+		fprintf(stderr, "\t: Orientation: %d\n", Monitors[index].Orientation);
+#endif
+
+#ifndef DISP_PREVIEW
+		Stream_Write_UINT32(s, Monitors[index].DesktopScaleFactor); /* DesktopScaleFactor (4 bytes) */
+		Stream_Write_UINT32(s, Monitors[index].DeviceScaleFactor); /* DeviceScaleFactor (4 bytes) */
+#endif
+	}
+
+	Stream_SealLength(s);
+
+	status = callback->channel->Write(callback->channel, Stream_Length(s), Stream_Buffer(s), NULL);
+
+	Stream_Free(s, TRUE);
+
+	return status;
+}
+
+int disp_recv_display_control_caps_pdu(DISP_CHANNEL_CALLBACK* callback, wStream* s)
+{
+	DISP_PLUGIN* disp;
+
+	disp = (DISP_PLUGIN*) callback->plugin;
+
+	Stream_Read_UINT32(s, disp->MaxNumMonitors); /* MaxNumMonitors (4 bytes) */
+	Stream_Read_UINT32(s, disp->MaxMonitorWidth); /* MaxMonitorWidth (4 bytes) */
+	Stream_Read_UINT32(s, disp->MaxMonitorHeight); /* MaxMonitorHeight (4 bytes) */
+
+	//fprintf(stderr, "DisplayControlCapsPdu: MaxNumMonitors: %d MaxMonitorWidth: %d MaxMonitorHeight: %d\n",
+	//       disp->MaxNumMonitors, disp->MaxMonitorWidth, disp->MaxMonitorHeight);
+
+	return 0;
+}
+
+int disp_recv_pdu(DISP_CHANNEL_CALLBACK* callback, wStream* s)
+{
+	UINT32 type;
+	UINT32 length;
+
+	Stream_Read_UINT32(s, type); /* Type (4 bytes) */
+	Stream_Read_UINT32(s, length); /* Length (4 bytes) */
+
+	//fprintf(stderr, "Type: %d Length: %d\n", type, length);
+
+	switch (type)
+	{
+		case DISPLAY_CONTROL_PDU_TYPE_CAPS:
+			disp_recv_display_control_caps_pdu(callback, s);
+			break;
+
+		default:
+			break;
+	}
+
+	return 0;
+}
+
+static int disp_on_data_received(IWTSVirtualChannelCallback* pChannelCallback, UINT32 cbSize, BYTE* pBuffer)
+{
+	wStream* s;
+	int status = 0;
+	DISP_CHANNEL_CALLBACK* callback = (DISP_CHANNEL_CALLBACK*) pChannelCallback;
+
+	s = Stream_New(pBuffer, cbSize);
+
+	status = disp_recv_pdu(callback, s);
+
+	Stream_Free(s, FALSE);
+
+	return status;
+}
+
+static int disp_on_close(IWTSVirtualChannelCallback* pChannelCallback)
+{
+	DISP_CHANNEL_CALLBACK* callback = (DISP_CHANNEL_CALLBACK*) pChannelCallback;
+
+	if (callback)
+	{
+		free(callback);
+	}
+
+	return 0;
+}
+
+static int disp_on_new_channel_connection(IWTSListenerCallback* pListenerCallback,
+	IWTSVirtualChannel* pChannel, BYTE* Data, int* pbAccept,
+	IWTSVirtualChannelCallback** ppCallback)
+{
+	DISP_CHANNEL_CALLBACK* callback;
+	DISP_LISTENER_CALLBACK* listener_callback = (DISP_LISTENER_CALLBACK*) pListenerCallback;
+
+	callback = (DISP_CHANNEL_CALLBACK*) malloc(sizeof(DISP_CHANNEL_CALLBACK));
+	ZeroMemory(callback, sizeof(DISP_CHANNEL_CALLBACK));
+
+	callback->iface.OnDataReceived = disp_on_data_received;
+	callback->iface.OnClose = disp_on_close;
+	callback->plugin = listener_callback->plugin;
+	callback->channel_mgr = listener_callback->channel_mgr;
+	callback->channel = pChannel;
+	listener_callback->channel_callback = callback;
+
+	*ppCallback = (IWTSVirtualChannelCallback*) callback;
+
+	return 0;
+}
+
+static int disp_plugin_initialize(IWTSPlugin* pPlugin, IWTSVirtualChannelManager* pChannelMgr)
+{
+	int status;
+	DISP_PLUGIN* disp = (DISP_PLUGIN*) pPlugin;
+
+	disp->listener_callback = (DISP_LISTENER_CALLBACK*) malloc(sizeof(DISP_LISTENER_CALLBACK));
+	ZeroMemory(disp->listener_callback, sizeof(DISP_LISTENER_CALLBACK));
+
+	disp->listener_callback->iface.OnNewChannelConnection = disp_on_new_channel_connection;
+	disp->listener_callback->plugin = pPlugin;
+	disp->listener_callback->channel_mgr = pChannelMgr;
+
+	status = pChannelMgr->CreateListener(pChannelMgr, DISP_DVC_CHANNEL_NAME, 0,
+		(IWTSListenerCallback*) disp->listener_callback, &(disp->listener));
+
+	disp->listener->pInterface = disp->iface.pInterface;
+
+	return status;
+}
+
+static int disp_plugin_terminated(IWTSPlugin* pPlugin)
+{
+	DISP_PLUGIN* disp = (DISP_PLUGIN*) pPlugin;
+
+	if (disp)
+	{
+		free(disp);
+	}
+
+	return 0;
+}
+
+/**
+ * Channel Client Interface
+ */
+
+int disp_send_monitor_layout(DispClientContext* context, UINT32 NumMonitors, DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors)
+{
+	DISP_PLUGIN* disp = (DISP_PLUGIN*) context->handle;
+	DISP_CHANNEL_CALLBACK* callback = disp->listener_callback->channel_callback;
+
+	disp_send_display_control_monitor_layout_pdu(callback, NumMonitors, Monitors);
+
+	return 1;
+}
+
+#ifdef STATIC_CHANNELS
+#define DVCPluginEntry		disp_DVCPluginEntry
+#endif
+
+int DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+{
+	int error = 0;
+	DISP_PLUGIN* disp;
+	DispClientContext* context;
+
+	disp = (DISP_PLUGIN*) pEntryPoints->GetPlugin(pEntryPoints, "disp");
+
+	if (disp == NULL)
+	{
+		disp = (DISP_PLUGIN*) malloc(sizeof(DISP_PLUGIN));
+
+		if (disp)
+		{
+			ZeroMemory(disp, sizeof(DISP_PLUGIN));
+
+			disp->iface.Initialize = disp_plugin_initialize;
+			disp->iface.Connected = NULL;
+			disp->iface.Disconnected = NULL;
+			disp->iface.Terminated = disp_plugin_terminated;
+
+			context = (DispClientContext*) malloc(sizeof(DispClientContext));
+
+			context->handle = (void*) disp;
+
+			context->SendMonitorLayout = disp_send_monitor_layout;
+
+			disp->iface.pInterface = (void*) context;
+
+			disp->MaxNumMonitors = 16;
+			disp->MaxMonitorWidth = 8192;
+			disp->MaxMonitorHeight = 8192;
+
+			error = pEntryPoints->RegisterPlugin(pEntryPoints, "disp", (IWTSPlugin*) disp);
+		}
+	}
+
+	return error;
+}
--- a/channels/disp/client/disp_main.h
+++ b/channels/disp/client/disp_main.h
@ -0,0 +1,40 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Display Update Virtual Channel Extension
+ *
+ * Copyright 2013 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FREERDP_CHANNEL_DISP_CLIENT_MAIN_H
+#define FREERDP_CHANNEL_DISP_CLIENT_MAIN_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <freerdp/dvc.h>
+#include <freerdp/types.h>
+#include <freerdp/addin.h>
+#include <freerdp/utils/debug.h>
+
+#include <freerdp/client/disp.h>
+
+#define DISPLAY_CONTROL_PDU_TYPE_MONITOR_LAYOUT		0x00000002
+#define DISPLAY_CONTROL_PDU_TYPE_CAPS			0x00000003
+
+#define DISP_PREVIEW	1
+
+#endif /* FREERDP_CHANNEL_DISP_CLIENT_MAIN_H */
+
--- a/channels/rdpei/client/rdpei_main.c
+++ b/channels/rdpei/client/rdpei_main.c
@ -212,7 +212,7 @@ int rdpei_send_cs_ready_pdu(RDPEI_CHANNEL_CALLBACK* callback)
 	Stream_Seek(s, RDPINPUT_HEADER_LENGTH);

 	Stream_Write_UINT32(s, flags); /* flags (4 bytes) */
-	Stream_Write_UINT32(s, RDPINPUT_PROTOCOL_V1); /* protocolVersion (4 bytes) */
+	Stream_Write_UINT32(s, RDPINPUT_PROTOCOL_V10); /* protocolVersion (4 bytes) */
 	Stream_Write_UINT16(s, rdpei->maxTouchContacts); /* maxTouchContacts (2 bytes) */

 	Stream_SealLength(s);
@ -249,6 +249,7 @@ void rdpei_print_contact_flags(UINT32 contactFlags)
 int rdpei_write_touch_frame(wStream* s, RDPINPUT_TOUCH_FRAME* frame)
 {
 	int index;
+	int rectSize = 2;
 	RDPINPUT_CONTACT_DATA* contact;

 #ifdef WITH_DEBUG_RDPEI
@ -264,12 +265,18 @@ int rdpei_write_touch_frame(wStream* s, RDPINPUT_TOUCH_FRAME* frame)
 	 */
 	rdpei_write_8byte_unsigned(s, frame->frameOffset * 1000); /* frameOffset (EIGHT_BYTE_UNSIGNED_INTEGER) */

-	Stream_EnsureRemainingCapacity(s, frame->contactCount * 32);
+	Stream_EnsureRemainingCapacity(s, frame->contactCount * 64);

 	for (index = 0; index < frame->contactCount; index++)
 	{
 		contact = &frame->contacts[index];

+		contact->fieldsPresent |= CONTACT_DATA_CONTACTRECT_PRESENT;
+		contact->contactRectLeft = contact->x - rectSize;
+		contact->contactRectTop = contact->y - rectSize;
+		contact->contactRectRight = contact->x + rectSize;
+		contact->contactRectBottom = contact->y + rectSize;
+
 #ifdef WITH_DEBUG_RDPEI
 		printf("contact[%d].contactId: %d\n", index, contact->contactId);
 		printf("contact[%d].fieldsPresent: %d\n", index, contact->fieldsPresent);
@ -325,7 +332,7 @@ int rdpei_send_touch_event_pdu(RDPEI_CHANNEL_CALLBACK* callback, RDPINPUT_TOUCH_
 	wStream* s;
 	UINT32 pduLength;

-	pduLength = 64 + (frame->contactCount * 32);
+	pduLength = 64 + (frame->contactCount * 64);

 	s = Stream_New(NULL, pduLength);
 	Stream_Seek(s, RDPINPUT_HEADER_LENGTH);
@ -355,11 +362,13 @@ int rdpei_recv_sc_ready_pdu(RDPEI_CHANNEL_CALLBACK* callback, wStream* s)

 	Stream_Read_UINT32(s, protocolVersion); /* protocolVersion (4 bytes) */

-	if (protocolVersion != RDPINPUT_PROTOCOL_V1)
+#if 0
+	if (protocolVersion != RDPINPUT_PROTOCOL_V10)
 	{
 		fprintf(stderr, "Unknown [MS-RDPEI] protocolVersion: 0x%08X\n", protocolVersion);
 		return -1;
 	}
+#endif

 	return 0;
 }
--- a/channels/rdpei/client/rdpei_main.h
+++ b/channels/rdpei/client/rdpei_main.h
@ -35,7 +35,8 @@

 /* Protocol Version */

-#define RDPINPUT_PROTOCOL_V1				0x00010000
+#define RDPINPUT_PROTOCOL_V10				0x00010000
+#define RDPINPUT_PROTOCOL_V101				0x00010001

 /* Client Ready Flags */

--- a/client/Android/FreeRDPCore/jni/android_freerdp.c
+++ b/client/Android/FreeRDPCore/jni/android_freerdp.c
@ -686,7 +686,8 @@ JNIEXPORT void JNICALL jni_freerdp_set_gateway_info(JNIEnv *env, jclass cls, jin
 	settings->GatewayUsername = strdup(gatewayusername);
 	settings->GatewayPassword = strdup(gatewaypassword);
 	settings->GatewayDomain = strdup(gatewaydomain);
-	settings->GatewayUsageMethod = TRUE;
+	settings->GatewayUsageMethod = TSC_PROXY_MODE_DIRECT;
+	settings->GatewayEnabled = TRUE;
 	settings->GatewayUseSameCredentials = FALSE;

 	(*env)->ReleaseStringUTFChars(env, jgatewayhostname, gatewayhostname);
--- a/client/Mac/CMakeLists.txt
+++ b/client/Mac/CMakeLists.txt
@ -106,15 +106,15 @@ if (${BUILD_SHARED_LIBS})
 		add_custom_command(TARGET ${MODULE_NAME} POST_BUILD 
 			COMMAND "${CMAKE_COMMAND}" -E copy 
 					"$<TARGET_FILE:${LIB}>"
-					"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
+					"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
 			COMMENT "Copying ${LIB} to output directory"
 			COMMAND install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>"
-				"@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
-				"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/${MODULE_NAME}"
+				"@executable_path/../Frameworks/${MODULE_OUTPUT_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
+				"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/${MODULE_NAME}"
 			COMMENT Setting install name for ${LIB}
 			COMMAND "${CMAKE_COMMAND}" -E echo install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>"
-				"@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
-				"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/${MODULE_NAME}")
+				"@executable_path/../Frameworks/${MODULE_OUTPUT_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
+				"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/${MODULE_NAME}")
 	endforeach()

 	# Call install_name_tool to reassign the library install names in dependent libraries
@ -123,8 +123,8 @@ if (${BUILD_SHARED_LIBS})
 			# message("adding post-build dependency: ${LIB}")
 			add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
 				COMMAND install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>"
-					"@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
-					"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${DEST}>"
+					"@executable_path/../Frameworks/${MODULE_OUTPUT_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
+					"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/Contents/$<TARGET_FILE_NAME:${DEST}>"
 				COMMENT Setting install name for ${LIB} in module ${DEST})
 		endforeach()
 	endforeach()
@ -145,7 +145,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")

 	# Make sure the 'Resources' Directory is correctly created before we build
 	add_custom_command(TARGET ${MODULE_NAME} PRE_BUILD
-						  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.app/Contents/Resources)
+						  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/Versions/${MACOSX_BUNDLE_SHORT_VERSION_STRING}/Resources)

 	# Compile the .xib files using the 'ibtool' program with the destination being the app package
 	foreach(xib ${${MODULE_NAME}_XIBS})
@ -153,7 +153,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
 						 
 		add_custom_command (TARGET ${MODULE_NAME} POST_BUILD 
 			COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text 
-				--compile ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.app/Contents/Resources/${XIB_WE}.nib ${xib}                     
+				--compile ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/Versions/${MACOSX_BUNDLE_SHORT_VERSION_STRING}/Resources/${XIB_WE}.nib ${xib}
 			COMMENT "Compiling ${xib}")
 	endforeach()
 endif()
@ -162,13 +162,13 @@ endif()
 foreach(HEADER ${${MODULE_NAME}_HEADERS})
 	# message("adding post-build dependency: ${LIB}")
 	add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
-		COMMAND ditto ${HEADER} ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Headers/
+		COMMAND ditto ${HEADER} ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/Headers/
 		COMMENT Copying public header files to ${MODULE_NAME})
 endforeach()

 # Copy the FreeRDP header files into the framework
 add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
-	COMMAND ditto ${CMAKE_SOURCE_DIR}/include/freerdp ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Headers/freerdp
+	COMMAND ditto ${CMAKE_SOURCE_DIR}/include/freerdp ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/Headers/freerdp
 	COMMENT Copying FreeRDP header files to ${MODULE_NAME})

 add_subdirectory(cli)
--- a/client/Mac/MRDPView.h
+++ b/client/Mac/MRDPView.h
@ -78,6 +78,8 @@
 	int kdlmeta;
 	int kdrmeta;
 	int kdcapslock;
+
+    BOOL initialized;
 	
@public
 	NSPasteboard* pasteboard_rd; /* for reading from clipboard */
@ -107,3 +109,8 @@
 #define PTR_FLAGS_BUTTON2               0x2000
 #define PTR_FLAGS_BUTTON3               0x4000
 #define WheelRotationMask               0x01FF
+
+BOOL mac_pre_connect(freerdp* instance);
+BOOL mac_post_connect(freerdp*	instance);
+BOOL mac_authenticate(freerdp* instance, char** username, char** password, char** domain);
+int mac_receive_channel_data(freerdp* instance, int chan_id, BYTE* data, int size, int flags, int total_size);
--- a/client/Mac/MRDPView.m
+++ b/client/Mac/MRDPView.m
@ -75,9 +75,6 @@ void mf_Pointer_Set(rdpContext* context, rdpPointer* pointer);
 void mf_Pointer_SetNull(rdpContext* context);
 void mf_Pointer_SetDefault(rdpContext* context);
 // int rdp_connect(void);
-BOOL mac_pre_connect(freerdp* instance);
-BOOL mac_post_connect(freerdp*	instance);
-BOOL mac_authenticate(freerdp* instance, char** username, char** password, char** domain);
 void mac_set_bounds(rdpContext* context, rdpBounds* bounds);
 void mac_bitmap_update(rdpContext* context, BITMAP_UPDATE* bitmap);
 void mac_begin_paint(rdpContext* context);
@ -129,28 +126,19 @@ struct rgba_data
 	rdpSettings* settings;
 	EmbedWindowEventArgs e;

+    [self initializeView];
+
 	context = rdp_context;
 	mfc = (mfContext*) rdp_context;
 	instance = context->instance;
 	settings = context->settings;
-	mfc->view = self;

 	EventArgsInit(&e, "mfreerdp");
 	e.embed = TRUE;
 	e.handle = (void*) self;
 	PubSub_OnEmbedWindow(context->pubSub, context, &e);

-	context->instance->PreConnect = mac_pre_connect;
-	context->instance->PostConnect = mac_post_connect;
-	context->instance->ReceiveChannelData = mac_receive_channel_data;
-	context->instance->Authenticate = mac_authenticate;
-
-	// TODO
-	//    instance->Authenticate = mf_authenticate;
-	//    instance->VerifyCertificate = mf_verify_certificate;
-	//    instance->LogonErrorInfo = mf_logon_error_info;
-
-	status = freerdp_connect(context->instance);
+    status = freerdp_connect(context->instance);
 	
 	if (!status)
 	{
@ -185,7 +173,7 @@ struct rgba_data

 - (id)initWithFrame:(NSRect)frame
 {
-	self = [super initWithFrame:frame];
+    self = [super initWithFrame:frame];
 	
 	if (self)
 	{
@ -201,24 +189,34 @@ struct rgba_data

 //TODO - Expose this code as a public method, because awakeFromNib
 //       won't be called if the view is created dynamically
- (void) awakeFromNib
+- (void) viewDidLoad
 {
-	// store our window dimensions
-	width = [self frame].size.width;
-	height = [self frame].size.height;
-	titleBarHeight = 22;
-	
-	[[self window] becomeFirstResponder];
-	[[self window] setAcceptsMouseMovedEvents:YES];
-	
-	cursors = [[NSMutableArray alloc] initWithCapacity:10];
+    [self initializeView];
+}

-	// setup a mouse tracking area
-	NSTrackingArea * trackingArea = [[NSTrackingArea alloc] initWithRect:[self visibleRect] options:NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | NSTrackingCursorUpdate | NSTrackingEnabledDuringMouseDrag | NSTrackingActiveWhenFirstResponder owner:self userInfo:nil];
-	
-	[self addTrackingArea:trackingArea];
-	
-	mouseInClientArea = YES;
+- (void) initializeView
+{
+    if (!initialized)
+    {
+        // store our window dimensions
+        width = [self frame].size.width;
+        height = [self frame].size.height;
+        titleBarHeight = 22;
+
+        [[self window] becomeFirstResponder];
+        [[self window] setAcceptsMouseMovedEvents:YES];
+
+        cursors = [[NSMutableArray alloc] initWithCapacity:10];
+
+        // setup a mouse tracking area
+        NSTrackingArea * trackingArea = [[NSTrackingArea alloc] initWithRect:[self visibleRect] options:NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | NSTrackingCursorUpdate | NSTrackingEnabledDuringMouseDrag | NSTrackingActiveWhenFirstResponder owner:self userInfo:nil];
+
+        [self addTrackingArea:trackingArea];
+
+        mouseInClientArea = YES;
+
+        initialized = YES;
+    }
 }

 /** *********************************************************************
@ -619,11 +617,6 @@ struct rgba_data

 	if (run_loop_src_channels != 0)
 		CFRunLoopRemoveSource(CFRunLoopGetCurrent(), run_loop_src_channels, kCFRunLoopDefaultMode);
-
-	freerdp_client_stop(self->context);
-
-	freerdp_client_context_free(self->context);
-
 }

 /** *********************************************************************
@ -782,8 +775,17 @@ struct rgba_data
 	outerRect.size.height = h + heightDiff;
 	[[self window] setMaxSize:outerRect.size];
 	[[self window] setMinSize:outerRect.size];
-	[[self window] setFrame:outerRect display:YES];
-	
+
+    @try
+    {
+        [[self window] setFrame:outerRect display:YES];
+    }
+    @catch (NSException * e) {
+       NSLog(@"Exception: %@", e);
+    }
+    @finally {
+    }
+
 	// set client area to specified dimensions
 	innerRect.size.width = w;
 	innerRect.size.height = h;
@ -868,8 +870,7 @@ BOOL mac_pre_connect(freerdp* instance)
 	settings->OrderSupport[NEG_ELLIPSE_SC_INDEX] = FALSE;
 	settings->OrderSupport[NEG_ELLIPSE_CB_INDEX] = FALSE;

-	[view setViewSize :instance->settings->DesktopWidth :instance->settings->DesktopHeight];
-	
+    [view setViewSize :instance->settings->DesktopWidth :instance->settings->DesktopHeight];
 	freerdp_channels_pre_connect(instance->context->channels, instance);
 	
 	return TRUE;
@ -888,13 +889,7 @@ BOOL mac_pre_connect(freerdp* instance)

 BOOL mac_post_connect(freerdp* instance)
 {
-	int index;
-	int fds[32];
 	UINT32 flags;
-	int rd_count = 0;
-	int wr_count = 0;
-	void* rd_fds[32];
-	void* wr_fds[32];
 	rdpPointer rdp_pointer;
 	mfContext *mfc = (mfContext*) instance->context;

@ -908,7 +903,7 @@ BOOL mac_post_connect(freerdp* instance)
 	rdp_pointer.SetNull = mf_Pointer_SetNull;
 	rdp_pointer.SetDefault = mf_Pointer_SetDefault;

-	flags = CLRBUF_32BPP;
+	flags = CLRBUF_32BPP | CLRCONV_ALPHA;
 	gdi_init(instance, flags, NULL);

 	rdpGdi* gdi = instance->context->gdi;
@ -927,9 +922,6 @@ BOOL mac_post_connect(freerdp* instance)
 	view->pasteboard_rd = [NSPasteboard generalPasteboard];
 	view->pasteboard_changecount = (int) [view->pasteboard_rd changeCount];
 	view->pasteboard_timer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:mfc->view selector:@selector(onPasteboardTimerFired:) userInfo:nil repeats:YES];
-	
-	/* we want to be notified when window resizes */
-	[[NSNotificationCenter defaultCenter] addObserver:mfc->view selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:nil];

 	return TRUE;
 }
@ -983,7 +975,7 @@ void mf_Pointer_New(rdpContext* context, rdpPointer* pointer)
 	MRDPCursor* mrdpCursor = [[MRDPCursor alloc] init];
 	mfContext* mfc = (mfContext*) context;
 	MRDPView* view = (MRDPView*) mfc->view;
-	
+
 	rect.size.width = pointer->width;
 	rect.size.height = pointer->height;
 	rect.origin.x = pointer->xPos;
@ -994,10 +986,7 @@ void mf_Pointer_New(rdpContext* context, rdpPointer* pointer)
 	
 	freerdp_alpha_cursor_convert(cursor_data, pointer->xorMaskData, pointer->andMaskData,
 				     pointer->width, pointer->height, pointer->xorBpp, context->gdi->clrconv);
-	
-	// TODO if xorBpp is > 24 need to call freerdp_image_swap_color_order
-	//         see file df_graphics.c
-	
+
 	/* store cursor bitmap image in representation - required by NSImage */
 	bmiRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:(unsigned char **) &cursor_data
 											pixelsWide:rect.size.width
@ -1065,8 +1054,6 @@ void mf_Pointer_Set(rdpContext* context, rdpPointer* pointer)
 	MRDPView* view = (MRDPView*) mfc->view;

 	NSMutableArray* ma = view->cursors;
-
-	return; /* disable pointer until it is fixed */
 	
 	if (!view->mouseInClientArea)
 		return;
@ -1152,10 +1139,10 @@ void mac_end_paint(rdpContext* context)

 	for (i = 0; i < gdi->primary->hdc->hwnd->ninvalid; i++)
 	{
-		drawRect.origin.x = gdi->primary->hdc->hwnd->cinvalid[i].x;
-		drawRect.origin.y = gdi->primary->hdc->hwnd->cinvalid[i].y;
-		drawRect.size.width = gdi->primary->hdc->hwnd->cinvalid[i].w;
-		drawRect.size.height = gdi->primary->hdc->hwnd->cinvalid[i].h;
+		drawRect.origin.x = gdi->primary->hdc->hwnd->cinvalid[i].x - 1;
+		drawRect.origin.y = gdi->primary->hdc->hwnd->cinvalid[i].y - 1;
+		drawRect.size.width = gdi->primary->hdc->hwnd->cinvalid[i].w + 1;
+		drawRect.size.height = gdi->primary->hdc->hwnd->cinvalid[i].h + 1;
 		windows_to_apple_cords(mfc->view, &drawRect);
 		[view setNeedsDisplayInRect:drawRect];
 	}
@ -1235,6 +1222,7 @@ static void channel_activity_cb(CFFileDescriptorRef fdref, CFOptionFlags callBac

 	freerdp_channels_process_pending_messages(instance);
 	event = freerdp_channels_pop_event(instance->context->channels);
+
 	if (event)
 	{
 		switch (GetMessageClass(event->id))
--- a/client/Mac/cli/AppDelegate.h
+++ b/client/Mac/cli/AppDelegate.h
@ -7,8 +7,8 @@
 //

 #import <Cocoa/Cocoa.h>
-#import <MacFreeRDP-library/MRDPView.h>
-#import <MacFreeRDP-library/mfreerdp.h>
+#import <MacFreeRDP/MRDPView.h>
+#import <MacFreeRDP/mfreerdp.h>

@interface AppDelegate : NSObject <NSApplicationDelegate>
 {
@ -20,6 +20,5 @@

@property (assign) IBOutlet NSWindow *window;
@property (assign) rdpContext *context;
-@property (assign) IBOutlet MRDPView *mrdpView;

@end
--- a/client/Mac/cli/AppDelegate.m
+++ b/client/Mac/cli/AppDelegate.m
@ -7,8 +7,12 @@
 //

 #import "AppDelegate.h"
-#import "MacFreeRDP-library/mfreerdp.h"
-#import "MacFreeRDP-library/mf_client.h"
+#import "MacFreeRDP/mfreerdp.h"
+#import "MacFreeRDP/mf_client.h"
+
+static AppDelegate* _singleDelegate = nil;
+void AppDelegate_EmbedWindowEventHandler(rdpContext* context, EmbedWindowEventArgs* e);
+

@implementation AppDelegate

@ -19,7 +23,6 @@

@synthesize window = window;

-@synthesize mrdpView = mrdpView;

@synthesize context = context;

@ -28,6 +31,7 @@
 	int status;
 	mfContext* mfc;

+    _singleDelegate = self;
 	[self CreateContext];

 	status = [self ParseCommandLineArguments];
@ -41,6 +45,7 @@
 	}
 	else
 	{
+        PubSub_Subscribe(context->pubSub, "EmbedWindow", (pEventHandler) AppDelegate_EmbedWindowEventHandler);
 		freerdp_client_start(context);
 	}
 }
@ -48,6 +53,7 @@
 - (void) applicationWillTerminate:(NSNotification*)notification
 {
 	[mrdpView releaseResources];
+    _singleDelegate = nil;    
 }

 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
@ -103,4 +109,19 @@
 	context = nil;
 }

+
@end
+
+void AppDelegate_EmbedWindowEventHandler(rdpContext* context, EmbedWindowEventArgs* e)
+{
+    if (_singleDelegate)
+    {
+        mfContext* mfc = (mfContext*) context;
+        _singleDelegate->mrdpView = mfc->view;
+        
+        if (_singleDelegate->window)
+        {
+            [[_singleDelegate->window contentView] addSubview:mfc->view];
+        }
+    }
+}
--- a/client/Mac/cli/MainMenu.xib
+++ b/client/Mac/cli/MainMenu.xib
@ -2,18 +2,16 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
+		<string key="IBDocument.SystemVersion">12E55</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">3084</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBNSLayoutConstraint</string>
 			<string>NSCustomObject</string>
-			<string>NSCustomView</string>
 			<string>NSMenu</string>
 			<string>NSMenuItem</string>
 			<string>NSView</string>
@ -257,24 +255,12 @@
 				<object class="NSView" key="NSWindowView" id="439893737">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="NSCustomView" id="467991374">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrameSize">{1024, 768}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
-							<string key="NSReuseIdentifierKey">_NS:9</string>
-							<string key="NSClassName">MRDPView</string>
-						</object>
-					</array>
+					<array class="NSMutableArray" key="NSSubviews"/>
 					<string key="NSFrameSize">{1024, 768}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="467991374"/>
+					<reference key="NSNextKeyView"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{1024, 790}</string>
 				<string key="NSMaxSize">{1024, 790}</string>
 				<int key="NSWindowCollectionBehavior">128</int>
@ -369,14 +355,6 @@
 					</object>
 					<int key="connectionID">493</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mrdpView</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="467991374"/>
-					</object>
-					<int key="connectionID">569</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">window</string>
@ -551,73 +529,7 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">372</int>
 						<reference key="object" ref="439893737"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="467991374"/>
-							<object class="IBNSLayoutConstraint" id="334327932">
-								<reference key="firstItem" ref="467991374"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="439893737"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="439893737"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="890641817">
-								<reference key="firstItem" ref="467991374"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="439893737"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="439893737"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="437142032">
-								<reference key="firstItem" ref="467991374"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="439893737"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="439893737"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="934352021">
-								<reference key="firstItem" ref="467991374"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="439893737"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="439893737"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-						</array>
+						<array class="NSMutableArray" key="children"/>
 						<reference key="parent" ref="972006081"/>
 					</object>
 					<object class="IBObjectRecord">
@ -657,31 +569,6 @@
 						<reference key="object" ref="976324537"/>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">551</int>
-						<reference key="object" ref="467991374"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">561</int>
-						<reference key="object" ref="334327932"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">562</int>
-						<reference key="object" ref="890641817"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">563</int>
-						<reference key="object" ref="437142032"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">564</int>
-						<reference key="object" ref="934352021"/>
-						<reference key="parent" ref="439893737"/>
-					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -706,12 +593,6 @@
 				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="371.IBWindowTemplateEditedContentRect">{{380, 496}, {480, 360}}</string>
 				<integer value="1" key="371.NSWindowTemplate.visibleAtLaunch"/>
-				<array class="NSMutableArray" key="372.IBNSViewMetadataConstraints">
-					<reference ref="334327932"/>
-					<reference ref="890641817"/>
-					<reference ref="437142032"/>
-					<reference ref="934352021"/>
-				</array>
 				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -720,13 +601,7 @@
 				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="494.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="551.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="551.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="562.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="563.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="564.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -738,48 +613,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">570</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">AppDelegate</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="mrdpView">MRDPView</string>
-						<string key="window">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="mrdpView">
-							<string key="name">mrdpView</string>
-							<string key="candidateClassName">MRDPView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="window">
-							<string key="name">window</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppDelegate.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MRDPView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MRDPView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSLayoutConstraint</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
--- a/client/Mac/mf_client.m
+++ b/client/Mac/mf_client.m
@ -25,6 +25,7 @@
 #include <freerdp/constants.h>
 #include <freerdp/utils/signal.h>
 #include <freerdp/client/cmdline.h>
+#import "MRDPView.h"

 /**
 * Client Interface
@ -46,6 +47,13 @@ int mfreerdp_client_start(rdpContext* context)
 	MRDPView* view;
 	mfContext* mfc = (mfContext*) context;

+    if (mfc->view == NULL)
+    {
+        // view not specified beforehand. Create view dynamically
+        mfc->view = [[MRDPView alloc] initWithFrame : NSMakeRect(0, 0, context->settings->DesktopWidth, context->settings->DesktopHeight)];
+        mfc->view_ownership = TRUE;
+    }
+
 	view = (MRDPView*) mfc->view;
 	[view rdpStart:context];

@ -60,20 +68,34 @@ int mfreerdp_client_stop(rdpContext* context)
 	{
 		wMessageQueue* queue;
 		queue = freerdp_get_message_queue(context->instance, FREERDP_UPDATE_MESSAGE_QUEUE);
-		MessageQueue_PostQuit(queue, 0);
+        if (queue)
+        {
+            MessageQueue_PostQuit(queue, 0);
+        }
 	}

 	if (context->settings->AsyncInput)
 	{
 		wMessageQueue* queue;
 		queue = freerdp_get_message_queue(context->instance, FREERDP_INPUT_MESSAGE_QUEUE);
-		MessageQueue_PostQuit(queue, 0);
-	}
+        if (queue)
+        {
+            MessageQueue_PostQuit(queue, 0);
+        }
+    }
 	else
 	{
 		mfc->disconnect = TRUE;
 	}

+    if (mfc->view_ownership)
+    {
+        MRDPView* view = (MRDPView*) mfc->view;
+        [view releaseResources];
+        [view release];
+        mfc->view = nil;
+    }
+
 	return 0;
 }

@ -84,7 +106,12 @@ int mfreerdp_client_new(freerdp* instance, rdpContext* context)

 	mfc = (mfContext*) instance->context;

-	context->channels = freerdp_channels_new();
+    context->instance->PreConnect = mac_pre_connect;
+    context->instance->PostConnect = mac_post_connect;
+    context->instance->ReceiveChannelData = mac_receive_channel_data;
+    context->instance->Authenticate = mac_authenticate;
+
+    context->channels = freerdp_channels_new();

 	settings = instance->settings;

--- a/client/Mac/mfreerdp.h
+++ b/client/Mac/mfreerdp.h
@ -28,6 +28,7 @@ struct mf_context
 	DEFINE_RDP_CLIENT_COMMON();

 	void* view;
+    BOOL view_ownership; // TRUE indicates that the window was created and should be freed by the API.

 	int width;
 	int height;
--- a/client/X11/xf_channels.c
+++ b/client/X11/xf_channels.c
@ -26,19 +26,17 @@
 #include "xf_client.h"
 #include "xfreerdp.h"

-int xf_on_channel_connected(freerdp* instance, const char* name, void* pInterface)
+void xf_OnChannelConnectedEventHandler(rdpContext* context, ChannelConnectedEventArgs* e)
 {
-	xfContext* xfc = (xfContext*) instance->context;
+	xfContext* xfc = (xfContext*) context;

-	if (strcmp(name, RDPEI_DVC_CHANNEL_NAME) == 0)
+	if (strcmp(e->name, RDPEI_DVC_CHANNEL_NAME) == 0)
 	{
-		xfc->rdpei = (RdpeiClientContext*) pInterface;
+		xfc->rdpei = (RdpeiClientContext*) e->pInterface;
 	}
-
-	return 0;
 }

-int xf_on_channel_disconnected(freerdp* instance, const char* name, void* pInterface)
+void xf_OnChannelDisconnectedEventHandler(rdpContext* context, ChannelDisconnectedEventArgs* e)
 {
-	return 0;
+
 }
--- a/client/X11/xf_channels.h
+++ b/client/X11/xf_channels.h
@ -27,4 +27,7 @@
 int xf_on_channel_connected(freerdp* instance, const char* name, void* pInterface);
 int xf_on_channel_disconnected(freerdp* instance, const char* name, void* pInterface);

+void xf_OnChannelConnectedEventHandler(rdpContext* context, ChannelConnectedEventArgs* e);
+void xf_OnChannelDisconnectedEventHandler(rdpContext* context, ChannelDisconnectedEventArgs* e);
+
 #endif
--- a/client/X11/xf_client.c
+++ b/client/X11/xf_client.c
@ -666,8 +666,11 @@ BOOL xf_pre_connect(freerdp* instance)
 	settings = instance->settings;
 	channels = instance->context->channels;

-	instance->OnChannelConnected = xf_on_channel_connected;
-	instance->OnChannelDisconnected = xf_on_channel_disconnected;
+	PubSub_SubscribeChannelConnected(instance->context->pubSub,
+			(pChannelConnectedEventHandler) xf_OnChannelConnectedEventHandler);
+
+	PubSub_SubscribeChannelDisconnected(instance->context->pubSub,
+			(pChannelDisconnectedEventHandler) xf_OnChannelDisconnectedEventHandler);

 	freerdp_client_load_addins(channels, instance->settings);

--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@ -176,6 +176,9 @@ BOOL xf_generic_MotionNotify(xfContext* xfc, int x, int y, int state, Window win

 static BOOL xf_event_MotionNotify(xfContext* xfc, XEvent* event, BOOL app)
 {
+	if (xfc->use_xinput)
+		return TRUE;
+
 	return xf_generic_MotionNotify(xfc, event->xmotion.x, event->xmotion.y,
 			event->xmotion.state, event->xmotion.window, app);
 }
@ -278,6 +281,9 @@ BOOL xf_generic_ButtonPress(xfContext* xfc, int x, int y, int button, Window win

 static BOOL xf_event_ButtonPress(xfContext* xfc, XEvent* event, BOOL app)
 {
+	if (xfc->use_xinput)
+		return TRUE;
+
 	return xf_generic_ButtonPress(xfc, event->xbutton.x, event->xbutton.y,
 			event->xbutton.button, event->xbutton.window, app);
 }
@ -290,6 +296,7 @@ BOOL xf_generic_ButtonRelease(xfContext* xfc, int x, int y, int button, Window w
 	rdpInput* input;
 	Window childWindow;

+
 	flags = 0;
 	wheel = FALSE;
 	extended = FALSE;
@ -361,6 +368,9 @@ BOOL xf_generic_ButtonRelease(xfContext* xfc, int x, int y, int button, Window w

 static BOOL xf_event_ButtonRelease(xfContext* xfc, XEvent* event, BOOL app)
 {
+	if (xfc->use_xinput)
+		return TRUE;
+
 	return xf_generic_ButtonRelease(xfc, event->xbutton.x, event->xbutton.y,
 			event->xbutton.button, event->xbutton.window, app);
 }
--- a/client/X11/xf_input.c
+++ b/client/X11/xf_input.c
@ -163,8 +163,11 @@ int xf_input_init(xfContext* xfc, Window window)

 			if (xfc->use_xinput)
 			{
-				if (!touch && (class->type == XIButtonClass))
+				if (!touch && (class->type == XIButtonClass) && strcmp(dev->name, "Virtual core pointer"))
 				{
+					printf("%s button device (id: %d, mode: %d)\n",
+						dev->name,
+						dev->deviceid, t->mode);
 					XISetMask(masks[nmasks], XI_ButtonPress);
 					XISetMask(masks[nmasks], XI_ButtonRelease);
 					XISetMask(masks[nmasks], XI_Motion);
@ -419,24 +422,23 @@ int xf_input_touch_remote(xfContext* xfc, XIDeviceEvent* event, int evtype)

 int xf_input_event(xfContext* xfc, XIDeviceEvent* event, int evtype)
 {
-	return TRUE;

 	switch (evtype)
 	{
 		case XI_ButtonPress:
-			printf("ButtonPress\n");
+			//printf("ButtonPress\n");
 			xf_generic_ButtonPress(xfc, (int) event->event_x, (int) event->event_y,
 					event->detail, event->event, xfc->remote_app);
 			break;

 		case XI_ButtonRelease:
-			printf("ButtonRelease\n");
+			//printf("ButtonRelease\n");
 			xf_generic_ButtonRelease(xfc, (int) event->event_x, (int) event->event_y,
 					event->detail, event->event, xfc->remote_app);
 			break;

 		case XI_Motion:
-			printf("Motion\n");
+			//printf("Motion\n");
 			xf_generic_MotionNotify(xfc, (int) event->event_x, (int) event->event_y,
 					event->detail, event->event, xfc->remote_app);
 			break;
--- a/client/common/client.c
+++ b/client/common/client.c
@ -56,8 +56,8 @@ rdpContext* freerdp_client_context_new(RDP_CLIENT_ENTRY_POINTS* pEntryPoints)
 	freerdp_context_new(instance);

 	context = instance->context;
-    context->instance = instance;
-    context->settings = instance->settings;
+	context->instance = instance;
+	context->settings = instance->settings;

 	return context;
 }
@ -112,16 +112,13 @@ int freerdp_client_parse_command_line(rdpContext* context, int argc, char** argv

 	if (settings->ConnectionFile)
 	{
-		rdpFile* file = freerdp_client_rdp_file_new();
-		freerdp_client_parse_rdp_file(file, settings->ConnectionFile);
-		freerdp_client_populate_settings_from_rdp_file(file, settings);
-		freerdp_client_rdp_file_free(file);
+        return freerdp_client_parse_connection_file(context, settings->ConnectionFile);
 	}

 	return status;
 }

-int freerdp_client_parse_connection_file(rdpContext* context, char* filename)
+int freerdp_client_parse_connection_file(rdpContext* context, const char* filename)
 {
 	rdpFile* file;

@ -136,11 +133,35 @@ int freerdp_client_parse_connection_file(rdpContext* context, char* filename)
 int freerdp_client_parse_connection_file_buffer(rdpContext* context, BYTE* buffer, size_t size)
 {
 	rdpFile* file;
+    int status = -1;

 	file = freerdp_client_rdp_file_new();
-	freerdp_client_parse_rdp_file_buffer(file, buffer, size);
-	freerdp_client_populate_settings_from_rdp_file(file, context->settings);
+    if (freerdp_client_parse_rdp_file_buffer(file, buffer, size)
+        && freerdp_client_populate_settings_from_rdp_file(file, context->settings))
+    {
+        status = 0;
+    }
+
 	freerdp_client_rdp_file_free(file);

-	return 0;
+    return status;
+}
+
+int freerdp_client_write_connection_file(rdpContext* context, const char* filename, BOOL unicode)
+{
+    rdpFile* file;
+    int status = -1;
+
+    file = freerdp_client_rdp_file_new();
+    if (freerdp_client_populate_rdp_file_from_settings(file, context->settings))
+    {
+        if (freerdp_client_write_rdp_file(file, filename, unicode))
+        {
+            status = 0;
+        }
+    }
+
+    freerdp_client_rdp_file_free(file);
+
+    return status;
 }
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@ -91,6 +91,7 @@ COMMAND_LINE_ARGUMENT_A args[] =
 	{ "usb", COMMAND_LINE_VALUE_REQUIRED, NULL, NULL, NULL, -1, NULL, "Redirect USB device" },
 	{ "multitouch", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Redirect multitouch input" },
 	{ "echo", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "echo", "Echo channel" },
+	{ "disp", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL, "Display control" },
 	{ "fonts", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Smooth fonts (ClearType)" },
 	{ "aero", COMMAND_LINE_VALUE_BOOL, NULL, NULL, BoolValueFalse, -1, NULL, "Desktop composition" },
 	{ "window-drag", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Full window drag" },
@ -607,6 +608,16 @@ int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_ARGUMENT

 		freerdp_client_add_dynamic_channel(settings, count, p);
 	}
+	CommandLineSwitchCase(arg, "disp")
+	{
+		char* p[1];
+		int count;
+
+		count = 1;
+		p[0] = "disp";
+
+		freerdp_client_add_dynamic_channel(settings, count, p);
+	}
 	CommandLineSwitchCase(arg, "sound")
 	{
 		if (arg->Flags & COMMAND_LINE_VALUE_PRESENT)
@ -1238,8 +1249,9 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
 				settings->GatewayHostname = _strdup(settings->ServerHostname);
 			}

-			settings->GatewayUsageMethod = TRUE;
+			settings->GatewayUsageMethod = TSC_PROXY_MODE_DIRECT;
 			settings->GatewayUseSameCredentials = TRUE;
+			settings->GatewayEnabled = TRUE;
 		}
 		CommandLineSwitchCase(arg, "gu")
 		{
@ -1633,7 +1645,7 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
 	if (settings->DisableThemes)
 		settings->PerformanceFlags |= PERF_DISABLE_THEMING;

-	if (settings->GatewayUsageMethod)
+	if (settings->GatewayEnabled)
 	{
 		if (settings->GatewayUseSameCredentials)
 		{
--- a/client/common/file.c
+++ b/client/common/file.c
@ -439,7 +439,7 @@ BOOL freerdp_client_parse_rdp_file_buffer(rdpFile* file, BYTE* buffer, size_t si
 	return freerdp_client_parse_rdp_file_buffer_ascii(file, buffer, size);
 }

-BOOL freerdp_client_parse_rdp_file(rdpFile* file, char* name)
+BOOL freerdp_client_parse_rdp_file(rdpFile* file, const char* name)
 {
 	BYTE* buffer;
 	FILE* fp = NULL;
@ -480,7 +480,8 @@ BOOL freerdp_client_parse_rdp_file(rdpFile* file, char* name)
 	return freerdp_client_parse_rdp_file_buffer(file, buffer, file_size);
 }

-#define SETTING_MODIFIED(_settings, _field) (_settings->settings_modified[FreeRDP_##_field])
+#define WRITE_ALL_SETTINGS TRUE
+#define SETTING_MODIFIED(_settings, _field) (WRITE_ALL_SETTINGS || _settings->settings_modified[FreeRDP_##_field])
 #define SETTING_MODIFIED_SET(_target, _settings, _field) if SETTING_MODIFIED(_settings, _field) _target = _settings->_field

 BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, rdpSettings* settings)
@ -529,9 +530,9 @@ BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, rdpSettings*
 }


-BOOL freerdp_client_write_rdp_file(rdpFile* file, char* name, BOOL unicode)
+BOOL freerdp_client_write_rdp_file(rdpFile* file, const char* name, BOOL unicode)
 {
-	BOOL success = FALSE;
+    int rc = 0;
 	char* buffer;
 	int len, len2;
 	FILE* fp = NULL;
@ -559,22 +560,22 @@ BOOL freerdp_client_write_rdp_file(rdpFile* file, char* name, BOOL unicode)
 				fwrite(BOM_UTF16_LE, sizeof(BYTE), 2, fp);
 				fwrite(unicodestr, 2, len, fp);

-				free(unicodestr);
+                free(unicodestr);
 			}
 			else
 			{
 				fwrite(buffer, 1, len, fp);
 			}

-			fflush(fp);
-			fclose(fp);
+            rc = fflush(fp);
+            rc = fclose(fp);
 		}
 	}

 	if (buffer != NULL)
 		free(buffer);

-	return success;
+    return (rc == 0);
 }

 #define WRITE_RDP_FILE_DECLARE(_file, _buffer, _size) \
@ -731,11 +732,19 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*

 	if (~((size_t) file->GatewayHostname))
 		freerdp_set_param_string(settings, FreeRDP_GatewayHostname, file->GatewayHostname);
+
 	if (~file->GatewayUsageMethod)
-		freerdp_set_param_bool(settings, FreeRDP_GatewayUsageMethod, file->GatewayUsageMethod);
+	{
+		freerdp_set_param_uint32(settings, FreeRDP_GatewayUsageMethod, file->GatewayUsageMethod);
+
+		if (file->GatewayUsageMethod == TSC_PROXY_MODE_DIRECT)
+			freerdp_set_param_bool(settings, FreeRDP_GatewayEnabled, TRUE);
+		else if (file->GatewayUsageMethod == TSC_PROXY_MODE_NONE_DETECT)
+			freerdp_set_param_bool(settings, FreeRDP_GatewayEnabled, FALSE);
+	}
+
 	if (~file->PromptCredentialOnce)
-		freerdp_set_param_bool(settings, FreeRDP_GatewayUsageMethod, file->GatewayUsageMethod);
-		settings->GatewayUseSameCredentials = TRUE;
+		freerdp_set_param_bool(settings, FreeRDP_GatewayUseSameCredentials, TRUE);
 	
 	if (~file->RemoteApplicationMode)
 		freerdp_set_param_bool(settings, FreeRDP_RemoteApplicationMode, file->RemoteApplicationMode);
--- a/client/iOS/Models/RDPSession.m
+++ b/client/iOS/Models/RDPSession.m
@ -175,7 +175,8 @@ NSString* TSXSessionDidFailToConnectNotification = @"TSXSessionDidFailToConnect"
        settings->GatewayUsername = strdup([_params UTF8StringForKey:@"tsg_username"]);
        settings->GatewayPassword = strdup([_params UTF8StringForKey:@"tsg_password"]);
        settings->GatewayDomain = strdup([_params UTF8StringForKey:@"tsg_domain"]);
-        settings->GatewayUsageMethod = TRUE;
+        settings->GatewayUsageMethod = TSC_PROXY_MODE_DIRECT;
+        settings->GatewayEnabled = TRUE;
        settings->GatewayUseSameCredentials = FALSE;
    }
    
--- a/include/freerdp/client.h
+++ b/include/freerdp/client.h
@ -84,8 +84,9 @@ FREERDP_API freerdp* freerdp_client_get_instance(rdpContext* context);
 FREERDP_API HANDLE freerdp_client_get_thread(rdpContext* context);

 FREERDP_API int freerdp_client_parse_command_line(rdpContext* context, int argc, char** argv);
-FREERDP_API int freerdp_client_parse_connection_file(rdpContext* context, char* filename);
+FREERDP_API int freerdp_client_parse_connection_file(rdpContext* context, const char* filename);
 FREERDP_API int freerdp_client_parse_connection_file_buffer(rdpContext* context, BYTE* buffer, size_t size);
+FREERDP_API int freerdp_client_write_connection_file(rdpContext* context, const char* filename, BOOL unicode);

 #ifdef __cplusplus
 }
--- a/include/freerdp/client/disp.h
+++ b/include/freerdp/client/disp.h
@ -0,0 +1,64 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Display Update Virtual Channel Extension
+ *
+ * Copyright 2013 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FREERDP_CHANNEL_CLIENT_DISP_H
+#define FREERDP_CHANNEL_CLIENT_DISP_H
+
+#define ORIENTATION_LANDSCAPE				0
+#define ORIENTATION_PORTRAIT				90
+#define ORIENTATION_LANDSCAPE_FLIPPED			180
+#define ORIENTATION_PORTRAIT_FLIPPED			270
+
+#define DISPLAY_CONTROL_MONITOR_PRIMARY			0x00000001
+
+struct _DISPLAY_CONTROL_MONITOR_LAYOUT
+{
+	UINT32 Flags;
+	INT32 Left;
+	INT32 Top;
+	UINT32 Width;
+	UINT32 Height;
+	UINT32 PhysicalWidth;
+	UINT32 PhysicalHeight;
+	UINT32 Orientation;
+	UINT32 DesktopScaleFactor;
+	UINT32 DeviceScaleFactor;
+};
+typedef struct _DISPLAY_CONTROL_MONITOR_LAYOUT DISPLAY_CONTROL_MONITOR_LAYOUT;
+
+/**
+ * Client Interface
+ */
+
+#define DISP_DVC_CHANNEL_NAME	"Microsoft::Windows::RDS::DisplayControl"
+
+typedef struct _disp_client_context DispClientContext;
+
+typedef int (*pcDispSendMonitorLayout)(DispClientContext* context, UINT32 NumMonitors, DISPLAY_CONTROL_MONITOR_LAYOUT* Monitors);
+
+struct _disp_client_context
+{
+	void* handle;
+	void* custom;
+
+	pcDispSendMonitorLayout SendMonitorLayout;
+};
+
+#endif /* FREERDP_CHANNEL_CLIENT_DISP_H */
+
--- a/include/freerdp/client/file.h
+++ b/include/freerdp/client/file.h
@ -137,12 +137,12 @@ typedef struct rdp_file rdpFile;
 extern "C" {
 #endif

-FREERDP_API BOOL freerdp_client_parse_rdp_file(rdpFile* file, char* name);
+FREERDP_API BOOL freerdp_client_parse_rdp_file(rdpFile* file, const char* name);
 FREERDP_API BOOL freerdp_client_parse_rdp_file_buffer(rdpFile* file, BYTE* buffer, size_t size);
 FREERDP_API BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings* settings);

 FREERDP_API BOOL freerdp_client_populate_rdp_file_from_settings(rdpFile* file, rdpSettings* settings);
-FREERDP_API BOOL freerdp_client_write_rdp_file(rdpFile* file, char* name, BOOL unicode);
+FREERDP_API BOOL freerdp_client_write_rdp_file(rdpFile* file, const char* name, BOOL unicode);
 FREERDP_API size_t freerdp_client_write_rdp_file_buffer(rdpFile* file, char* buffer, size_t size);

 FREERDP_API rdpFile* freerdp_client_rdp_file_new(void);
--- a/include/freerdp/codec/bitmap.h
+++ b/include/freerdp/codec/bitmap.h
@ -23,6 +23,12 @@
 #include <freerdp/api.h>
 #include <freerdp/types.h>

+#include <winpr/crt.h>
+#include <winpr/stream.h>
+
 FREERDP_API BOOL bitmap_decompress(BYTE* srcData, BYTE* dstData, int width, int height, int size, int srcBpp, int dstBpp);

+FREERDP_API int freerdp_bitmap_compress(char* in_data, int width, int height,
+		wStream* s, int bpp, int byte_limit, int start_line, wStream* temp_s, int e);
+
 #endif /* FREERDP_CODEC_BITMAP_H */
--- a/include/freerdp/event.h
+++ b/include/freerdp/event.h
@ -41,6 +41,11 @@ DEFINE_EVENT_BEGIN(ResizeWindow)
 	int width;
 	int height;
 DEFINE_EVENT_END(ResizeWindow)
+
+DEFINE_EVENT_BEGIN(LocalResizeWindow)
+	int width;
+	int height;
+DEFINE_EVENT_END(LocalResizeWindow)
 	
 DEFINE_EVENT_BEGIN(EmbedWindow)
 	BOOL embed;
@ -68,6 +73,20 @@ DEFINE_EVENT_BEGIN(Terminate)
 	int code;
 DEFINE_EVENT_END(Terminate)

+DEFINE_EVENT_BEGIN(ConnectionResult)
+	int result;
+DEFINE_EVENT_END(ConnectionResult)
+
+DEFINE_EVENT_BEGIN(ChannelConnected)
+	const char* name;
+	void* pInterface;
+DEFINE_EVENT_END(ChannelConnected)
+
+DEFINE_EVENT_BEGIN(ChannelDisconnected)
+	const char* name;
+	void* pInterface;
+DEFINE_EVENT_END(ChannelDisconnected)
+
 #ifdef	__cplusplus
 }
 #endif
--- a/include/freerdp/freerdp.h
+++ b/include/freerdp/freerdp.h
@ -66,9 +66,6 @@ typedef int (*pLogonErrorInfo)(freerdp* instance, UINT32 data, UINT32 type);
 typedef int (*pSendChannelData)(freerdp* instance, int channelId, BYTE* data, int size);
 typedef int (*pReceiveChannelData)(freerdp* instance, int channelId, BYTE* data, int size, int flags, int total_size);

-typedef int (*pOnChannelConnected)(freerdp* instance, const char* name, void* pInterface);
-typedef int (*pOnChannelDisconnected)(freerdp* instance, const char* name, void* pInterface);
-
 /**
 * Defines the context for a given instance of RDP connection.
 * It is embedded in the rdp_freerdp structure, and allocated by a call to freerdp_context_new().
@ -208,9 +205,6 @@ struct rdp_freerdp
 											   This is called by freerdp_channel_process() (if not NULL).
 											   Clients will typically use a function that calls freerdp_channels_data() to perform the needed tasks. */

-	ALIGN64 pOnChannelConnected OnChannelConnected;
-	ALIGN64 pOnChannelDisconnected OnChannelDisconnected;
-
 	UINT64 paddingE[80 - 66]; /* 66 */
 };

--- a/include/freerdp/settings.h
+++ b/include/freerdp/settings.h
@ -633,6 +633,7 @@ typedef struct _RDPDR_PARALLEL RDPDR_PARALLEL;
 #define FreeRDP_GatewayDomain					1989
 #define FreeRDP_GatewayCredentialsSource			1990
 #define FreeRDP_GatewayUseSameCredentials			1991
+#define FreeRDP_GatewayEnabled					1992
 #define FreeRDP_RemoteApplicationMode				2112
 #define FreeRDP_RemoteApplicationName				2113
 #define FreeRDP_RemoteApplicationIcon				2114
@ -1019,7 +1020,7 @@ struct rdp_settings
 	 */

 	/* Gateway */
-	ALIGN64 BOOL GatewayUsageMethod; /* 1984 */
+	ALIGN64 UINT32 GatewayUsageMethod; /* 1984 */
 	ALIGN64 UINT32 GatewayPort; /* 1985 */
 	ALIGN64 char* GatewayHostname; /* 1986 */
 	ALIGN64 char* GatewayUsername; /* 1987 */
@ -1027,7 +1028,8 @@ struct rdp_settings
 	ALIGN64 char* GatewayDomain; /* 1989 */
 	ALIGN64 UINT32 GatewayCredentialsSource; /* 1990 */
 	ALIGN64 BOOL GatewayUseSameCredentials; /* 1991 */
-	UINT64 padding2048[2048 - 1992]; /* 1992 */
+	ALIGN64 BOOL GatewayEnabled; /* 1992 */
+	UINT64 padding2048[2048 - 1993]; /* 1993 */
 	UINT64 padding2112[2112 - 2048]; /* 2048 */

 	/**
--- a/libfreerdp/codec/CMakeLists.txt
+++ b/libfreerdp/codec/CMakeLists.txt
@ -20,9 +20,10 @@ set(MODULE_PREFIX "FREERDP_CODEC")

 set(${MODULE_PREFIX}_SRCS
 	dsp.c
-	bitmap.c
 	color.c
 	audio.c
+	bitmap_decode.c
+	bitmap_encode.c
 	rfx_bitstream.h
 	rfx_constants.h
 	rfx_decode.c
--- a/libfreerdp/codec/bitmap_decode.c
+++ b/libfreerdp/codec/bitmap_decode.c
@ -1,6 +1,6 @@
 /**
 * FreeRDP: A Remote Desktop Protocol Implementation
- * Compressed Bitmap
+ * Bitmap Decompression
 *
 * Copyright 2011 Jay Sorg <jay.sorg@gmail.com>
 *
--- a/libfreerdp/codec/bitmap_encode.c
+++ b/libfreerdp/codec/bitmap_encode.c
--- a/libfreerdp/common/settings.c
+++ b/libfreerdp/common/settings.c
@ -562,14 +562,14 @@ BOOL freerdp_get_param_bool(rdpSettings* settings, int id)
 			return settings->PlayRemoteFx;
 			break;

-		case FreeRDP_GatewayUsageMethod:
-			return settings->GatewayUsageMethod;
-			break;
-
 		case FreeRDP_GatewayUseSameCredentials:
 			return settings->GatewayUseSameCredentials;
 			break;

+		case FreeRDP_GatewayEnabled:
+			return settings->GatewayEnabled;
+			break;
+
 		case FreeRDP_RemoteApplicationMode:
 			return settings->RemoteApplicationMode;
 			break;
@ -1017,14 +1017,14 @@ int freerdp_set_param_bool(rdpSettings* settings, int id, BOOL param)
 			settings->PlayRemoteFx = param;
 			break;

-		case FreeRDP_GatewayUsageMethod:
-			settings->GatewayUsageMethod = param;
-			break;
-
 		case FreeRDP_GatewayUseSameCredentials:
 			settings->GatewayUseSameCredentials = param;
 			break;

+		case FreeRDP_GatewayEnabled:
+			settings->GatewayEnabled = param;
+			break;
+
 		case FreeRDP_RemoteApplicationMode:
 			settings->RemoteApplicationMode = param;
 			break;
@ -1417,6 +1417,10 @@ UINT32 freerdp_get_param_uint32(rdpSettings* settings, int id)
 			return settings->PercentScreen;
 			break;

+		case FreeRDP_GatewayUsageMethod:
+			return settings->GatewayUsageMethod;
+			break;
+
 		case FreeRDP_GatewayPort:
 			return settings->GatewayPort;
 			break;
@ -1736,6 +1740,10 @@ int freerdp_set_param_uint32(rdpSettings* settings, int id, UINT32 param)
 			settings->PercentScreen = param;
 			break;

+		case FreeRDP_GatewayUsageMethod:
+			settings->GatewayUsageMethod = param;
+			break;
+
 		case FreeRDP_GatewayPort:
 			settings->GatewayPort = param;
 			break;
--- a/libfreerdp/core/connection.c
+++ b/libfreerdp/core/connection.c
@ -75,17 +75,21 @@ BOOL rdp_client_connect(rdpRdp* rdp)
 	nego_init(rdp->nego);
 	nego_set_target(rdp->nego, settings->ServerHostname, settings->ServerPort);

-	if (settings->GatewayUsageMethod)
+	if (settings->GatewayEnabled)
 	{
-		char* user;
+        char* user;
 		char* domain;
 		char* cookie;
-		int user_length;
+        int user_length = 0;
 		int domain_length;
 		int cookie_length;

-		user = settings->Username;
-		user_length = strlen(settings->Username);
+
+        if (settings->Username)
+        {
+            user = settings->Username;
+            user_length = strlen(settings->Username);
+        }

 		if (settings->Domain)
 			domain = settings->Domain;
@ -100,8 +104,11 @@ BOOL rdp_client_connect(rdpRdp* rdp)
 		CopyMemory(cookie, domain, domain_length);
 		CharUpperBuffA(cookie, domain_length);
 		cookie[domain_length] = '\\';
-		CopyMemory(&cookie[domain_length + 1], user, user_length);
-		cookie[cookie_length] = '\0';
+
+        if (settings->Username)
+            CopyMemory(&cookie[domain_length + 1], user, user_length);
+
+        cookie[cookie_length] = '\0';

 		nego_set_cookie(rdp->nego, cookie);
 		free(cookie);
--- a/libfreerdp/core/freerdp.c
+++ b/libfreerdp/core/freerdp.c
@ -56,6 +56,7 @@ BOOL freerdp_connect(freerdp* instance)
 	rdpRdp* rdp;
 	rdpSettings* settings;
 	BOOL status = FALSE;
+	ConnectionResultEventArgs e;

 	/* We always set the return code to 0 before we start the connect sequence*/
 	connectErrorCode = 0;
@ -169,6 +170,10 @@ BOOL freerdp_connect(freerdp* instance)

 	SetEvent(rdp->transport->connectedEvent);

+	EventArgsInit(&e, "freerdp");
+	e.result = status ? 0 : -1;
+	PubSub_OnConnectionResult(instance->context->pubSub, instance->context, &e);
+
 	return status;
 }

@ -325,12 +330,16 @@ static wEventType FreeRDP_Events[] =
 {
 	DEFINE_EVENT_ENTRY(WindowStateChange)
 	DEFINE_EVENT_ENTRY(ResizeWindow)
+	DEFINE_EVENT_ENTRY(LocalResizeWindow)
 	DEFINE_EVENT_ENTRY(EmbedWindow)
 	DEFINE_EVENT_ENTRY(PanningChange)
 	DEFINE_EVENT_ENTRY(ScalingFactorChange)
 	DEFINE_EVENT_ENTRY(ErrorInfo)
 	DEFINE_EVENT_ENTRY(ParamChange)
 	DEFINE_EVENT_ENTRY(Terminate)
+	DEFINE_EVENT_ENTRY(ConnectionResult)
+	DEFINE_EVENT_ENTRY(ChannelConnected)
+	DEFINE_EVENT_ENTRY(ChannelDisconnected)
 };

 /** Allocator function for a rdp context.
--- a/libfreerdp/core/gateway/tsg.c
+++ b/libfreerdp/core/gateway/tsg.c
@ -1369,6 +1369,10 @@ BOOL tsg_disconnect(rdpTsg* tsg)
 	 *        |                                                   |
 	 */

+
+    if (tsg == NULL)
+        return FALSE;
+
 	tsg->rpc->client->SynchronousReceive = TRUE;

    /* if we are already in state pending (i.e. if a server initiated disconnect was issued)
@ -1392,7 +1396,12 @@ BOOL tsg_disconnect(rdpTsg* tsg)
 int tsg_read(rdpTsg* tsg, BYTE* data, UINT32 length)
 {
 	int CopyLength;
-	rdpRpc* rpc = tsg->rpc;
+    rdpRpc* rpc;
+
+    if (tsg == NULL)
+        return -1;
+
+    rpc = tsg->rpc;

 	if (tsg->PendingPdu)
 	{
--- a/libfreerdp/core/transport.c
+++ b/libfreerdp/core/transport.c
@ -213,7 +213,7 @@ BOOL transport_connect(rdpTransport* transport, const char* hostname, UINT16 por
 				(LPTHREAD_START_ROUTINE) transport_client_thread, transport, 0, NULL);
 	}

-	if (transport->settings->GatewayUsageMethod)
+	if (transport->settings->GatewayEnabled)
 	{
 		transport->layer = TRANSPORT_LAYER_TSG;
 		transport->TcpOut = tcp_new(settings);
@ -788,7 +788,6 @@ static void* transport_client_thread(void* arg)
 	freerdp* instance;
 	rdpContext* context;
 	rdpTransport* transport;
-	TerminateEventArgs e;

 	transport = (rdpTransport*) arg;
 	instance = (freerdp*) transport->settings->instance;
--- a/libfreerdp/crypto/tls.c
+++ b/libfreerdp/crypto/tls.c
@ -184,7 +184,7 @@ BOOL tls_connect(rdpTls* tls)
 		return FALSE;
 	}

-	if (tls->settings->GatewayUsageMethod)
+	if (tls->settings->GatewayEnabled)
 		hostname = tls->settings->GatewayHostname;
 	else
 		hostname = tls->settings->ServerHostname;
--- a/winpr/include/winpr/collections.h
+++ b/winpr/include/winpr/collections.h
@ -171,13 +171,39 @@ typedef struct _wDictionary wDictionary;

 /* System.Collections.Specialized.ListDictionary */

+typedef struct _wListDictionaryItem wListDictionaryItem;
+
+struct _wListDictionaryItem
+{
+	void* key;
+	void* value;
+
+	wListDictionaryItem* next;
+};
+
 struct _wListDictionary
 {
 	BOOL synchronized;
 	HANDLE mutex;
+
+	wListDictionaryItem* head;
 };
 typedef struct _wListDictionary wListDictionary;

+WINPR_API int ListDictionary_Count(wListDictionary* listDictionary);
+
+WINPR_API void ListDictionary_Add(wListDictionary* listDictionary, void* key, void* value);
+WINPR_API void ListDictionary_Remove(wListDictionary* listDictionary, void* key);
+WINPR_API void ListDictionary_Clear(wListDictionary* listDictionary);
+
+WINPR_API BOOL ListDictionary_Contains(wListDictionary* listDictionary, void* key);
+
+WINPR_API void* ListDictionary_GetItemValue(wListDictionary* listDictionary, void* key);
+WINPR_API BOOL ListDictionary_SetItemValue(wListDictionary* listDictionary, void* key, void* value);
+
+WINPR_API wListDictionary* ListDictionary_New(BOOL synchronized);
+WINPR_API void ListDictionary_Free(wListDictionary* listDictionary);
+
 /* System.Collections.Generic.KeyValuePair<TKey,TValue> */

 struct _wKeyValuePair
--- a/winpr/libwinpr/synch/wait.c
+++ b/winpr/libwinpr/synch/wait.c
@ -210,6 +210,9 @@ DWORD WaitForMultipleObjects(DWORD nCount, const HANDLE* lpHandles, BOOL bWaitAl
 			return WAIT_FAILED;
 		}

+        if (fd == -1)
+            return WAIT_FAILED;
+
 		FD_SET(fd, &fds);

 		if (fd > maxfd)
--- a/winpr/libwinpr/utils/collections/ListDictionary.c
+++ b/winpr/libwinpr/utils/collections/ListDictionary.c
@ -26,6 +26,8 @@
 /**
 * C equivalent of the C# ListDictionary Class:
 * http://msdn.microsoft.com/en-us/library/system.collections.specialized.listdictionary.aspx
+ *
+ * Internal implementation uses a singly-linked list
 */

 /**
@ -38,7 +40,21 @@

 int ListDictionary_Count(wListDictionary* listDictionary)
 {
-	return 0;
+	int count = 0;
+	wListDictionaryItem* item;
+
+	if (!listDictionary->head)
+		return 0;
+
+	item = listDictionary->head;
+
+	while (item)
+	{
+		count++;
+		item = item->next;
+	}
+
+	return count;
 }

 /**
@ -78,7 +94,28 @@ BOOL ListDictionary_IsSynchronized(wListDictionary* listDictionary)

 void ListDictionary_Add(wListDictionary* listDictionary, void* key, void* value)
 {
+	wListDictionaryItem* item;
+	wListDictionaryItem* lastItem;

+	item = (wListDictionaryItem*) malloc(sizeof(wListDictionaryItem));
+
+	item->key = key;
+	item->value = value;
+
+	item->next = NULL;
+
+	if (!listDictionary->head)
+	{
+		listDictionary->head = item;
+		return;
+	}
+
+	lastItem = listDictionary->head;
+
+	while (lastItem->next)
+		lastItem = lastItem->next;
+
+	lastItem->next = item;
 }

 /**
@ -87,7 +124,22 @@ void ListDictionary_Add(wListDictionary* listDictionary, void* key, void* value)

 void ListDictionary_Clear(wListDictionary* listDictionary)
 {
+	wListDictionaryItem* item;
+	wListDictionaryItem* nextItem;

+	if (!listDictionary->head)
+		return;
+
+	item = listDictionary->head;
+
+	while (item)
+	{
+		nextItem = item->next;
+		free(item);
+		item = nextItem;
+	}
+
+	listDictionary->head = NULL;
 }

 /**
@ -96,7 +148,22 @@ void ListDictionary_Clear(wListDictionary* listDictionary)

 BOOL ListDictionary_Contains(wListDictionary* listDictionary, void* key)
 {
-	return FALSE;
+	wListDictionaryItem* item;
+
+	if (!listDictionary->head)
+		return FALSE;
+
+	item = listDictionary->head;
+
+	while (item)
+	{
+		if (item->key == key)
+			break;
+
+		item = item->next;
+	}
+
+	return (item) ? TRUE : FALSE;
 }

 /**
@ -105,7 +172,89 @@ BOOL ListDictionary_Contains(wListDictionary* listDictionary, void* key)

 void ListDictionary_Remove(wListDictionary* listDictionary, void* key)
 {
+	wListDictionaryItem* item;
+	wListDictionaryItem* prevItem;

+	if (!listDictionary->head)
+		return;
+
+	item = listDictionary->head;
+
+	if (listDictionary->head->key == key)
+	{
+		listDictionary->head = listDictionary->head->next;
+		free(item);
+		return;
+	}
+
+	if (!item->next)
+		return;
+
+	prevItem = item;
+	item = item->next;
+
+	while (item)
+	{
+		if (item->key == key)
+		{
+			prevItem->next = item->next;
+			free(item);
+			break;
+		}
+
+		item = item->next;
+	}
+}
+
+/**
+ * Get an item value using key
+ */
+
+void* ListDictionary_GetItemValue(wListDictionary* listDictionary, void* key)
+{
+	wListDictionaryItem* item;
+
+	if (!listDictionary->head)
+		return NULL;
+
+	item = listDictionary->head;
+
+	while (item)
+	{
+		if (item->key == key)
+			break;
+
+		item = item->next;
+	}
+
+	return (item) ? item->value : NULL;
+}
+
+/**
+ * Set an item value using key
+ */
+
+BOOL ListDictionary_SetItemValue(wListDictionary* listDictionary, void* key, void* value)
+{
+	wListDictionaryItem* item;
+
+	if (!listDictionary->head)
+		return FALSE;
+
+	item = listDictionary->head;
+
+	while (item)
+	{
+		if (item->key == key)
+			break;
+
+		item = item->next;
+	}
+
+	if (item)
+		item->value = value;
+
+	return (item) ? TRUE : FALSE;
 }

 /**
@ -121,6 +270,8 @@ wListDictionary* ListDictionary_New(BOOL synchronized)
 	if (listDictionary)
 	{
 		listDictionary->synchronized = synchronized;
+
+		listDictionary->head = NULL;
 	}

 	return listDictionary;
@ -128,6 +279,10 @@ wListDictionary* ListDictionary_New(BOOL synchronized)

 void ListDictionary_Free(wListDictionary* listDictionary)
 {
-	free(listDictionary);
+	if (listDictionary)
+	{
+		ListDictionary_Clear(listDictionary);
+		free(listDictionary);
+	}
 }

--- a/winpr/libwinpr/utils/test/CMakeLists.txt
+++ b/winpr/libwinpr/utils/test/CMakeLists.txt
@ -9,6 +9,7 @@ set(${MODULE_PREFIX}_TESTS
 	TestPrint.c
 	TestPubSub.c
 	TestArrayList.c
+	TestListDictionary.c
 	TestCmdLine.c
 	TestStreamPool.c
 	TestMessageQueue.c
--- a/winpr/libwinpr/utils/test/TestListDictionary.c
+++ b/winpr/libwinpr/utils/test/TestListDictionary.c
@ -0,0 +1,130 @@
+
+#include <winpr/crt.h>
+#include <winpr/tchar.h>
+#include <winpr/collections.h>
+
+static char* key1 = "key1";
+static char* key2 = "key2";
+static char* key3 = "key3";
+
+static char* val1 = "val1";
+static char* val2 = "val2";
+static char* val3 = "val3";
+
+int TestListDictionary(int argc, char* argv[])
+{
+	int count;
+	char* value;
+	wListDictionary* list;
+
+	list = ListDictionary_New(FALSE);
+
+	ListDictionary_Add(list, key1, val1);
+	ListDictionary_Add(list, key2, val2);
+	ListDictionary_Add(list, key3, val3);
+
+	count = ListDictionary_Count(list);
+
+	if (count != 3)
+	{
+		printf("ListDictionary_Count: Expected : %d, Actual: %d\n", 3, count);
+		return -1;
+	}
+
+	ListDictionary_Remove(list, key2);
+
+	count = ListDictionary_Count(list);
+
+	if (count != 2)
+	{
+		printf("ListDictionary_Count: Expected : %d, Actual: %d\n", 2, count);
+		return -1;
+	}
+
+	ListDictionary_Remove(list, key3);
+
+	count = ListDictionary_Count(list);
+
+	if (count != 1)
+	{
+		printf("ListDictionary_Count: Expected : %d, Actual: %d\n", 1, count);
+		return -1;
+	}
+
+	ListDictionary_Remove(list, key1);
+
+	count = ListDictionary_Count(list);
+
+	if (count != 0)
+	{
+		printf("ListDictionary_Count: Expected : %d, Actual: %d\n", 0, count);
+		return -1;
+	}
+
+	ListDictionary_Add(list, key1, val1);
+	ListDictionary_Add(list, key2, val2);
+	ListDictionary_Add(list, key3, val3);
+
+	count = ListDictionary_Count(list);
+
+	if (count != 3)
+	{
+		printf("ListDictionary_Count: Expected : %d, Actual: %d\n", 3, count);
+		return -1;
+	}
+
+	value = (char*) ListDictionary_GetItemValue(list, key1);
+
+	if (strcmp(value, val1) != 0)
+	{
+		printf("ListDictionary_GetItemValue: Expected : %d, Actual: %d\n", val1, value);
+		return -1;
+	}
+
+	value = (char*) ListDictionary_GetItemValue(list, key2);
+
+	if (strcmp(value, val2) != 0)
+	{
+		printf("ListDictionary_GetItemValue: Expected : %d, Actual: %d\n", val2, value);
+		return -1;
+	}
+
+	value = (char*) ListDictionary_GetItemValue(list, key3);
+
+	if (strcmp(value, val3) != 0)
+	{
+		printf("ListDictionary_GetItemValue: Expected : %d, Actual: %d\n", val3, value);
+		return -1;
+	}
+
+	ListDictionary_SetItemValue(list, key2, "apple");
+
+	value = (char*) ListDictionary_GetItemValue(list, key2);
+
+	if (strcmp(value, "apple") != 0)
+	{
+		printf("ListDictionary_GetItemValue: Expected : %d, Actual: %d\n", "apple", value);
+		return -1;
+	}
+
+	if (!ListDictionary_Contains(list, key2))
+	{
+		printf("ListDictionary_Contains: Expected : %d, Actual: %d\n", TRUE, FALSE);
+		return -1;
+	}
+
+	ListDictionary_Clear(list);
+
+	count = ListDictionary_Count(list);
+
+	if (count != 0)
+	{
+		printf("ListDictionary_Count: Expected : %d, Actual: %d\n", 0, count);
+		return -1;
+	}
+
+	ListDictionary_Free(list);
+
+	return 0;
+}
+