maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-249: Use ReadColor() / WriteColor() around FreeRDPConvertColor().

Browse Source 
The latter expects color input to be in an intermediate representation
resulting from using ReadColor(), and produces color output which cannot
be used until converted back with WriteColor().
This commit is contained in:
Michael Jumper 2020-01-06 11:04:12 -08:00
parent e325dbc672
commit a54a12362c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/protocols/rdp/color.c
View File

@ -45,11 +45,23 @@ UINT32 guac_rdp_get_native_pixel_format(BOOL alpha) {
UINT32 guac_rdp_convert_color(rdpContext* context, UINT32 color) { UINT32 guac_rdp_convert_color(rdpContext* context, UINT32 color) {
int depth = guac_rdp_get_depth(context->instance); int depth = guac_rdp_get_depth(context->instance);
int src_format = gdi_get_pixel_format(depth);
int dst_format = guac_rdp_get_native_pixel_format(TRUE);
rdpGdi* gdi = context->gdi; rdpGdi* gdi = context->gdi;
/* Convert given color to ARGB32 */ /* Convert provided color into the intermediate representation expected by
return FreeRDPConvertColor(color, gdi_get_pixel_format(depth), * FreeRDPConvertColor() */
guac_rdp_get_native_pixel_format(TRUE), &gdi->palette); UINT32 intermed = ReadColor((BYTE*) &color, src_format);
/* Convert color from RDP source format to the native format used by Cairo,
* still maintaining intermediate representation */
intermed = FreeRDPConvertColor(intermed, src_format, dst_format,
&gdi->palette);
/* Convert color from intermediate representation to the actual desired
* format */
WriteColor((BYTE*) &color, dst_format, intermed);
return color;
} }