Aric Stewart : usp10: Fall back to 'dflt' language if shaping language tag isn't found.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9d32c2d31aa036f9e7e49e26ccc800ac848639e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9d32c2d31aa036f9e7e49e26ccc800ac848639e8

Author: Aric Stewart <aric at codeweavers.com>
Date:   Wed Aug 16 07:03:14 2017 -0500

usp10: Fall back to 'dflt' language if shaping language tag isn't found.

Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/usp10/shape.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 2f47f89..b75be60 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -638,8 +638,12 @@ static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache
         } while(attempt && !feature);
 
         /* try in the default (latin) table */
-        if (!feature && !script)
-            OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature);
+        if (!feature)
+        {
+            if (!script)
+                script = MS_MAKE_TAG('l','a','t','n');
+            OpenType_GetFontFeatureTags(psc, script, MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature);
+        }
     }
 
     TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature);