Re: Convert the COLORREF to a real colour for ExtTextOut

[Alexandre Julliard]

Glenn Wurster <gwurster(a)scs.carleton.ca> writes:
> Index: dlls/x11drv/xrender.c
> ===================================================================
> RCS file: /home/wine/wine/dlls/x11drv/xrender.c,v
> retrieving revision 1.48
> diff -u -r1.48 xrender.c
> --- dlls/x11drv/xrender.c	27 Oct 2004 00:43:50 -0000	1.48
> +++ dlls/x11drv/xrender.c	8 Nov 2004 03:54:51 -0000
> @@ -1019,6 +1019,11 @@
>      UINT align = GetTextAlign( hdc );
>      COLORREF textColor = GetTextColor( hdc );
>
> +    textColor = X11DRV_PALETTE_ToPhysical( physDev, textColor );
> +    textColor = ((textColor & 0xFF0000) >> 16) |
> +                (textColor & 0xFF00) |
> +                ((textColor & 0xFF) << 16);
> +

That color swapping looks very suspicious, you shouldn't need anything
like that. And actually it seems to me you should simply be able to
use physDev->textPixel instead, but maybe I'm missing something.

-- 
Alexandre Julliard
julliard(a)winehq.org