Fixed behavior of GetTextExtentExPointW. It must always return the

extents of the entire string in size.
This commit is contained in:
Travis Michielsen 2001-09-07 15:28:32 +00:00 committed by Alexandre Julliard
parent 342b5a861a
commit 2bbca90cd7
1 changed files with 4 additions and 5 deletions

View File

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