Andrew Talbot : wineps.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: 92bfdeb5915abeba9875bbaef3162b737c222a50
URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bfdeb5915abeba9875bbaef3162b737c222a50
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Thu Mar 19 22:40:07 2009 +0000
wineps.drv: Remove order-of-evaluation dependencies.
---
dlls/wineps.drv/builtin.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c
index b8c5349..c8c3f9b 100644
--- a/dlls/wineps.drv/builtin.c
+++ b/dlls/wineps.drv/builtin.c
@@ -424,10 +424,11 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf,
}
if(family) {
for(afmle = family->afmlist; afmle; afmle = afmle->next) {
+ UINT fm;
+
TRACE("Got '%s'\n", afmle->afm->FontName);
- if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm,
- PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ),
- lp )) )
+ fm = PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf );
+ if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp )) )
bRet = b;
else break;
}
@@ -436,11 +437,12 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf,
TRACE("lfFaceName = NULL\n");
for(family = physDev->pi->Fonts; family; family = family->next) {
+ UINT fm;
+
afmle = family->afmlist;
TRACE("Got '%s'\n", afmle->afm->FontName);
- if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm,
- PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ),
- lp )) )
+ fm = PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf );
+ if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp )) )
bRet = b;
else break;
}
More information about the wine-cvs
mailing list