jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added keyboard type and subtype to struct xrdp_client_info

Browse Source
This commit is contained in:
Jay Sorg 2014-01-12 18:24:07 -08:00
parent 44642a01d9
commit 02aa39c79d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/xrdp_client_info.h
View File

@ -110,6 +110,9 @@ struct xrdp_client_info
int multimon; /* 0 = deny , 1 = allow */ int multimon; /* 0 = deny , 1 = allow */
int monitorCount; /* number of monitors detected (max = 16) */ int monitorCount; /* number of monitors detected (max = 16) */
struct monitor_info minfo[16]; /* client monitor data */ struct monitor_info minfo[16]; /* client monitor data */
int keyboard_type;
int keyboard_subtype;
}; };
#endif #endif

9
libxrdp/xrdp_sec.c
View File

@ -1232,6 +1232,15 @@ xrdp_sec_in_mcs_data(struct xrdp_sec *self)
} }
in_uint8s(s, 39); in_uint8s(s, 39);
in_uint32_le(s, client_info->keylayout); in_uint32_le(s, client_info->keylayout);
/* get keyboard type / subtype */
s->p = s->data;
if (!s_check_rem(s, 79 + 8))
{
return 1;
}
in_uint8s(s, 79);
in_uint32_le(s, client_info->keyboard_type);
in_uint32_le(s, client_info->keyboard_subtype);
s->p = s->data; s->p = s->data;
return 0; return 0;
} }