Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NtGdi]

Browse source 
- Remove Path for MoveTo. It is not needed.

svn path=/trunk/; revision=72603
This commit is contained in:
James Tabor 2016-09-07 03:20:18 +00:00
parent 7049508b80
commit c2a9c48bbf
4 changed files with 10 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/win32ss/gdi/ntgdi/arc.c
View file

@ -238,9 +238,9 @@ IntGdiArcInternal(
if (arctype == GdiTypeArcTo) if (arctype == GdiTypeArcTo)
{ {
if (dc->dclevel.flPath & DCPATH_CLOCKWISE) if (dc->dclevel.flPath & DCPATH_CLOCKWISE)
IntGdiMoveToEx(dc, XStartArc, YStartArc, NULL, TRUE); IntGdiMoveToEx(dc, XStartArc, YStartArc, NULL);
else else
IntGdiMoveToEx(dc, XEndArc, YEndArc, NULL, TRUE); IntGdiMoveToEx(dc, XEndArc, YEndArc, NULL);
} }
return Ret; return Ret;
} }
@ -285,7 +285,7 @@ IntGdiAngleArc( PDC pDC,
if (result) if (result)
{ {
IntGdiMoveToEx(pDC, x2, y2, NULL, TRUE); IntGdiMoveToEx(pDC, x2, y2, NULL);
} }
return result; return result;
} }

3
reactos/win32ss/gdi/ntgdi/intgdi.h
View file

@ -25,8 +25,7 @@ BOOL FASTCALL
IntGdiMoveToEx(DC *dc, IntGdiMoveToEx(DC *dc,
int X, int X,
int Y, int Y,
LPPOINT Point, LPPOINT Point);
BOOL BypassPath);
BOOL FASTCALL BOOL FASTCALL
IntGdiPolyBezier(DC *dc, IntGdiPolyBezier(DC *dc,

33
reactos/win32ss/gdi/ntgdi/line.c
View file

@ -19,10 +19,8 @@ BOOL FASTCALL
IntGdiMoveToEx(DC *dc, IntGdiMoveToEx(DC *dc,
int X, int X,
int Y, int Y,
LPPOINT Point, LPPOINT Point)
BOOL BypassPath)
{ {
BOOL PathIsOpen;
PDC_ATTR pdcattr = dc->pdcattr; PDC_ATTR pdcattr = dc->pdcattr;
if ( Point ) if ( Point )
{ {
@ -44,13 +42,6 @@ IntGdiMoveToEx(DC *dc,
CoordLPtoDP(dc, &pdcattr->ptfxCurrent); // Update fx CoordLPtoDP(dc, &pdcattr->ptfxCurrent); // Update fx
pdcattr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE); pdcattr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
if (BypassPath) return TRUE;
PathIsOpen = PATH_IsPathOpen(dc->dclevel);
if ( PathIsOpen )
return PATH_MoveTo ( dc );
return TRUE; return TRUE;
} }
@ -67,7 +58,7 @@ GreMoveTo( HDC hdc,
EngSetLastError(ERROR_INVALID_HANDLE); EngSetLastError(ERROR_INVALID_HANDLE);
return FALSE; return FALSE;
} }
Ret = IntGdiMoveToEx(dc, x, y, pptOut, TRUE); Ret = IntGdiMoveToEx(dc, x, y, pptOut);
DC_UnlockDc(dc); DC_UnlockDc(dc);
return Ret; return Ret;
} }
@ -108,16 +99,6 @@ IntGdiLineTo(DC *dc,
if (PATH_IsPathOpen(dc->dclevel)) if (PATH_IsPathOpen(dc->dclevel))
{ {
Ret = PATH_LineTo(dc, XEnd, YEnd); Ret = PATH_LineTo(dc, XEnd, YEnd);
if (Ret)
{
// FIXME: PATH_LineTo should maybe do this? No
pdcattr->ptlCurrent.x = XEnd;
pdcattr->ptlCurrent.y = YEnd;
pdcattr->ptfxCurrent = pdcattr->ptlCurrent;
CoordLPtoDP(dc, &pdcattr->ptfxCurrent); // Update fx
pdcattr->ulDirty_ &= ~(DIRTY_PTLCURRENT|DIRTY_PTFXCURRENT|DIRTY_STYLESTATE);
}
return Ret;
} }
else else
{ {
@ -257,9 +238,6 @@ IntGdiPolyline(DC *dc,
return FALSE; return FALSE;
} }
if (PATH_IsPathOpen(dc->dclevel))
return PATH_Polyline(dc, pt, Count);
DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL);
psurf = dc->dclevel.pSurface; psurf = dc->dclevel.pSurface;
@ -355,8 +333,9 @@ IntGdiPolyPolyline(DC *dc,
pc = PolyPoints; pc = PolyPoints;
if (PATH_IsPathOpen(dc->dclevel)) if (PATH_IsPathOpen(dc->dclevel))
{
return PATH_PolyPolyline( dc, pt, PolyPoints, Count ); return PATH_PolyPolyline( dc, pt, PolyPoints, Count );
}
for (i = 0; i < Count; i++) for (i = 0; i < Count; i++)
{ {
ret = IntGdiPolyline ( dc, pts, *pc ); ret = IntGdiPolyline ( dc, pts, *pc );
@ -544,7 +523,7 @@ NtGdiPolyDraw(
} }
if (num_pts >= 2) IntGdiPolyline( dc, line_pts, num_pts ); if (num_pts >= 2) IntGdiPolyline( dc, line_pts, num_pts );
IntGdiMoveToEx( dc, line_pts[num_pts - 1].x, line_pts[num_pts - 1].y, NULL, TRUE ); IntGdiMoveToEx( dc, line_pts[num_pts - 1].x, line_pts[num_pts - 1].y, NULL );
result = TRUE; result = TRUE;
} }
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
@ -592,7 +571,7 @@ NtGdiMoveTo(
pdc = DC_LockDc(hdc); pdc = DC_LockDc(hdc);
if (!pdc) return FALSE; if (!pdc) return FALSE;
Ret = IntGdiMoveToEx(pdc, x, y, &Point, TRUE); Ret = IntGdiMoveToEx(pdc, x, y, &Point);
if (Ret && pptOut) if (Ret && pptOut)
{ {

1
reactos/win32ss/gdi/ntgdi/path.h
View file

@ -54,7 +54,6 @@ BOOL FASTCALL PATH_Arc (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT
BOOL FASTCALL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2); BOOL FASTCALL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2);
VOID FASTCALL PATH_EmptyPath (PPATH pPath); VOID FASTCALL PATH_EmptyPath (PPATH pPath);
BOOL FASTCALL PATH_LineTo (PDC dc, INT x, INT y); BOOL FASTCALL PATH_LineTo (PDC dc, INT x, INT y);
BOOL FASTCALL PATH_MoveTo (PDC dc);
BOOL FASTCALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints); BOOL FASTCALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints);
BOOL FASTCALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints); BOOL FASTCALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints);
BOOL FASTCALL PATH_PolyDraw(PDC dc, const POINT *pts, const BYTE *types, DWORD cbPoints); BOOL FASTCALL PATH_PolyDraw(PDC dc, const POINT *pts, const BYTE *types, DWORD cbPoints);