wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Huw Davies : gdi32: Implement Polyline and PolyPolyline in the dib driver.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: c6f6c3f727556734905a5bbf4fe1b59079e37bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f6c3f727556734905a5bbf4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:19 2011 +0100 gdi32: Implement Polyline and PolyPolyline in the dib driver. --- dlls/gdi32/dibdrv/dc.c | 4 +- dlls/gdi32/dibdrv/dibdrv.h | 3 ++ dlls/gdi32/dibdrv/graphics.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 64769be..03e3f65 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -773,9 +773,9 @@ const DC_FUNCTIONS dib_driver = NULL, /* pPolyBezierTo */ NULL, /* pPolyDraw */ NULL, /* pPolyPolygon */ - NULL, /* pPolyPolyline */ + dibdrv_PolyPolyline, /* pPolyPolyline */ NULL, /* pPolygon */ - NULL, /* pPolyline */ + dibdrv_Polyline, /* pPolyline */ NULL, /* pPolylineTo */ dibdrv_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index bab52cd..760c02e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -21,6 +21,9 @@ extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, + DWORD polylines ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index ff83d1a..b2e9f2c 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -147,6 +147,61 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) } /*********************************************************************** + * dibdrv_PolyPolyline + */ +BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolyline ); + DWORD max_points = 0, i; + POINT *points; + + if (defer_pen( pdev )) return next->funcs->pPolyPolyline( next, pt, counts, polylines ); + + for (i = 0; i < polylines; i++) max_points = max( counts[i], max_points ); + + points = HeapAlloc( GetProcessHeap(), 0, max_points * sizeof(*pt) ); + if (!points) return FALSE; + + for (i = 0; i < polylines; i++) + { + memcpy( points, pt, counts[i] * sizeof(*pt) ); + pt += counts[i]; + LPtoDP( dev->hdc, points, counts[i] ); + + reset_dash_origin( pdev ); + pdev->pen_lines( pdev, counts[i], points ); + } + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +/*********************************************************************** + * dibdrv_Polyline + */ +BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyline ); + POINT *points; + + if (defer_pen( pdev )) return next->funcs->pPolyline( next, pt, count ); + + points = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*pt) ); + if (!points) return FALSE; + + memcpy( points, pt, count * sizeof(*pt) ); + LPtoDP( dev->hdc, points, count ); + + reset_dash_origin( pdev ); + pdev->pen_lines( pdev, count, points ); + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +/*********************************************************************** * dibdrv_Rectangle */ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom )

1 0

Huw Davies : gdi32: Move to using a multi-line pen object-level function.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 0f40ad8a3d5a968234dc04976b55f4e62125ca67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f40ad8a3d5a968234dc04976… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:18 2011 +0100 gdi32: Move to using a multi-line pen object-level function. --- dlls/gdi32/dibdrv/graphics.c | 10 ++++------ dlls/gdi32/dibdrv/objects.c | 32 ++++++++++++++++++++++++++++---- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index a7a2fd8..ff83d1a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -73,7 +73,7 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) reset_dash_origin(pdev); - if(defer_pen(pdev) || !pdev->pen_line(pdev, pts, pts + 1)) + if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts)) return next->funcs->pLineTo( next, x, y ); return TRUE; @@ -154,7 +154,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); - POINT pts[4]; + POINT pts[5]; TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); @@ -170,11 +170,9 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) pts[0].y = pts[1].y = rect.top; pts[1].x = pts[2].x = rect.left; pts[2].y = pts[3].y = rect.bottom - 1; + pts[4] = pts[0]; - pdev->pen_line(pdev, pts , pts + 1); - pdev->pen_line(pdev, pts + 1, pts + 2); - pdev->pen_line(pdev, pts + 2, pts + 3); - pdev->pen_line(pdev, pts + 3, pts ); + pdev->pen_lines(pdev, 5, pts); /* FIXME: Will need updating when we support wide pens */ diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index d96f4bd..e0e37f7 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -647,6 +647,18 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } +static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) +{ + int i; + + assert( num >= 2 ); + for (i = 0; i < num - 1; i++) + if (!solid_pen_line( pdev, pts + i, pts + i + 1 )) + return FALSE; + + return TRUE; +} + void reset_dash_origin(dibdrv_physdev *pdev) { pdev->dash_pos.cur_dash = 0; @@ -920,7 +932,19 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } -static BOOL null_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) +static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) +{ + int i; + + assert( num >= 2 ); + for (i = 0; i < num - 1; i++) + if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) + return FALSE; + + return TRUE; +} + +static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) { return TRUE; } @@ -984,7 +1008,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) case PS_SOLID: if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; - pdev->pen_line = solid_pen_line; + pdev->pen_lines = solid_pen_lines; pdev->defer &= ~DEFER_PEN; break; @@ -994,13 +1018,13 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) case PS_DASHDOTDOT: if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; - pdev->pen_line = dashed_pen_line; + pdev->pen_lines = dashed_pen_lines; pdev->pen_pattern = dash_patterns[style]; pdev->defer &= ~DEFER_PEN; break; case PS_NULL: - pdev->pen_line = null_pen_line; + pdev->pen_lines = null_pen_lines; pdev->defer &= ~DEFER_PEN; break; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f3ba2cf..40271af 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -136,7 +136,7 @@ typedef struct dibdrv_physdev DWORD pen_color, pen_and, pen_xor; dash_pattern pen_pattern; dash_pos dash_pos; - BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); + BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts); /* brush */ UINT brush_style;

1 0

Huw Davies : gdi32: Use the gdi_image_bits structure to maintain the dib driver's bits.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 1e83fd0076c8c83240d5ecc0559fe828d27a52b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e83fd0076c8c83240d5ecc05… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:17 2011 +0100 gdi32: Use the gdi_image_bits structure to maintain the dib driver's bits. --- dlls/gdi32/dibdrv/dc.c | 33 ++++++++++++++++++--------------- dlls/gdi32/dibdrv/objects.c | 14 ++++++++++---- dlls/gdi32/dibdrv/primitives.c | 14 +++++++------- dlls/gdi32/gdi_private.h | 3 +-- 4 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2f93648..64769be 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -69,13 +69,15 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, RGBQUAD *color_table, int color_table_size, void *bits, enum dib_info_flags flags) { - dib->bit_count = bi->biBitCount; - dib->width = bi->biWidth; - dib->height = bi->biHeight; - dib->stride = get_dib_stride( dib->width, dib->bit_count ); - dib->bits = bits; - dib->ptr_to_free = NULL; - dib->flags = flags; + dib->bit_count = bi->biBitCount; + dib->width = bi->biWidth; + dib->height = bi->biHeight; + dib->stride = get_dib_stride( dib->width, dib->bit_count ); + dib->bits.ptr = bits; + dib->bits.is_copy = FALSE; + dib->bits.free = NULL; + dib->bits.param = NULL; + dib->flags = flags; if(dib->height < 0) /* top-down */ { @@ -84,7 +86,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD else /* bottom-up */ { /* bits always points to the top-left corner and the stride is -ve */ - dib->bits = (BYTE*)dib->bits + (dib->height - 1) * dib->stride; + dib->bits.ptr = (BYTE*)dib->bits.ptr + (dib->height - 1) * dib->stride; dib->stride = -dib->stride; } @@ -211,8 +213,9 @@ BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void * static void clear_dib_info(dib_info *dib) { dib->color_table = NULL; - dib->bits = NULL; - dib->ptr_to_free = NULL; + dib->bits.ptr = NULL; + dib->bits.free = NULL; + dib->bits.param = NULL; } /********************************************************************** @@ -224,11 +227,9 @@ void free_dib_info(dib_info *dib) { if (dib->flags & private_color_table) HeapFree(GetProcessHeap(), 0, dib->color_table); - dib->color_table = NULL; - HeapFree(GetProcessHeap(), 0, dib->ptr_to_free); - dib->ptr_to_free = NULL; - dib->bits = NULL; + if (dib->bits.free) dib->bits.free( &dib->bits ); + clear_dib_info( dib ); } void copy_dib_color_info(dib_info *dst, const dib_info *src) @@ -423,7 +424,7 @@ static DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, if (bits) { - bits->ptr = dib->bits; + bits->ptr = dib->bits.ptr; if (dib->stride < 0) bits->ptr = (char *)bits->ptr + (dib->height - 1) * dib->stride; bits->is_copy = FALSE; @@ -479,6 +480,7 @@ static inline BOOL rop_uses_pat(DWORD rop) return ((rop >> 4) & 0x0f0000) != (rop & 0x0f0000); } + /*********************************************************************** * dibdrv_PutImage */ @@ -541,6 +543,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF } init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); + src_dib.bits.is_copy = bits->is_copy; origin.x = src->visrect.left; origin.y = src->visrect.top; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 15ce72f..d96f4bd 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1089,7 +1089,7 @@ void free_pattern_brush( dibdrv_physdev *pdev ) static BOOL create_pattern_brush_bits(dibdrv_physdev *pdev) { DWORD size = pdev->brush_dib.height * abs(pdev->brush_dib.stride); - DWORD *brush_bits = pdev->brush_dib.bits; + DWORD *brush_bits = pdev->brush_dib.bits.ptr; DWORD *and_bits, *xor_bits; assert(pdev->brush_and_bits == NULL); @@ -1161,7 +1161,9 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev) hatch.bit_count = 1; hatch.height = hatch.width = 8; hatch.stride = 4; - hatch.bits = (void *) hatches[pdev->brush_hatch]; + hatch.bits.ptr = (void *) hatches[pdev->brush_hatch]; + hatch.bits.free = hatch.bits.param = NULL; + hatch.bits.is_copy = FALSE; fg_mask.and = pdev->brush_and; fg_mask.xor = pdev->brush_xor; @@ -1306,8 +1308,12 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) pdev->brush_dib.height = orig_dib.height; pdev->brush_dib.width = orig_dib.width; pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); - pdev->brush_dib.ptr_to_free = HeapAlloc( GetProcessHeap(), 0, pdev->brush_dib.height * pdev->brush_dib.stride ); - pdev->brush_dib.bits = pdev->brush_dib.ptr_to_free; + + pdev->brush_dib.bits.param = NULL; + pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, + pdev->brush_dib.height * pdev->brush_dib.stride ); + pdev->brush_dib.bits.is_copy = TRUE; + pdev->brush_dib.bits.free = free_heap_bits; rect.left = rect.top = 0; rect.right = orig_dib.width; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 7b3468b..c102f9c 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -29,37 +29,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); static inline DWORD *get_pixel_ptr_32(const dib_info *dib, int x, int y) { - return (DWORD *)((BYTE*)dib->bits + y * dib->stride + x * 4); + return (DWORD *)((BYTE*)dib->bits.ptr + y * dib->stride + x * 4); } static inline DWORD *get_pixel_ptr_24_dword(const dib_info *dib, int x, int y) { - return (DWORD *)((BYTE*)dib->bits + y * dib->stride) + x * 3 / 4; + return (DWORD *)((BYTE*)dib->bits.ptr + y * dib->stride) + x * 3 / 4; } static inline BYTE *get_pixel_ptr_24(const dib_info *dib, int x, int y) { - return (BYTE*)dib->bits + y * dib->stride + x * 3; + return (BYTE*)dib->bits.ptr + y * dib->stride + x * 3; } static inline WORD *get_pixel_ptr_16(const dib_info *dib, int x, int y) { - return (WORD *)((BYTE*)dib->bits + y * dib->stride + x * 2); + return (WORD *)((BYTE*)dib->bits.ptr + y * dib->stride + x * 2); } static inline BYTE *get_pixel_ptr_8(const dib_info *dib, int x, int y) { - return (BYTE*)dib->bits + y * dib->stride + x; + return (BYTE*)dib->bits.ptr + y * dib->stride + x; } static inline BYTE *get_pixel_ptr_4(const dib_info *dib, int x, int y) { - return (BYTE*)dib->bits + y * dib->stride + x / 2; + return (BYTE*)dib->bits.ptr + y * dib->stride + x / 2; } static inline BYTE *get_pixel_ptr_1(const dib_info *dib, int x, int y) { - return (BYTE*)dib->bits + y * dib->stride + x / 8; + return (BYTE*)dib->bits.ptr + y * dib->stride + x / 8; } static const BYTE pixel_masks_1[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3e3cc3c..f3ba2cf 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -83,8 +83,7 @@ typedef struct { int bit_count, width, height; int stride; /* stride in bytes. Will be -ve for bottom-up dibs (see bits). */ - void *bits; /* points to the top-left corner of the dib. */ - void *ptr_to_free; + struct gdi_image_bits bits; /* bits.ptr points to the top-left corner of the dib. */ DWORD red_mask, green_mask, blue_mask; int red_shift, green_shift, blue_shift;

1 0

Huw Davies : gdi32: Simplify dibdrv_PutImage a little.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 2e908e067c6bf1f74fe7b768ca632f5f8c14d6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e908e067c6bf1f74fe7b768c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:16 2011 +0100 gdi32: Simplify dibdrv_PutImage a little. --- dlls/gdi32/dibdrv/dc.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9e996a0..2f93648 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -490,7 +490,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF DWORD ret; POINT origin; dib_info src_dib; - HRGN total_clip, saved_clip = NULL; + HRGN saved_clip = NULL; dibdrv_physdev *pdev = NULL; const WINEREGION *clip_data; int i, rop2; @@ -518,6 +518,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF goto done; } dib = &stand_alone; + rop = SRCCOPY; } else { @@ -544,22 +545,18 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF origin.x = src->visrect.left; origin.y = src->visrect.top; - if (hbitmap) - { - total_clip = clip; - rop2 = R2_COPYPEN; - } - else + if (!hbitmap) { if (clip) saved_clip = add_extra_clipping_region( pdev, clip ); - total_clip = pdev->clip; - rop2 = ((rop >> 16) & 0xf) + 1; + clip = pdev->clip; } - if (total_clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 ); + rop2 = ((rop >> 16) & 0xf) + 1; + + if (clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 ); else { - clip_data = get_wine_region( total_clip ); + clip_data = get_wine_region( clip ); for (i = 0; i < clip_data->numRects; i++) { RECT clipped_rect; @@ -571,7 +568,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 ); } } - release_wine_region( total_clip ); + release_wine_region( clip ); } ret = ERROR_SUCCESS;

1 0

Huw Davies : gdi32: Avoid directly accessing the bits ptr where possible.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: de213f2c668224ee8fc8b943d806e548f9e921a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de213f2c668224ee8fc8b943d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:15 2011 +0100 gdi32: Avoid directly accessing the bits ptr where possible. --- dlls/gdi32/dibdrv/primitives.c | 42 ++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de213f2c668224ee8fc8b…

1 0

Huw Davies : gdi32: Use the dib driver GetImage and PutImage implementations in GetBitmapBits and SetBitmapBits when appropriate .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a55ec17b74a2a0608e63d16250712eb0f29c9309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55ec17b74a2a0608e63d1625… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:14 2011 +0100 gdi32: Use the dib driver GetImage and PutImage implementations in GetBitmapBits and SetBitmapBits when appropriate. --- dlls/gdi32/bitmap.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 33d3a53..e5008fb 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -463,8 +463,10 @@ LONG WINAPI GetBitmapBits( struct bitblt_coords src; int dst_stride, max, ret; BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); + const struct gdi_dc_funcs *funcs; if (!bmp) return 0; + funcs = get_bitmap_funcs( bmp ); if (bmp->dib) dst_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); else dst_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); @@ -482,7 +484,7 @@ LONG WINAPI GetBitmapBits( src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; - if (!bmp->funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) + if (!funcs->pGetImage( NULL, hbitmap, info, &src_bits, &src )) { const char *src_ptr = src_bits.ptr; int src_stride = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); @@ -536,12 +538,15 @@ LONG WINAPI SetBitmapBits( struct bitblt_coords src, dst; struct gdi_image_bits src_bits; HRGN clip = NULL; + const struct gdi_dc_funcs *funcs; if (!bits) return 0; bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return 0; + funcs = get_bitmap_funcs( bmp ); + if (count < 0) { WARN("(%d): Negative number of bytes passed???\n", count ); count = -count; @@ -611,7 +616,7 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = 0; info->bmiHeader.biHeight = 0; info->bmiHeader.biSizeImage = 0; - err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); + err = funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); if (!err || err == ERROR_BAD_FORMAT) { @@ -620,7 +625,7 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = bmp->bitmap.bmWidth; info->bmiHeader.biHeight = -dst.height; info->bmiHeader.biSizeImage = dst.height * dst_stride; - err = bmp->funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); + err = funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0;

1 0

Huw Davies : gdi32: Add a helper to retrieve the bitmap functions.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e82f88d5eebe11575e8586c412c1e53f2c0b9675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82f88d5eebe11575e8586c41… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:13 2011 +0100 gdi32: Add a helper to retrieve the bitmap functions. --- dlls/gdi32/dib.c | 6 ++---- dlls/gdi32/gdi_private.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ebc6fe4..add3a70 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -583,8 +583,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, physdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); if (!BITMAP_SetOwnerDC( hbitmap, physdev )) goto done; - funcs = bitmap->funcs; - if (bitmap->dib) funcs = dc->dibdrv.dev.funcs; + funcs = get_bitmap_funcs( bitmap ); result = lines; @@ -947,8 +946,7 @@ INT WINAPI GetDIBits( return 0; } - funcs = bmp->funcs; - if (bmp->dib) funcs = dc->dibdrv.dev.funcs; + funcs = get_bitmap_funcs( bmp ); if (dst_info->bmiHeader.biBitCount == 0) /* query bitmap info only */ { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b24f4eb..3e3cc3c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -571,6 +571,12 @@ static inline int get_dib_num_of_colors( const BITMAPINFO *info ) return info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; } +static inline const struct gdi_dc_funcs *get_bitmap_funcs( const BITMAPOBJ *bitmap ) +{ + if( bitmap->dib ) return &dib_driver; + return bitmap->funcs; +} + extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */

1 0

Huw Davies : gdi32: Allow SetBitmapBits to set incomplete scanlines.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: cb82c45b3a803e24f2f9f10c5857a9ee2a923888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb82c45b3a803e24f2f9f10c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:12 2011 +0100 gdi32: Allow SetBitmapBits to set incomplete scanlines. --- dlls/gdi32/bitmap.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8117d6d..33d3a53 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -535,6 +535,7 @@ LONG WINAPI SetBitmapBits( int i, src_stride, dst_stride; struct bitblt_coords src, dst; struct gdi_image_bits src_bits; + HRGN clip = NULL; if (!bits) return 0; @@ -548,17 +549,30 @@ LONG WINAPI SetBitmapBits( if (bmp->dib) src_stride = get_bitmap_stride( bmp->dib->dsBmih.biWidth, bmp->dib->dsBmih.biBitCount ); else src_stride = get_bitmap_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + count = min( count, src_stride * bmp->bitmap.bmHeight ); dst_stride = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); src.visrect.left = src.x = 0; src.visrect.top = src.y = 0; src.visrect.right = src.width = bmp->bitmap.bmWidth; - src.visrect.bottom = src.height = min( count / src_stride, bmp->bitmap.bmHeight ); + src.visrect.bottom = src.height = (count + src_stride - 1 ) / src_stride; dst = src; - /* Only set entire lines */ - count = src.height * src_stride; + if (count % src_stride) + { + HRGN last_row; + int extra_pixels = ((count % src_stride) << 3) / bmp->bitmap.bmBitsPixel; + + if ((count % src_stride << 3) % bmp->bitmap.bmBitsPixel) + FIXME( "Unhandled partial pixel\n" ); + clip = CreateRectRgn( src.visrect.left, src.visrect.top, + src.visrect.right, src.visrect.bottom - 1 ); + last_row = CreateRectRgn( src.visrect.left, src.visrect.bottom - 1, + src.visrect.left + extra_pixels, src.visrect.bottom ); + CombineRgn( clip, clip, last_row, RGN_OR ); + DeleteObject( last_row ); + } TRACE("(%p, %d, %p) %dx%d %d bpp fetched height: %d\n", hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, @@ -579,8 +593,10 @@ LONG WINAPI SetBitmapBits( } src_bits.is_copy = TRUE; src_bits.free = free_heap_bits; - for (i = 0; i < dst.height; i++) + for (i = 0; i < count / src_stride; i++) memcpy( (char *)src_bits.ptr + i * dst_stride, (char *)bits + i * src_stride, src_stride ); + if (count % src_stride) + memcpy( (char *)src_bits.ptr + i * dst_stride, (char *)bits + i * src_stride, count % src_stride ); } /* query the color info */ @@ -604,10 +620,11 @@ LONG WINAPI SetBitmapBits( info->bmiHeader.biWidth = bmp->bitmap.bmWidth; info->bmiHeader.biHeight = -dst.height; info->bmiHeader.biSizeImage = dst.height * dst_stride; - err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, &src_bits, &src, &dst, SRCCOPY ); + err = bmp->funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0; + if (clip) DeleteObject( clip ); if (src_bits.free) src_bits.free( &src_bits ); GDI_ReleaseObj( hbitmap ); return count;

1 0

Huw Davies : gdi32: Avoid a possible unnecessary conversion if PutImage is called with zero biClrUsed .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: bdc3b9c0a98de289d009690706ef3a90e323301c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc3b9c0a98de289d00969070… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:11 2011 +0100 gdi32: Avoid a possible unnecessary conversion if PutImage is called with zero biClrUsed. --- dlls/gdi32/dibdrv/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 21ebec8..9e996a0 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -444,7 +444,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) case 8: { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); - if (dib->color_table_size != info->bmiHeader.biClrUsed ) return FALSE; + if (dib->color_table_size != get_dib_num_of_colors( info )) return FALSE; return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); }

1 0

Huw Davies : gdi32: Fix colour table comparison.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 40742c2f725e8a5f987471ccaafb59aa5c03820d URL: http://source.winehq.org/git/wine.git/?a=commit;h=40742c2f725e8a5f987471cca… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:10 2011 +0100 gdi32: Fix colour table comparison. --- dlls/gdi32/dibdrv/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 6ffb554..21ebec8 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -445,7 +445,7 @@ static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) { RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); if (dib->color_table_size != info->bmiHeader.biClrUsed ) return FALSE; - return memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); + return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); } case 16:

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
77
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 August 2011