ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Remove the code that doesn't work as intended around FcFontList(). 

Signed-off-by: Byeongsik Jeon <bsjeon@hanmail.net>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Byeongsik Jeon 2018-10-29 21:50:20 +09:00 committed by Alexandre Julliard
parent 2fe859b8ef
commit af90ab3259
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/gdi32/freetype.c
View File

@ -176,9 +176,6 @@ MAKE_FUNCPTR(FcConfigSubstitute);
MAKE_FUNCPTR(FcFontList); MAKE_FUNCPTR(FcFontList);
MAKE_FUNCPTR(FcFontSetDestroy); MAKE_FUNCPTR(FcFontSetDestroy);
MAKE_FUNCPTR(FcInit); MAKE_FUNCPTR(FcInit);
MAKE_FUNCPTR(FcObjectSetAdd);
MAKE_FUNCPTR(FcObjectSetCreate);
MAKE_FUNCPTR(FcObjectSetDestroy);
MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternCreate);
MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternDestroy);
MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetBool);
@ -2796,9 +2793,6 @@ static void init_fontconfig(void)
LOAD_FUNCPTR(FcFontList); LOAD_FUNCPTR(FcFontList);
LOAD_FUNCPTR(FcFontSetDestroy); LOAD_FUNCPTR(FcFontSetDestroy);
LOAD_FUNCPTR(FcInit); LOAD_FUNCPTR(FcInit);
LOAD_FUNCPTR(FcObjectSetAdd);
LOAD_FUNCPTR(FcObjectSetCreate);
LOAD_FUNCPTR(FcObjectSetDestroy);
LOAD_FUNCPTR(FcPatternCreate); LOAD_FUNCPTR(FcPatternCreate);
LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternDestroy);
LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetBool);
@ -2829,7 +2823,6 @@ static void init_fontconfig(void)
static void load_fontconfig_fonts(void) static void load_fontconfig_fonts(void)
{ {
FcPattern *pat; FcPattern *pat;
FcObjectSet *os;
FcFontSet *fontset; FcFontSet *fontset;
int i, len; int i, len;
char *file; char *file;
@ -2838,13 +2831,15 @@ static void load_fontconfig_fonts(void)
if (!fontconfig_enabled) return; if (!fontconfig_enabled) return;
pat = pFcPatternCreate(); pat = pFcPatternCreate();
os = pFcObjectSetCreate(); if (!pat) return;
pFcObjectSetAdd(os, FC_FILE);
pFcObjectSetAdd(os, FC_SCALABLE); fontset = pFcFontList(NULL, pat, NULL);
pFcObjectSetAdd(os, FC_ANTIALIAS); if (!fontset)
pFcObjectSetAdd(os, FC_RGBA); {
fontset = pFcFontList(NULL, pat, os); pFcPatternDestroy(pat);
if(!fontset) return; return;
}
for(i = 0; i < fontset->nfont; i++) { for(i = 0; i < fontset->nfont; i++) {
FcBool scalable; FcBool scalable;
DWORD aa_flags; DWORD aa_flags;
@ -2875,7 +2870,6 @@ static void load_fontconfig_fonts(void)
ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) );
} }
pFcFontSetDestroy(fontset); pFcFontSetDestroy(fontset);
pFcObjectSetDestroy(os);
pFcPatternDestroy(pat); pFcPatternDestroy(pat);
} }