Commit 4612d61b authored by Alexandre Julliard's avatar Alexandre Julliard

winex11: Fix selecting a pattern brush into a DIB section device.

parent 57c12336
...@@ -2985,18 +2985,13 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap ...@@ -2985,18 +2985,13 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap
if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap )))
{ {
format = get_bitmap_format( info->bmiHeader.biBitCount );
if (format == physdev->format || !pict_formats[format]) goto x11drv_fallback;
if (!(bitmap = create_brush_bitmap( physdev->x11dev, info, bits, usage ))) return 0; if (!(bitmap = create_brush_bitmap( physdev->x11dev, info, bits, usage ))) return 0;
physbitmap = X11DRV_get_phys_bitmap( bitmap ); physbitmap = X11DRV_get_phys_bitmap( bitmap );
delete_bitmap = TRUE; delete_bitmap = TRUE;
} }
else
{
format = get_xrender_format_from_color_shifts( physbitmap->depth, &physbitmap->color_shifts ); format = get_xrender_format_from_color_shifts( physbitmap->depth, &physbitmap->color_shifts );
if (format == WXR_FORMAT_MONO || format == physdev->format || !pict_formats[format]) if (format == WXR_FORMAT_MONO || !pict_formats[format]) goto x11drv_fallback;
goto x11drv_fallback;
}
GetObjectW( bitmap, sizeof(bm), &bm ); GetObjectW( bitmap, sizeof(bm), &bm );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment