gdi32: Try to load Wine's TrueType fonts from the build directory.
Alexandre Julliard
julliard at winehq.org
Wed Oct 10 14:37:03 CDT 2007
Huw Davies <huw at codeweavers.com> writes:
> --- a/dlls/gdi32/freetype.c
> +++ b/dlls/gdi32/freetype.c
> @@ -2109,6 +2109,7 @@ BOOL WineEngInit(void)
>
> /* load the system truetype fonts */
> data_dir = wine_get_data_dir();
> + if(!data_dir) data_dir = wine_get_build_dir();
This causes a bunch of test failures here:
../../../tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so font.c && touch font.ok
font.c:174: Test succeeded inside todo block: 32 != 32
font.c:175: Test succeeded inside todo block: 26 != 26
font.c:176: Test succeeded inside todo block: 6 != 6
font.c:177: Test succeeded inside todo block: 21 != 21
font.c:182: Test succeeded inside todo block: 32 != 32
font.c:174: Test succeeded inside todo block: 48 != 48
font.c:175: Test succeeded inside todo block: 39 != 39
font.c:176: Test succeeded inside todo block: 9 != 9
font.c:182: Test succeeded inside todo block: 48 != 48
font.c:385: Test failed: MS Sans Serif(13): tm.tmInternalLeading 0 != 2
font.c:392: Test failed: MS Sans Serif(13): tm.tmMaxCharWidth 4 != 11
font.c:383: Test failed: MS Sans Serif(16): tm.tmAscent 14 != 13
font.c:384: Test failed: MS Sans Serif(16): tm.tmDescent 2 != 3
font.c:385: Test failed: MS Sans Serif(16): tm.tmInternalLeading 0 != 3
font.c:392: Test failed: MS Sans Serif(16): tm.tmMaxCharWidth 5 != 14
font.c:383: Test failed: MS Sans Serif(20): tm.tmAscent 17 != 16
font.c:384: Test failed: MS Sans Serif(20): tm.tmDescent 3 != 4
font.c:385: Test failed: MS Sans Serif(20): tm.tmInternalLeading 0 != 4
font.c:392: Test failed: MS Sans Serif(20): tm.tmMaxCharWidth 6 != 16
font.c:386: Test failed: Courier(13): tm.tmExternalLeading 1 != 0
font.c:392: Test failed: Courier(13): tm.tmMaxCharWidth 4 != 8
font.c:385: Test failed: System(16): tm.tmInternalLeading 0 != 3
font.c:386: Test failed: System(16): tm.tmExternalLeading 90 != 0
font.c:385: Test failed: Small Fonts(11): tm.tmInternalLeading 0 != 2
font.c:386: Test failed: Small Fonts(11): tm.tmExternalLeading 90 != 0
font.c:392: Test failed: Small Fonts(11): tm.tmMaxCharWidth 3 != 9
make: *** [font.ok] Error 26
--
Alexandre Julliard
julliard at winehq.org
More information about the wine-devel
mailing list