usp10: When checking font for shaping the font needs at least 1 of the features…

usp10: When checking font for shaping the font needs at least 1 of the features but does not need all.

usp10: When checking font for shaping the font needs at least 1 of the features…
0c5d0f80 · Aric Stewart · Alexandre Julliard · 5c8ed149 · 0c5d0f80
Commit 0c5d0f80 authored Oct 07, 2010 by Aric Stewart Committed by Alexandre Julliard Oct 07, 2010
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

shape.c dlls/usp10/shape.c +5 -3

No files found.
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -1348,13 +1348,15 @@ HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANA
    if (!psc->GSUB_Table)
        psc->GSUB_Table = load_gsub_table(hdc);

+    /* we need to have at least one of the required features */
    i = 0;
    while (ShapingData[psa->eScript].requiredFeatures[i])
    {
        feature = load_GSUB_feature(hdc, psa, psc, ShapingData[psa->eScript].requiredFeatures[i]);
-        if (!feature)
-            return USP_E_SCRIPT_NOT_IN_FONT;
+        if (feature)
+            return S_OK;
        i++;
    }
-    return S_OK;
+
+    return USP_E_SCRIPT_NOT_IN_FONT;
 }