gdi32: Use get_dc_attr in SetStretchBltMode.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
4198e0760b
commit
7517fdf229
|
@ -1392,34 +1392,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* SetStretchBltMode (GDI32.@)
|
|
||||||
*/
|
|
||||||
INT WINAPI SetStretchBltMode( HDC hdc, INT mode )
|
|
||||||
{
|
|
||||||
INT ret = 0;
|
|
||||||
DC *dc;
|
|
||||||
|
|
||||||
if ((mode <= 0) || (mode > MAXSTRETCHBLTMODE))
|
|
||||||
{
|
|
||||||
SetLastError(ERROR_INVALID_PARAMETER);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if ((dc = get_dc_ptr( hdc )))
|
|
||||||
{
|
|
||||||
PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetStretchBltMode );
|
|
||||||
mode = physdev->funcs->pSetStretchBltMode( physdev, mode );
|
|
||||||
if (mode)
|
|
||||||
{
|
|
||||||
ret = dc->attr->stretch_blt_mode;
|
|
||||||
dc->attr->stretch_blt_mode = mode;
|
|
||||||
}
|
|
||||||
release_dc_ptr( dc );
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* GetMapMode (GDI32.@)
|
* GetMapMode (GDI32.@)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -134,13 +134,13 @@ BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode )
|
||||||
return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
|
return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
|
||||||
}
|
}
|
||||||
|
|
||||||
INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode )
|
BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode )
|
||||||
{
|
{
|
||||||
EMRSETSTRETCHBLTMODE emr;
|
EMRSETSTRETCHBLTMODE emr;
|
||||||
emr.emr.iType = EMR_SETSTRETCHBLTMODE;
|
emr.emr.iType = EMR_SETSTRETCHBLTMODE;
|
||||||
emr.emr.nSize = sizeof(emr);
|
emr.emr.nSize = sizeof(emr);
|
||||||
emr.iMode = mode;
|
emr.iMode = mode;
|
||||||
return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0;
|
return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir )
|
BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir )
|
||||||
|
|
|
@ -123,7 +123,6 @@ extern DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HID
|
||||||
extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
|
extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
|
||||||
extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN;
|
extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN;
|
||||||
extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
|
extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
|
||||||
extern INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
|
|
||||||
extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
|
extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN;
|
extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN;
|
extern BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN;
|
||||||
|
|
|
@ -141,7 +141,7 @@ static const struct gdi_dc_funcs emfdrv_driver =
|
||||||
EMFDRV_SetPixel, /* pSetPixel */
|
EMFDRV_SetPixel, /* pSetPixel */
|
||||||
NULL, /* pSetPolyFillMode */
|
NULL, /* pSetPolyFillMode */
|
||||||
NULL, /* pSetRelAbs */
|
NULL, /* pSetRelAbs */
|
||||||
EMFDRV_SetStretchBltMode, /* pSetStretchBltMode */
|
NULL, /* pSetStretchBltMode */
|
||||||
NULL, /* pSetTextCharacterExtra */
|
NULL, /* pSetTextCharacterExtra */
|
||||||
EMFDRV_SetTextColor, /* pSetTextColor */
|
EMFDRV_SetTextColor, /* pSetTextColor */
|
||||||
EMFDRV_SetTextJustification, /* pSetTextJustification */
|
EMFDRV_SetTextJustification, /* pSetTextJustification */
|
||||||
|
|
|
@ -71,6 +71,7 @@ extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HI
|
||||||
extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN;
|
extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL METADC_SetRelAbs( HDC hdc, INT mode ) DECLSPEC_HIDDEN;
|
extern BOOL METADC_SetRelAbs( HDC hdc, INT mode ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN;
|
extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN;
|
||||||
|
extern BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN;
|
extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* enhanced metafiles */
|
/* enhanced metafiles */
|
||||||
|
@ -118,6 +119,7 @@ extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
|
extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN;
|
extern BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN;
|
extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN;
|
||||||
|
extern BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN;
|
extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
#endif /* __WINE_GDI_PRIVATE_H */
|
#endif /* __WINE_GDI_PRIVATE_H */
|
||||||
|
|
|
@ -205,6 +205,29 @@ INT WINAPI GetStretchBltMode( HDC hdc )
|
||||||
return dc_attr ? dc_attr->stretch_blt_mode : 0;
|
return dc_attr ? dc_attr->stretch_blt_mode : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* SetStretchBltMode (GDI32.@)
|
||||||
|
*/
|
||||||
|
INT WINAPI SetStretchBltMode( HDC hdc, INT mode )
|
||||||
|
{
|
||||||
|
DC_ATTR *dc_attr;
|
||||||
|
INT ret;
|
||||||
|
|
||||||
|
if (mode <= 0 || mode > MAXSTRETCHBLTMODE)
|
||||||
|
{
|
||||||
|
SetLastError(ERROR_INVALID_PARAMETER);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_meta_dc( hdc )) return METADC_SetStretchBltMode( hdc, mode );
|
||||||
|
if (!(dc_attr = get_dc_attr( hdc ))) return 0;
|
||||||
|
if (dc_attr->emf && !EMFDC_SetStretchBltMode( dc_attr, mode )) return 0;
|
||||||
|
|
||||||
|
ret = dc_attr->stretch_blt_mode;
|
||||||
|
dc_attr->stretch_blt_mode = mode;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* GetCurrentPositionEx (GDI32.@)
|
* GetCurrentPositionEx (GDI32.@)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -65,9 +65,9 @@ BOOL METADC_SetPolyFillMode( HDC hdc, INT mode )
|
||||||
return metadc_param1( hdc, META_SETPOLYFILLMODE, mode );
|
return metadc_param1( hdc, META_SETPOLYFILLMODE, mode );
|
||||||
}
|
}
|
||||||
|
|
||||||
INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode )
|
BOOL METADC_SetStretchBltMode( HDC hdc, INT mode )
|
||||||
{
|
{
|
||||||
return MFDRV_MetaParam1( dev, META_SETSTRETCHBLTMODE, (WORD)mode) ? mode : 0;
|
return metadc_param1( hdc, META_SETSTRETCHBLTMODE, mode );
|
||||||
}
|
}
|
||||||
|
|
||||||
INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
|
INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
|
||||||
|
|
|
@ -204,7 +204,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
|
||||||
NULL, /* pSetPixel */
|
NULL, /* pSetPixel */
|
||||||
NULL, /* pSetPolyFillMode */
|
NULL, /* pSetPolyFillMode */
|
||||||
NULL, /* pSetRelAbs */
|
NULL, /* pSetRelAbs */
|
||||||
MFDRV_SetStretchBltMode, /* pSetStretchBltMode */
|
NULL, /* pSetStretchBltMode */
|
||||||
MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */
|
MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */
|
||||||
MFDRV_SetTextColor, /* pSetTextColor */
|
MFDRV_SetTextColor, /* pSetTextColor */
|
||||||
MFDRV_SetTextJustification, /* pSetTextJustification */
|
MFDRV_SetTextJustification, /* pSetTextJustification */
|
||||||
|
|
|
@ -111,7 +111,6 @@ extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPE
|
||||||
extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN;
|
extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN;
|
||||||
extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
|
extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
|
||||||
extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN;
|
extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN;
|
||||||
extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
|
|
||||||
extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN;
|
extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN;
|
||||||
extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
|
extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
|
||||||
extern BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) DECLSPEC_HIDDEN;
|
extern BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) DECLSPEC_HIDDEN;
|
||||||
|
|
Loading…
Reference in New Issue