From eadd97cbcea105cade5981503b3bb8eceaa3a127 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Tue, 5 May 2020 13:45:55 +0300 Subject: [PATCH] dwrite: Use feature tags directly instead of SDK symbols. Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- 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 a5a1a232e76..e7693b58ae2 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;