ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: SelectClipPath should update actual clipping region for a EMF DC.

This commit is contained in:
Dmitry Timoshkov 2013-02-15 13:06:33 +08:00 committed by Alexandre Julliard
parent e89edd60fe
commit e069662c0c
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/gdi32/enhmfdrv/dc.c
View File

@ -159,7 +159,6 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto
{ {
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect );
EMREXCLUDECLIPRECT emr; EMREXCLUDECLIPRECT emr;
BOOL ret;
emr.emr.iType = EMR_EXCLUDECLIPRECT; emr.emr.iType = EMR_EXCLUDECLIPRECT;
emr.emr.nSize = sizeof(emr); emr.emr.nSize = sizeof(emr);
@ -167,15 +166,14 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto
emr.rclClip.top = top; emr.rclClip.top = top;
emr.rclClip.right = right; emr.rclClip.right = right;
emr.rclClip.bottom = bottom; emr.rclClip.bottom = bottom;
ret = EMFDRV_WriteRecord( dev, &emr.emr ); if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR;
return ret ? next->funcs->pExcludeClipRect( next, left, top, right, bottom ) : ERROR; return next->funcs->pExcludeClipRect( next, left, top, right, bottom );
} }
INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom)
{ {
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect );
EMRINTERSECTCLIPRECT emr; EMRINTERSECTCLIPRECT emr;
BOOL ret;
emr.emr.iType = EMR_INTERSECTCLIPRECT; emr.emr.iType = EMR_INTERSECTCLIPRECT;
emr.emr.nSize = sizeof(emr); emr.emr.nSize = sizeof(emr);
@ -183,22 +181,21 @@ INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bot
emr.rclClip.top = top; emr.rclClip.top = top;
emr.rclClip.right = right; emr.rclClip.right = right;
emr.rclClip.bottom = bottom; emr.rclClip.bottom = bottom;
ret = EMFDRV_WriteRecord( dev, &emr.emr ); if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR;
return ret ? next->funcs->pIntersectClipRect( next, left, top, right, bottom ) : ERROR; return next->funcs->pIntersectClipRect( next, left, top, right, bottom );
} }
INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y )
{ {
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn );
EMROFFSETCLIPRGN emr; EMROFFSETCLIPRGN emr;
BOOL ret;
emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.iType = EMR_OFFSETCLIPRGN;
emr.emr.nSize = sizeof(emr); emr.emr.nSize = sizeof(emr);
emr.ptlOffset.x = x; emr.ptlOffset.x = x;
emr.ptlOffset.y = y; emr.ptlOffset.y = y;
ret = EMFDRV_WriteRecord( dev, &emr.emr ); if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR;
return ret ? next->funcs->pOffsetClipRgn( next, x, y ) : ERROR; return next->funcs->pOffsetClipRgn( next, x, y );
} }
INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode )
@ -477,13 +474,15 @@ BOOL EMFDRV_FlattenPath( PHYSDEV dev )
BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode )
{ {
PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectClipPath );
EMRSELECTCLIPPATH emr; EMRSELECTCLIPPATH emr;
emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.iType = EMR_SELECTCLIPPATH;
emr.emr.nSize = sizeof(emr); emr.emr.nSize = sizeof(emr);
emr.iMode = iMode; emr.iMode = iMode;
return EMFDRV_WriteRecord( dev, &emr.emr ); if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
return next->funcs->pSelectClipPath( next, iMode );
} }
BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev )