Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-03 07:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update IntEngCreateSrcMonoXlate parameter names and function call with brush colors after logic changes of r38633.

Browse source 
Based on the patch of Evgeny Boltik <bstsoft AT narod DOT ru>, see bug #4070 for more info.
Fixes inverted colors when using hatched brushes.

svn path=/trunk/; revision=39134
This commit is contained in:
Gregor Schneider 2009-01-27 15:36:07 +00:00
parent 42bd582bfe
commit 906bea5252
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/subsystems/win32/win32k/eng/xlate.c
View file

@ -358,8 +358,8 @@ IntEngCreateMonoXlate(
XLATEOBJ* FASTCALL
IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
ULONG ForegroundColor,
ULONG BackgroundColor)
ULONG Color0,
ULONG Color1)
{
XLATEOBJ *XlateObj;
XLATEGDI *XlateGDI;
@ -404,8 +404,8 @@ IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
XlateGDI->BlueShift = CalculateShift(RGB(0x00, 0x00, 0xFF)) - CalculateShift(XlateGDI->BlueMask);
/* Yes, that's how Windows works, ... */
XlateObj->pulXlate[1] = ShiftAndMask(XlateGDI, BackgroundColor);
XlateObj->pulXlate[0] = ShiftAndMask(XlateGDI, ForegroundColor);
XlateObj->pulXlate[1] = ShiftAndMask(XlateGDI, Color1);
XlateObj->pulXlate[0] = ShiftAndMask(XlateGDI, Color0);
if (XlateObj->iDstType == PAL_INDEXED)
{

4
reactos/subsystems/win32/win32k/include/inteng.h
View file

@ -114,8 +114,8 @@ IntEngCreateMonoXlate(USHORT SourcePalType,
XLATEOBJ* FASTCALL
IntEngCreateSrcMonoXlate(HPALETTE PaletteDest,
ULONG ForegroundColor,
ULONG BackgroundColor);
ULONG Color0,
ULONG Color1);
HPALETTE FASTCALL
IntEngGetXlatePalette(XLATEOBJ *XlateObj,

2
reactos/subsystems/win32/win32k/objects/brush.c
View file

@ -153,7 +153,7 @@ IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed)
if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr;
if (Dc->w.bitsPerPixel != 1)
Result = IntEngCreateSrcMonoXlate(hPalette, BrushObj->BrushAttr.lbColor, Dc_Attr->crBackgroundClr);
Result = IntEngCreateSrcMonoXlate(hPalette, Dc_Attr->crBackgroundClr, BrushObj->BrushAttr.lbColor);
}
else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB)
{