Commit 2bbca90c authored by Travis Michielsen's avatar Travis Michielsen Committed by Alexandre Julliard

Fixed behavior of GetTextExtentExPointW. It must always return the

extents of the entire string in size.
parent 342b5a86
......@@ -1173,16 +1173,15 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count,
/* FIXME - justification needs doing yet. Remember that the base
* data will not be in logical coordinates.
*/
if( !lpnFit || extent+tSize.cx <= maxExt )
extent += tSize.cx;
if( !lpnFit || extent <= maxExt )
/* It is allowed to be equal. */
{
extent+=tSize.cx;
nFit++;
str++;
if( alpDx ) alpDx[index] = extent;
if( tSize.cy > size->cy ) size->cy = tSize.cy;
}
else break;
if( tSize.cy > size->cy ) size->cy = tSize.cy;
str++;
}
size->cx = extent;
if(lpnFit) *lpnFit = nFit;
......
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