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

[Byeongsik Jeon]

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net>
---
v3: remove the various ObjectSet* functions from
    the (MAKE|LOAD)_FUNCPTR macros.

 dlls/gdi32/freetype.c | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 6393e273fb..27032e6774 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -176,9 +176,6 @@ MAKE_FUNCPTR(FcConfigSubstitute);
 MAKE_FUNCPTR(FcFontList);
 MAKE_FUNCPTR(FcFontSetDestroy);
 MAKE_FUNCPTR(FcInit);
-MAKE_FUNCPTR(FcObjectSetAdd);
-MAKE_FUNCPTR(FcObjectSetCreate);
-MAKE_FUNCPTR(FcObjectSetDestroy);
 MAKE_FUNCPTR(FcPatternCreate);
 MAKE_FUNCPTR(FcPatternDestroy);
 MAKE_FUNCPTR(FcPatternGetBool);
@@ -2796,9 +2793,6 @@ static void init_fontconfig(void)
     LOAD_FUNCPTR(FcFontList);
     LOAD_FUNCPTR(FcFontSetDestroy);
     LOAD_FUNCPTR(FcInit);
-    LOAD_FUNCPTR(FcObjectSetAdd);
-    LOAD_FUNCPTR(FcObjectSetCreate);
-    LOAD_FUNCPTR(FcObjectSetDestroy);
     LOAD_FUNCPTR(FcPatternCreate);
     LOAD_FUNCPTR(FcPatternDestroy);
     LOAD_FUNCPTR(FcPatternGetBool);
@@ -2829,7 +2823,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 +2831,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;
+    if (!pat) return;
+
+    fontset = pFcFontList(NULL, pat, NULL);
+    if (!fontset)
+    {
+        pFcPatternDestroy(pat);
+        return;
+    }
+
     for(i = 0; i < fontset->nfont; i++) {
         FcBool scalable;
         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) );
     }
     pFcFontSetDestroy(fontset);
-    pFcObjectSetDestroy(os);
     pFcPatternDestroy(pat);
 }
 
-- 
2.19.1

[PATCH v3 2/2] gdi32: Respect the FC_ANTIALIAS setting for the FC_RGBA_NONE case.

[Byeongsik Jeon]

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net>
---
It seems better that the following setting returns FC_BITMAP,
not FC_GRAY4_BITMAP.

 <edit name="antialias" mode="assign"><bool>false</bool></edit>
 <edit name="rgba"      mode="assign"><const>none</const></edit>

 dlls/gdi32/freetype.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 27032e6774..641353d1ac 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2772,7 +2772,7 @@ static UINT parse_aa_pattern( FcPattern *pattern )
         case FC_RGBA_BGR:  aa_flags = WINE_GGO_HBGR_BITMAP; break;
         case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break;
         case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break;
-        case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break;
+        case FC_RGBA_NONE: aa_flags = aa_flags ? aa_flags : GGO_GRAY4_BITMAP; break;
         }
     }
     return aa_flags;
-- 
2.19.1

[PATCH v3 2/2] gdi32: Respect the FC_ANTIALIAS setting for the FC_RGBA_NONE case.

[Huw Davies]

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

[Huw Davies]

Signed-off-by: Huw Davies <huw(a)codeweavers.com>