usp10: Do not try to fallback if no fallback font is specified.

6fe14a01 · Aric Stewart · Alexandre Julliard · 5086bb2c · 6fe14a01
Commit 6fe14a01 authored Dec 15, 2011 by Aric Stewart Committed by Alexandre Julliard Dec 15, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

usp10.c dlls/usp10/usp10.c +8 -4

No files found.
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1719,12 +1719,16 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
                LOGFONTW lf;
                GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), & lf);
                lf.lfCharSet = scriptInformation[analysis->pItem[i].a.eScript].props.bCharSet;
+                lf.lfFaceName[0] = 0;
                find_fallback_font(analysis->pItem[i].a.eScript, lf.lfFaceName);
-                analysis->glyphs[i].fallbackFont = CreateFontIndirectW(&lf);
-                if (analysis->glyphs[i].fallbackFont)
+                if (lf.lfFaceName[0])
                {
-                    ScriptFreeCache(sc);
-                    originalFont = SelectObject(hdc, analysis->glyphs[i].fallbackFont);
+                    analysis->glyphs[i].fallbackFont = CreateFontIndirectW(&lf);
+                    if (analysis->glyphs[i].fallbackFont)
+                    {
+                        ScriptFreeCache(sc);
+                        originalFont = SelectObject(hdc, analysis->glyphs[i].fallbackFont);
+                    }
                }
            }