Fixed error handling for channel load failures.

Author: akallabeth

channels/audin/client/audin_main.c

@@ -832,23 +832,21 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 	assert(pEntryPoints->GetPlugin);
 
 	audin = (AUDIN_PLUGIN*) pEntryPoints->GetPlugin(pEntryPoints, "audin");
-	if (audin == NULL)
-	{
-		audin = (AUDIN_PLUGIN*) calloc(1, sizeof(AUDIN_PLUGIN));
-		if (!audin)
-		{
-			WLog_ERR(TAG, "calloc failed!");
-			return CHANNEL_RC_NO_MEMORY;
-		}
-
-		audin->iface.Initialize = audin_plugin_initialize;
-		audin->iface.Connected = NULL;
-		audin->iface.Disconnected = NULL;
-		audin->iface.Terminated = audin_plugin_terminated;
+	if (audin != NULL)
+		return CHANNEL_RC_ALREADY_INITIALIZED;
 
-		error = pEntryPoints->RegisterPlugin(pEntryPoints, "audin", (IWTSPlugin*) audin);
+	audin = (AUDIN_PLUGIN*) calloc(1, sizeof(AUDIN_PLUGIN));
+	if (!audin)
+	{
+		WLog_ERR(TAG, "calloc failed!");
+		return CHANNEL_RC_NO_MEMORY;
 	}
 
+	audin->iface.Initialize = audin_plugin_initialize;
+	audin->iface.Connected = NULL;
+	audin->iface.Disconnected = NULL;
+	audin->iface.Terminated = audin_plugin_terminated;
+
 	args = pEntryPoints->GetPluginData(pEntryPoints);
 	audin->rdpcontext = ((freerdp*)((rdpSettings*) pEntryPoints->GetRdpSettings(pEntryPoints))->instance)->context;
 
@@ -894,7 +892,7 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
 	if (audin->device == NULL)
 		WLog_ERR(TAG, "no sound device.");
 
-	error = CHANNEL_RC_OK;
+	error = pEntryPoints->RegisterPlugin(pEntryPoints, "audin", (IWTSPlugin*) audin);
 
 out:
 	if (error != CHANNEL_RC_OK)

channels/cliprdr/client/cliprdr_main.c

@@ -159,10 +159,10 @@ static UINT cliprdr_process_general_capability(cliprdrPlugin* cliprdr, wStream*
 		WLog_ERR(TAG, "cliprdr_get_client_interface failed!");
 		return ERROR_INTERNAL_ERROR;
 	}
-	
+
 	Stream_Read_UINT32(s, version); /* version (4 bytes) */
 	Stream_Read_UINT32(s, generalFlags); /* generalFlags (4 bytes) */
-	
+
 	DEBUG_CLIPRDR("Version: %d", version);
 #ifdef WITH_DEBUG_CLIPRDR
 	cliprdr_print_general_capability_flags(generalFlags);
@@ -179,15 +179,15 @@ static UINT cliprdr_process_general_capability(cliprdrPlugin* cliprdr, wStream*
 
 	if (cliprdr->canLockClipData)
 		cliprdr->canLockClipData = (generalFlags & CB_CAN_LOCK_CLIPDATA) ? TRUE : FALSE;
-	
+
 	cliprdr->capabilitiesReceived = TRUE;
 
 	if (!context->custom)
 	{
 		WLog_ERR(TAG, "context->custom not set!");
 		return ERROR_INTERNAL_ERROR;
 	}
-		
+
 	capabilities.cCapabilitiesSets = 1;
 	capabilities.capabilitySets = (CLIPRDR_CAPABILITY_SET*) &(generalCapabilitySet);
 	generalCapabilitySet.capabilitySetType = CB_CAPSTYPE_GENERAL;
@@ -215,7 +215,7 @@ static UINT cliprdr_process_clip_caps(cliprdrPlugin* cliprdr, wStream* s, UINT16
 	UINT16 cCapabilitiesSets;
 	UINT16 capabilitySetType;
 	UINT error = CHANNEL_RC_OK;
-	
+
 	Stream_Read_UINT16(s, cCapabilitiesSets); /* cCapabilitiesSets (2 bytes) */
 	Stream_Seek_UINT16(s); /* pad1 (2 bytes) */
 
@@ -235,7 +235,7 @@ static UINT cliprdr_process_clip_caps(cliprdrPlugin* cliprdr, wStream* s, UINT16
 					return error;
 				}
 				break;
-				
+
 			default:
 				WLog_ERR(TAG, "unknown cliprdr capability set: %d", capabilitySetType);
 				return CHANNEL_RC_BAD_PROC;
@@ -273,13 +273,13 @@ static UINT cliprdr_process_monitor_ready(cliprdrPlugin* cliprdr, wStream* s, UI
 		  * When the server capabilities pdu is not used, default capabilities
 		  * corresponding to a generalFlags field set to zero are assumed.
 		  */
-		
+
 		cliprdr->useLongFormatNames = FALSE;
 		cliprdr->streamFileClipEnabled = FALSE;
 		cliprdr->fileClipNoFilePaths = TRUE;
 		cliprdr->canLockClipData = FALSE;
 	}
-	
+
 	monitorReady.msgType = CB_MONITOR_READY;
 	monitorReady.msgFlags = flags;
 	monitorReady.dataLen = length;
@@ -354,7 +354,7 @@ static UINT cliprdr_process_filecontents_response(cliprdrPlugin* cliprdr, wStrea
 		WLog_ERR(TAG, "context->custom not set!");
 		return ERROR_INTERNAL_ERROR;
 	}
-		
+
 	if (Stream_GetRemainingLength(s) < 4)
 	{
 		WLog_ERR(TAG, "not enought remaining data");
@@ -366,7 +366,7 @@ static UINT cliprdr_process_filecontents_response(cliprdrPlugin* cliprdr, wStrea
 	response.dataLen = length;
 
 	Stream_Read_UINT32(s, response.streamId); /* streamId (4 bytes) */
-	
+
 	response.cbRequested = length - 4;
 	response.requestedData = Stream_Pointer(s); /* requestedFileContentsData */
 
@@ -434,7 +434,7 @@ static UINT cliprdr_process_unlock_clipdata(cliprdrPlugin* cliprdr, wStream* s,
 		WLog_ERR(TAG, "context->custom not set!");
 		return ERROR_INTERNAL_ERROR;
 	}
-	
+
 	if (Stream_GetRemainingLength(s) < 4)
 	{
 		WLog_ERR(TAG, "not enought remaining data");
@@ -637,7 +637,7 @@ UINT cliprdr_client_format_list(CliprdrClientContext* context, CLIPRDR_FORMAT_LI
 	if (!cliprdr->useLongFormatNames)
 	{
 		length = formatList->numFormats * 36;
-		
+
 		s = cliprdr_packet_new(CB_FORMAT_LIST, 0, length);
 
 		if (!s)
@@ -649,40 +649,40 @@ UINT cliprdr_client_format_list(CliprdrClientContext* context, CLIPRDR_FORMAT_LI
 		for (index = 0; index < formatList->numFormats; index++)
 		{
 			format = (CLIPRDR_FORMAT*) &(formatList->formats[index]);
-			
+
 			Stream_Write_UINT32(s, format->formatId); /* formatId (4 bytes) */
-			
+
 			formatNameSize = 0;
 			formatNameLength = 0;
 
 			szFormatName = format->formatName;
-			
+
 			if (asciiNames)
 			{
 				if (szFormatName)
 					formatNameLength = strlen(szFormatName);
-				
+
 				if (formatNameLength > 31)
 					formatNameLength = 31;
-				
+
 				Stream_Write(s, szFormatName, formatNameLength);
 				Stream_Zero(s, 32 - formatNameLength);
 			}
 			else
 			{
 				wszFormatName = NULL;
-				
+
 				if (szFormatName)
 					formatNameSize = ConvertToUnicode(CP_UTF8, 0, szFormatName, -1, &wszFormatName, 0);
-				
+
 				if (formatNameSize > 15)
 					formatNameSize = 15;
-			
-				if (wszFormatName)	
+
+				if (wszFormatName)
 					Stream_Write(s, wszFormatName, formatNameSize * 2);
 
 				Stream_Zero(s, 32 - (formatNameSize * 2));
-				
+
 				free(wszFormatName);
 			}
 		}
@@ -1218,9 +1218,9 @@ static UINT cliprdr_virtual_channel_event_disconnected(cliprdrPlugin* cliprdr)
 
 	if (MessageQueue_PostQuit(cliprdr->queue, 0) && (WaitForSingleObject(cliprdr->thread, INFINITE) == WAIT_FAILED))
     {
-        rc = GetLastError();
-        WLog_ERR(TAG, "WaitForSingleObject failed with error %lu", rc);
-        return rc;
+	rc = GetLastError();
+	WLog_ERR(TAG, "WaitForSingleObject failed with error %lu", rc);
+	return rc;
     }
 
 	MessageQueue_Free(cliprdr->queue);
@@ -1257,7 +1257,9 @@ static UINT cliprdr_virtual_channel_event_terminated(cliprdrPlugin* cliprdr)
 	return CHANNEL_RC_OK;
 }
 
-static VOID VCAPITYPE cliprdr_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength)
+static UINT VCAPITYPE cliprdr_virtual_channel_init_event(LPVOID pInitHandle,
+							 UINT event, LPVOID pData,
+							 UINT dataLength)
 {
 	cliprdrPlugin* cliprdr;
 	UINT error = CHANNEL_RC_OK;
@@ -1267,7 +1269,7 @@ static VOID VCAPITYPE cliprdr_virtual_channel_init_event(LPVOID pInitHandle, UIN
 	if (!cliprdr)
 	{
 		WLog_ERR(TAG, "error no match");
-		return;
+		return CHANNEL_RC_BAD_INIT_HANDLE;
 	}
 
 	switch (event)
@@ -1290,7 +1292,7 @@ static VOID VCAPITYPE cliprdr_virtual_channel_init_event(LPVOID pInitHandle, UIN
 	if (error && cliprdr->context->rdpcontext)
 		setChannelError(cliprdr->context->rdpcontext, error, "cliprdr_virtual_channel_init_event reported an error");
 
-	return;
+	return error;
 }
 
 /* cliprdr is always built-in */
@@ -1358,14 +1360,14 @@ BOOL VCAPITYPE VirtualChannelEntry(PCHANNEL_ENTRY_POINTS pEntryPoints)
 	cliprdr->streamFileClipEnabled = FALSE;
 	cliprdr->fileClipNoFilePaths = TRUE;
 	cliprdr->canLockClipData = FALSE;
-	
+
 	WLog_Print(cliprdr->log, WLOG_DEBUG, "VirtualChannelEntry");
 
 	CopyMemory(&(cliprdr->channelEntryPoints), pEntryPoints, sizeof(CHANNEL_ENTRY_POINTS_FREERDP));
 
 	rc = cliprdr->channelEntryPoints.pVirtualChannelInit(&cliprdr->InitHandle,
 		&cliprdr->channelDef, 1, VIRTUAL_CHANNEL_VERSION_WIN2000, cliprdr_virtual_channel_init_event);
-	
+
 	if (CHANNEL_RC_OK != rc)
 	{
 		WLog_ERR(TAG, "pVirtualChannelInit failed with %s [%08X]",

channels/drdynvc/client/drdynvc_main.c

@@ -241,7 +241,7 @@ IWTSVirtualChannelManager* dvcman_new(drdynvcPlugin* plugin)
  *
  * @return 0 on success, otherwise a Win32 error code
  */
-UINT dvcman_load_addin(IWTSVirtualChannelManager* pChannelMgr, ADDIN_ARGV* args, rdpSettings* settings)
+static UINT dvcman_load_addin(IWTSVirtualChannelManager* pChannelMgr, ADDIN_ARGV* args, rdpSettings* settings)
 {
 	DVCMAN_ENTRY_POINTS entryPoints;
 	PDVC_PLUGIN_ENTRY pDVCPluginEntry = NULL;
@@ -261,7 +261,7 @@ UINT dvcman_load_addin(IWTSVirtualChannelManager* pChannelMgr, ADDIN_ARGV* args,
 		entryPoints.args = args;
 		entryPoints.settings = settings;
 
-		pDVCPluginEntry((IDRDYNVC_ENTRY_POINTS*) &entryPoints);
+		return pDVCPluginEntry((IDRDYNVC_ENTRY_POINTS*) &entryPoints);
 	}
 
 	return CHANNEL_RC_OK;
@@ -478,8 +478,8 @@ UINT dvcman_create_channel(IWTSVirtualChannelManager* pChannelMgr, UINT32 Channe
 				context = dvcman->drdynvc->context;
 				IFCALLRET(context->OnChannelConnected, error, context, ChannelName, listener->iface.pInterface);
 
-                if (error)
-                    WLog_ERR(TAG, "context.ReceiveSamples failed with error %lu", error);
+		if (error)
+			WLog_ERR(TAG, "context.ReceiveSamples failed with error %lu", error);
 
 				return error;
 			}
@@ -1056,7 +1056,7 @@ static UINT drdynvc_process_close_request(drdynvcPlugin* drdynvc, int Sp, int cb
 		WLog_ERR(TAG, "dvcman_close_channel failed with error %lu!", error);
 		return error;
 	}
-	
+
 	data_out = Stream_New(NULL, 4);
 
 	if (!data_out)
@@ -1214,6 +1214,10 @@ void* drdynvc_get_open_handle_data(DWORD openHandle)
 void drdynvc_remove_open_handle_data(DWORD openHandle)
 {
 	void* pOpenHandle = (void*) (size_t) openHandle;
+
+	if (!g_OpenHandles)
+		return;
+
 	ListDictionary_Remove(g_OpenHandles, pOpenHandle);
 
 	if (ListDictionary_Count(g_OpenHandles) < 1)
@@ -1411,7 +1415,9 @@ static UINT drdynvc_virtual_channel_event_connected(drdynvcPlugin* drdynvc, LPVO
 	for (index = 0; index < settings->DynamicChannelCount; index++)
 	{
 		args = settings->DynamicChannelArray[index];
-		dvcman_load_addin(drdynvc->channel_mgr, args, settings);
+		error = dvcman_load_addin(drdynvc->channel_mgr, args, settings);
+		if (CHANNEL_RC_OK != error)
+			goto error;
 	}
 
 	if ((error = dvcman_init(drdynvc->channel_mgr)))
@@ -1434,8 +1440,6 @@ static UINT drdynvc_virtual_channel_event_connected(drdynvcPlugin* drdynvc, LPVO
 
 error:
 	drdynvc_remove_open_handle_data(drdynvc->OpenHandle);
-	MessageQueue_Free(drdynvc->queue);
-	drdynvc->queue = NULL;
 	return error;
 }
 
@@ -1449,11 +1453,11 @@ static UINT drdynvc_virtual_channel_event_disconnected(drdynvcPlugin* drdynvc)
 	UINT status;
 
 	if (MessageQueue_PostQuit(drdynvc->queue, 0) && (WaitForSingleObject(drdynvc->thread, INFINITE) == WAIT_FAILED))
-    {
-        status = GetLastError();
-        WLog_ERR(TAG, "WaitForSingleObject failed with error %lu", status);
-        return status;
-    }
+	{
+		status = GetLastError();
+		WLog_ERR(TAG, "WaitForSingleObject failed with error %lu", status);
+		return status;
+	}
 
 	MessageQueue_Free(drdynvc->queue);
 	CloseHandle(drdynvc->thread);
@@ -1497,7 +1501,9 @@ static UINT drdynvc_virtual_channel_event_terminated(drdynvcPlugin* drdynvc)
 	return CHANNEL_RC_OK;
 }
 
-static void VCAPITYPE drdynvc_virtual_channel_init_event(LPVOID pInitHandle, UINT event, LPVOID pData, UINT dataLength)
+static UINT VCAPITYPE drdynvc_virtual_channel_init_event(LPVOID pInitHandle,
+							 UINT event, LPVOID pData,
+							 UINT dataLength)
 {
 	drdynvcPlugin* drdynvc;
 	UINT error = CHANNEL_RC_OK;
@@ -1507,7 +1513,7 @@ static void VCAPITYPE drdynvc_virtual_channel_init_event(LPVOID pInitHandle, UIN
 	if (!drdynvc)
 	{
 		WLog_ERR(TAG, "drdynvc_virtual_channel_init_event: error no match");
-		return;
+		return CHANNEL_RC_BAD_INIT_HANDLE;
 	}
 
 	switch (event)
@@ -1530,6 +1536,7 @@ static void VCAPITYPE drdynvc_virtual_channel_init_event(LPVOID pInitHandle, UIN
 	if (error && drdynvc->rdpcontext)
 		setChannelError(drdynvc->rdpcontext, error, "drdynvc_virtual_channel_init_event reported an error");
 
+	return error;
 }
 
 /**