Alexandre Julliard : gdi32: Don' t store a font pointer in the generic part of the DC.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Wed Dec  5 21:13:54 2012 +0100

gdi32: Don't store a font pointer in the generic part of the DC.

---

dlls/gdi32/dc.c          |    1 -
 dlls/gdi32/freetype.c    |    4 ++--
 dlls/gdi32/gdi_private.h |    3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index 5df55bc..07d68eb 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -409,7 +409,6 @@ INT nulldrv_SaveDC( PHYSDEV dev )
     newdc->vportExtY        = dc->vportExtY;
     newdc->virtual_res      = dc->virtual_res;
     newdc->virtual_size     = dc->virtual_size;
-    newdc->gdiFont          = dc->gdiFont;

/* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index a06d575..456a094 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -309,6 +309,8 @@ typedef struct tagHFONTLIST {
     HFONT hfont;
 } HFONTLIST;

+typedef struct tagGdiFont GdiFont;
+
 typedef struct {
     struct list entry;
     Face *face;
@@ -4552,7 +4554,6 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags )

if (!hfont)  /* notification that the font has been changed by another driver */
     {
-        dc->gdiFont = NULL;
         physdev->font = NULL;
         release_dc_ptr( dc );
         return 0;
@@ -5010,7 +5011,6 @@ done:
             }
         }
         TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags );
-        dc->gdiFont = ret;
         physdev->font = ret;
     }
     LeaveCriticalSection( &freetype_cs );
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 2408c97..8288e35 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -57,8 +57,6 @@ struct gdi_obj_funcs
     BOOL    (*pDeleteObject)( HGDIOBJ handle );
 };

-typedef struct tagGdiFont GdiFont;
-
 typedef struct tagDC
 {
     HDC          hSelf;            /* Handle to this DC */
@@ -103,7 +101,6 @@ typedef struct tagDC
     HBITMAP       hBitmap;
     HPALETTE      hPalette;

-    GdiFont      *gdiFont;
     struct gdi_path *path;

UINT          font_code_page;