reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-01 09:42:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winex11.drv: Remove order-of-evaluation dependencies.

Browse Source
This commit is contained in:
Andrew Talbot 2009-03-19 22:40:14 +00:00 committed by Alexandre Julliard
parent d2e4bcf531
commit 2024592b41
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/winex11.drv/xfont.c
View File

@ -3318,11 +3318,11 @@ BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf,
/* Note: XFONT_GetFontMetric() will have to
release the crit section, font list will
have to be retraversed on return */
if(plf->lfCharSet == DEFAULT_CHARSET ||
plf->lfCharSet == pfi->df.dfCharSet) {
if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm,
XFONT_GetFontMetric( pfi, &lf, &tm ), lp )) )
UINT xfm = XFONT_GetFontMetric( pfi, &lf, &tm );
if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, xfm, lp )) )
bRet = b;
else break;
}
@ -3334,8 +3334,9 @@ BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf,
{
if(pfr->fi)
{
if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm,
XFONT_GetFontMetric( pfr->fi, &lf, &tm ), lp )) )
UINT xfm = XFONT_GetFontMetric( pfr->fi, &lf, &tm );
if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, xfm, lp )) )
bRet = b;
else break;
}