[ros-diffs] [tkreuzer] 33738: [FORMATTING] Apply consistent indentation (4 spaces)
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Wed May 28 17:20:56 CEST 2008
Author: tkreuzer
Date: Wed May 28 10:20:56 2008
New Revision: 33738
URL: http://svn.reactos.org/svn/reactos?rev=33738&view=rev
Log:
[FORMATTING]
Apply consistent indentation (4 spaces)
Modified:
trunk/reactos/subsystems/win32/win32k/objects/line.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/line.c?rev=33738&r1=33737&r2=33738&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Wed May 28 10:20:56 2008
@@ -32,35 +32,35 @@
int Y,
LPPOINT Point)
{
- BOOL PathIsOpen;
- PDC_ATTR Dc_Attr = dc->pDc_Attr;
- if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
- if ( Point )
- {
- if ( Dc_Attr->ulDirty_ & DIRTY_PTLCURRENT ) // Double hit!
- {
- Point->x = Dc_Attr->ptfxCurrent.x; // ret prev before change.
- Point->y = Dc_Attr->ptfxCurrent.y;
- IntDPtoLP ( dc, Point, 1); // reconvert back.
- }
- else
- {
- Point->x = Dc_Attr->ptlCurrent.x;
- Point->y = Dc_Attr->ptlCurrent.y;
- }
- }
- Dc_Attr->ptlCurrent.x = X;
- Dc_Attr->ptlCurrent.y = Y;
- Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
- CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
- Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
-
- PathIsOpen = PATH_IsPathOpen(dc->w.path);
-
- if ( PathIsOpen )
- return PATH_MoveTo ( dc );
-
- return TRUE;
+ BOOL PathIsOpen;
+ PDC_ATTR Dc_Attr = dc->pDc_Attr;
+ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
+ if ( Point )
+ {
+ if ( Dc_Attr->ulDirty_ & DIRTY_PTLCURRENT ) // Double hit!
+ {
+ Point->x = Dc_Attr->ptfxCurrent.x; // ret prev before change.
+ Point->y = Dc_Attr->ptfxCurrent.y;
+ IntDPtoLP ( dc, Point, 1); // reconvert back.
+ }
+ else
+ {
+ Point->x = Dc_Attr->ptlCurrent.x;
+ Point->y = Dc_Attr->ptlCurrent.y;
+ }
+ }
+ Dc_Attr->ptlCurrent.x = X;
+ Dc_Attr->ptlCurrent.y = Y;
+ Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
+ CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
+ Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
+
+ PathIsOpen = PATH_IsPathOpen(dc->w.path);
+
+ if ( PathIsOpen )
+ return PATH_MoveTo ( dc );
+
+ return TRUE;
}
// Should use Fx in pt
@@ -68,20 +68,20 @@
VOID FASTCALL
IntGetCurrentPositionEx(PDC dc, LPPOINT pt)
{
- PDC_ATTR Dc_Attr = dc->pDc_Attr;
- if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
-
- if ( pt )
- {
- if (Dc_Attr->ulDirty_ & DIRTY_PTFXCURRENT)
- {
- Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
- CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
- Dc_Attr->ulDirty_ &= ~(DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
- }
- pt->x = Dc_Attr->ptlCurrent.x;
- pt->y = Dc_Attr->ptlCurrent.y;
- }
+ PDC_ATTR Dc_Attr = dc->pDc_Attr;
+ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
+
+ if ( pt )
+ {
+ if (Dc_Attr->ulDirty_ & DIRTY_PTFXCURRENT)
+ {
+ Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
+ CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
+ Dc_Attr->ulDirty_ &= ~(DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
+ }
+ pt->x = Dc_Attr->ptlCurrent.x;
+ pt->y = Dc_Attr->ptlCurrent.y;
+ }
}
BOOL FASTCALL
@@ -89,88 +89,88 @@
int XEnd,
int YEnd)
{
- BITMAPOBJ *BitmapObj;
- BOOL Ret = TRUE;
- PGDIBRUSHOBJ PenBrushObj;
- GDIBRUSHINST PenBrushInst;
- RECTL Bounds;
- POINT Points[2];
- PDC_ATTR Dc_Attr = dc->pDc_Attr;
-
- if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
-
- if (PATH_IsPathOpen(dc->w.path))
- {
- Ret = PATH_LineTo(dc, XEnd, YEnd);
- if (Ret)
- {
- // FIXME - PATH_LineTo should maybe do this...
- Dc_Attr->ptlCurrent.x = XEnd;
- Dc_Attr->ptlCurrent.y = YEnd;
+ BITMAPOBJ *BitmapObj;
+ BOOL Ret = TRUE;
+ PGDIBRUSHOBJ PenBrushObj;
+ GDIBRUSHINST PenBrushInst;
+ RECTL Bounds;
+ POINT Points[2];
+ PDC_ATTR Dc_Attr = dc->pDc_Attr;
+
+ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
+
+ if (PATH_IsPathOpen(dc->w.path))
+ {
+ Ret = PATH_LineTo(dc, XEnd, YEnd);
+ if (Ret)
+ {
+ // FIXME - PATH_LineTo should maybe do this...
+ Dc_Attr->ptlCurrent.x = XEnd;
+ Dc_Attr->ptlCurrent.y = YEnd;
Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
- }
- return Ret;
- }
- else
- {
- BitmapObj = BITMAPOBJ_LockBitmap ( dc->w.hBitmap );
- if (NULL == BitmapObj)
- {
- SetLastWin32Error(ERROR_INVALID_HANDLE);
- return FALSE;
- }
-
- Points[0].x = Dc_Attr->ptlCurrent.x;
- Points[0].y = Dc_Attr->ptlCurrent.y;
- Points[1].x = XEnd;
- Points[1].y = YEnd;
-
- IntLPtoDP(dc, Points, 2);
-
- /* FIXME: Is it correct to do this after the transformation? */
- Points[0].x += dc->w.DCOrgX;
- Points[0].y += dc->w.DCOrgY;
- Points[1].x += dc->w.DCOrgX;
- Points[1].y += dc->w.DCOrgY;
-
- Bounds.left = min(Points[0].x, Points[1].x);
- Bounds.top = min(Points[0].y, Points[1].y);
- Bounds.right = max(Points[0].x, Points[1].x);
- Bounds.bottom = max(Points[0].y, Points[1].y);
-
- /* get BRUSHOBJ from current pen. */
- PenBrushObj = PENOBJ_LockPen( Dc_Attr->hpen );
- /* FIXME - PenBrushObj can be NULL!!!! Don't assert here! */
- ASSERT(PenBrushObj);
-
- if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
- {
- IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
- Ret = IntEngLineTo(&BitmapObj->SurfObj,
- dc->CombinedClip,
- &PenBrushInst.BrushObject,
- Points[0].x, Points[0].y,
- Points[1].x, Points[1].y,
- &Bounds,
- ROP2_TO_MIX(Dc_Attr->jROP2));
- }
-
- BITMAPOBJ_UnlockBitmap ( BitmapObj );
- PENOBJ_UnlockPen( PenBrushObj );
- }
-
- if (Ret)
- {
- Dc_Attr->ptlCurrent.x = XEnd;
- Dc_Attr->ptlCurrent.y = YEnd;
- Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
- CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
- Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
- }
-
- return Ret;
+ }
+ return Ret;
+ }
+ else
+ {
+ BitmapObj = BITMAPOBJ_LockBitmap ( dc->w.hBitmap );
+ if (NULL == BitmapObj)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+
+ Points[0].x = Dc_Attr->ptlCurrent.x;
+ Points[0].y = Dc_Attr->ptlCurrent.y;
+ Points[1].x = XEnd;
+ Points[1].y = YEnd;
+
+ IntLPtoDP(dc, Points, 2);
+
+ /* FIXME: Is it correct to do this after the transformation? */
+ Points[0].x += dc->w.DCOrgX;
+ Points[0].y += dc->w.DCOrgY;
+ Points[1].x += dc->w.DCOrgX;
+ Points[1].y += dc->w.DCOrgY;
+
+ Bounds.left = min(Points[0].x, Points[1].x);
+ Bounds.top = min(Points[0].y, Points[1].y);
+ Bounds.right = max(Points[0].x, Points[1].x);
+ Bounds.bottom = max(Points[0].y, Points[1].y);
+
+ /* get BRUSHOBJ from current pen. */
+ PenBrushObj = PENOBJ_LockPen( Dc_Attr->hpen );
+ /* FIXME - PenBrushObj can be NULL!!!! Don't assert here! */
+ ASSERT(PenBrushObj);
+
+ if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
+ {
+ IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
+ Ret = IntEngLineTo(&BitmapObj->SurfObj,
+ dc->CombinedClip,
+ &PenBrushInst.BrushObject,
+ Points[0].x, Points[0].y,
+ Points[1].x, Points[1].y,
+ &Bounds,
+ ROP2_TO_MIX(Dc_Attr->jROP2));
+ }
+
+ BITMAPOBJ_UnlockBitmap ( BitmapObj );
+ PENOBJ_UnlockPen( PenBrushObj );
+ }
+
+ if (Ret)
+ {
+ Dc_Attr->ptlCurrent.x = XEnd;
+ Dc_Attr->ptlCurrent.y = YEnd;
+ Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
+ CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
+ Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
+ }
+
+ return Ret;
}
BOOL FASTCALL
@@ -178,27 +178,27 @@
LPPOINT pt,
DWORD Count)
{
- BOOL ret = FALSE; // default to FAILURE
-
- if ( PATH_IsPathOpen(dc->w.path) )
- {
- return PATH_PolyBezier ( dc, pt, Count );
- }
-
- /* We'll convert it into line segments and draw them using Polyline */
- {
- POINT *Pts;
- INT nOut;
-
- Pts = GDI_Bezier ( pt, Count, &nOut );
- if ( Pts )
- {
- ret = IntGdiPolyline(dc, Pts, nOut);
- ExFreePool(Pts);
- }
- }
-
- return ret;
+ BOOL ret = FALSE; // default to FAILURE
+
+ if ( PATH_IsPathOpen(dc->w.path) )
+ {
+ return PATH_PolyBezier ( dc, pt, Count );
+ }
+
+ /* We'll convert it into line segments and draw them using Polyline */
+ {
+ POINT *Pts;
+ INT nOut;
+
+ Pts = GDI_Bezier ( pt, Count, &nOut );
+ if ( Pts )
+ {
+ ret = IntGdiPolyline(dc, Pts, nOut);
+ ExFreePool(Pts);
+ }
+ }
+
+ return ret;
}
BOOL FASTCALL
@@ -206,35 +206,37 @@
LPPOINT pt,
DWORD Count)
{
- BOOL ret = FALSE; // default to failure
- PDC_ATTR Dc_Attr = dc->pDc_Attr;
-
- if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
- if ( PATH_IsPathOpen(dc->w.path) )
- ret = PATH_PolyBezierTo ( dc, pt, Count );
- else /* We'll do it using PolyBezier */
- {
- POINT *npt;
- npt = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * (Count + 1), TAG_BEZIER);
- if ( npt )
- {
- npt[0].x = Dc_Attr->ptlCurrent.x;
- npt[0].y = Dc_Attr->ptlCurrent.y;
- memcpy(npt + 1, pt, sizeof(POINT) * Count);
- ret = IntGdiPolyBezier(dc, npt, Count+1);
- ExFreePool(npt);
- }
- }
- if ( ret )
- {
- Dc_Attr->ptlCurrent.x = pt[Count-1].x;
- Dc_Attr->ptlCurrent.y = pt[Count-1].y;
- Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
- CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
- Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
- }
-
- return ret;
+ BOOL ret = FALSE; // default to failure
+ PDC_ATTR Dc_Attr = dc->pDc_Attr;
+
+ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
+ if ( PATH_IsPathOpen(dc->w.path) )
+ ret = PATH_PolyBezierTo ( dc, pt, Count );
+ else /* We'll do it using PolyBezier */
+ {
+ POINT *npt;
+ npt = ExAllocatePoolWithTag(PagedPool,
+ sizeof(POINT) * (Count + 1),
+ TAG_BEZIER);
+ if ( npt )
+ {
+ npt[0].x = Dc_Attr->ptlCurrent.x;
+ npt[0].y = Dc_Attr->ptlCurrent.y;
+ memcpy(npt + 1, pt, sizeof(POINT) * Count);
+ ret = IntGdiPolyBezier(dc, npt, Count+1);
+ ExFreePool(npt);
+ }
+ }
+ if ( ret )
+ {
+ Dc_Attr->ptlCurrent.x = pt[Count-1].x;
+ Dc_Attr->ptlCurrent.y = pt[Count-1].y;
+ Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
+ CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
+ Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
+ }
+
+ return ret;
}
BOOL FASTCALL
@@ -242,59 +244,63 @@
LPPOINT pt,
int Count)
{
- BITMAPOBJ *BitmapObj;
- GDIBRUSHOBJ *PenBrushObj;
- GDIBRUSHINST PenBrushInst;
- LPPOINT Points;
- BOOL Ret = TRUE;
- LONG i;
- PDC_ATTR Dc_Attr = dc->pDc_Attr;
-
- if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
- if (PATH_IsPathOpen(dc->w.path))
- return PATH_Polyline(dc, pt, Count);
-
- /* Get BRUSHOBJ from current pen. */
- PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen);
- /* FIXME - PenBrushObj can be NULL! Don't assert here! */
- ASSERT(PenBrushObj);
-
- if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
- {
- Points = EngAllocMem(0, Count * sizeof(POINT), TAG_COORD);
- if (Points != NULL)
- {
- BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
- /* FIXME - BitmapObj can be NULL!!!! Don't assert but handle this case gracefully! */
- ASSERT(BitmapObj);
-
- RtlCopyMemory(Points, pt, Count * sizeof(POINT));
- IntLPtoDP(dc, Points, Count);
-
- /* Offset the array of point by the dc->w.DCOrg */
- for (i = 0; i < Count; i++)
- {
- Points[i].x += dc->w.DCOrgX;
- Points[i].y += dc->w.DCOrgY;
- }
-
- IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
- Ret = IntEngPolyline(&BitmapObj->SurfObj, dc->CombinedClip,
- &PenBrushInst.BrushObject, Points, Count,
- ROP2_TO_MIX(Dc_Attr->jROP2));
-
- BITMAPOBJ_UnlockBitmap(BitmapObj);
- EngFreeMem(Points);
- }
- else
- {
- Ret = FALSE;
- }
- }
-
- PENOBJ_UnlockPen(PenBrushObj);
-
- return Ret;
+ BITMAPOBJ *BitmapObj;
+ GDIBRUSHOBJ *PenBrushObj;
+ GDIBRUSHINST PenBrushInst;
+ LPPOINT Points;
+ BOOL Ret = TRUE;
+ LONG i;
+ PDC_ATTR Dc_Attr = dc->pDc_Attr;
+
+ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
+ if (PATH_IsPathOpen(dc->w.path))
+ return PATH_Polyline(dc, pt, Count);
+
+ /* Get BRUSHOBJ from current pen. */
+ PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen);
+ /* FIXME - PenBrushObj can be NULL! Don't assert here! */
+ ASSERT(PenBrushObj);
+
+ if (!(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL))
+ {
+ Points = EngAllocMem(0, Count * sizeof(POINT), TAG_COORD);
+ if (Points != NULL)
+ {
+ BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap);
+ /* FIXME - BitmapObj can be NULL!!!!
+ Don't assert but handle this case gracefully! */
+ ASSERT(BitmapObj);
+
+ RtlCopyMemory(Points, pt, Count * sizeof(POINT));
+ IntLPtoDP(dc, Points, Count);
+
+ /* Offset the array of point by the dc->w.DCOrg */
+ for (i = 0; i < Count; i++)
+ {
+ Points[i].x += dc->w.DCOrgX;
+ Points[i].y += dc->w.DCOrgY;
+ }
+
+ IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen);
+ Ret = IntEngPolyline(&BitmapObj->SurfObj,
+ dc->CombinedClip,
+ &PenBrushInst.BrushObject,
+ Points,
+ Count,
+ ROP2_TO_MIX(Dc_Attr->jROP2));
+
+ BITMAPOBJ_UnlockBitmap(BitmapObj);
+ EngFreeMem(Points);
+ }
+ else
+ {
+ Ret = FALSE;
+ }
+ }
+
+ PENOBJ_UnlockPen(PenBrushObj);
+
+ return Ret;
}
BOOL FASTCALL
@@ -302,36 +308,38 @@
LPPOINT pt,
DWORD Count)
{
- BOOL ret = FALSE; // default to failure
- PDC_ATTR Dc_Attr = dc->pDc_Attr;
-
- if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
- if(PATH_IsPathOpen(dc->w.path))
- {
- ret = PATH_PolylineTo(dc, pt, Count);
- }
- else /* do it using Polyline */
- {
- POINT *pts = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * (Count + 1), TAG_SHAPE);
- if ( pts )
- {
- pts[0].x = Dc_Attr->ptlCurrent.x;
- pts[0].y = Dc_Attr->ptlCurrent.y;
- memcpy( pts + 1, pt, sizeof(POINT) * Count);
- ret = IntGdiPolyline(dc, pts, Count + 1);
- ExFreePool(pts);
- }
- }
- if ( ret )
- {
- Dc_Attr->ptlCurrent.x = pt[Count-1].x;
- Dc_Attr->ptlCurrent.y = pt[Count-1].y;
- Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
- CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
- Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
- }
-
- return ret;
+ BOOL ret = FALSE; // default to failure
+ PDC_ATTR Dc_Attr = dc->pDc_Attr;
+
+ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
+ if (PATH_IsPathOpen(dc->w.path))
+ {
+ ret = PATH_PolylineTo(dc, pt, Count);
+ }
+ else /* do it using Polyline */
+ {
+ POINT *pts = ExAllocatePoolWithTag(PagedPool,
+ sizeof(POINT) * (Count + 1),
+ TAG_SHAPE);
+ if ( pts )
+ {
+ pts[0].x = Dc_Attr->ptlCurrent.x;
+ pts[0].y = Dc_Attr->ptlCurrent.y;
+ memcpy( pts + 1, pt, sizeof(POINT) * Count);
+ ret = IntGdiPolyline(dc, pts, Count + 1);
+ ExFreePool(pts);
+ }
+ }
+ if ( ret )
+ {
+ Dc_Attr->ptlCurrent.x = pt[Count-1].x;
+ Dc_Attr->ptlCurrent.y = pt[Count-1].y;
+ Dc_Attr->ptfxCurrent = Dc_Attr->ptlCurrent;
+ CoordLPtoDP(dc, &Dc_Attr->ptfxCurrent); // Update fx
+ Dc_Attr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
+ }
+
+ return ret;
}
@@ -341,24 +349,24 @@
LPDWORD PolyPoints,
DWORD Count)
{
- int i;
- LPPOINT pts;
- LPDWORD pc;
- BOOL ret = FALSE; // default to failure
- pts = pt;
- pc = PolyPoints;
-
- for (i = 0; i < Count; i++)
- {
- ret = IntGdiPolyline ( dc, pts, *pc );
- if (ret == FALSE)
- {
- return ret;
- }
- pts+=*pc++;
- }
-
- return ret;
+ int i;
+ LPPOINT pts;
+ LPDWORD pc;
+ BOOL ret = FALSE; // default to failure
+ pts = pt;
+ pc = PolyPoints;
+
+ for (i = 0; i < Count; i++)
+ {
+ ret = IntGdiPolyline ( dc, pts, *pc );
+ if (ret == FALSE)
+ {
+ return ret;
+ }
+ pts+=*pc++;
+ }
+
+ return ret;
}
/******************************************************************************/
@@ -373,37 +381,37 @@
IN DWORD dwStartAngle,
IN DWORD dwSweepAngle)
{
- UNIMPLEMENTED;
- return FALSE;
+ UNIMPLEMENTED;
+ return FALSE;
}
BOOL
STDCALL
NtGdiLineTo(HDC hDC,
- int XEnd,
- int YEnd)
-{
- DC *dc;
- BOOL Ret;
-
- dc = DC_LockDc(hDC);
- if(!dc)
- {
- SetLastWin32Error(ERROR_INVALID_HANDLE);
- return FALSE;
- }
- if (dc->DC_Type == DC_TYPE_INFO)
- {
+ int XEnd,
+ int YEnd)
+{
+ DC *dc;
+ BOOL Ret;
+
+ dc = DC_LockDc(hDC);
+ if (!dc)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+ if (dc->DC_Type == DC_TYPE_INFO)
+ {
+ DC_UnlockDc(dc);
+ /* Yes, Windows really returns TRUE in this case */
+ return TRUE;
+ }
+
+ Ret = IntGdiLineTo(dc, XEnd, YEnd);
+
DC_UnlockDc(dc);
- /* Yes, Windows really returns TRUE in this case */
- return TRUE;
- }
-
- Ret = IntGdiLineTo(dc, XEnd, YEnd);
-
- DC_UnlockDc(dc);
- return Ret;
+ return Ret;
}
BOOL
@@ -419,9 +427,9 @@
POINT lastmove;
unsigned int i;
PDC_ATTR Dc_Attr = NULL;
-
+
dc = DC_LockDc(hdc);
- if(!dc) return FALSE;
+ if (!dc) return FALSE;
Dc_Attr = dc->pDc_Attr;
if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
@@ -431,12 +439,14 @@
ProbeArrayForRead(lpbTypes, sizeof(BYTE), cCount, sizeof(BYTE));
/* check for each bezierto if there are two more points */
- for( i = 0; i < cCount; i++ )
- if( lpbTypes[i] != PT_MOVETO &&
- lpbTypes[i] & PT_BEZIERTO )
- {
- if( cCount < i+3 ) _SEH_LEAVE;
- else i += 2;
+ for ( i = 0; i < cCount; i++ )
+ {
+ if ( lpbTypes[i] != PT_MOVETO &&
+ lpbTypes[i] & PT_BEZIERTO )
+ {
+ if ( cCount < i+3 ) _SEH_LEAVE;
+ else i += 2;
+ }
}
/* if no moveto occurs, we will close the figure here */
@@ -444,17 +454,17 @@
lastmove.y = Dc_Attr->ptlCurrent.y;
/* now let's draw */
- for( i = 0; i < cCount; i++ )
- {
- if( lpbTypes[i] == PT_MOVETO )
+ for ( i = 0; i < cCount; i++ )
+ {
+ if ( lpbTypes[i] == PT_MOVETO )
{
IntGdiMoveToEx( dc, lppt[i].x, lppt[i].y, NULL );
lastmove.x = Dc_Attr->ptlCurrent.x;
lastmove.y = Dc_Attr->ptlCurrent.y;
}
- else if( lpbTypes[i] & PT_LINETO )
+ else if ( lpbTypes[i] & PT_LINETO )
IntGdiLineTo( dc, lppt[i].x, lppt[i].y );
- else if( lpbTypes[i] & PT_BEZIERTO )
+ else if ( lpbTypes[i] & PT_BEZIERTO )
{
POINT pts[4];
pts[0].x = Dc_Attr->ptlCurrent.x;
@@ -465,9 +475,12 @@
}
else _SEH_LEAVE;
- if( lpbTypes[i] & PT_CLOSEFIGURE )
+ if ( lpbTypes[i] & PT_CLOSEFIGURE )
{
- if( PATH_IsPathOpen( dc->w.path ) ) IntGdiCloseFigure( dc );
+ if ( PATH_IsPathOpen(dc->w.path) )
+ {
+ IntGdiCloseFigure( dc );
+ }
else IntGdiLineTo( dc, lastmove.x, lastmove.y );
}
}
More information about the Ros-diffs
mailing list