Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-05 23:31:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Patch by Evgeniy Boltik: Fix Rectangle, Ellipse, RoundRect and Polygon.

Browse source 
svn path=/trunk/; revision=40051
This commit is contained in:
James Tabor 2009-03-16 03:21:00 +00:00
parent 6f8ec7004e
commit a27da8f7e8
4 changed files with 227 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/win32/win32k/include/paint.h
View file

@ -3,5 +3,7 @@
BOOL APIENTRY FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor); BOOL APIENTRY FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor);
BOOL APIENTRY FillPolygon ( DC* dc, SURFACE* pSurface, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect ); BOOL APIENTRY FillPolygon ( DC* dc, SURFACE* pSurface, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect );
BOOL FASTCALL IntFillPolygon(PDC dc, SURFACE *psurf, BRUSHOBJ *BrushObj,
CONST PPOINT Points, int Count, RECTL DestRect, POINTL *BrushOrigin);
#endif /* _WIN32K_PAINT_H */ #endif /* _WIN32K_PAINT_H */

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

@ -1337,26 +1337,10 @@ IntFillEllipse( PDC dc,
INT XLeft, INT XLeft,
INT YLeft, INT YLeft,
INT Width, INT Width,
INT Height) INT Height,
PGDIBRUSHOBJ FillBrushObj)
{ {
BOOL ret; return (BOOL)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), FillBrushObj);
PDC_ATTR Dc_Attr;
PGDIBRUSHOBJ FillBrushObj;
Dc_Attr = dc->pDc_Attr;
if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush);
if (NULL == FillBrushObj)
{
DPRINT1("FillEllipse Fail\n");
SetLastWin32Error(ERROR_INTERNAL_ERROR);
return FALSE;
}
ret = (BOOL)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), FillBrushObj);
BRUSHOBJ_UnlockBrush(FillBrushObj);
return ret;
} }
BOOL BOOL
@ -1367,23 +1351,12 @@ IntFillRoundRect( PDC dc,
INT Right, INT Right,
INT Bottom, INT Bottom,
INT Wellipse, INT Wellipse,
INT Hellipse) INT Hellipse,
PGDIBRUSHOBJ FillBrushObj)
{ {
PDC_ATTR Dc_Attr;
PGDIBRUSHOBJ FillBrushObj;
Rect r; Rect r;
int rx, ry; /* radius in x and y directions */ int rx, ry; /* radius in x and y directions */
Dc_Attr = dc->pDc_Attr;
if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush);
if (NULL == FillBrushObj)
{
DPRINT1("FillEllipse Fail\n");
SetLastWin32Error(ERROR_INTERNAL_ERROR);
return FALSE;
}
// x y Width Height // x y Width Height
r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top)); r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top));
rx = Wellipse/2; rx = Wellipse/2;
@ -1432,7 +1405,6 @@ IntFillRoundRect( PDC dc,
app_fill_rect(dc, rect(r.x, r.y+ry+1, r.width, r.height-ry-ry), FillBrushObj, FALSE); app_fill_rect(dc, rect(r.x, r.y+ry+1, r.width, r.height-ry-ry), FillBrushObj, FALSE);
} }
BRUSHOBJ_UnlockBrush(FillBrushObj);
return TRUE; return TRUE;
} }

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

@ -44,9 +44,9 @@
#define Rsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0))) #define Rsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0)))
#define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) #define Rcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0)))
BOOL FASTCALL IntFillEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height); BOOL FASTCALL IntFillEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, PGDIBRUSHOBJ FillBrushObj);
BOOL FASTCALL IntDrawEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, PGDIBRUSHOBJ PenBrushObj); BOOL FASTCALL IntDrawEllipse( PDC dc, INT XLeft, INT YLeft, INT Width, INT Height, PGDIBRUSHOBJ PenBrushObj);
BOOL FASTCALL IntFillRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse); BOOL FASTCALL IntFillRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse, PGDIBRUSHOBJ FillBrushObj);
BOOL FASTCALL IntDrawRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse, PGDIBRUSHOBJ PenBrushObj); BOOL FASTCALL IntDrawRoundRect( PDC dc, INT Left, INT Top, INT Right, INT Bottom, INT Wellipse, INT Hellipse, PGDIBRUSHOBJ PenBrushObj);
BOOL FASTCALL BOOL FASTCALL
@ -61,7 +61,10 @@ IntGdiPolygon(PDC dc,
RECTL DestRect; RECTL DestRect;
int CurrentPoint; int CurrentPoint;
PDC_ATTR Dc_Attr; PDC_ATTR Dc_Attr;
POINTL BrushOrigin;
// int Left;
// int Top;
ASSERT(dc); // caller's responsibility to pass a valid dc ASSERT(dc); // caller's responsibility to pass a valid dc
if (!Points || Count < 2 ) if (!Points || Count < 2 )
@ -70,6 +73,16 @@ IntGdiPolygon(PDC dc,
return FALSE; return FALSE;
} }
/*
//Find start x, y
Left = Points[0].x;
Top = Points[0].y;
for (CurrentPoint = 1; CurrentPoint < Count; ++CurrentPoint) {
Left = min(Left, Points[CurrentPoint].x);
Top = min(Top, Points[CurrentPoint].y);
}
*/
Dc_Attr = dc->pDc_Attr; Dc_Attr = dc->pDc_Attr;
if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
@ -111,8 +124,12 @@ IntGdiPolygon(PDC dc,
/* Now fill the polygon with the current brush. */ /* Now fill the polygon with the current brush. */
if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL))
{ {
BrushOrigin = *((PPOINTL)&FillBrushObj->ptOrigin);
BrushOrigin.x += dc->ptlDCOrig.x;
BrushOrigin.y += dc->ptlDCOrig.y;
IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush);
ret = FillPolygon ( dc, psurf, &FillBrushInst.BrushObject, ROP2_TO_MIX(Dc_Attr->jROP2), Points, Count, DestRect ); ret = IntFillPolygon (dc, psurf, &FillBrushInst.BrushObject, Points, Count,
DestRect, &BrushOrigin);
} }
if (FillBrushObj) if (FillBrushObj)
BRUSHOBJ_UnlockBrush(FillBrushObj); BRUSHOBJ_UnlockBrush(FillBrushObj);
@ -213,6 +230,8 @@ NtGdiEllipse(
BOOL ret = TRUE; BOOL ret = TRUE;
LONG PenWidth, PenOrigWidth; LONG PenWidth, PenOrigWidth;
LONG RadiusX, RadiusY, CenterX, CenterY; LONG RadiusX, RadiusY, CenterX, CenterY;
PGDIBRUSHOBJ pFillBrushObj;
GDIBRUSHOBJ tmpFillBrushObj;
if ((Left == Right) || (Top == Bottom)) return TRUE; if ((Left == Right) || (Top == Bottom)) return TRUE;
@ -303,11 +322,29 @@ NtGdiEllipse(
DPRINT("Ellipse 2: XLeft: %d, YLeft: %d, Width: %d, Height: %d\n", DPRINT("Ellipse 2: XLeft: %d, YLeft: %d, Width: %d, Height: %d\n",
CenterX - RadiusX, CenterY + RadiusY, RadiusX*2, RadiusY*2); CenterX - RadiusX, CenterY + RadiusY, RadiusX*2, RadiusY*2);
ret = IntFillEllipse( dc, pFillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush);
CenterX - RadiusX, if (NULL == pFillBrushObj)
CenterY - RadiusY, {
RadiusX*2, // Width DPRINT1("FillEllipse Fail\n");
RadiusY*2); // Height SetLastWin32Error(ERROR_INTERNAL_ERROR);
ret = FALSE;
}
else
{
RtlCopyMemory(&tmpFillBrushObj, pFillBrushObj, sizeof(tmpFillBrushObj));
// tmpFillBrushObj.ptOrigin.x += RectBounds.left - Left;
// tmpFillBrushObj.ptOrigin.y += RectBounds.top - Top;
tmpFillBrushObj.ptOrigin.x += dc->ptlDCOrig.x;
tmpFillBrushObj.ptOrigin.y += dc->ptlDCOrig.y;
ret = IntFillEllipse( dc,
CenterX - RadiusX,
CenterY - RadiusY,
RadiusX*2, // Width
RadiusY*2, // Height
&tmpFillBrushObj);
BRUSHOBJ_UnlockBrush(pFillBrushObj);
}
if (ret) if (ret)
ret = IntDrawEllipse( dc, ret = IntDrawEllipse( dc,
CenterX - RadiusX, CenterX - RadiusX,
@ -512,6 +549,7 @@ IntRectangle(PDC dc,
RECTL DestRect; RECTL DestRect;
MIX Mix; MIX Mix;
PDC_ATTR Dc_Attr; PDC_ATTR Dc_Attr;
POINTL BrushOrigin;
ASSERT ( dc ); // caller's responsibility to set this up ASSERT ( dc ); // caller's responsibility to set this up
@ -581,6 +619,9 @@ IntRectangle(PDC dc,
{ {
if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL))
{ {
BrushOrigin = *((PPOINTL)&FillBrushObj->ptOrigin);
BrushOrigin.x += dc->ptlDCOrig.x;
BrushOrigin.y += dc->ptlDCOrig.y;
IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush);
ret = IntEngBitBlt(&psurf->SurfObj, ret = IntEngBitBlt(&psurf->SurfObj,
NULL, NULL,
@ -591,7 +632,7 @@ IntRectangle(PDC dc,
NULL, NULL,
NULL, NULL,
&FillBrushInst.BrushObject, &FillBrushInst.BrushObject,
NULL, &BrushOrigin,
ROP3_TO_ROP4(PATCOPY)); ROP3_TO_ROP4(PATCOPY));
} }
} }
@ -697,6 +738,8 @@ IntRoundRect(
RECTL RectBounds; RECTL RectBounds;
LONG PenWidth, PenOrigWidth; LONG PenWidth, PenOrigWidth;
BOOL ret = TRUE; // default to success BOOL ret = TRUE; // default to success
PGDIBRUSHOBJ pFillBrushObj;
GDIBRUSHOBJ tmpFillBrushObj;
ASSERT ( dc ); // caller's responsibility to set this up ASSERT ( dc ); // caller's responsibility to set this up
@ -763,13 +806,29 @@ IntRoundRect(
RectBounds.right += dc->ptlDCOrig.x; RectBounds.right += dc->ptlDCOrig.x;
RectBounds.bottom += dc->ptlDCOrig.y; RectBounds.bottom += dc->ptlDCOrig.y;
ret = IntFillRoundRect( dc, pFillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush);
RectBounds.left, if (NULL == pFillBrushObj)
RectBounds.top, {
RectBounds.right, DPRINT1("FillRound Fail\n");
RectBounds.bottom, SetLastWin32Error(ERROR_INTERNAL_ERROR);
xCurveDiameter, ret = FALSE;
yCurveDiameter); }
else
{
RtlCopyMemory(&tmpFillBrushObj, pFillBrushObj, sizeof(tmpFillBrushObj));
tmpFillBrushObj.ptOrigin.x += RectBounds.left - Left;
tmpFillBrushObj.ptOrigin.y += RectBounds.top - Top;
ret = IntFillRoundRect( dc,
RectBounds.left,
RectBounds.top,
RectBounds.right,
RectBounds.bottom,
xCurveDiameter,
yCurveDiameter,
&tmpFillBrushObj);
BRUSHOBJ_UnlockBrush(pFillBrushObj);
}
if (ret) if (ret)
ret = IntDrawRoundRect( dc, ret = IntDrawRoundRect( dc,
RectBounds.left, RectBounds.left,
@ -1048,95 +1107,93 @@ NtGdiExtFloodFill(
COLORREF Color, COLORREF Color,
UINT FillType) UINT FillType)
{ {
PDC dc; PDC dc;
PDC_ATTR Dc_Attr; PDC_ATTR Dc_Attr;
SURFACE *psurf = NULL; SURFACE *psurf = NULL;
PGDIBRUSHOBJ FillBrushObj = NULL; PGDIBRUSHOBJ FillBrushObj = NULL;
GDIBRUSHINST FillBrushInst; GDIBRUSHINST FillBrushInst;
BOOL Ret = FALSE; BOOL Ret = FALSE;
RECTL DestRect; RECTL DestRect;
POINTL Pt; POINTL Pt;
// MIX Mix; POINTL BrushOrigin;
DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n"); DPRINT1("FIXME: NtGdiExtFloodFill is UNIMPLEMENTED\n");
dc = DC_LockDc(hDC); dc = DC_LockDc(hDC);
if (!dc) if (!dc)
{ {
SetLastWin32Error(ERROR_INVALID_HANDLE); SetLastWin32Error(ERROR_INVALID_HANDLE);
return FALSE; return FALSE;
} }
if (dc->DC_Type == DC_TYPE_INFO) if (dc->DC_Type == DC_TYPE_INFO)
{ {
DC_UnlockDc(dc); DC_UnlockDc(dc);
/* Yes, Windows really returns TRUE in this case */ /* Yes, Windows really returns TRUE in this case */
return TRUE; return TRUE;
} }
Dc_Attr = dc->pDc_Attr; Dc_Attr = dc->pDc_Attr;
if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY) if (Dc_Attr->ulDirty_ & DC_PEN_DIRTY)
IntGdiSelectPen(dc,Dc_Attr->hpen); IntGdiSelectPen(dc,Dc_Attr->hpen);
if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY) if (Dc_Attr->ulDirty_ & DC_BRUSH_DIRTY)
IntGdiSelectBrush(dc,Dc_Attr->hbrush); IntGdiSelectBrush(dc,Dc_Attr->hbrush);
Pt.x = XStart; Pt.x = XStart;
Pt.y = YStart; Pt.y = YStart;
IntLPtoDP(dc, (LPPOINT)&Pt, 1); IntLPtoDP(dc, (LPPOINT)&Pt, 1);
Ret = NtGdiPtInRegion(dc->w.hGCClipRgn, Pt.x, Pt.y); Ret = NtGdiPtInRegion(dc->w.hGCClipRgn, Pt.x, Pt.y);
if (Ret) if (Ret)
IntGdiGetRgnBox(dc->w.hGCClipRgn,(LPRECT)&DestRect); IntGdiGetRgnBox(dc->w.hGCClipRgn,(LPRECT)&DestRect);
else else
goto cleanup; goto cleanup;
FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush);
if (!FillBrushObj) if (!FillBrushObj)
{ {
Ret = FALSE; Ret = FALSE;
goto cleanup; goto cleanup;
} }
psurf = SURFACE_LockSurface(dc->w.hBitmap); psurf = SURFACE_LockSurface(dc->w.hBitmap);
if (!psurf) if (!psurf)
{ {
Ret = FALSE; Ret = FALSE;
goto cleanup; goto cleanup;
} }
if ( FillBrushObj && (FillType == FLOODFILLBORDER)) if ( FillBrushObj && (FillType == FLOODFILLBORDER))
{ {
if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) if (!(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL))
{ {
FillBrushObj->BrushAttr.lbColor = Color; FillBrushObj->BrushAttr.lbColor = Color;
IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); BrushOrigin = *((PPOINTL)&FillBrushObj->ptOrigin);
Ret = IntEngBitBlt(&psurf->SurfObj, BrushOrigin.x += dc->ptlDCOrig.x;
NULL, BrushOrigin.y += dc->ptlDCOrig.y;
NULL, IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush);
dc->CombinedClip, Ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL,
NULL, dc->CombinedClip, NULL,
&DestRect, &DestRect, NULL, NULL,
NULL,
NULL,
&FillBrushInst.BrushObject, &FillBrushInst.BrushObject,
NULL, &BrushOrigin,
ROP3_TO_ROP4(PATCOPY)); ROP3_TO_ROP4(PATCOPY));
} }
} }
else else
{ {
} }
cleanup: cleanup:
if (FillBrushObj) if (FillBrushObj)
BRUSHOBJ_UnlockBrush(FillBrushObj); BRUSHOBJ_UnlockBrush(FillBrushObj);
if (psurf) if (psurf)
SURFACE_UnlockSurface(psurf); SURFACE_UnlockSurface(psurf);
DC_UnlockDc(dc); DC_UnlockDc(dc);
return Ret; return Ret;
} }
/* EOF */ /* EOF */

72
reactos/subsystems/win32/win32k/objects/polyfill.c
View file

@ -600,4 +600,76 @@ FillPolygon(
return TRUE; return TRUE;
} }
BOOL FASTCALL
IntFillPolygon(
PDC dc,
SURFACE *psurf,
BRUSHOBJ *BrushObj,
CONST PPOINT Points,
int Count,
RECTL DestRect,
POINTL *BrushOrigin)
{
FILL_EDGE_LIST *list = 0;
FILL_EDGE *ActiveHead = 0;
FILL_EDGE *pLeft, *pRight;
int ScanLine;
//DPRINT("IntFillPolygon\n");
/* Create Edge List. */
list = POLYGONFILL_MakeEdgeList(Points, Count);
/* DEBUG_PRINT_EDGELIST(list); */
if (NULL == list)
return FALSE;
/* For each Scanline from DestRect.top to DestRect.bottom, determine line segments to draw */
for ( ScanLine = DestRect.top; ScanLine < DestRect.bottom; ++ScanLine )
{
POLYGONFILL_BuildActiveList(ScanLine, list, &ActiveHead);
//DEBUG_PRINT_ACTIVE_EDGELIST(ActiveHead);
if ( !ActiveHead )
return FALSE;
pLeft = ActiveHead;
pRight = pLeft->pNext;
ASSERT(pRight);
while ( NULL != pRight )
{
int x1 = pLeft->XIntercept[0];
int x2 = pRight->XIntercept[1];
if ( x2 > x1 )
{
RECTL LineRect;
LineRect.top = ScanLine;
LineRect.bottom = ScanLine + 1;
LineRect.left = x1;
LineRect.right = x2;
IntEngBitBlt(&psurf->SurfObj,
NULL,
NULL,
dc->CombinedClip,
NULL,
&LineRect,
NULL,
NULL,
BrushObj,
BrushOrigin,
ROP3_TO_ROP4(PATCOPY));
}
pLeft = pRight->pNext;
pRight = pLeft ? pLeft->pNext : NULL;
}
}
/* Free Edge List. If any are left. */
POLYGONFILL_DestroyEdgeList(list);
return TRUE;
}
/* EOF */ /* EOF */