gdi32: Stop forwarding object selection calls to x11drv.
This commit is contained in:
parent
dc1aeeb2f8
commit
9c112996d0
|
@ -348,7 +348,6 @@ static BOOL dibdrv_DeleteBitmap( HBITMAP bitmap )
|
||||||
*/
|
*/
|
||||||
static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap )
|
static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap )
|
||||||
{
|
{
|
||||||
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectBitmap );
|
|
||||||
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
||||||
BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP );
|
BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP );
|
||||||
dib_info dib;
|
dib_info dib;
|
||||||
|
@ -365,7 +364,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap )
|
||||||
pdev->dib = dib;
|
pdev->dib = dib;
|
||||||
GDI_ReleaseObj( bitmap );
|
GDI_ReleaseObj( bitmap );
|
||||||
|
|
||||||
return next->funcs->pSelectBitmap( next, bitmap );
|
return bitmap;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
@ -373,12 +372,10 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap )
|
||||||
*/
|
*/
|
||||||
static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn )
|
static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn )
|
||||||
{
|
{
|
||||||
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping );
|
|
||||||
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
||||||
TRACE("(%p, %p)\n", dev, rgn);
|
TRACE("(%p, %p)\n", dev, rgn);
|
||||||
|
|
||||||
pdev->clip = rgn;
|
pdev->clip = rgn;
|
||||||
return next->funcs->pSetDeviceClipping( next, rgn );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
|
|
@ -1703,13 +1703,12 @@ static inline int get_pen_device_width( dibdrv_physdev *pdev, int width )
|
||||||
*/
|
*/
|
||||||
COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color )
|
COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color )
|
||||||
{
|
{
|
||||||
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCPenColor );
|
|
||||||
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
||||||
|
|
||||||
if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN ))
|
if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN ))
|
||||||
pdev->pen_brush.colorref = color;
|
pdev->pen_brush.colorref = color;
|
||||||
|
|
||||||
return next->funcs->pSetDCPenColor( next, color );
|
return color;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
|
@ -2023,7 +2022,6 @@ static void select_brush( dib_brush *brush, const LOGBRUSH *logbrush, const stru
|
||||||
*/
|
*/
|
||||||
HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern )
|
HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern )
|
||||||
{
|
{
|
||||||
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectBrush );
|
|
||||||
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
||||||
LOGBRUSH logbrush;
|
LOGBRUSH logbrush;
|
||||||
|
|
||||||
|
@ -2035,8 +2033,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter
|
||||||
logbrush.lbColor = GetDCBrushColor( dev->hdc );
|
logbrush.lbColor = GetDCBrushColor( dev->hdc );
|
||||||
|
|
||||||
select_brush( &pdev->brush, &logbrush, pattern );
|
select_brush( &pdev->brush, &logbrush, pattern );
|
||||||
|
return hbrush;
|
||||||
return next->funcs->pSelectBrush( next, hbrush, pattern );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
@ -2044,7 +2041,6 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter
|
||||||
*/
|
*/
|
||||||
HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern )
|
HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern )
|
||||||
{
|
{
|
||||||
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen );
|
|
||||||
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
||||||
LOGPEN logpen;
|
LOGPEN logpen;
|
||||||
LOGBRUSH logbrush;
|
LOGBRUSH logbrush;
|
||||||
|
@ -2139,8 +2135,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte
|
||||||
pdev->pen_uses_region = (logpen.lopnStyle & PS_GEOMETRIC || pdev->pen_width > 1);
|
pdev->pen_uses_region = (logpen.lopnStyle & PS_GEOMETRIC || pdev->pen_width > 1);
|
||||||
pdev->pen_is_ext = (elp != NULL);
|
pdev->pen_is_ext = (elp != NULL);
|
||||||
HeapFree( GetProcessHeap(), 0, elp );
|
HeapFree( GetProcessHeap(), 0, elp );
|
||||||
|
return hpen;
|
||||||
return next->funcs->pSelectPen( next, hpen, pattern );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
|
@ -2148,13 +2143,12 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte
|
||||||
*/
|
*/
|
||||||
COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color )
|
COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color )
|
||||||
{
|
{
|
||||||
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCBrushColor );
|
|
||||||
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
|
||||||
|
|
||||||
if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH ))
|
if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH ))
|
||||||
pdev->brush.colorref = color;
|
pdev->brush.colorref = color;
|
||||||
|
|
||||||
return next->funcs->pSetDCBrushColor( next, color );
|
return color;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL brush_rect(dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip, INT rop)
|
BOOL brush_rect(dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip, INT rop)
|
||||||
|
|
Loading…
Reference in New Issue