Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-07 18:56:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USP10] Don't mix character and glyph index caches. CORE-14226

Browse source 
Import Wine commits by Nikolay Sivov:
* d1e618d31da usp10: Use glyph index consistently in ScriptGetGlyphABCWidth().
* 8d018d8d1da usp10: Make sure metrics cache is used with glyph indices only.
* eda3a3e37da usp10: Remove extra parentheses.

Fixes font display in UltraISO and GOG installers.

See also https://bugs.winehq.org/show_bug.cgi?id=44410
This commit is contained in:
Thomas Faber 2018-12-22 11:29:24 +01:00
parent 4d1f13cf77
commit c086edf366
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
dll/win32/usp10/usp10.c
View file

@ -3416,35 +3416,41 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS
if (pABC) memset(pABC, 0, sizeof(ABC)); if (pABC) memset(pABC, 0, sizeof(ABC));
for (i = 0; i < cGlyphs; i++) for (i = 0; i < cGlyphs; i++)
{ {
WORD glyph;
ABC abc; ABC abc;
/* FIXME: set to more reasonable values */
pGoffset[i].du = pGoffset[i].dv = 0;
if (pGlyphProps[i].sva.fZeroWidth) if (pGlyphProps[i].sva.fZeroWidth)
{ {
abc.abcA = abc.abcB = abc.abcC = 0; abc.abcA = abc.abcB = abc.abcC = 0;
if (piAdvance) piAdvance[i] = 0;
continue;
} }
else if (!get_cache_glyph_widths(psc, pwGlyphs[i], &abc))
if (psa->fNoGlyphIndex)
{
if (FAILED(hr = ScriptGetCMap(hdc, psc, &pwGlyphs[i], 1, 0, &glyph))) return hr;
}
else
glyph = pwGlyphs[i];
if (!get_cache_glyph_widths(psc, glyph, &abc))
{ {
BOOL ret;
if (!hdc) return E_PENDING; if (!hdc) return E_PENDING;
if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) if (get_cache_pitch_family(psc) & TMPF_TRUETYPE)
{ {
if (psa->fNoGlyphIndex) if (!GetCharABCWidthsI(hdc, glyph, 1, NULL, &abc)) return S_FALSE;
ret = GetCharABCWidthsW(hdc, pwGlyphs[i], pwGlyphs[i], &abc);
else
ret = GetCharABCWidthsI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &abc);
if (!ret) return S_FALSE;
} }
else else
{ {
INT width; INT width;
if (psa->fNoGlyphIndex) if (!GetCharWidthI(hdc, glyph, 1, NULL, &width)) return S_FALSE;
ret = GetCharWidth32W(hdc, pwGlyphs[i], pwGlyphs[i], &width);
else
ret = GetCharWidthI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &width);
if (!ret) return S_FALSE;
abc.abcB = width; abc.abcB = width;
abc.abcA = abc.abcC = 0; abc.abcA = abc.abcC = 0;
} }
set_cache_glyph_widths(psc, pwGlyphs[i], &abc); set_cache_glyph_widths(psc, glyph, &abc);
} }
if (pABC) if (pABC)
{ {
@ -3452,8 +3458,6 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS
pABC->abcB += abc.abcB; pABC->abcB += abc.abcB;
pABC->abcC += abc.abcC; pABC->abcC += abc.abcC;
} }
/* FIXME: set to more reasonable values */
pGoffset[i].du = pGoffset[i].dv = 0;
if (piAdvance) piAdvance[i] = abc.abcA + abc.abcB + abc.abcC; if (piAdvance) piAdvance[i] = abc.abcA + abc.abcB + abc.abcC;
} }
@ -3708,14 +3712,14 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB
if (!get_cache_glyph_widths(psc, glyph, abc)) if (!get_cache_glyph_widths(psc, glyph, abc))
{ {
if (!hdc) return E_PENDING; if (!hdc) return E_PENDING;
if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) if (get_cache_pitch_family(psc) & TMPF_TRUETYPE)
{ {
if (!GetCharABCWidthsI(hdc, 0, 1, &glyph, abc)) return S_FALSE; if (!GetCharABCWidthsI(hdc, 0, 1, &glyph, abc)) return S_FALSE;
} }
else else
{ {
INT width; INT width;
if (!GetCharWidth32W(hdc, glyph, glyph, &width)) return S_FALSE; if (!GetCharWidthI(hdc, glyph, 1, NULL, &width)) return S_FALSE;
abc->abcB = width; abc->abcB = width;
abc->abcA = abc->abcC = 0; abc->abcA = abc->abcC = 0;
} }