Commit ded15757 authored by Alexandre Julliard's avatar Alexandre Julliard

gdi32: Remove the function table pointer from the DC structure.

parent 3d34f01f
...@@ -77,7 +77,6 @@ DC *alloc_dc_ptr( WORD magic ) ...@@ -77,7 +77,6 @@ DC *alloc_dc_ptr( WORD magic )
if (!(dc = HeapAlloc( GetProcessHeap(), 0, sizeof(*dc) ))) return NULL; if (!(dc = HeapAlloc( GetProcessHeap(), 0, sizeof(*dc) ))) return NULL;
dc->funcs = &null_driver;
dc->nulldrv.funcs = &null_driver; dc->nulldrv.funcs = &null_driver;
dc->nulldrv.next = NULL; dc->nulldrv.next = NULL;
dc->physDev = &dc->nulldrv; dc->physDev = &dc->nulldrv;
...@@ -252,7 +251,6 @@ void push_dc_driver( DC * dc, PHYSDEV physdev, const DC_FUNCTIONS *funcs ) ...@@ -252,7 +251,6 @@ void push_dc_driver( DC * dc, PHYSDEV physdev, const DC_FUNCTIONS *funcs )
physdev->next = dc->physDev; physdev->next = dc->physDev;
physdev->hdc = dc->hSelf; physdev->hdc = dc->hSelf;
dc->physDev = physdev; dc->physDev = physdev;
dc->funcs = physdev->funcs;
} }
...@@ -266,7 +264,6 @@ void pop_dc_driver( DC * dc, PHYSDEV physdev ) ...@@ -266,7 +264,6 @@ void pop_dc_driver( DC * dc, PHYSDEV physdev )
assert( physdev == dc->physDev ); assert( physdev == dc->physDev );
assert( physdev != &dc->nulldrv ); assert( physdev != &dc->nulldrv );
dc->physDev = physdev->next; dc->physDev = physdev->next;
dc->funcs = dc->physDev->funcs;
physdev->funcs->pDeleteDC( physdev ); physdev->funcs->pDeleteDC( physdev );
} }
......
...@@ -246,7 +246,6 @@ typedef struct tagDC ...@@ -246,7 +246,6 @@ typedef struct tagDC
GDIOBJHDR header; GDIOBJHDR header;
HDC hSelf; /* Handle to this DC */ HDC hSelf; /* Handle to this DC */
struct gdi_physdev nulldrv; /* physdev for the null driver */ struct gdi_physdev nulldrv; /* physdev for the null driver */
const struct tagDC_FUNCS *funcs; /* DC function table */
PHYSDEV physDev; /* Physical device (driver-specific) */ PHYSDEV physDev; /* Physical device (driver-specific) */
DWORD thread; /* thread owning the DC */ DWORD thread; /* thread owning the DC */
LONG refcount; /* thread refcount */ LONG refcount; /* thread refcount */
......
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