Convert the COLORREF to a real colour for ExtTextOut

Glenn Wurster gwurster at scs.carleton.ca
Sun Nov 7 22:12:54 CST 2004


Authors:
  Doug Paul <doug at elemental.ath.cx>,
  Glenn Wurster <gwurster at scs.carleton.ca>

Description: 
  * GetTextColor returns a COLORREF which may be a palette entry.
    Convert to a real colour value.

Changelog:
  * Convert GetTextColor result to a real colour

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);
+
     TRACE("%p, %d, %d, %08x, %p, %s, %d, %p)\n", hdc, x, y, flags,
 	  lprect, debugstr_wn(wstr, count), count, lpDx);
 



More information about the wine-patches mailing list