mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138 from ngraziano/master 

2 small fix : color on windows and remove a warning when connecting to XP.
This commit is contained in:
Marc-André Moreau 2011-10-10 07:07:59 -07:00
parent 8c4a8d982f 0622ab87cf
commit 992d0a92e3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/Windows/wf_gdi.c
View File

@ -172,7 +172,7 @@ void wf_gdi_bitmap_update(rdpUpdate* update, BITMAP_UPDATE* bitmap)
{
bmp = &bitmap->bitmaps[i];
wf_bmp = wf_image_new(wfi, bmp->width, bmp->height, wfi->dstBpp, bmp->dstData);
wf_bmp = wf_image_new(wfi, bmp->width, bmp->height, wfi->srcBpp, bmp->dstData);
BitBlt(wfi->primary->hdc,
bmp->left, bmp->top, bmp->right - bmp->left + 1,
@ -241,7 +241,7 @@ void wf_gdi_opaque_rect(rdpUpdate* update, OPAQUE_RECT_ORDER* opaque_rect)
uint32 brush_color;
wfInfo* wfi = GET_WFI(update);
brush_color = freerdp_color_convert(opaque_rect->color, wfi->dstBpp, 24, wfi->clrconv);
brush_color = freerdp_color_convert(opaque_rect->color, wfi->srcBpp, 24, wfi->clrconv);
rect.left = opaque_rect->nLeftRect;
rect.top = opaque_rect->nTopRect;
@ -368,7 +368,7 @@ void wf_gdi_cache_bitmap_v2(rdpUpdate* update, CACHE_BITMAP_V2_ORDER* cache_bitm
wfInfo* wfi = GET_WFI(update);
bitmap_data = cache_bitmap_v2->bitmap_data;
bitmap = wf_image_new(wfi, bitmap_data->width, bitmap_data->height, wfi->dstBpp, bitmap_data->dstData);
bitmap = wf_image_new(wfi, bitmap_data->width, bitmap_data->height, wfi->srcBpp, bitmap_data->dstData);
bitmap_v2_put(wfi->cache->bitmap_v2, cache_bitmap_v2->cacheId,
cache_bitmap_v2->cacheIndex, bitmap_data, (void*) bitmap);

1
client/Windows/wfreerdp.c
View File

@ -223,6 +223,7 @@ boolean wf_post_connect(freerdp* instance)
else
{
wf_gdi_register_update_callbacks(instance->update);
wfi->srcBpp = instance->settings->color_depth;
wfi->primary = wf_image_new(wfi, width, height, wfi->dstBpp, NULL);
wfi->hdc = gdi_GetDC();

4
libfreerdp-core/license.c
View File

@ -445,10 +445,10 @@ void license_read_binary_blob(STREAM* s, LICENSE_BLOB* blob)
stream_read_uint16(s, blob->length); /* wBlobLen (2 bytes) */
/*
* Server can choose to not send a certificate by setting len to 0.
* Server can choose to not send data by setting len to 0.
* If so, it may not bother to set the type, so shortcut the warning
*/
if (blob->type == BB_CERTIFICATE_BLOB && blob->length == 0)
if (blob->type != BB_ANY_BLOB && blob->length == 0)
return;
if (blob->type != wBlobType && blob->type != BB_ANY_BLOB)