Re: [2/2] gdi32: Enumerated font size should not be too large.

[Huw Davies]

On 23/04/2012 15:32, Dmitry Timoshkov wrote:
> This reverts commit f4625d1ae1109ee9a30faa8254b10779853f0ac2.
>
> dlls/gdi32/freetype.c   |    2 +-
>   dlls/gdi32/tests/font.c |    1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
> index 3875e4f..401cfd1 100644
> --- a/dlls/gdi32/freetype.c
> +++ b/dlls/gdi32/freetype.c
> @@ -5048,7 +5048,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf,
>       font = alloc_font();
>   if(face->scalable) {
> -
>    height = -2048; /* 2048 is the most common em size */
> -
>    height = 100;
>     width = 0;
> } else {
>     height = face->size.y_ppem>>  6;

You'll need to fix the ntmTm.ntmCellHeight and ntmTm.ntmAvgWidth values.

Huw.