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

Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow

Browse Source
This commit is contained in:
Marc-André Moreau 2014-07-26 14:41:54 -04:00
commit 9e6fa5f5a5
5 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/common/file.c
View File

@ -1013,6 +1013,11 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
freerdp_set_param_bool(settings, FreeRDP_RedirectDrives, TRUE);
}
if (~file->KeyboardHook)
{
freerdp_set_param_uint32(settings, FreeRDP_KeyboardHook, file->KeyboardHook);
}
if (file->argc > 1)
{
char* ConnectionFile = settings->ConnectionFile;

9
include/freerdp/settings.h
View File

@ -222,6 +222,11 @@
#define LB_CLIENT_TSV_URL 0x00001000
#define LB_SERVER_TSV_CAPABLE 0x00002000
/* Keyboard Hook */
#define KEYBOARD_HOOK_LOCAL 0
#define KEYBOARD_HOOK_REMOTE 1
#define KEYBOARD_HOOK_FULLSCREEN_ONLY 2
struct _TARGET_NET_ADDRESS
{
UINT32 Length;
@ -726,6 +731,7 @@ typedef struct _RDPDR_PARALLEL RDPDR_PARALLEL;
#define FreeRDP_FastPathInput 2630
#define FreeRDP_MultiTouchInput 2631
#define FreeRDP_MultiTouchGestures 2632
#define FreeRDP_KeyboardHook 2633
#define FreeRDP_BrushSupportLevel 2688
#define FreeRDP_GlyphSupportLevel 2752
#define FreeRDP_GlyphCache 2753
@ -1180,7 +1186,8 @@ struct rdp_settings
ALIGN64 BOOL FastPathInput; /* 2630 */
ALIGN64 BOOL MultiTouchInput; /* 2631 */
ALIGN64 BOOL MultiTouchGestures; /* 2632 */
UINT64 padding2688[2688 - 2633]; /* 2633 */
ALIGN64 UINT32 KeyboardHook; /* 2633 */
UINT64 padding2688[2688 - 2634]; /* 2634 */
/* Brush Capabilities */
ALIGN64 UINT32 BrushSupportLevel; /* 2688 */

8
libfreerdp/common/settings.c
View File

@ -1920,6 +1920,10 @@ UINT32 freerdp_get_param_uint32(rdpSettings* settings, int id)
return settings->KeyboardFunctionKey;
break;
case FreeRDP_KeyboardHook:
return settings->KeyboardHook;
break;
case FreeRDP_BrushSupportLevel:
return settings->BrushSupportLevel;
break;
@ -2229,6 +2233,10 @@ int freerdp_set_param_uint32(rdpSettings* settings, int id, UINT32 param)
settings->KeyboardFunctionKey = param;
break;
case FreeRDP_KeyboardHook:
settings->KeyboardHook = param;
break;
case FreeRDP_BrushSupportLevel:
settings->BrushSupportLevel = param;
break;

1
libfreerdp/core/settings.c
View File

@ -563,6 +563,7 @@ rdpSettings* freerdp_settings_clone(rdpSettings* settings)
_settings->KeyboardType = settings->KeyboardType; /* 2625 */
_settings->KeyboardSubType = settings->KeyboardSubType; /* 2626 */
_settings->KeyboardFunctionKey = settings->KeyboardFunctionKey; /* 2627 */
_settings->KeyboardHook = settings->KeyboardHook; /* 2633 */
_settings->BrushSupportLevel = settings->BrushSupportLevel; /* 2688 */
_settings->GlyphSupportLevel = settings->GlyphSupportLevel; /* 2752 */
_settings->OffscreenSupportLevel = settings->OffscreenSupportLevel; /* 2816 */

2
winpr/include/winpr/pool.h
View File

@ -120,7 +120,7 @@ typedef struct _TP_WAIT TP_WAIT, *PTP_WAIT;
typedef struct _TP_IO TP_IO, *PTP_IO;
#if (defined(_WIN32) && (_WIN32_WINNT < 0x0601))
#if !defined(_WIN32) || (defined(_WIN32) && (_WIN32_WINNT < 0x0601))
typedef TP_CALLBACK_ENVIRON_V1 TP_CALLBACK_ENVIRON, *PTP_CALLBACK_ENVIRON;
#endif