Skip to content

W
wine-winehq
Commit 6fe14a01 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

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

parent 5086bb2c
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
dlls/usp10/usp10.c
View file @ 6fe14a01
...@@ -1719,7 +1719,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, ...@@ -1719,7 +1719,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
LOGFONTW lf; LOGFONTW lf;
GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), & lf); GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), & lf);
lf.lfCharSet = scriptInformation[analysis->pItem[i].a.eScript].props.bCharSet; lf.lfCharSet = scriptInformation[analysis->pItem[i].a.eScript].props.bCharSet;
lf.lfFaceName[0] = 0;
find_fallback_font(analysis->pItem[i].a.eScript, lf.lfFaceName); find_fallback_font(analysis->pItem[i].a.eScript, lf.lfFaceName);
if (lf.lfFaceName[0])
{
analysis->glyphs[i].fallbackFont = CreateFontIndirectW(&lf); analysis->glyphs[i].fallbackFont = CreateFontIndirectW(&lf);
if (analysis->glyphs[i].fallbackFont) if (analysis->glyphs[i].fallbackFont)
{ {
...@@ -1727,6 +1730,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, ...@@ -1727,6 +1730,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString,
originalFont = SelectObject(hdc, analysis->glyphs[i].fallbackFont); originalFont = SelectObject(hdc, analysis->glyphs[i].fallbackFont);
} }
} }
}
hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos],
cChar, numGlyphs, &analysis->pItem[i].a, cChar, numGlyphs, &analysis->pItem[i].a,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment