mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Printing a warning if a error is overwritten.

Browse Source
This commit is contained in:
Armin Novak 2016-12-19 14:13:36 +01:00
parent 8250bbd6c8
commit ece9491932
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libfreerdp/core/freerdp.c
View File

@ -51,7 +51,8 @@
/* connectErrorCode is 'extern' in error.h. See comment there.*/
UINT freerdp_channel_add_init_handle_data(rdpChannelHandles* handles, void* pInitHandle, void* pUserData)
UINT freerdp_channel_add_init_handle_data(rdpChannelHandles* handles, void* pInitHandle,
void* pUserData)
{
if (!handles->init)
handles->init = ListDictionary_New(TRUE);
@ -89,9 +90,10 @@ void freerdp_channel_remove_init_handle_data(rdpChannelHandles* handles, void* p
}
}
UINT freerdp_channel_add_open_handle_data(rdpChannelHandles* handles, DWORD openHandle, void* pUserData)
UINT freerdp_channel_add_open_handle_data(rdpChannelHandles* handles, DWORD openHandle,
void* pUserData)
{
void* pOpenHandle = (void*) (size_t) openHandle;
void* pOpenHandle = (void*)(size_t) openHandle;
if (!handles->open)
handles->open = ListDictionary_New(TRUE);
@ -114,14 +116,14 @@ UINT freerdp_channel_add_open_handle_data(rdpChannelHandles* handles, DWORD open
void* freerdp_channel_get_open_handle_data(rdpChannelHandles* handles, DWORD openHandle)
{
void* pUserData = NULL;
void* pOpenHandle = (void*) (size_t) openHandle;
void* pOpenHandle = (void*)(size_t) openHandle;
pUserData = ListDictionary_GetItemValue(handles->open, pOpenHandle);
return pUserData;
}
void freerdp_channel_remove_open_handle_data(rdpChannelHandles* handles, DWORD openHandle)
{
void* pOpenHandle = (void*) (size_t) openHandle;
void* pOpenHandle = (void*)(size_t) openHandle;
ListDictionary_Remove(handles->open, pOpenHandle);
if (ListDictionary_Count(handles->open) < 1)
@ -799,6 +801,13 @@ void freerdp_set_last_error(rdpContext* context, UINT32 lastError)
WLog_ERR(TAG, "freerdp_set_last_error %s [0x%08"PRIX32"]",
freerdp_get_last_error_name(lastError), lastError);
if (context->LastError != 0)
{
WLog_ERR(TAG, "TODO: Trying to set error code %s, but %s already set!",
freerdp_get_last_error_name(lastError),
freerdp_get_last_error_name(context->LastError));
}
context->LastError = lastError;
switch (lastError)