ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check X11 errors on each XLoadQueryFont calls.

This commit is contained in:
Lionel Ulmer 2003-09-15 20:05:09 +00:00 committed by Alexandre Julliard
parent 120abaed95
commit 91ebff2ee4
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
graphics/x11drv/xfont.c
View File

@ -2028,6 +2028,21 @@ static int XLoadQueryFont_ErrorHandler(Display *dpy, XErrorEvent *event, void *a
return 1; return 1;
} }
/* XLoadQueryFont has the bad habit of crashing when loading a bad font... */
static XFontStruct *safe_XLoadQueryFont(Display *display, char *name)
{
XFontStruct *ret;
wine_tsx11_lock();
X11DRV_expect_error(display, XLoadQueryFont_ErrorHandler, NULL);
ret = XLoadQueryFont(display, name);
if (X11DRV_check_error()) ret = NULL;
wine_tsx11_unlock();
return ret;
}
static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, int x_count) static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, int x_count)
{ {
int i; int i;
@ -2130,12 +2145,7 @@ static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, in
else lpstr = x_pattern[i]; else lpstr = x_pattern[i];
/* X11 may return an error on some bad fonts... So be prepared to handle these. */ /* X11 may return an error on some bad fonts... So be prepared to handle these. */
wine_tsx11_lock(); if ((x_fs = safe_XLoadQueryFont(gdi_display, lpstr)) != 0)
X11DRV_expect_error(gdi_display, XLoadQueryFont_ErrorHandler, NULL);
x_fs = XLoadQueryFont(gdi_display, lpstr);
if (X11DRV_check_error()) x_fs = 0;
wine_tsx11_unlock();
if (x_fs != 0)
{ {
XFONT_SetFontMetric( fi, fr, x_fs ); XFONT_SetFontMetric( fi, fr, x_fs );
TSXFreeFont( gdi_display, x_fs ); TSXFreeFont( gdi_display, x_fs );
@ -2991,7 +3001,7 @@ void X11DRV_FONT_InitX11Metrics( void )
{ {
XFontStruct* x_fs; XFontStruct* x_fs;
strcpy(buffer, "-*-*-*-*-normal-*-[12 0 0 12]-*-72-*-*-*-iso8859-1"); strcpy(buffer, "-*-*-*-*-normal-*-[12 0 0 12]-*-72-*-*-*-iso8859-1");
if( (x_fs = TSXLoadQueryFont(gdi_display, buffer)) ) if( (x_fs = safe_XLoadQueryFont(gdi_display, buffer)) )
{ {
text_caps |= TC_SF_X_YINDEP; text_caps |= TC_SF_X_YINDEP;
TSXFreeFont(gdi_display, x_fs); TSXFreeFont(gdi_display, x_fs);
@ -3133,7 +3143,7 @@ static X_PHYSFONT XFONT_RealizeFont( const LPLOGFONT16 plf,
do do
{ {
LFD_ComposeLFD( pfo, fm.height, lpLFD, uRelaxLevel++ ); LFD_ComposeLFD( pfo, fm.height, lpLFD, uRelaxLevel++ );
if( (pfo->fs = TSXLoadQueryFont( gdi_display, lpLFD )) ) break; if( (pfo->fs = safe_XLoadQueryFont( gdi_display, lpLFD )) ) break;
} while( uRelaxLevel ); } while( uRelaxLevel );