mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed invalid return from xf_rail_window_icon

This commit is contained in:
Armin Novak 2017-03-28 11:47:46 +02:00
parent 13a1d80daf
commit d46d0c3d4a
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/X11/xf_rail.c
View File

@ -32,7 +32,7 @@
#define TAG CLIENT_TAG("x11")
const char* error_code_names[] =
static const char* error_code_names[] =
{
"RAIL_EXEC_S_OK",
"RAIL_EXEC_E_HOOK_NOT_LOADED",
@ -43,7 +43,7 @@ const char* error_code_names[] =
"RAIL_EXEC_E_SESSION_LOCKED"
};
const char* movetype_names[] =
static const char* movetype_names[] =
{
"(invalid)",
"RAIL_WMSZ_LEFT",
@ -529,15 +529,14 @@ static BOOL xf_rail_window_delete(rdpContext* context,
static BOOL xf_rail_window_icon(rdpContext* context,
WINDOW_ORDER_INFO* orderInfo, WINDOW_ICON_ORDER* windowIcon)
{
xfAppWindow* railWindow;
xfContext* xfc = (xfContext*) context;
railWindow = (xfAppWindow*) HashTable_GetItemValue(xfc->railWindows,
(void*)(UINT_PTR) orderInfo->windowId);
xfAppWindow* railWindow = (xfAppWindow*) HashTable_GetItemValue(xfc->railWindows,
(void*)(UINT_PTR) orderInfo->windowId);
if (!railWindow)
return FALSE;
return (orderInfo->fieldFlags & WINDOW_ORDER_FIELD_ICON_BIG) ? TRUE : FALSE;
return TRUE;
}
static BOOL xf_rail_window_cached_icon(rdpContext* context,

2
libfreerdp/core/fastpath.c
View File

@ -366,7 +366,7 @@ static int fastpath_recv_update(rdpFastPath* fastpath, BYTE updateCode, UINT32 s
case FASTPATH_UPDATETYPE_PALETTE:
if (!fastpath_recv_update_common(fastpath, s))
{
WLog_ERR(TAG, "FASTPATH_UPDATETYPE_ORDERS - fastpath_recv_orders()");
WLog_ERR(TAG, "FASTPATH_UPDATETYPE_ORDERS - fastpath_recv_update_common()");
return -1;
}

1
libfreerdp/core/orders.c
View File

@ -3501,7 +3501,6 @@ static BOOL update_recv_altsec_order(rdpUpdate* update, wStream* s,
case ORDER_TYPE_WINDOW:
return update_recv_altsec_window_order(update, s);
break;
case ORDER_TYPE_COMPDESK_FIRST:
break;