Skip to content
Snippets Groups Projects
Commit d7ed2457 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

winex11: Make sure the bitmap of the brush pattern is owned by x11drv before getting its pixmap.

parent ac0a7b64
No related branches found
No related tags found
No related merge requests found
......@@ -251,6 +251,34 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
}
/***********************************************************************
* BRUSH_SelectDIBPatternBrush
*/
static BOOL BRUSH_SelectDIBPatternBrush( X11DRV_PDEVICE *physDev, HGLOBAL mem )
{
BOOL ret;
HDC memdc;
BITMAPINFO *info = GlobalLock( mem );
HBITMAP bitmap = CreateDIBitmap( physDev->dev.hdc, &info->bmiHeader, CBM_INIT,
(LPBYTE)info + bitmap_info_size( info, DIB_RGB_COLORS ),
info, DIB_RGB_COLORS );
/* make sure it's owned by x11drv */
memdc = CreateCompatibleDC( physDev->dev.hdc );
SelectObject( memdc, bitmap );
DeleteDC( memdc );
if ((ret = BRUSH_SelectPatternBrush( physDev, bitmap )))
{
X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( bitmap );
physBitmap->pixmap = 0; /* so it doesn't get freed */
}
DeleteObject( bitmap );
GlobalUnlock( mem );
return ret;
}
/***********************************************************************
* SelectBrush (X11DRV.@)
*/
......@@ -258,8 +286,6 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush )
{
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
LOGBRUSH logbrush;
HBITMAP hBitmap;
BITMAPINFO * bmpInfo;
if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0;
......@@ -304,18 +330,7 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush )
case BS_DIBPATTERN:
TRACE("BS_DIBPATTERN\n");
if ((bmpInfo = GlobalLock( (HGLOBAL)logbrush.lbHatch )))
{
int size = bitmap_info_size( bmpInfo, logbrush.lbColor );
hBitmap = CreateDIBitmap( dev->hdc, &bmpInfo->bmiHeader,
CBM_INIT, ((char *)bmpInfo) + size,
bmpInfo,
(WORD)logbrush.lbColor );
BRUSH_SelectPatternBrush( physDev, hBitmap );
DeleteObject( hBitmap );
GlobalUnlock( (HGLOBAL)logbrush.lbHatch );
}
if (!BRUSH_SelectDIBPatternBrush( physDev, (HGLOBAL)logbrush.lbHatch )) return 0;
break;
}
return hbrush;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment