Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-08 05:35:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename IntGdiInitBrushInstance to EBRUSHOBJ_vInit and move it to engbrush.c. Add 2 FIXME comments.

Browse source 
svn path=/trunk/; revision=40145
This commit is contained in:
Timo Kreuzer 2009-03-20 23:40:59 +00:00
parent 38dec447a2
commit 946deefb20
10 changed files with 50 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
reactos/subsystems/win32/win32k/eng/engbrush.c
View file

@ -1,27 +1,8 @@
/*
* ReactOS W32 Subsystem
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$
*
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: GDI Driver Brush Functions
* FILE: subsys/win32k/eng/brush.c
* FILE: subsystem/win32/win32k/eng/engbrush.c
* PROGRAMER: Jason Filby
* REVISION HISTORY:
* 3/7/1999: Created
@ -32,6 +13,37 @@
#define NDEBUG
#include <debug.h>
/** Internal functions ********************************************************/
VOID FASTCALL
EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, XLATEOBJ *pxlo)
{
ASSERT(pebo);
ASSERT(pbrush);
if (pbrush->flAttrs & GDIBRUSH_IS_NULL)
{
pebo->BrushObject.iSolidColor = 0;
}
else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID)
{
pebo->BrushObject.iSolidColor = XLATEOBJ_iXlate(pxlo, pbrush->BrushAttr.lbColor);
}
else
{
pebo->BrushObject.iSolidColor = 0xFFFFFFFF;
// FIXME: What about calling DrvRealizeBrush?
}
pebo->BrushObject.pvRbrush = pbrush->ulRealization;
pebo->BrushObject.flColorType = 0;
pebo->GdiBrushObject = pbrush;
pebo->XlateObject = pxlo;
}
/** Exported DDI functions ****************************************************/
/*
* @implemented
*/
@ -49,6 +61,7 @@ BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj,
PVOID APIENTRY
BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj)
{
// FIXME: this is wrong! Read msdn.
return(BrushObj->pvRbrush);
}

3
reactos/subsystems/win32/win32k/include/intgdi.h
View file

@ -15,9 +15,6 @@ XLATEOBJ*
FASTCALL
IntCreateXlateForBlt(PDC pDCDest, PDC pDCSrc, SURFACE* pDestSurf, SURFACE* pSrcSurf);
VOID FASTCALL
IntGdiInitBrushInstance(EBRUSHOBJ *BrushInst, PBRUSH BrushObj, XLATEOBJ *XlateObj);
HBRUSH APIENTRY
IntGdiCreateDIBBrush(
CONST BITMAPINFO *BitmapInfo,

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

@ -166,7 +166,7 @@ IntArc( DC *dc,
return FALSE;
}
IntGdiInitBrushInstance(&eboPen, pbrushPen, dc->rosdc.XlatePen);
EBRUSHOBJ_vInit(&eboPen, pbrushPen, dc->rosdc.XlatePen);
if (arctype == GdiTypePie)
{

6
reactos/subsystems/win32/win32k/objects/bitblt.c
View file

@ -292,7 +292,7 @@ NtGdiBitBlt(
goto cleanup;
}
BrushOrigin = *((PPOINTL)&pbrush->ptOrigin);
IntGdiInitBrushInstance(&BrushInst, pbrush, DCDest->rosdc.XlateBrush);
EBRUSHOBJ_vInit(&BrushInst, pbrush, DCDest->rosdc.XlateBrush);
}
/* Create the XLATEOBJ. */
@ -874,7 +874,7 @@ NtGdiStretchBlt(
goto failed;
}
BrushOrigin = *((PPOINTL)&pbrush->ptOrigin);
IntGdiInitBrushInstance(&BrushInst, pbrush, DCDest->rosdc.XlateBrush);
EBRUSHOBJ_vInit(&BrushInst, pbrush, DCDest->rosdc.XlateBrush);
}
/* Offset the brush */
@ -968,7 +968,7 @@ IntPatBlt(
BrushOrigin.x = BrushObj->ptOrigin.x + dc->ptlDCOrig.x;
BrushOrigin.y = BrushObj->ptOrigin.y + dc->ptlDCOrig.y;
IntGdiInitBrushInstance(&eboFill, BrushObj, dc->rosdc.XlateBrush);
EBRUSHOBJ_vInit(&eboFill, BrushObj, dc->rosdc.XlateBrush);
ret = IntEngBitBlt(
&psurf->SurfObj,

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

@ -166,30 +166,6 @@ IntGdiCreateBrushXlate(PDC Dc, BRUSH *pbrush, BOOLEAN *Failed)
return Result;
}
VOID FASTCALL
IntGdiInitBrushInstance(EBRUSHOBJ *BrushInst, PBRUSH pbrush, XLATEOBJ *XlateObj)
{
ASSERT(BrushInst);
ASSERT(pbrush);
if (pbrush->flAttrs & GDIBRUSH_IS_NULL)
{
BrushInst->BrushObject.iSolidColor = 0;
}
else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID)
{
BrushInst->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, pbrush->BrushAttr.lbColor);
}
else
{
BrushInst->BrushObject.iSolidColor = 0xFFFFFFFF;
}
BrushInst->BrushObject.pvRbrush = pbrush->ulRealization;
BrushInst->BrushObject.flColorType = 0;
BrushInst->GdiBrushObject = pbrush;
BrushInst->XlateObject = XlateObj;
}
/**
* @name CalculateColorTableSize
*

4
reactos/subsystems/win32/win32k/objects/drawing.c
View file

@ -1237,9 +1237,9 @@ IntFillRect( DC *dc,
ROP = PATCOPY;
if (Pen)
IntGdiInitBrushInstance(&eboFill, pbrush, dc->rosdc.XlatePen);
EBRUSHOBJ_vInit(&eboFill, pbrush, dc->rosdc.XlatePen);
else
IntGdiInitBrushInstance(&eboFill, pbrush, dc->rosdc.XlateBrush);
EBRUSHOBJ_vInit(&eboFill, pbrush, dc->rosdc.XlateBrush);
Ret = IntEngBitBlt(
&psurf->SurfObj,

10
reactos/subsystems/win32/win32k/objects/fillshap.c
View file

@ -107,7 +107,7 @@ IntGdiPolygon(PDC dc,
BrushOrigin = *((PPOINTL)&pbrushFill->ptOrigin);
BrushOrigin.x += dc->ptlDCOrig.x;
BrushOrigin.y += dc->ptlDCOrig.y;
IntGdiInitBrushInstance(&eboFill, pbrushFill, dc->rosdc.XlateBrush);
EBRUSHOBJ_vInit(&eboFill, pbrushFill, dc->rosdc.XlateBrush);
ret = IntFillPolygon (dc, psurf, &eboFill.BrushObject, Points, Count,
DestRect, &BrushOrigin);
}
@ -119,7 +119,7 @@ IntGdiPolygon(PDC dc,
{
int i;
IntGdiInitBrushInstance(&eboLine, pbrushLine, dc->rosdc.XlatePen);
EBRUSHOBJ_vInit(&eboLine, pbrushLine, dc->rosdc.XlatePen);
for (i = 0; i < Count-1; i++)
{
@ -600,7 +600,7 @@ IntRectangle(PDC dc,
BrushOrigin = *((PPOINTL)&pbrushFill->ptOrigin);
BrushOrigin.x += dc->ptlDCOrig.x;
BrushOrigin.y += dc->ptlDCOrig.y;
IntGdiInitBrushInstance(&eboFill, pbrushFill, dc->rosdc.XlateBrush);
EBRUSHOBJ_vInit(&eboFill, pbrushFill, dc->rosdc.XlateBrush);
ret = IntEngBitBlt(&psurf->SurfObj,
NULL,
NULL,
@ -615,7 +615,7 @@ IntRectangle(PDC dc,
}
}
IntGdiInitBrushInstance(&eboLine, pbrushLine, dc->rosdc.XlatePen);
EBRUSHOBJ_vInit(&eboLine, pbrushLine, dc->rosdc.XlatePen);
// Draw the rectangle with the current pen
@ -1147,7 +1147,7 @@ NtGdiExtFloodFill(
BrushOrigin = *((PPOINTL)&pbrushFill->ptOrigin);
BrushOrigin.x += dc->ptlDCOrig.x;
BrushOrigin.y += dc->ptlDCOrig.y;
IntGdiInitBrushInstance(&eboFill, pbrushFill, dc->rosdc.XlateBrush);
EBRUSHOBJ_vInit(&eboFill, pbrushFill, dc->rosdc.XlateBrush);
Ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL,
dc->rosdc.CombinedClip, NULL,
&DestRect, NULL, NULL,

4
reactos/subsystems/win32/win32k/objects/freetype.c
View file

@ -3237,7 +3237,7 @@ GreExtTextOutW(
{
goto fail;
}
IntGdiInitBrushInstance(&eboText, pbrushText, NULL);
EBRUSHOBJ_vInit(&eboText, pbrushText, NULL);
if ((fuOptions & ETO_OPAQUE) || pdcattr->jBkMode == OPAQUE)
{
hbrushBackGnd = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, pdcattr->crBackgroundClr), 0);
@ -3250,7 +3250,7 @@ GreExtTextOutW(
{
goto fail;
}
IntGdiInitBrushInstance(&eboBackGnd, pbrushBackGnd, NULL);
EBRUSHOBJ_vInit(&eboBackGnd, pbrushBackGnd, NULL);
}
XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, hDestPalette);
if ( !XlateObj2 )

4
reactos/subsystems/win32/win32k/objects/line.c
View file

@ -154,7 +154,7 @@ IntGdiLineTo(DC *dc,
if (!(pbrushLine->flAttrs & GDIBRUSH_IS_NULL))
{
IntGdiInitBrushInstance(&eboLine, pbrushLine, dc->rosdc.XlatePen);
EBRUSHOBJ_vInit(&eboLine, pbrushLine, dc->rosdc.XlatePen);
Ret = IntEngLineTo(&psurf->SurfObj,
dc->rosdc.CombinedClip,
&eboLine.BrushObject,
@ -292,7 +292,7 @@ IntGdiPolyline(DC *dc,
Points[i].y += dc->ptlDCOrig.y;
}
IntGdiInitBrushInstance(&eboLine, pbrushLine, dc->rosdc.XlatePen);
EBRUSHOBJ_vInit(&eboLine, pbrushLine, dc->rosdc.XlatePen);
Ret = IntEngPolyline(&psurf->SurfObj,
dc->rosdc.CombinedClip,
&eboLine.BrushObject,

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

@ -2937,7 +2937,7 @@ IntGdiPaintRgn(
ASSERT(ClipRegion);
pbrush = BRUSH_LockBrush(pdcattr->hbrush);
ASSERT(pbrush);
IntGdiInitBrushInstance(&eboFill, pbrush, dc->rosdc.XlateBrush);
EBRUSHOBJ_vInit(&eboFill, pbrush, dc->rosdc.XlateBrush);
BrushOrigin.x = pdcattr->ptlBrushOrigin.x;
BrushOrigin.y = pdcattr->ptlBrushOrigin.y;