diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c index 5880f9329dd..3a55628b564 100644 --- a/reactos/subsys/win32k/objects/text.c +++ b/reactos/subsys/win32k/objects/text.c @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: text.c,v 1.116 2004/12/13 01:45:18 royce Exp $ */ +/* $Id: text.c,v 1.117 2004/12/17 17:40:29 gvg Exp $ */ #include #include @@ -1647,11 +1647,11 @@ NtGdiExtTextOut( IntLockFreeType; error = FT_Set_Pixel_Sizes( face, + TextObj->logfont.lfWidth, /* FIXME should set character height if neg */ (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight), - TextObj->logfont.lfWidth); + TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); IntUnLockFreeType; if (error) { @@ -2030,11 +2030,11 @@ NtGdiGetCharWidth32(HDC hDC, IntLockFreeType; FT_Set_Pixel_Sizes(face, + TextObj->logfont.lfWidth, /* FIXME should set character height if neg */ (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight), - TextObj->logfont.lfWidth); + TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); for (i = FirstChar; i <= LastChar; i++) { @@ -2188,11 +2188,11 @@ TextIntGetTextExtentPoint(PDC dc, IntLockFreeType; error = FT_Set_Pixel_Sizes(face, + TextObj->logfont.lfWidth, /* FIXME should set character height if neg */ (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight), - TextObj->logfont.lfWidth); + TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); IntUnLockFreeType; if (error) { @@ -2543,11 +2543,11 @@ NtGdiGetTextMetrics(HDC hDC, Face = FontGDI->face; IntLockFreeType; Error = FT_Set_Pixel_Sizes(Face, + TextObj->logfont.lfWidth, /* FIXME should set character height if neg */ - (TextObj->logfont.lfHeight < 0 ? - - TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight), - TextObj->logfont.lfWidth); + (TextObj->logfont.lfHeight < 0 ? + - TextObj->logfont.lfHeight : + TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); IntUnLockFreeType; if (0 != Error) {