Commit 8cca615f authored by Alexandre Julliard's avatar Alexandre Julliard

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

parent baedf81b
......@@ -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). */
......
......@@ -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 );
......
......@@ -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;
......
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