gdi32: Do not skip the font metrics update after the DC transform change.

This commit is contained in:
Dmitry Timoshkov 2008-10-02 06:16:26 +09:00 committed by Alexandre Julliard
parent 47ecb4882f
commit b31d7dbe8e
1 changed files with 4 additions and 7 deletions

View File

@ -484,14 +484,11 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc )
return 0; return 0;
} }
if (dc->hFont != handle || dc->gdiFont == NULL) if (GetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_VA_ABLE)
{ {
if(GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_VA_ABLE) FONTOBJ *font = GDI_GetObjPtr( handle, FONT_MAGIC ); /* to grab the GDI lock (FIXME) */
{ dc->gdiFont = WineEngCreateFontInstance( dc, handle );
FONTOBJ *font = GDI_GetObjPtr( handle, FONT_MAGIC ); /* to grab the GDI lock (FIXME) */ if (font) GDI_ReleaseObj( handle );
dc->gdiFont = WineEngCreateFontInstance(dc, handle);
if (font) GDI_ReleaseObj( handle );
}
} }
if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont ); if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont );