Skip to content

W
wine-winehq
Commit 7aff723c authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

gdi32: If there is no clipping rect, EMREXTTEXTOUT shouldn't have a bounding rect.

parent 0c59e312
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
dlls/gdi32/enhmfdrv/graphics.c
View file @ 7aff723c
...@@ -775,6 +775,13 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, ...@@ -775,6 +775,13 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
} }
} }
if (!lprect)
{
pemr->rclBounds.left = pemr->rclBounds.top = 0;
pemr->rclBounds.right = pemr->rclBounds.bottom = -1;
goto no_bounds;
}
switch (textAlign & (TA_LEFT | TA_RIGHT | TA_CENTER)) { switch (textAlign & (TA_LEFT | TA_RIGHT | TA_CENTER)) {
case TA_CENTER: { case TA_CENTER: {
pemr->rclBounds.left = x - (textWidth / 2) - 1; pemr->rclBounds.left = x - (textWidth / 2) - 1;
...@@ -814,6 +821,7 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, ...@@ -814,6 +821,7 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
} }
} }
no_bounds:
ret = EMFDRV_WriteRecord( dev, &pemr->emr ); ret = EMFDRV_WriteRecord( dev, &pemr->emr );
if(ret) if(ret)
EMFDRV_UpdateBBox( dev, &pemr->rclBounds ); EMFDRV_UpdateBBox( dev, &pemr->rclBounds );
......
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