Alexandre Julliard : gdi32: Pass the brush origin explicitly to the brush backend functions.
Module: wine Branch: master Commit: 97a9db43d256b85fae84fd63fcadd3d064602b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a9db43d256b85fae84fd63fc...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Aug 28 09:07:31 2017 +0200
gdi32: Pass the brush origin explicitly to the brush backend functions.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/dibdrv/bitblt.c | 10 ++++++---- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 6 ++++-- dlls/gdi32/dibdrv/objects.c | 9 ++++----- 4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 79cd629..f4efc8f 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -737,7 +737,8 @@ static DWORD create_tmp_dib( const dib_info *copy, int width, int height, dib_in }
static DWORD execute_rop( dibdrv_physdev *pdev, const RECT *dst_rect, dib_info *src, - const RECT *src_rect, const struct clipped_rects *clipped_rects, DWORD rop ) + const RECT *src_rect, const struct clipped_rects *clipped_rects, + const POINT *brush_org, DWORD rop ) { dib_info *dibs[3], *result = src, tmp; RECT rects[3]; @@ -784,10 +785,10 @@ static DWORD execute_rop( dibdrv_physdev *pdev, const RECT *dst_rect, dib_info * break; case OP_ARGS(PAT,DST): pdev->brush.rects( pdev, &pdev->brush, dibs[DST], clipped_rects->count, clipped_rects->rects, - OP_ROP(*opcode) ); + brush_org, OP_ROP(*opcode) ); break; case OP_ARGS(PAT,SRC): - pdev->brush.rects( pdev, &pdev->brush, dibs[SRC], 1, &rects[SRC], OP_ROP(*opcode) ); + pdev->brush.rects( pdev, &pdev->brush, dibs[SRC], 1, &rects[SRC], brush_org, OP_ROP(*opcode) ); break; } } @@ -1026,7 +1027,8 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, mask_rect( &pdev->dib, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, rop2 ); } else - ret = execute_rop( pdev, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, rop ); + ret = execute_rop( pdev, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, + &dc->brush_org, rop ); free_clipped_rects( &clipped_rects ); } if (tmp_rgn) DeleteObject( tmp_rgn ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index adf16c4..ce34c0d 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -75,7 +75,7 @@ typedef struct dib_brush rop_mask_bits masks; struct brush_pattern pattern; BOOL (*rects)(struct dibdrv_physdev *pdev, struct dib_brush *brush, dib_info *dib, - int num, const RECT *rects, INT rop); + int num, const RECT *rects, const POINT *brush_org, INT rop); } dib_brush;
struct intensity_range diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 98b4dcf..a39f1e2 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -74,7 +74,7 @@ static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect
if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, - dc->ROPmode ); + &dc->brush_org, dc->ROPmode ); free_clipped_rects( &clipped_rects ); return ret; } @@ -1174,6 +1174,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dib_brush *brush = &pdev->brush; + DC *dc = get_physdev_dc( dev ); int rop2 = get_rop2_from_rop( rop ); struct clipped_rects clipped_rects; DWORD and = 0, xor = 0; @@ -1196,7 +1197,8 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) case R2_NOP: break; default: - ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, rop2 ); + ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, + &dc->brush_org, rop2 ); break; } free_clipped_rects( &clipped_rects ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a36e03f..736e526 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1773,7 +1773,7 @@ BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *r * Fill a number of rectangles with the solid brush */ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, - int num, const RECT *rects, INT rop) + int num, const RECT *rects, const POINT *brush_org, INT rop) { DC *dc = get_physdev_dc( &pdev->dev ); DWORD color = get_pixel_color( dc, &pdev->dib, brush->colorref, TRUE ); @@ -2005,9 +2005,8 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * * FIXME: Should we insist l < r && t < b? Currently we assume this. */ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, - int num, const RECT *rects, INT rop) + int num, const RECT *rects, const POINT *brush_org, INT rop) { - DC *dc = get_physdev_dc( &pdev->dev ); BOOL needs_reselect = FALSE;
if (rop != brush->rop) @@ -2043,14 +2042,14 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, } }
- dib->funcs->pattern_rects( dib, num, rects, &dc->brush_org, &brush->dib, &brush->masks ); + dib->funcs->pattern_rects( dib, num, rects, brush_org, &brush->dib, &brush->masks );
if (needs_reselect) free_pattern_brush( brush ); return TRUE; }
static BOOL null_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, - int num, const RECT *rects, INT rop) + int num, const RECT *rects, const POINT *brush_org, INT rop) { return TRUE; }
-
Alexandre Julliard