forked from Mirrors/wine-wine
winex11.drv: In the case requested glyphs do not present in the font fail gracefully instead of asserting.
parent
637a6116e2
commit
520aa9f548
|
@ -3398,7 +3398,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *font, UINT glyph, UINT format,
|
||||||
err = pFT_Load_Glyph(ft_face, glyph_index, load_flags);
|
err = pFT_Load_Glyph(ft_face, glyph_index, load_flags);
|
||||||
|
|
||||||
if(err) {
|
if(err) {
|
||||||
FIXME("FT_Load_Glyph on index %x returns %d\n", glyph_index, err);
|
WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err);
|
||||||
return GDI_ERROR;
|
return GDI_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -655,7 +655,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
|
||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
if(buflen == GDI_ERROR) {
|
if(buflen == GDI_ERROR) {
|
||||||
ERR("GetGlyphOutlineW failed\n");
|
WARN("GetGlyphOutlineW failed\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
TRACE("Turning off antialiasing for this monochrome font\n");
|
TRACE("Turning off antialiasing for this monochrome font\n");
|
||||||
|
@ -1258,7 +1258,12 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
|
||||||
UploadGlyph(physDev, wstr[idx], antialias);
|
UploadGlyph(physDev, wstr[idx], antialias);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
assert(formatEntry);
|
if (!formatEntry)
|
||||||
|
{
|
||||||
|
WARN("could not upload requested glyphs\n");
|
||||||
|
LeaveCriticalSection(&xrender_cs);
|
||||||
|
goto done_unlock;
|
||||||
|
}
|
||||||
|
|
||||||
TRACE("Writing %s at %d,%d\n", debugstr_wn(wstr,count),
|
TRACE("Writing %s at %d,%d\n", debugstr_wn(wstr,count),
|
||||||
physDev->dc_rect.left + x, physDev->dc_rect.top + y);
|
physDev->dc_rect.left + x, physDev->dc_rect.top + y);
|
||||||
|
|
Loading…
Reference in New Issue