From d3534c39573bab590fd405c29886275f8fc50ec4 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Sun, 5 Nov 2000 03:28:18 +0000 Subject: [PATCH] Optimized {,p}MoveTo{,Ex}{,16}. --- dlls/ttydrv/dc.c | 2 +- dlls/wineps/init.c | 2 +- graphics/enhmetafiledrv/graphics.c | 4 ++-- graphics/enhmetafiledrv/init.c | 2 +- graphics/metafiledrv/graphics.c | 4 ++-- graphics/metafiledrv/init.c | 2 +- graphics/metafiledrv/metafiledrv.h | 2 +- graphics/painting.c | 10 ++++------ graphics/win16drv/graphics.c | 18 +----------------- graphics/win16drv/init.c | 2 +- graphics/x11drv/init.c | 2 +- include/enhmetafiledrv.h | 2 +- include/gdi.h | 2 +- include/win16drv.h | 1 - 14 files changed, 18 insertions(+), 37 deletions(-) diff --git a/dlls/ttydrv/dc.c b/dlls/ttydrv/dc.c index 6e815a1dd1d..b19b886d66a 100644 --- a/dlls/ttydrv/dc.c +++ b/dlls/ttydrv/dc.c @@ -61,7 +61,7 @@ static const DC_FUNCTIONS TTYDRV_DC_Driver = NULL, /* pIntersectClipRect */ NULL, /* pIntersectVisRect */ TTYDRV_DC_LineTo, /* pLineTo */ - NULL, /* pMoveToEx */ + NULL, /* pMoveTo */ NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg (optional) */ NULL, /* pOffsetWindowOrg (optional) */ diff --git a/dlls/wineps/init.c b/dlls/wineps/init.c index b29c6e87fb7..61c6e6ac504 100644 --- a/dlls/wineps/init.c +++ b/dlls/wineps/init.c @@ -65,7 +65,7 @@ static const DC_FUNCTIONS PSDRV_Funcs = NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ PSDRV_LineTo, /* pLineTo */ - NULL, /* pMoveToEx */ + NULL, /* pMoveTo */ NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg (optional) */ NULL, /* pOffsetWindowOrg (optional) */ diff --git a/graphics/enhmetafiledrv/graphics.c b/graphics/enhmetafiledrv/graphics.c index afd06f62d9b..c899cd52698 100644 --- a/graphics/enhmetafiledrv/graphics.c +++ b/graphics/enhmetafiledrv/graphics.c @@ -15,10 +15,10 @@ DEFAULT_DEBUG_CHANNEL(enhmetafile); /********************************************************************** - * EMFDRV_MoveToEx + * EMFDRV_MoveTo */ BOOL -EMFDRV_MoveToEx(DC *dc,INT x,INT y,LPPOINT pt) +EMFDRV_MoveTo(DC *dc, INT x, INT y) { EMRMOVETOEX emr; diff --git a/graphics/enhmetafiledrv/init.c b/graphics/enhmetafiledrv/init.c index 7b9a81f3d40..5af5a0e866e 100644 --- a/graphics/enhmetafiledrv/init.c +++ b/graphics/enhmetafiledrv/init.c @@ -62,7 +62,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_IntersectClipRect, /* pIntersectClipRect */ EMFDRV_InvertRgn, /* pInvertRgn */ EMFDRV_LineTo, /* pLineTo */ - EMFDRV_MoveToEx, /* pMoveToEx */ + EMFDRV_MoveTo, /* pMoveTo */ EMFDRV_OffsetClipRgn, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg */ NULL, /* pOffsetWindowOrg */ diff --git a/graphics/metafiledrv/graphics.c b/graphics/metafiledrv/graphics.c index 79c911a4236..067ef238b6e 100644 --- a/graphics/metafiledrv/graphics.c +++ b/graphics/metafiledrv/graphics.c @@ -16,10 +16,10 @@ DEFAULT_DEBUG_CHANNEL(metafile); /********************************************************************** - * MFDRV_MoveToEx + * MFDRV_MoveTo */ BOOL -MFDRV_MoveToEx(DC *dc,INT x,INT y,LPPOINT pt) +MFDRV_MoveTo(DC *dc, INT x, INT y) { return MFDRV_MetaParam2(dc,META_MOVETO,x,y); } diff --git a/graphics/metafiledrv/init.c b/graphics/metafiledrv/init.c index 6f5c2709276..cc9487049f8 100644 --- a/graphics/metafiledrv/init.c +++ b/graphics/metafiledrv/init.c @@ -61,7 +61,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_IntersectClipRect, /* pIntersectClipRect */ MFDRV_InvertRgn, /* pInvertRgn */ MFDRV_LineTo, /* pLineTo */ - MFDRV_MoveToEx, /* pMoveToEx */ + MFDRV_MoveTo, /* pMoveTo */ MFDRV_OffsetClipRgn, /* pOffsetClipRgn */ MFDRV_OffsetViewportOrg, /* pOffsetViewportOrg */ MFDRV_OffsetWindowOrg, /* pOffsetWindowOrg */ diff --git a/graphics/metafiledrv/metafiledrv.h b/graphics/metafiledrv/metafiledrv.h index 19c6aac0695..24473189deb 100644 --- a/graphics/metafiledrv/metafiledrv.h +++ b/graphics/metafiledrv/metafiledrv.h @@ -65,7 +65,7 @@ extern INT MFDRV_IntersectClipRect( DC *dc, INT left, INT top, INT right, INT bottom ); extern BOOL MFDRV_InvertRgn( DC *dc, HRGN hrgn ); extern BOOL MFDRV_LineTo( DC *dc, INT x, INT y ); -extern BOOL MFDRV_MoveToEx( DC *dc, INT x, INT y, LPPOINT pt ); +extern BOOL MFDRV_MoveTo( DC *dc, INT x, INT y ); extern INT MFDRV_OffsetClipRgn( DC *dc, INT x, INT y ); extern BOOL MFDRV_OffsetViewportOrg( DC *dc, INT x, INT y ); extern BOOL MFDRV_OffsetWindowOrg( DC *dc, INT x, INT y ); diff --git a/graphics/painting.c b/graphics/painting.c index 7b74c561231..cb0bda79ceb 100644 --- a/graphics/painting.c +++ b/graphics/painting.c @@ -59,10 +59,9 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) */ DWORD WINAPI MoveTo16( HDC16 hdc, INT16 x, INT16 y ) { - POINT16 pt; + POINT pt; - if (!MoveToEx16(hdc,x,y,&pt)) - return 0; + if (!MoveToEx( (HDC)hdc, x, y, &pt )) return 0; return MAKELONG(pt.x,pt.y); } @@ -77,7 +76,6 @@ BOOL16 WINAPI MoveToEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt ) if (!MoveToEx( (HDC)hdc, (INT)x, (INT)y, &pt32 )) return FALSE; if (pt) CONV_POINT32TO16( &pt32, pt ); return TRUE; - } @@ -87,7 +85,7 @@ BOOL16 WINAPI MoveToEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt ) BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) { BOOL ret = TRUE; - DC * dc = DC_GetDCUpdate( hdc ); + DC * dc = DC_GetDCPtr( hdc ); if(!dc) return FALSE; @@ -99,7 +97,7 @@ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) dc->CursPosY = y; if(PATH_IsPathOpen(dc->path)) ret = PATH_MoveTo(dc); - else if (dc->funcs->pMoveToEx) ret = dc->funcs->pMoveToEx(dc,x,y,pt); + else if (dc->funcs->pMoveTo) ret = dc->funcs->pMoveTo(dc,x,y); GDI_ReleaseObj( hdc ); return ret; } diff --git a/graphics/win16drv/graphics.c b/graphics/win16drv/graphics.c index c31f337daaf..a3f3a71071d 100644 --- a/graphics/win16drv/graphics.c +++ b/graphics/win16drv/graphics.c @@ -9,23 +9,7 @@ #include "win16drv.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(win16drv) - -/********************************************************************** - * WIN16DRV_MoveToEx - */ -BOOL -WIN16DRV_MoveToEx(DC *dc,INT x,INT y,LPPOINT pt) -{ - if (pt) - { - pt->x = dc->CursPosX; - pt->y = dc->CursPosY; - } - dc->CursPosX = x; - dc->CursPosY = y; - return TRUE; -} +DEFAULT_DEBUG_CHANNEL(win16drv); /*********************************************************************** * WIN16DRV_LineTo diff --git a/graphics/win16drv/init.c b/graphics/win16drv/init.c index 73b4a65a6d6..cdcae1d57c4 100644 --- a/graphics/win16drv/init.c +++ b/graphics/win16drv/init.c @@ -86,7 +86,7 @@ static const DC_FUNCTIONS WIN16DRV_Funcs = NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ WIN16DRV_LineTo, /* pLineTo */ - WIN16DRV_MoveToEx, /* pMoveToEx */ + NULL, /* pMoveTo */ NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrgEx */ NULL, /* pOffsetWindowOrgEx */ diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c index 8521f6512a6..bce4117afea 100644 --- a/graphics/x11drv/init.c +++ b/graphics/x11drv/init.c @@ -71,7 +71,7 @@ const DC_FUNCTIONS X11DRV_DC_Funcs = NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ X11DRV_LineTo, /* pLineTo */ - NULL, /* pMoveToEx */ + NULL, /* pMoveTo */ NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg (optional) */ NULL, /* pOffsetWindowOrg (optional) */ diff --git a/include/enhmetafiledrv.h b/include/enhmetafiledrv.h index 303e376802d..34acd04b272 100644 --- a/include/enhmetafiledrv.h +++ b/include/enhmetafiledrv.h @@ -56,7 +56,7 @@ extern INT EMFDRV_IntersectClipRect( DC *dc, INT left, INT top, INT right, INT bottom ); extern BOOL EMFDRV_InvertRgn( DC *dc, HRGN hrgn ); extern BOOL EMFDRV_LineTo( DC *dc, INT x, INT y ); -extern BOOL EMFDRV_MoveToEx( DC *dc, INT x, INT y, LPPOINT pt); +extern BOOL EMFDRV_MoveTo( DC *dc, INT x, INT y ); extern INT EMFDRV_OffsetClipRgn( DC *dc, INT x, INT y ); extern BOOL EMFDRV_OffsetViewportOrg( DC *dc, INT x, INT y ); extern BOOL EMFDRV_OffsetWindowOrg( DC *dc, INT x, INT y ); diff --git a/include/gdi.h b/include/gdi.h index 28d66ce459a..5020258944f 100644 --- a/include/gdi.h +++ b/include/gdi.h @@ -207,7 +207,7 @@ typedef struct tagDC_FUNCS INT (*pIntersectClipRect)(DC*,INT,INT,INT,INT); BOOL (*pInvertRgn)(DC*,HRGN); BOOL (*pLineTo)(DC*,INT,INT); - BOOL (*pMoveToEx)(DC*,INT,INT,LPPOINT); + BOOL (*pMoveTo)(DC*,INT,INT); INT (*pOffsetClipRgn)(DC*,INT,INT); BOOL (*pOffsetViewportOrg)(DC*,INT,INT); BOOL (*pOffsetWindowOrg)(DC*,INT,INT); diff --git a/include/win16drv.h b/include/win16drv.h index 102042d2b33..231c1aae68a 100644 --- a/include/win16drv.h +++ b/include/win16drv.h @@ -217,7 +217,6 @@ extern BOOL WIN16DRV_ExtTextOut( DC *dc, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ); extern BOOL WIN16DRV_LineTo( DC *dc, INT x, INT y ); -extern BOOL WIN16DRV_MoveToEx(DC *dc,INT x,INT y,LPPOINT pt); extern BOOL WIN16DRV_Polygon(DC *dc, const POINT* pt, INT count ); extern BOOL WIN16DRV_Polyline(DC *dc, const POINT* pt, INT count ); extern BOOL WIN16DRV_Rectangle(DC *dc, INT left, INT top, INT right, INT bottom);