[PATCH 2/3] gdi32: Fix text metrics used in EnumFonts families.

[Akihiro Sagawa]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50818
Signed-off-by: Akihiro Sagawa 
---
 dlls/gdi32/font.c       | 34 ++++++++++++++++++++++++++++++++--
 dlls/gdi32/tests/font.c | 19 +++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

[Huw Davies]

Signed-off-by: Huw Davies

[Alexandre Julliard]

Akihiro Sagawa  writes:
> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50818
> Signed-off-by: Akihiro Sagawa
>
> dlls/gdi32/font.c       | 34 ++++++++++++++++++++++++++++++++--
>  dlls/gdi32/tests/font.c | 19 +++++++++++++++++++
>  2 files changed, 51 insertions(+), 2 deletions(-)

This breaks the tests here:

tools/runtest -q -P wine -T . -M gdi32.dll -p dlls/gdi32/tests/gdi32_test.exe font && touch dlls/gdi32/tests/font.ok
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2900: Test failed: enumerated font height 212
font.c:2900: Test failed: enumerated font height 212
font.c:2900: Test failed: enumerated font height 212
font.c:2900: Test failed: enumerated font height 212
font.c:2900: Test failed: enumerated font height 212
font.c:2900: Test failed: enumerated font height 212
font.c:2900: Test failed: enumerated font height 212
font.c:2900: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:2877: Test failed: enumerated font height 212
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Droid Sans Fallback doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Black doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Bold doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Cond Blk doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Cond Bold doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Cond ExBd doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Cond ExLt doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Cond Lt doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Cond Med doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Cond SmBd doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Cond Thin doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Condensed doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExCd Blk doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExCd Bold doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExCd ExBd doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExCd ExLt doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExCd Lt doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExCd Med doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExCd SmBd doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExCd Thin doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExtLight doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExtraBold doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao ExtraCond doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Light doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Medium doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao Regular doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao SemiBold doesn't contain 'x', skipping the test
font.c:3305: Tests skipped: Font Noto Looped Lao SemiCond doesn't contain 'x', skipping the test
font.c:3305: Line has been silenced after 42 occurrences
font.c:4892: Tests skipped: Fixed-pitch TrueType font for charset 129 is not available
font.c:4892: Tests skipped: Fixed-pitch TrueType font for charset 134 is not available
font.c:4892: Tests skipped: Fixed-pitch TrueType font for charset 136 is not available
font.c:7552: Tests skipped: Ume Gothic is not installed
font.c:7552: Tests skipped: MS Gothic is not installed
font.c:5635: Tests skipped: Lucida Sans Demibold Roman is not installed
font.c:5635: Tests skipped: Lucida Sans Italic is not installed
font.c:5635: Tests skipped: Lucida Sans Regular is not installed
font.c:5696: Tests skipped: Lucida Sans is not installed
font.c:5696: Tests skipped: SimSun is not installed
font.c:5696: Tests skipped: NSimSun is not installed
font.c:5696: Tests skipped: MingLiu is not installed
font.c:5696: Tests skipped: PMingLiu is not installed
font.c:5696: Tests skipped: WenQuanYi Micro Hei is not installed
font.c:5696: Tests skipped: MS UI Gothic is not installed
font.c:5696: Tests skipped: Ume UI Gothic is not installed
font.c:5696: Tests skipped: MS Gothic is not installed
font.c:5696: Tests skipped: Ume Gothic is not installed
font.c:5696: Tests skipped: MS PGothic is not installed
font.c:5696: Tests skipped: Ume P Gothic is not installed
font.c:5696: Tests skipped: Gulim is not installed
font.c:5696: Tests skipped: Batang is not installed
font.c:5696: Tests skipped: UnBatang is not installed
font.c:5696: Tests skipped: UnDotum is not installed
font.c:5696: Tests skipped: @SimSun is not installed
font.c:5696: Tests skipped: @NSimSun is not installed
font.c:5696: Tests skipped: @MingLiu is not installed
font.c:5696: Tests skipped: @PMingLiu is not installed
font.c:5696: Tests skipped: @WenQuanYi Micro Hei is not installed
font.c:5696: Tests skipped: @MS UI Gothic is not installed
font.c:5696: Tests skipped: @Ume UI Gothic is not installed
font.c:5696: Tests skipped: @MS Gothic is not installed
font.c:5696: Tests skipped: @Ume Gothic is not installed
font.c:5696: Tests skipped: @MS PGothic is not installed
font.c:5696: Tests skipped: @Ume P Gothic is not installed
font.c:5696: Tests skipped: @Gulim is not installed
font.c:5696: Tests skipped: @Batang is not installed
font.c:5696: Tests skipped: @UnBatang is not installed
font.c:5696: Tests skipped: @UnDotum is not installed
font.c:6335: Tests skipped: @Ume Gothic is not installed
font.c:6335: Tests skipped: @MS UI Gothic is not installed
font.c:5305: Tests skipped: Unable to locate and load font sserife.fon
make: *** [Makefile:58705: dlls/gdi32/tests/font.ok] Error 23