Merge branch 'master' of https://github.com/FreeRDP/FreeRDP

Author: cedrozor

CMakeLists.txt

@@ -1019,6 +1019,14 @@ set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
 # Path to put extensions
 set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}/extensions")
 
+# Proxy plugins path
+if(NOT DEFINED PROXY_PLUGINDIR)
+message("using default plugins location")
+	set(FREERDP_PROXY_PLUGINDIR "${CMAKE_BINARY_DIR}/server/proxy/plugins")
+else()
+set(FREERDP_PROXY_PLUGINDIR "${PROXY_PLUGINDIR}")
+endif()
+
 # Include directories
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)

channels/audin/client/audin_main.c

@@ -1027,9 +1027,10 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 if ((error = audin_load_device_plugin(audin, audin->subsystem, args)))
 {
-WLog_Print(audin->log, WLOG_ERROR,
- "audin_load_device_plugin %s failed with error %" PRIu32 "!",
- audin->subsystem, error);
+WLog_Print(
+ audin->log, WLOG_ERROR,
+ "Unable to load microphone redirection subsystem %s because of error %" PRIu32 "",
+ audin->subsystem, error);
 goto out;
 }
 }
@@ -1064,7 +1065,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 {
 /* If we have no audin device do not register plugin but still return OK or the client will
  * just disconnect due to a missing microphone. */
-WLog_Print(audin->log, WLOG_ERROR, "no sound device.");
+WLog_Print(audin->log, WLOG_ERROR, "No microphone device could be found.");
 error = CHANNEL_RC_OK;
 goto out;
 }

channels/audin/client/winmm/audin_winmm.c

@@ -465,7 +465,10 @@ UINT freerdp_audin_client_subsystem_entry(PFREERDP_AUDIN_DEVICE_ENTRY_POINTS pEn
 UINT error;
 
 if (waveInGetNumDevs() == 0)
+{
+WLog_Print(WLog_Get(TAG), WLOG_ERROR, "No microphone available!");
 return ERROR_DEVICE_NOT_AVAILABLE;
+}
 
 winmm = (AudinWinmmDevice*)calloc(1, sizeof(AudinWinmmDevice));
 

channels/disp/server/disp_main.c

@@ -275,7 +275,7 @@ static UINT disp_server_handle_messages(DispServerContext* context)
 WTSFreeMemory(buffer);
 }
 
-/* Consume channel event only after the gfx dynamic channel is ready */
+/* Consume channel event only after the disp dynamic channel is ready */
 Stream_SetPosition(s, 0);
 
 if (!WTSVirtualChannelRead(priv->disp_channel, 0, NULL, 0, &BytesReturned))
@@ -384,6 +384,7 @@ static UINT disp_server_open(DispServerContext* context)
 }
 
 priv->SessionId = (DWORD)*pSessionId;
+WTSFreeMemory(pSessionId);
 priv->disp_channel = (HANDLE)WTSVirtualChannelOpenEx(priv->SessionId, DISP_DVC_CHANNEL_NAME,
  WTS_CHANNEL_OPTION_DYNAMIC);
 
@@ -513,6 +514,12 @@ static UINT disp_server_close(DispServerContext* context)
 priv->stopEvent = NULL;
 }
 
+if (priv->disp_channel)
+{
+WTSVirtualChannelClose(priv->disp_channel);
+priv->disp_channel = NULL;
+}
+
 return error;
 }
 

channels/drdynvc/client/drdynvc_main.c

@@ -1319,10 +1319,8 @@ static DWORD WINAPI drdynvc_virtual_channel_client_thread(LPVOID arg)
 
 if ((error = drdynvc_order_recv(drdynvc, data)))
 {
-Stream_Free(data, TRUE);
-WLog_Print(drdynvc->log, WLOG_ERROR,
+WLog_Print(drdynvc->log, WLOG_WARN,
  "drdynvc_order_recv failed with error %" PRIu32 "!", error);
-break;
 }
 
 Stream_Free(data, TRUE);