/*
* PROJECT: ReactOS win32 kernel mode subsystem
* LICENSE: GPL - See COPYING in the top level directory
- * FILE: subsystems/win32/win32k/objects/fillshap.c
+ * FILE: win32ss/gdi/ntgdi/fillshap.c
* PURPOSE: fillshap
* PROGRAMMER:
*/
pbrFill = dc->dclevel.pbrFill;
pbrLine = dc->dclevel.pbrLine;
psurf = dc->dclevel.pSurface;
- /* FIXME: psurf can be NULL!!!! don't assert but handle this case gracefully! */
- ASSERT(psurf);
+ if (psurf == NULL)
+ {
+ /* Memory DC without a bitmap selected, nothing to do. */
+ return TRUE;
+ }
/* Now fill the polygon with the current fill brush. */
if (!(pbrFill->flAttrs & BR_IS_NULL))
// Points[1].x, Points[1].y );
ret = IntEngLineTo(&psurf->SurfObj,
- &dc->co.ClipObj,
+ (CLIPOBJ *)&dc->co,
&dc->eboLine.BrushObject,
Points[i].x, /* From */
Points[i].y,
if (ret)
{
ret = IntEngLineTo(&psurf->SurfObj,
- &dc->co.ClipObj,
+ (CLIPOBJ *)&dc->co,
&dc->eboLine.BrushObject,
Points[Count-1].x, /* From */
Points[Count-1].y,
BOOL FASTCALL
IntPolygon(HDC hdc, POINT *Point, int Count)
{
- PDC dc;
- if (!(dc = DC_LockDc(hdc)))
- {
- EngSetLastError(ERROR_INVALID_HANDLE);
- return FALSE;
- }
- return IntGdiPolygon(dc, Point, Count);
+ BOOL bResult;
+ PDC pdc;
+
+ pdc = DC_LockDc(hdc);
+ if (pdc == NULL)
+ {
+ EngSetLastError(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+
+ bResult = IntGdiPolygon(pdc, Point, Count);
+
+ DC_UnlockDc(pdc);
+ return bResult;
}
PBRUSH pFillBrushObj;
BRUSH tmpFillBrushObj;
- if ((Left == Right) || (Top == Bottom)) return TRUE;
-
dc = DC_LockDc(hDC);
if (dc == NULL)
{
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
if (PATH_IsPathOpen(dc->dclevel))
{
return ret;
}
+ ////
+ //// Could this use PATH_CheckCorners ?
+ ////
+ if ((Left == Right) || (Top == Bottom))
+ {
+ DC_UnlockDc(dc);
+ return TRUE;
+ }
+
if (Right < Left)
{
INT tmp = Right; Right = Left; Left = tmp;
{
INT tmp = Bottom; Bottom = Top; Top = tmp;
}
+ ////
pdcattr = dc->pdcattr;
return FALSE;
}
- PenOrigWidth = PenWidth = pbrush->ptPenWidth.x;
+ PenOrigWidth = PenWidth = pbrush->lWidth;
if (pbrush->ulPenStyle == PS_NULL) PenWidth = 0;
if (pbrush->ulPenStyle == PS_INSIDEFRAME)
}
if (!PenWidth) PenWidth = 1;
- pbrush->ptPenWidth.x = PenWidth;
+ pbrush->lWidth = PenWidth;
RectBounds.left = Left;
RectBounds.right = Right;
DC_vFinishBlit(dc, NULL);
}
- pbrush->ptPenWidth.x = PenOrigWidth;
+ pbrush->lWidth = PenOrigWidth;
PEN_ShareUnlockPen(pbrush);
DC_UnlockDc(dc);
DPRINT("Ellipse Exit.\n");
/* Special handling for GdiPolyPolyRgn */
if (iFunc == GdiPolyPolyRgn)
{
- PREGION Rgn;
- HRGN hRgn;
+ INT iMode = (INT)(UINT_PTR)hDC;
+ HRGN hrgn;
+
+ hrgn = GreCreatePolyPolygonRgn(SafePoints, SafeCounts, Count, iMode);
- Rgn = REGION_AllocUserRgnWithHandle(0);
- if (!Rgn)
- {
- EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
- ExFreePoolWithTag(pTemp, TAG_SHAPE);
- return 0;
- }
- hRgn = Rgn->BaseObject.hHmgr;
- if (!IntSetPolyPolygonRgn(SafePoints, SafeCounts, Count, hDC ? 1 : 2, Rgn))
- {
- /* EngSetLastError ? */
- GreDeleteObject(hRgn);
- hRgn = NULL;
- }
- RGNOBJAPI_Unlock(Rgn);
ExFreePoolWithTag(pTemp, TAG_SHAPE);
- return (ULONG_PTR)hRgn;
+ return (ULONG_PTR)hrgn;
}
dc = DC_LockDc(hDC);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- ExFreePoolWithTag(pTemp, TAG_SHAPE);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
-
DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL);
if (dc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
DestRect.top += dc->ptlDCOrig.y;
DestRect.bottom += dc->ptlDCOrig.y;
+ if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR))
+ {
+ IntUpdateBoundsRect(dc, &DestRect);
+ }
+
/* In GM_COMPATIBLE, don't include bottom and right edges */
if (pdcattr->iGraphicsMode == GM_COMPATIBLE)
{
psurf = dc->dclevel.pSurface;
if (!psurf)
{
- ret = FALSE;
+ ret = TRUE;
goto cleanup;
}
ret = IntEngBitBlt(&psurf->SurfObj,
NULL,
NULL,
- &dc->co.ClipObj,
+ (CLIPOBJ *)&dc->co,
NULL,
&DestRect,
NULL,
{
Mix = ROP2_TO_MIX(pdcattr->jROP2);
ret = ret && IntEngLineTo(&psurf->SurfObj,
- &dc->co.ClipObj,
+ (CLIPOBJ *)&dc->co,
&dc->eboLine.BrushObject,
DestRect.left, DestRect.top, DestRect.right, DestRect.top,
&DestRect, // Bounding rectangle
Mix);
ret = ret && IntEngLineTo(&psurf->SurfObj,
- &dc->co.ClipObj,
+ (CLIPOBJ *)&dc->co,
&dc->eboLine.BrushObject,
DestRect.right, DestRect.top, DestRect.right, DestRect.bottom,
&DestRect, // Bounding rectangle
Mix);
ret = ret && IntEngLineTo(&psurf->SurfObj,
- &dc->co.ClipObj,
+ (CLIPOBJ *)&dc->co,
&dc->eboLine.BrushObject,
DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom,
&DestRect, // Bounding rectangle
Mix);
ret = ret && IntEngLineTo(&psurf->SurfObj,
- &dc->co.ClipObj,
+ (CLIPOBJ *)&dc->co,
&dc->eboLine.BrushObject,
DestRect.left, DestRect.bottom, DestRect.left, DestRect.top,
&DestRect, // Bounding rectangle
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
/* Do we rotate or shear? */
if (!(dc->pdcattr->mxWorldToDevice.flAccel & XFORM_SCALE))
return FALSE;
}
- PenOrigWidth = PenWidth = pbrLine->ptPenWidth.x;
+ PenOrigWidth = PenWidth = pbrLine->lWidth;
if (pbrLine->ulPenStyle == PS_NULL) PenWidth = 0;
if (pbrLine->ulPenStyle == PS_INSIDEFRAME)
}
if (!PenWidth) PenWidth = 1;
- pbrLine->ptPenWidth.x = PenWidth;
+ pbrLine->lWidth = PenWidth;
RectBounds.left = Left;
RectBounds.top = Top;
}
- pbrLine->ptPenWidth.x = PenOrigWidth;
+ pbrLine->lWidth = PenOrigWidth;
PEN_ShareUnlockPen(pbrLine);
return ret;
}
DPRINT1("NtGdiRoundRect() - hDC is invalid\n");
EngSetLastError(ERROR_INVALID_HANDLE);
}
- else if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- ret = TRUE;
- }
else
{
ret = IntRoundRect ( dc, LeftRect, TopRect, RightRect, BottomRect, Width, Height );
return FALSE;
}
- if(pdc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(pdc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
-
- psurf = pdc->dclevel.pSurface;
- if(!psurf)
+ if (!pdc->dclevel.pSurface)
{
/* Memory DC with no surface selected */
DC_UnlockDc(pdc);
rclExtent.top += pdc->ptlDCOrig.y;
rclExtent.bottom += pdc->ptlDCOrig.y;
+ if (RECTL_bIsEmptyRect(&rclExtent))
+ {
+ DC_UnlockDc(pdc);
+ return TRUE;
+ }
+
ptlDitherOrg.x = ptlDitherOrg.y = 0;
IntLPtoDP(pdc, (LPPOINT)&ptlDitherOrg, 1);
ptlDitherOrg.x += pdc->ptlDCOrig.x;
ptlDitherOrg.y += pdc->ptlDCOrig.y;
- EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0, 0);
+ if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR))
+ {
+ IntUpdateBoundsRect(pdc, &rclExtent);
+ }
DC_vPrepareDCsForBlit(pdc, &rclExtent, NULL, NULL);
+ psurf = pdc->dclevel.pSurface;
+
+ EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0, 0);
+
bRet = IntEngGradientFill(&psurf->SurfObj,
- &pdc->co.ClipObj,
+ (CLIPOBJ *)&pdc->co,
&exlo.xlo,
pVertex,
nVertex,
UINT FillType)
{
PDC dc;
+#if 0
PDC_ATTR pdcattr;
- SURFACE *psurf = NULL;
+#endif
+ SURFACE *psurf;
EXLATEOBJ exlo;
BOOL Ret = FALSE;
RECTL DestRect;
POINTL Pt;
ULONG ConvColor;
+ PREGION prgn;
dc = DC_LockDc(hDC);
if (!dc)
EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if (dc->dctype == DC_TYPE_INFO)
- {
- DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
- psurf = dc->dclevel.pSurface;
- if (!psurf)
+ if (!dc->dclevel.pSurface)
{
- Ret = FALSE;
+ Ret = TRUE;
goto cleanup;
}
+#if 0
pdcattr = dc->pdcattr;
-
- if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
- DC_vUpdateFillBrush(dc);
-
- if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
- DC_vUpdateLineBrush(dc);
+#endif
Pt.x = XStart;
Pt.y = YStart;
IntLPtoDP(dc, (LPPOINT)&Pt, 1);
- if (dc->prgnRao)
+ DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL);
+
+ psurf = dc->dclevel.pSurface;
+
+ prgn = dc->prgnRao ? dc->prgnRao : dc->prgnVis;
+ if (prgn)
{
- Ret = REGION_PtInRegion(dc->prgnRao, Pt.x, Pt.y);
+ Ret = REGION_PtInRegion(prgn, Pt.x, Pt.y);
if (Ret)
- REGION_GetRgnBox(dc->prgnRao ,(LPRECT)&DestRect);
+ REGION_GetRgnBox(prgn, (LPRECT)&DestRect);
else
+ {
+ DC_vFinishBlit(dc, NULL);
goto cleanup;
+ }
}
else
+ {
RECTL_vSetRect(&DestRect, 0, 0, psurf->SurfObj.sizlBitmap.cx, psurf->SurfObj.sizlBitmap.cy);
+ }
- DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL);
+ if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR))
+ {
+ IntUpdateBoundsRect(dc, &DestRect);
+ }
EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0xffffff, 0);
projects / reactos.git / blobdiff