mirror of
https://github.com/FreeRDP/FreeRDP.git
synced 2025-06-03 00:00:20 +00:00
Merge pull request #1770 from dpoe/stable-1.1
/kbd: option should be unsigned
This commit is contained in:
commit
01865f0e28
@ -1165,17 +1165,17 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
|
|||||||
}
|
}
|
||||||
CommandLineSwitchCase(arg, "kbd")
|
CommandLineSwitchCase(arg, "kbd")
|
||||||
{
|
{
|
||||||
int id;
|
unsigned long int id;
|
||||||
char* pEnd;
|
char* pEnd;
|
||||||
|
|
||||||
id = strtol(arg->Value, &pEnd, 16);
|
id = strtoul(arg->Value, &pEnd, 16);
|
||||||
|
|
||||||
if (pEnd != (arg->Value + strlen(arg->Value)))
|
if (pEnd != (arg->Value + strlen(arg->Value)))
|
||||||
id = 0;
|
id = 0;
|
||||||
|
|
||||||
if (id == 0)
|
if (id == 0)
|
||||||
{
|
{
|
||||||
id = freerdp_map_keyboard_layout_name_to_id(arg->Value);
|
id = (unsigned long int) freerdp_map_keyboard_layout_name_to_id(arg->Value);
|
||||||
|
|
||||||
if (!id)
|
if (!id)
|
||||||
{
|
{
|
||||||
@ -1183,7 +1183,7 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
settings->KeyboardLayout = id;
|
settings->KeyboardLayout = (UINT32) id;
|
||||||
}
|
}
|
||||||
CommandLineSwitchCase(arg, "kbd-type")
|
CommandLineSwitchCase(arg, "kbd-type")
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user