system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 14:04:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdi32: Do not dither non-extended wide pens.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2017-08-28 09:13:25 +02:00
parent 1c56b3b516
commit 66507e86c0
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/gdi32/dibdrv/objects.c
View file

@ -2073,7 +2073,7 @@ static BOOL brush_needs_dithering( dibdrv_physdev *pdev, COLORREF color )
}
static void select_brush( dibdrv_physdev *pdev, dib_brush *brush,
const LOGBRUSH *logbrush, const struct brush_pattern *pattern )
const LOGBRUSH *logbrush, const struct brush_pattern *pattern, BOOL dither )
{
free_pattern_brush( brush );
@ -2094,7 +2094,7 @@ static void select_brush( dibdrv_physdev *pdev, dib_brush *brush,
case BS_NULL: brush->rects = null_brush; break;
case BS_HATCHED: brush->rects = pattern_brush; break;
case BS_SOLID:
brush->rects = brush_needs_dithering( pdev, brush->colorref ) ? pattern_brush : solid_brush;
brush->rects = dither && brush_needs_dithering( pdev, brush->colorref ) ? pattern_brush : solid_brush;
break;
}
}
@ -2116,7 +2116,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter
if (hbrush == GetStockObject( DC_BRUSH ))
logbrush.lbColor = dc->dcBrushColor;
select_brush( pdev, &pdev->brush, &logbrush, pattern );
select_brush( pdev, &pdev->brush, &logbrush, pattern, TRUE );
return hbrush;
}
@ -2130,6 +2130,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte
LOGPEN logpen;
LOGBRUSH logbrush;
EXTLOGPEN *elp = NULL;
BOOL dither = TRUE;
TRACE("(%p, %p)\n", dev, hpen);
@ -2157,6 +2158,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte
logbrush.lbStyle = BS_SOLID;
logbrush.lbColor = logpen.lopnColor;
logbrush.lbHatch = 0;
dither = FALSE;
}
pdev->pen_join = logpen.lopnStyle & PS_JOIN_MASK;
@ -2167,7 +2169,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte
logbrush.lbColor = dc->dcPenColor;
set_dash_pattern( &pdev->pen_pattern, 0, NULL );
select_brush( pdev, &pdev->pen_brush, &logbrush, pattern );
select_brush( pdev, &pdev->pen_brush, &logbrush, pattern, dither );
pdev->pen_style = logpen.lopnStyle & PS_STYLE_MASK;
@ -2234,7 +2236,7 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color )
if (dc->hBrush == GetStockObject( DC_BRUSH ))
{
LOGBRUSH logbrush = { BS_SOLID, color, 0 };
select_brush( pdev, &pdev->brush, &logbrush, NULL );
select_brush( pdev, &pdev->brush, &logbrush, NULL, TRUE );
}
return color;
}

2
dlls/gdi32/tests/dib.c
View file

@ -2781,7 +2781,7 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits)
LineTo( hdc, wide_lines[i].right, wide_lines[i].bottom );
}
compare_hash_broken_todo( hdc, bmi, bits, "wide pen", 0, is_ddb );
compare_hash( hdc, bmi, bits, "wide pen" );
SelectObject( hdc, orig_pen );
DeleteObject( wide_pen );