August 2011 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Change the object-level brush function to accept a stand-alone dib and a separate clip region .
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 925fa108657239ae1672a12299432f696723a072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925fa108657239ae1672a1229… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:20 2011 +0100 gdi32: Change the object-level brush function to accept a stand-alone dib and a separate clip region. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 6 +++--- dlls/gdi32/dibdrv/objects.c | 40 +++++++++++++++++++++++++++++----------- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 760c02e..6727a6b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -75,6 +75,7 @@ extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern DWORD get_fg_color(dibdrv_physdev *pdev, COLORREF color) DECLSPEC_HIDDEN; +extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN; static inline BOOL defer_pen(dibdrv_physdev *pdev) { diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index b2e9f2c..f8b3f8a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -107,7 +107,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) update_brush_rop( pdev, rop2 ); - done = pdev->brush_rects( pdev, 1, &dst->visrect ); + done = brush_rects( pdev, 1, &dst->visrect ); update_brush_rop( pdev, GetROP2(dev->hdc) ); @@ -139,7 +139,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, region->rects[i].right, region->rects[i].bottom, FALSE ); - pdev->brush_rects( pdev, 1, &rect ); + brush_rects( pdev, 1, &rect ); } release_wine_region( rgn ); @@ -236,7 +236,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.right -= 1; rect.bottom -= 1; - pdev->brush_rects(pdev, 1, &rect); + brush_rects(pdev, 1, &rect); return TRUE; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e0e37f7..8575bb4 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1059,10 +1059,16 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) * Fill a number of rectangles with the solid brush * FIXME: Should we insist l < r && t < b? Currently we assume this. */ -static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) +static BOOL solid_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) { int i, j; - const WINEREGION *clip = get_wine_region(pdev->clip); + const WINEREGION *clip = get_wine_region( region ); + + if (!clip) + { + dib->funcs->solid_rects( dib, num, rects, pdev->brush_and, pdev->brush_xor ); + return TRUE; + } for(i = 0; i < num; i++) { @@ -1074,7 +1080,7 @@ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right) { - pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->brush_and, pdev->brush_xor); + dib->funcs->solid_rects( dib, 1, &rect, pdev->brush_and, pdev->brush_xor ); break; } @@ -1088,11 +1094,11 @@ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) rect.right = min(rect.right, clip->rects[j].right); rect.bottom = min(rect.bottom, clip->rects[j].bottom); - pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->brush_and, pdev->brush_xor); + dib->funcs->solid_rects( dib, 1, &rect, pdev->brush_and, pdev->brush_xor ); } } } - release_wine_region(pdev->clip); + release_wine_region( region ); return TRUE; } @@ -1205,7 +1211,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev) * Fill a number of rectangles with the pattern brush * FIXME: Should we insist l < r && t < b? Currently we assume this. */ -static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) +static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) { int i, j; const WINEREGION *clip; @@ -1233,7 +1239,14 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) GetBrushOrgEx(pdev->dev.hdc, &origin); - clip = get_wine_region(pdev->clip); + clip = get_wine_region( region ); + + if (!clip) + { + dib->funcs->pattern_rects( dib, num, rects, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits ); + return TRUE; + } + for(i = 0; i < num; i++) { for(j = 0; j < clip->numRects; j++) @@ -1244,7 +1257,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right) { - pdev->dib.funcs->pattern_rects(&pdev->dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits); + dib->funcs->pattern_rects( dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits ); break; } @@ -1258,15 +1271,15 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, int num, RECT *rects) rect.right = min(rect.right, clip->rects[j].right); rect.bottom = min(rect.bottom, clip->rects[j].bottom); - pdev->dib.funcs->pattern_rects(&pdev->dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits); + dib->funcs->pattern_rects( dib, 1, &rect, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits ); } } } - release_wine_region(pdev->clip); + release_wine_region( region ); return TRUE; } -static BOOL null_brush(dibdrv_physdev *pdev, int num, RECT *rects) +static BOOL null_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) { return TRUE; } @@ -1392,3 +1405,8 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) return next->funcs->pSetDCBrushColor( next, color ); } + +BOOL brush_rects(dibdrv_physdev *pdev, int num, const RECT *rects) +{ + return pdev->brush_rects( pdev, &pdev->dib, num, rects, pdev->clip ); +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 40271af..2189040 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -146,7 +146,7 @@ typedef struct dibdrv_physdev DWORD brush_color, brush_and, brush_xor; dib_info brush_dib; void *brush_and_bits, *brush_xor_bits; - BOOL (* brush_rects)(struct dibdrv_physdev *pdev, int num, RECT *rects); + BOOL (* brush_rects)(struct dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN clip); /* background */ DWORD bkgnd_color, bkgnd_and, bkgnd_xor;

1 0

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

Aug. 22, 2011

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 Aug. 22, 2011

Aug. 22, 2011

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: Use the dib driver GetImage and PutImage implementations in GetBitmapBits and SetBitmapBits when appropriate .
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

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: Simplify dibdrv_PutImage a little.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

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 Aug. 22, 2011

Aug. 22, 2011

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

Henri Verbeet : wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill().
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 18434ddc57c049e1f78d79471651d73d0dbc5f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18434ddc57c049e1f78d79471… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:57 2011 +0200 wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill(). And avoid a potential infinite recursion if wined3d_surface_blt() ends up calling cpu_blit_color_fill(). --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d7d65fb..087196c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -7024,12 +7024,13 @@ release: static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface, const RECT *dst_rect, const WINED3DCOLORVALUE *color) { + static const RECT src_rect; WINEDDBLTFX BltFx; memset(&BltFx, 0, sizeof(BltFx)); BltFx.dwSize = sizeof(BltFx); BltFx.u5.dwFillColor = wined3d_format_convert_from_float(dst_surface, color); - return wined3d_surface_blt(dst_surface, dst_rect, NULL, NULL, + return surface_cpu_blt(dst_surface, dst_rect, NULL, &src_rect, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT); }

1 0

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

Aug. 22, 2011

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

Henri Verbeet : wined3d: Move FBO based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: a04f0e9c789295c22aab6e0d3b3239d0c794b304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04f0e9c789295c22aab6e0d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:35:00 2011 +0200 wined3d: Move FBO based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 293 +++++++++++++++++++++++------------------------- 1 files changed, 140 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a04f0e9c789295c22aab6…

1 0

Henri Verbeet : wined3d: Move surface_color_fill() based color fills from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: d063ff55e7f3639e492e24b6dcef8e8489825569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d063ff55e7f3639e492e24b6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:59 2011 +0200 wined3d: Move surface_color_fill() based color fills from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 165 ++++++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 83 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9b02177..62828e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1210,6 +1210,73 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } +/* This function checks if the primary render target uses the 8bit paletted format. */ +static BOOL primary_render_target_is_p8(const struct wined3d_device *device) +{ + if (device->fb.render_targets && device->fb.render_targets[0]) + { + const struct wined3d_surface *render_target = device->fb.render_targets[0]; + if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) + && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) + return TRUE; + } + return FALSE; +} + +static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, + DWORD color, WINED3DCOLORVALUE *float_color) +{ + const struct wined3d_format *format = surface->resource.format; + const struct wined3d_device *device = surface->resource.device; + + switch (format->id) + { + case WINED3DFMT_P8_UINT: + if (surface->palette) + { + float_color->r = surface->palette->palents[color].peRed / 255.0f; + float_color->g = surface->palette->palents[color].peGreen / 255.0f; + float_color->b = surface->palette->palents[color].peBlue / 255.0f; + } + else + { + float_color->r = 0.0f; + float_color->g = 0.0f; + float_color->b = 0.0f; + } + float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; + break; + + case WINED3DFMT_B5G6R5_UNORM: + float_color->r = ((color >> 11) & 0x1f) / 31.0f; + float_color->g = ((color >> 5) & 0x3f) / 63.0f; + float_color->b = (color & 0x1f) / 31.0f; + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8_UNORM: + case WINED3DFMT_B8G8R8X8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = 1.0f; + break; + + case WINED3DFMT_B8G8R8A8_UNORM: + float_color->r = D3DCOLOR_R(color); + float_color->g = D3DCOLOR_G(color); + float_color->b = D3DCOLOR_B(color); + float_color->a = D3DCOLOR_A(color); + break; + + default: + ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); + return FALSE; + } + + return TRUE; +} + static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface, DWORD depth, float *float_depth) { const struct wined3d_format *format = surface->resource.format; @@ -1464,6 +1531,21 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3D_OK; } } + else + { + if (flags & WINEDDBLT_COLORFILL) + { + WINED3DCOLORVALUE color; + + TRACE("Color fill.\n"); + + if (!surface_convert_color_to_float(dst_surface, fx->u5.dwFillColor, &color)) + goto fallback; + + if (SUCCEEDED(surface_color_fill(dst_surface, &dst_rect, &color))) + return WINED3D_OK; + } + } fallback: @@ -2029,19 +2111,6 @@ void surface_bind(struct wined3d_surface *surface, const struct wined3d_gl_info } } -/* This function checks if the primary render target uses the 8bit paletted format. */ -static BOOL primary_render_target_is_p8(const struct wined3d_device *device) -{ - if (device->fb.render_targets && device->fb.render_targets[0]) - { - const struct wined3d_surface *render_target = device->fb.render_targets[0]; - if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) - && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) - return TRUE; - } - return FALSE; -} - /* This call just downloads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -2523,60 +2592,6 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *d } } -static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, - DWORD color, WINED3DCOLORVALUE *float_color) -{ - const struct wined3d_format *format = surface->resource.format; - const struct wined3d_device *device = surface->resource.device; - - switch (format->id) - { - case WINED3DFMT_P8_UINT: - if (surface->palette) - { - float_color->r = surface->palette->palents[color].peRed / 255.0f; - float_color->g = surface->palette->palents[color].peGreen / 255.0f; - float_color->b = surface->palette->palents[color].peBlue / 255.0f; - } - else - { - float_color->r = 0.0f; - float_color->g = 0.0f; - float_color->b = 0.0f; - } - float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; - break; - - case WINED3DFMT_B5G6R5_UNORM: - float_color->r = ((color >> 11) & 0x1f) / 31.0f; - float_color->g = ((color >> 5) & 0x3f) / 63.0f; - float_color->b = (color & 0x1f) / 31.0f; - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = 1.0f; - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - float_color->r = D3DCOLOR_R(color); - float_color->g = D3DCOLOR_G(color); - float_color->b = D3DCOLOR_B(color); - float_color->a = D3DCOLOR_A(color); - break; - - default: - ERR("Unhandled conversion from %s to floating point.\n", debug_d3dformat(format->id)); - return FALSE; - } - - return TRUE; -} - HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; @@ -5552,22 +5567,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa return WINED3D_OK; } - else - { - /* Source-Less Blit to render target */ - if (flags & WINEDDBLT_COLORFILL) - { - WINED3DCOLORVALUE color; - - TRACE("Colorfill\n"); - - /* The color as given in the Blt function is in the surface format. */ - if (!surface_convert_color_to_float(dst_surface, DDBltFx->u5.dwFillColor, &color)) - return WINED3DERR_INVALIDCALL; - - return surface_color_fill(dst_surface, dst_rect, &color); - } - } /* Default: Fall back to the generic blt. Not an error, a TRACE is enough */ TRACE("Didn't find any usable render target setup for hw blit, falling back to software\n");

1 0