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

Merge branch 'master' of github.com:FreeRDP/FreeRDP

Browse Source
This commit is contained in:
Marc-André Moreau 2012-02-02 17:36:16 -05:00
commit 26d68997eb
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/kbd/vkcodes.h
View File

@ -434,7 +434,7 @@ static const virtualKey virtualKeyboard[256 + 2] =
{ 0x00, 0, "VK_SEPARATOR" , NULL },
{ 0x4A, 0, "VK_SUBTRACT" , "KPSU" },
{ 0x53, 0, "VK_DECIMAL" , "KPDL" },
{ 0x35, 1, "VK_DIVIDE" , "KPDV" },
{ 0x35, 0, "VK_DIVIDE" , "KPDV" },
{ 0x3B, 0, "VK_F1" , "FK01" },
{ 0x3C, 0, "VK_F2" , "FK02" },
{ 0x3D, 0, "VK_F3" , "FK03" },

9
libfreerdp-core/ber.c
View File

@ -383,12 +383,19 @@ int ber_write_integer(STREAM* s, uint32 value)
stream_write_uint8(s, value);
return 2;
}
else if (value <= 0xFFFF)
else if (value < 0xFF80)
{
ber_write_length(s, 2);
stream_write_uint16_be(s, value);
return 3;
}
else if (value < 0xFF8000)
{
ber_write_length(s, 3);
stream_write_uint8(s, (value >> 16));
stream_write_uint16_be(s, (value & 0xFFFF));
return 4;
}
else if (value <= 0xFFFFFFFF)
{
ber_write_length(s, 4);