Andrew Talbot : winex11.drv: Remove order-of-evaluation dependencies.
Alexandre Julliard
julliard at winehq.org
Tue Mar 24 09:01:56 CDT 2009
Module: wine
Branch: master
Commit: 2024592b4188f199c236c4294930f3bfb178a813
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2024592b4188f199c236c4294930f3bfb178a813
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Thu Mar 19 22:40:14 2009 +0000
winex11.drv: Remove order-of-evaluation dependencies.
---
dlls/winex11.drv/xfont.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c
index 16409c5..d3d3e8c 100644
--- a/dlls/winex11.drv/xfont.c
+++ b/dlls/winex11.drv/xfont.c
@@ -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;
}
More information about the wine-cvs
mailing list