Skip to content

W
wine-winehq
Commit 92bfdeb5 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard
Browse files
Options

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

parent 2024592b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
dlls/wineps.drv/builtin.c
View file @ 92bfdeb5
...@@ -424,10 +424,11 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, ...@@ -424,10 +424,11 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf,
} }
if(family) { if(family) {
for(afmle = family->afmlist; afmle; afmle = afmle->next) { for(afmle = family->afmlist; afmle; afmle = afmle->next) {
UINT fm;
TRACE("Got '%s'\n", afmle->afm->FontName); TRACE("Got '%s'\n", afmle->afm->FontName);
if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm = PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf );
PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ), if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp )) )
lp )) )
bRet = b; bRet = b;
else break; else break;
} }
...@@ -436,11 +437,12 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, ...@@ -436,11 +437,12 @@ BOOL CDECL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf,
TRACE("lfFaceName = NULL\n"); TRACE("lfFaceName = NULL\n");
for(family = physDev->pi->Fonts; family; family = family->next) { for(family = physDev->pi->Fonts; family; family = family->next) {
UINT fm;
afmle = family->afmlist; afmle = family->afmlist;
TRACE("Got '%s'\n", afmle->afm->FontName); TRACE("Got '%s'\n", afmle->afm->FontName);
if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm = PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf );
PSDRV_GetFontMetric( physDev->hdc, afmle->afm, &tm, &lf ), if( (b = (*proc)( &lf.elfLogFont, (TEXTMETRICW *)&tm, fm, lp )) )
lp )) )
bRet = b; bRet = b;
else break; else break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment