[PATCH 2/2] dwrite: Use feature tags directly instead of SDK symbols.

Nikolay Sivov nsivov at codeweavers.com
Tue May 5 05:45:55 CDT 2020


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---

Not all useful tags have symbols unfortunately, mixing the two does not make it more readable.

 dlls/dwrite/shape.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c
index a5a1a232e7..e7693b58ae 100644
--- a/dlls/dwrite/shape.c
+++ b/dlls/dwrite/shape.c
@@ -285,15 +285,15 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i
 {
     static const unsigned int common_features[] =
     {
-        DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION,
-        DWRITE_FONT_FEATURE_TAG_LOCALIZED_FORMS,
-        DWRITE_FONT_FEATURE_TAG_REQUIRED_LIGATURES,
+        DWRITE_MAKE_OPENTYPE_TAG('c','c','m','p'),
+        DWRITE_MAKE_OPENTYPE_TAG('l','o','c','l'),
+        DWRITE_MAKE_OPENTYPE_TAG('r','l','i','g'),
     };
     static const unsigned int horizontal_features[] =
     {
-        DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES,
-        DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_LIGATURES,
-        DWRITE_FONT_FEATURE_TAG_STANDARD_LIGATURES,
+        DWRITE_MAKE_OPENTYPE_TAG('c','a','l','t'),
+        DWRITE_MAKE_OPENTYPE_TAG('c','l','i','g'),
+        DWRITE_MAKE_OPENTYPE_TAG('l','i','g','a'),
         DWRITE_MAKE_OPENTYPE_TAG('r','c','l','t'),
     };
     struct scriptshaping_cache *cache = context->cache;
-- 
2.26.2




More information about the wine-devel mailing list