ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Expose a solid_rects function.

This commit is contained in:
Huw Davies 2011-11-14 12:49:03 +00:00 committed by Alexandre Julliard
parent 15fabcdefe
commit 5990091bbf
2 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/gdi32/dibdrv/dibdrv.h
View File

@ -211,6 +211,7 @@ extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HID
extern BOOL convert_dib(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_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN;
extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN; extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN;
extern void solid_rects( dib_info *dib, int num, const RECT *rects, const rop_mask *color, HRGN region ) DECLSPEC_HIDDEN;
extern HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN;
extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN;
extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, extern int clip_line(const POINT *start, const POINT *end, const RECT *clip,

57
dlls/gdi32/dibdrv/objects.c
View File

@ -1094,52 +1094,45 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color )
return next->funcs->pSetDCPenColor( next, color ); return next->funcs->pSetDCPenColor( next, color );
} }
/********************************************************************** void solid_rects( dib_info *dib, int num, const RECT *rects, const rop_mask *color, HRGN region )
* solid_brush
*
* 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, dib_info *dib, int num, const RECT *rects, HRGN region)
{ {
int i, j; int i, j;
const WINEREGION *clip = get_wine_region( region ); const WINEREGION *clip;
if (!clip) if (!region)
{ {
dib->funcs->solid_rects( dib, num, rects, pdev->brush_and, pdev->brush_xor ); dib->funcs->solid_rects( dib, num, rects, color->and, color->xor );
return TRUE; return;
} }
clip = get_wine_region( region );
for(i = 0; i < num; i++) for(i = 0; i < num; i++)
{ {
for(j = 0; j < clip->numRects; j++) for(j = 0; j < clip->numRects; j++)
{ {
RECT rect = rects[i]; RECT clipped_rect;
/* Optimize unclipped case */ if (intersect_rect( &clipped_rect, rects + i, clip->rects + j ))
if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && dib->funcs->solid_rects( dib, 1, &clipped_rect, color->and, color->xor );
clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right)
{
dib->funcs->solid_rects( dib, 1, &rect, pdev->brush_and, pdev->brush_xor );
break;
}
if(clip->rects[j].top >= rect.bottom) break;
if(clip->rects[j].bottom <= rect.top) continue;
if(clip->rects[j].right > rect.left && clip->rects[j].left < rect.right)
{
rect.left = max(rect.left, clip->rects[j].left);
rect.top = max(rect.top, clip->rects[j].top);
rect.right = min(rect.right, clip->rects[j].right);
rect.bottom = min(rect.bottom, clip->rects[j].bottom);
dib->funcs->solid_rects( dib, 1, &rect, pdev->brush_and, pdev->brush_xor );
}
} }
} }
release_wine_region( region ); release_wine_region( region );
}
/**********************************************************************
* solid_brush
*
* Fill a number of rectangles with the solid brush
*/
static BOOL solid_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region)
{
rop_mask brush_color;
brush_color.and = pdev->brush_and;
brush_color.xor = pdev->brush_xor;
solid_rects( dib, num, rects, &brush_color, region );
return TRUE; return TRUE;
} }