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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b31d7dbe8e41f20243a2d8c22c079985d730f7a6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b31d7dbe8e41f20243a2d8c22c...

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Thu Oct  2 06:16:26 2008 +0900

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

---

 dlls/gdi32/font.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 1e8cac3..21d2ebb 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -484,14 +484,11 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc )
         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);
-            if (font) GDI_ReleaseObj( handle );
-        }
+        FONTOBJ *font = GDI_GetObjPtr( handle, FONT_MAGIC ); /* to grab the GDI lock (FIXME) */
+        dc->gdiFont = WineEngCreateFontInstance( dc, handle );
+        if (font) GDI_ReleaseObj( handle );
     }
 
     if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont );