Improved error handling if channel is missing.

This commit is contained in:
Armin Novak 2016-10-27 14:41:05 +02:00
parent 6276f3d39a
commit 5bc691c79d
2 changed files with 6 additions and 1 deletions

View File

@ -275,7 +275,7 @@ static UINT dvcman_load_addin(IWTSVirtualChannelManager* pChannelMgr,
return pDVCPluginEntry((IDRDYNVC_ENTRY_POINTS*) &entryPoints); return pDVCPluginEntry((IDRDYNVC_ENTRY_POINTS*) &entryPoints);
} }
return CHANNEL_RC_OK; return ERROR_INVALID_FUNCTION;
} }
static DVCMAN_CHANNEL* dvcman_channel_new(IWTSVirtualChannelManager* static DVCMAN_CHANNEL* dvcman_channel_new(IWTSVirtualChannelManager*

View File

@ -32,6 +32,8 @@
#include <freerdp/addin.h> #include <freerdp/addin.h>
#include <freerdp/build-config.h> #include <freerdp/build-config.h>
#include <freerdp/log.h>
#define TAG FREERDP_TAG("addin")
LPSTR freerdp_get_library_install_path(void) LPSTR freerdp_get_library_install_path(void)
{ {
@ -293,5 +295,8 @@ PVIRTUALCHANNELENTRY freerdp_load_channel_addin_entry(LPCSTR pszName,
entry = freerdp_load_dynamic_channel_addin_entry(pszName, pszSubsystem, pszType, entry = freerdp_load_dynamic_channel_addin_entry(pszName, pszSubsystem, pszType,
dwFlags); dwFlags);
if (!entry)
WLog_WARN(TAG, "Failed to load channel %s [%s]", pszName, pszSubsystem);
return entry; return entry;
} }