[PATCH v2 2/3] gdi32: Remove the code that doesn't work as intended around FcFontList().

Huw Davies huw at codeweavers.com
Mon Oct 29 04:35:35 CDT 2018


On Wed, Oct 24, 2018 at 01:07:12AM +0900, Byeongsik Jeon wrote:
> diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
> index 7cc42b2a47..4fc4411a4a 100644
> --- a/dlls/gdi32/freetype.c
> +++ b/dlls/gdi32/freetype.c
> @@ -2829,7 +2829,6 @@ static void init_fontconfig(void)
>  static void load_fontconfig_fonts(void)
>  {
>      FcPattern *pat;
> -    FcObjectSet *os;
>      FcFontSet *fontset;
>      int i, len;
>      char *file;
> @@ -2838,13 +2837,15 @@ static void load_fontconfig_fonts(void)
>      if (!fontconfig_enabled) return;
>  
>      pat = pFcPatternCreate();
> -    os = pFcObjectSetCreate();
> -    pFcObjectSetAdd(os, FC_FILE);
> -    pFcObjectSetAdd(os, FC_SCALABLE);
> -    pFcObjectSetAdd(os, FC_ANTIALIAS);
> -    pFcObjectSetAdd(os, FC_RGBA);
> -    fontset = pFcFontList(NULL, pat, os);
> -    if(!fontset) return;

Please remove the various ObjectSet* functions from the
(MAKE|LOAD)_FUNCPTR macros.

Huw.



More information about the wine-devel mailing list