Merge pull request #528 from kiilerix/master

a valgrind fix and a non-controversial keyboard fix
This commit is contained in:
Anthony 2012-03-30 12:47:09 -07:00
commit fac716bcd7
2 changed files with 3 additions and 3 deletions

View File

@ -258,7 +258,7 @@ rdpBitmapCache* bitmap_cache_new(rdpSettings* settings)
{
bitmap_cache->cells[i].number = settings->bitmapCacheV2CellInfo[i].numEntries;
/* allocate an extra entry for BITMAP_CACHE_WAITING_LIST_INDEX */
bitmap_cache->cells[i].entries = (rdpBitmap**) xzalloc(sizeof(rdpBitmap*) * bitmap_cache->cells[i].number + 1);
bitmap_cache->cells[i].entries = (rdpBitmap**) xzalloc(sizeof(rdpBitmap*) * (bitmap_cache->cells[i].number + 1));
}
}

View File

@ -53,9 +53,9 @@ rdpSettings* settings_new(void* instance)
settings->tls_security = true;
settings->rdp_security = true;
settings->client_build = 2600;
settings->kbd_type = 0;
settings->kbd_type = 4; /* @msdn{cc240510} 'IBM enhanced (101- or 102-key) keyboard' */
settings->kbd_subtype = 0;
settings->kbd_fn_keys = 0;
settings->kbd_fn_keys = 12;
settings->kbd_layout = 0;
settings->encryption = false;
settings->salted_checksum = true;