wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Alexandre Julliard : gdi32: Implement the arc entry points in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 4d9cc241287bb716b1d6fd8ebba9e02ad6f678b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9cc241287bb716b1d6fd8eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 15:21:59 2011 +0200 gdi32: Implement the arc entry points in the path driver. --- dlls/gdi32/gdi_private.h | 3 - dlls/gdi32/painting.c | 84 +++++++---------------- dlls/gdi32/path.c | 171 +++++++++++++++++++++++++++++----------------- 3 files changed, 132 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d9cc241287bb716b1d6f…

1 0

Alexandre Julliard : gdi32: Implement the Rectangle and RoundRect entry points in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: f8040958f58da824711b3becf3156df01172cc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8040958f58da824711b3becf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 15:03:04 2011 +0200 gdi32: Implement the Rectangle and RoundRect entry points in the path driver. --- dlls/gdi32/gdi_private.h | 2 - dlls/gdi32/painting.c | 18 ++------ dlls/gdi32/path.c | 101 +++++++++++++++------------------------------ 3 files changed, 38 insertions(+), 83 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 79fb082..039807d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -325,7 +325,6 @@ extern void PATH_DestroyGdiPath(GdiPath *pPath) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; -extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2) DECLSPEC_HIDDEN; extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, LPCWSTR str, UINT count, const INT *dx) DECLSPEC_HIDDEN; extern BOOL PATH_Ellipse(DC *dc, INT x1, INT y1, INT x2, INT y2) DECLSPEC_HIDDEN; @@ -339,7 +338,6 @@ extern BOOL PATH_Polyline(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDE extern BOOL PATH_Polygon(DC *dc, const POINT *pt, DWORD cbCount) DECLSPEC_HIDDEN; extern BOOL PATH_PolyPolyline(DC *dc, const POINT *pt, const DWORD *counts, DWORD polylines) DECLSPEC_HIDDEN; extern BOOL PATH_PolyPolygon(DC *dc, const POINT *pt, const INT *counts, UINT polygons) DECLSPEC_HIDDEN; -extern BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height) DECLSPEC_HIDDEN; /* painting.c */ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 7e88219..b60046d 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -422,14 +422,9 @@ BOOL WINAPI Rectangle( HDC hdc, INT left, INT top, if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRectangle ); update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) - ret = PATH_Rectangle(dc, left, top, right, bottom); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRectangle ); - ret = physdev->funcs->pRectangle( physdev, left, top, right, bottom ); - } + ret = physdev->funcs->pRectangle( physdev, left, top, right, bottom ); release_dc_ptr( dc ); } return ret; @@ -447,14 +442,9 @@ BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right, if (dc) { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRoundRect ); update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) - ret = PATH_RoundRect(dc,left,top,right,bottom,ell_width,ell_height); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRoundRect ); - ret = physdev->funcs->pRoundRect( physdev, left, top, right, bottom, ell_width, ell_height ); - } + ret = physdev->funcs->pRoundRect( physdev, left, top, right, bottom, ell_width, ell_height ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 8ddff53..a5f39f6 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -273,9 +273,9 @@ static BOOL PATH_AssignGdiPath(GdiPath *pPathDest, const GdiPath *pPathSrc) /* PATH_CheckCorners * - * Helper function for PATH_RoundRect() and PATH_Rectangle() + * Helper function for RoundRect() and Rectangle() */ -static BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, INT y2) +static void PATH_CheckCorners( HDC hdc, POINT corners[], INT x1, INT y1, INT x2, INT y2 ) { INT temp; @@ -284,8 +284,7 @@ static BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, I corners[0].y=y1; corners[1].x=x2; corners[1].y=y2; - if(!LPtoDP(dc->hSelf, corners, 2)) - return FALSE; + LPtoDP( hdc, corners, 2 ); /* Make sure first corner is top left and second corner is bottom right */ if(corners[0].x>corners[1].x) @@ -302,13 +301,11 @@ static BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, I } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if(dc->GraphicsMode==GM_COMPATIBLE) + if (GetGraphicsMode( hdc ) == GM_COMPATIBLE) { corners[1].x--; corners[1].y--; } - - return TRUE; } /* PATH_AddFlatBezier @@ -926,115 +923,85 @@ static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) return PATH_AddEntry(physdev->path, &point, PT_LINETO); } -/* PATH_RoundRect - * - * Should be called when a call to RoundRect is performed on a DC that has - * an open path. Returns TRUE if successful, else FALSE. + +/************************************************************* + * pathdrv_RoundRect * * FIXME: it adds the same entries to the path as windows does, but there * is an error in the bezier drawing code so that there are small pixel-size * gaps when the resulting path is drawn by StrokePath() */ -BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height) +static BOOL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height ) { - GdiPath *pPath = &dc->path; - POINT corners[2], pointTemp; - FLOAT_POINT ellCorners[2]; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; + struct path_physdev *physdev = get_path_physdev( dev ); + POINT corners[2], pointTemp; + FLOAT_POINT ellCorners[2]; - if(!PATH_CheckCorners(dc,corners,x1,y1,x2,y2)) - return FALSE; + PATH_CheckCorners(dev->hdc,corners,x1,y1,x2,y2); /* Add points to the roundrect path */ ellCorners[0].x = corners[1].x-ell_width; ellCorners[0].y = corners[0].y; ellCorners[1].x = corners[1].x; ellCorners[1].y = corners[0].y+ell_height; - if(!PATH_DoArcPart(pPath, ellCorners, 0, -M_PI_2, PT_MOVETO)) + if(!PATH_DoArcPart(physdev->path, ellCorners, 0, -M_PI_2, PT_MOVETO)) return FALSE; pointTemp.x = corners[0].x+ell_width/2; pointTemp.y = corners[0].y; - if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_LINETO)) return FALSE; ellCorners[0].x = corners[0].x; ellCorners[1].x = corners[0].x+ell_width; - if(!PATH_DoArcPart(pPath, ellCorners, -M_PI_2, -M_PI, FALSE)) + if(!PATH_DoArcPart(physdev->path, ellCorners, -M_PI_2, -M_PI, FALSE)) return FALSE; pointTemp.x = corners[0].x; pointTemp.y = corners[1].y-ell_height/2; - if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_LINETO)) return FALSE; ellCorners[0].y = corners[1].y-ell_height; ellCorners[1].y = corners[1].y; - if(!PATH_DoArcPart(pPath, ellCorners, M_PI, M_PI_2, FALSE)) + if(!PATH_DoArcPart(physdev->path, ellCorners, M_PI, M_PI_2, FALSE)) return FALSE; pointTemp.x = corners[1].x-ell_width/2; pointTemp.y = corners[1].y; - if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_LINETO)) return FALSE; ellCorners[0].x = corners[1].x-ell_width; ellCorners[1].x = corners[1].x; - if(!PATH_DoArcPart(pPath, ellCorners, M_PI_2, 0, FALSE)) + if(!PATH_DoArcPart(physdev->path, ellCorners, M_PI_2, 0, FALSE)) return FALSE; /* Close the roundrect figure */ - if(!CloseFigure(dc->hSelf)) - return FALSE; - - return TRUE; + return CloseFigure( dev->hdc ); } -/* PATH_Rectangle - * - * Should be called when a call to Rectangle is performed on a DC that has - * an open path. Returns TRUE if successful, else FALSE. + +/************************************************************* + * pathdrv_Rectangle */ -BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2) +static BOOL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) { - GdiPath *pPath = &dc->path; - POINT corners[2], pointTemp; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; + struct path_physdev *physdev = get_path_physdev( dev ); + POINT corners[2], pointTemp; - if(!PATH_CheckCorners(dc,corners,x1,y1,x2,y2)) - return FALSE; - - /* Close any previous figure */ - if(!CloseFigure(dc->hSelf)) - { - /* The CloseFigure call shouldn't have failed */ - assert(FALSE); - return FALSE; - } + PATH_CheckCorners(dev->hdc,corners,x1,y1,x2,y2); /* Add four points to the path */ pointTemp.x=corners[1].x; pointTemp.y=corners[0].y; - if(!PATH_AddEntry(pPath, &pointTemp, PT_MOVETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_MOVETO)) return FALSE; - if(!PATH_AddEntry(pPath, corners, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, corners, PT_LINETO)) return FALSE; pointTemp.x=corners[0].x; pointTemp.y=corners[1].y; - if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, &pointTemp, PT_LINETO)) return FALSE; - if(!PATH_AddEntry(pPath, corners+1, PT_LINETO)) + if(!PATH_AddEntry(physdev->path, corners+1, PT_LINETO)) return FALSE; /* Close the rectangle figure */ - if(!CloseFigure(dc->hSelf)) - { - /* The CloseFigure call shouldn't have failed */ - assert(FALSE); - return FALSE; - } - - return TRUE; + return CloseFigure( dev->hdc ); } /* PATH_Ellipse @@ -2373,10 +2340,10 @@ const struct gdi_dc_funcs path_driver = NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ - NULL, /* pRectangle */ + pathdrv_Rectangle, /* pRectangle */ NULL, /* pResetDC */ NULL, /* pRestoreDC */ - NULL, /* pRoundRect */ + pathdrv_RoundRect, /* pRoundRect */ NULL, /* pSaveDC */ NULL, /* pScaleViewportExt */ NULL, /* pScaleWindowExt */

1 0

Alexandre Julliard : gdi32: Add a helper function to start a new path stroke.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 364e216462620b1bf15f472abb1833346a9f6314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=364e216462620b1bf15f472ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 20:02:10 2011 +0200 gdi32: Add a helper function to start a new path stroke. --- dlls/gdi32/path.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 11be17c..8ddff53 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -230,6 +230,18 @@ static BOOL PATH_AddEntry(GdiPath *pPath, const POINT *pPoint, BYTE flags) return TRUE; } +/* start a new path stroke if necessary */ +static BOOL start_new_stroke( struct path_physdev *physdev ) +{ + POINT pos; + + if (!physdev->path->newStroke) return TRUE; + physdev->path->newStroke = FALSE; + GetCurrentPositionEx( physdev->dev.hdc, &pos ); + LPtoDP( physdev->dev.hdc, &pos, 1 ); + return PATH_AddEntry( physdev->path, &pos, PT_MOVETO ); +} + /* PATH_AssignGdiPath * * Copies the GdiPath structure "pPathSrc" to "pPathDest". A deep copy is @@ -902,24 +914,15 @@ static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) { struct path_physdev *physdev = get_path_physdev( dev ); - POINT point, pointCurPos; + POINT point; /* Convert point to device coordinates */ point.x = x; point.y = y; LPtoDP( dev->hdc, &point, 1 ); - /* Add a PT_MOVETO if necessary */ - if(physdev->path->newStroke) - { - physdev->path->newStroke = FALSE; - GetCurrentPositionEx( dev->hdc, &pointCurPos ); - LPtoDP( dev->hdc, &pointCurPos, 1 ); - if(!PATH_AddEntry(physdev->path, &pointCurPos, PT_MOVETO)) - return FALSE; - } + if (!start_new_stroke( physdev )) return FALSE; - /* Add a PT_LINETO entry */ return PATH_AddEntry(physdev->path, &point, PT_LINETO); }

1 0

Alexandre Julliard : gdi32: Implement the LineTo entry point in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: fc5e29486dafefaaf3167c60ea1be4e36791a96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5e29486dafefaaf3167c60e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 19:58:51 2011 +0200 gdi32: Implement the LineTo entry point in the path driver. --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/painting.c | 11 +++------ dlls/gdi32/path.c | 54 ++++++++++++++++++--------------------------- 3 files changed, 26 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e0b3b76..79fb082 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -325,7 +325,6 @@ extern void PATH_DestroyGdiPath(GdiPath *pPath) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; -extern BOOL PATH_LineTo(DC *dc, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2) DECLSPEC_HIDDEN; extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, LPCWSTR str, UINT count, const INT *dx) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 5eb5654..7e88219 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -232,18 +232,15 @@ BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) { DC * dc = get_dc_ptr( hdc ); + PHYSDEV physdev; BOOL ret; if(!dc) return FALSE; update_dc( dc ); - if(PATH_IsPathOpen(dc->path)) - ret = PATH_LineTo(dc, x, y); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pLineTo ); - ret = physdev->funcs->pLineTo( physdev, x, y ); - } + physdev = GET_DC_PHYSDEV( dc, pLineTo ); + ret = physdev->funcs->pLineTo( physdev, x, y ); + if(ret) { dc->CursPosX = x; dc->CursPosY = y; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 25e1d52..11be17c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -895,42 +895,32 @@ static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) return TRUE; } -/* PATH_LineTo - * - * Should be called when a LineTo is performed on a DC that has an - * open path. This adds a PT_LINETO entry to the path (and possibly - * a PT_MOVETO entry, if this is the first LineTo in a stroke). - * Returns TRUE if successful, else FALSE. + +/************************************************************* + * pathdrv_LineTo */ -BOOL PATH_LineTo(DC *dc, INT x, INT y) +static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) { - GdiPath *pPath = &dc->path; - POINT point, pointCurPos; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - return FALSE; + struct path_physdev *physdev = get_path_physdev( dev ); + POINT point, pointCurPos; - /* Convert point to device coordinates */ - point.x=x; - point.y=y; - if(!LPtoDP(dc->hSelf, &point, 1)) - return FALSE; + /* Convert point to device coordinates */ + point.x = x; + point.y = y; + LPtoDP( dev->hdc, &point, 1 ); - /* Add a PT_MOVETO if necessary */ - if(pPath->newStroke) - { - pPath->newStroke=FALSE; - pointCurPos.x = dc->CursPosX; - pointCurPos.y = dc->CursPosY; - if(!LPtoDP(dc->hSelf, &pointCurPos, 1)) - return FALSE; - if(!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO)) - return FALSE; - } + /* Add a PT_MOVETO if necessary */ + if(physdev->path->newStroke) + { + physdev->path->newStroke = FALSE; + GetCurrentPositionEx( dev->hdc, &pointCurPos ); + LPtoDP( dev->hdc, &pointCurPos, 1 ); + if(!PATH_AddEntry(physdev->path, &pointCurPos, PT_MOVETO)) + return FALSE; + } - /* Add a PT_LINETO entry */ - return PATH_AddEntry(pPath, &point, PT_LINETO); + /* Add a PT_LINETO entry */ + return PATH_AddEntry(physdev->path, &point, PT_LINETO); } /* PATH_RoundRect @@ -2360,7 +2350,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ - NULL, /* pLineTo */ + pathdrv_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ pathdrv_MoveTo, /* pMoveTo */ NULL, /* pOffsetClipRgn */

1 0

Alexandre Julliard : gdi32: Implement the MoveTo entry point in the path driver.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 2c1ec7fc3b99c7ce38b777e010f480ce06b41ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1ec7fc3b99c7ce38b777e01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 19:57:28 2011 +0200 gdi32: Implement the MoveTo entry point in the path driver. --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/painting.c | 11 ++++------- dlls/gdi32/path.c | 26 ++++++++------------------ 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index db5ec43..e0b3b76 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -325,7 +325,6 @@ extern void PATH_DestroyGdiPath(GdiPath *pPath) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; -extern BOOL PATH_MoveTo(DC *dc) DECLSPEC_HIDDEN; extern BOOL PATH_LineTo(DC *dc, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL PATH_Rectangle(DC *dc, INT x1, INT y1, INT x2, INT y2) DECLSPEC_HIDDEN; extern BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 60b2898..5eb5654 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -258,7 +258,8 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) */ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) { - BOOL ret = TRUE; + BOOL ret; + PHYSDEV physdev; DC * dc = get_dc_ptr( hdc ); if(!dc) return FALSE; @@ -270,12 +271,8 @@ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, LPPOINT pt ) dc->CursPosX = x; dc->CursPosY = y; - if(PATH_IsPathOpen(dc->path)) ret = PATH_MoveTo(dc); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pMoveTo ); - ret = physdev->funcs->pMoveTo( physdev, x, y ); - } + physdev = GET_DC_PHYSDEV( dc, pMoveTo ); + ret = physdev->funcs->pMoveTo( physdev, x, y ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index ba67952..25e1d52 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -884,25 +884,15 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) return ret; } -/* PATH_MoveTo - * - * Should be called when a MoveTo is performed on a DC that has an - * open path. This starts a new stroke. Returns TRUE if successful, else - * FALSE. + +/************************************************************* + * pathdrv_MoveTo */ -BOOL PATH_MoveTo(DC *dc) +static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) { - GdiPath *pPath = &dc->path; - - /* Check that path is open */ - if(pPath->state!=PATH_Open) - /* FIXME: Do we have to call SetLastError? */ - return FALSE; - - /* Start a new stroke */ - pPath->newStroke=TRUE; - - return TRUE; + struct path_physdev *physdev = get_path_physdev( dev ); + physdev->path->newStroke = TRUE; + return TRUE; } /* PATH_LineTo @@ -2372,7 +2362,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pInvertRgn */ NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ - NULL, /* pMoveTo */ + pathdrv_MoveTo, /* pMoveTo */ NULL, /* pOffsetClipRgn */ NULL, /* pOffsetViewportOrg */ NULL, /* pOffsetWindowOrg */

1 0

Alexandre Julliard : gdi32: Push a path driver on the DC stack when a path is opened.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 8a7bf0a2abe85b7ae1199b84610e85b1da811519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7bf0a2abe85b7ae1199b846… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 18:13:21 2011 +0200 gdi32: Push a path driver on the DC stack when a path is opened. --- dlls/gdi32/bitmap.c | 5 +- dlls/gdi32/dc.c | 7 +- dlls/gdi32/gdi_private.h | 4 +- dlls/gdi32/path.c | 309 +++++++++++++++++++++++++++++++++++++++------- 4 files changed, 274 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a7bf0a2abe85b7ae1199…

1 0

Alexandre Julliard : gdi32: Avoid directly modifying the cursor position in the DC structure in PolyDraw .
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 97a261d573fec67d891bd763c660e7f2ec092636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a261d573fec67d891bd763c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 19:47:27 2011 +0200 gdi32: Avoid directly modifying the cursor position in the DC structure in PolyDraw. --- dlls/gdi32/path.c | 91 +++++++++++++++++++++++++---------------------------- 1 files changed, 43 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index e8c7eaa..9f44944 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1199,63 +1199,58 @@ BOOL PATH_PolyBezier(DC *dc, const POINT *pts, DWORD cbPoints) BOOL PATH_PolyDraw(DC *dc, const POINT *pts, const BYTE *types, DWORD cbPoints) { - GdiPath *pPath = &dc->path; - POINT lastmove, orig_pos; - INT i; - - lastmove.x = orig_pos.x = dc->CursPosX; - lastmove.y = orig_pos.y = dc->CursPosY; - - for(i = pPath->numEntriesUsed - 1; i >= 0; i--){ - if(pPath->pFlags[i] == PT_MOVETO){ - lastmove.x = pPath->pPoints[i].x; - lastmove.y = pPath->pPoints[i].y; - if(!DPtoLP(dc->hSelf, &lastmove, 1)) - return FALSE; - break; - } + GdiPath *pPath = &dc->path; + POINT lastmove, orig_pos; + INT i; + + GetCurrentPositionEx( dc->hSelf, &orig_pos ); + lastmove = orig_pos; + + for(i = pPath->numEntriesUsed - 1; i >= 0; i--){ + if(pPath->pFlags[i] == PT_MOVETO){ + lastmove = pPath->pPoints[i]; + DPtoLP(dc->hSelf, &lastmove, 1); + break; } + } - for(i = 0; i < cbPoints; i++){ - if(types[i] == PT_MOVETO){ - pPath->newStroke = TRUE; - lastmove.x = pts[i].x; - lastmove.y = pts[i].y; - } - else if((types[i] & ~PT_CLOSEFIGURE) == PT_LINETO){ - PATH_LineTo(dc, pts[i].x, pts[i].y); - } - else if(types[i] == PT_BEZIERTO){ - if(!((i + 2 < cbPoints) && (types[i + 1] == PT_BEZIERTO) - && ((types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO))) - goto err; - PATH_PolyBezierTo(dc, &(pts[i]), 3); + for(i = 0; i < cbPoints; i++) + { + switch (types[i]) + { + case PT_MOVETO: + MoveToEx( dc->hSelf, pts[i].x, pts[i].y, NULL ); + break; + case PT_LINETO: + case PT_LINETO | PT_CLOSEFIGURE: + LineTo( dc->hSelf, pts[i].x, pts[i].y ); + break; + case PT_BEZIERTO: + if ((i + 2 < cbPoints) && (types[i + 1] == PT_BEZIERTO) && + (types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO) + { + PolyBezierTo( dc->hSelf, &pts[i], 3 ); i += 2; + break; } - else - goto err; - - dc->CursPosX = pts[i].x; - dc->CursPosY = pts[i].y; - - if(types[i] & PT_CLOSEFIGURE){ - pPath->pFlags[pPath->numEntriesUsed-1] |= PT_CLOSEFIGURE; - pPath->newStroke = TRUE; - dc->CursPosX = lastmove.x; - dc->CursPosY = lastmove.y; + /* fall through */ + default: + if (i) /* restore original position */ + { + if (!(types[i - 1] & PT_CLOSEFIGURE)) lastmove = pts[i - 1]; + if (lastmove.x != orig_pos.x || lastmove.y != orig_pos.y) + MoveToEx( dc->hSelf, orig_pos.x, orig_pos.y, NULL ); } + return FALSE; } - return TRUE; - -err: - if((dc->CursPosX != orig_pos.x) || (dc->CursPosY != orig_pos.y)){ - pPath->newStroke = TRUE; - dc->CursPosX = orig_pos.x; - dc->CursPosY = orig_pos.y; + if(types[i] & PT_CLOSEFIGURE){ + pPath->pFlags[pPath->numEntriesUsed-1] |= PT_CLOSEFIGURE; + MoveToEx( dc->hSelf, lastmove.x, lastmove.y, NULL ); } + } - return FALSE; + return TRUE; } BOOL PATH_Polyline(DC *dc, const POINT *pts, DWORD cbPoints)

1 0

Michael Mc Donnell : d3dx9/tests: Implemented CloneMesh test.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: da6363e377f8a727bdd7bdb42116c533a3a20bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6363e377f8a727bdd7bdb42… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Aug 17 12:51:03 2011 +0200 d3dx9/tests: Implemented CloneMesh test. --- dlls/d3dx9_36/tests/mesh.c | 1682 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1678 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da6363e377f8a727bdd7b…

1 0

Michael Mc Donnell : d3dx9: Implemented non-equal declaration support in CloneMesh.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 3b693143ebc806e71126150d9301af9f64db29d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b693143ebc806e71126150d9… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Aug 17 12:50:09 2011 +0200 d3dx9: Implemented non-equal declaration support in CloneMesh. --- dlls/d3dx9_36/mesh.c | 455 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 423 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b693143ebc806e711261…

1 0

Louis Lenders : ntoskrnl.exe: Update version resource.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 066a649a7749d2d267d758ff07f4500bd8494d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=066a649a7749d2d267d758ff0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Oct 22 19:19:04 2011 +0200 ntoskrnl.exe: Update version resource. --- dlls/ntoskrnl.exe/ntoskrnl.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.rc b/dlls/ntoskrnl.exe/ntoskrnl.rc index 322dd75..767196c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.rc +++ b/dlls/ntoskrnl.exe/ntoskrnl.rc @@ -18,10 +18,10 @@ #define WINE_FILENAME_STR "ntoskrnl.exe" -/* Version as of Win XP SP3 */ -#define WINE_FILEVERSION 5,1,2600,5657 -#define WINE_FILEVERSION_STR "5.1.2600.5657" -#define WINE_PRODUCTVERSION 5,1,2600,5657 -#define WINE_PRODUCTVERSION_STR "5.1.2600.5657" +/* Version as of Win 7 SP1 */ +#define WINE_FILEVERSION 6,1,7601,17592 +#define WINE_FILEVERSION_STR "6.1.7601.17592" +#define WINE_PRODUCTVERSION 6,1,7601,17592 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17592" #include "wine/wine_common_ver.rc"

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011