marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Store the object flags directly in the GDI handle table.

oldstable
Alexandre Julliard 2012-10-17 13:20:46 +02:00
parent b95dd7e831
commit dfeeedcf74
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/gdi32/gdi_private.h
View File

@ -59,8 +59,6 @@ struct gdi_obj_funcs
typedef struct tagGDIOBJHDR typedef struct tagGDIOBJHDR
{ {
WORD system : 1; /* system object flag */
WORD deleted : 1; /* whether DeleteObject has been called on this object */
} GDIOBJHDR; } GDIOBJHDR;
typedef struct tagGdiFont GdiFont; typedef struct tagGdiFont GdiFont;
@ -310,7 +308,7 @@ extern BOOL WineEngInit(void) DECLSPEC_HIDDEN;
extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN;
/* gdiobj.c */ /* gdiobj.c */
extern HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN;
extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN;
extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN;
extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN;

34
dlls/gdi32/gdiobj.c
View File

@ -49,11 +49,13 @@ struct hdc_list
struct gdi_handle_entry struct gdi_handle_entry
{ {
GDIOBJHDR *obj; /* pointer to the object-specific data */ void *obj; /* pointer to the object-specific data */
const struct gdi_obj_funcs *funcs; /* type-specific functions */ const struct gdi_obj_funcs *funcs; /* type-specific functions */
struct hdc_list *hdcs; /* list of HDCs interested in this object */ struct hdc_list *hdcs; /* list of HDCs interested in this object */
WORD type; /* object type (one of the OBJ_* constants) */ WORD type; /* object type (one of the OBJ_* constants) */
WORD selcount; /* number of times the object is selected in a DC */ WORD selcount; /* number of times the object is selected in a DC */
WORD system : 1; /* system object flag */
WORD deleted : 1; /* whether DeleteObject has been called on this object */
}; };
static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES]; static struct gdi_handle_entry gdi_handles[MAX_GDI_HANDLES];
@ -479,9 +481,11 @@ static const struct DefaultFontInfo default_fonts[] =
*/ */
void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set)
{ {
GDIOBJHDR *ptr = GDI_GetObjPtr( handle, 0 ); struct gdi_handle_entry *entry;
ptr->system = !!set;
GDI_ReleaseObj( handle ); EnterCriticalSection( &gdi_section );
if ((entry = handle_entry( handle ))) entry->system = !!set;
LeaveCriticalSection( &gdi_section );
} }
/****************************************************************************** /******************************************************************************
@ -572,10 +576,10 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle )
if ((entry = handle_entry( handle ))) if ((entry = handle_entry( handle )))
{ {
assert( entry->selcount ); assert( entry->selcount );
if (!--entry->selcount && entry->obj->deleted) if (!--entry->selcount && entry->deleted)
{ {
/* handle delayed DeleteObject*/ /* handle delayed DeleteObject*/
entry->obj->deleted = 0; entry->deleted = 0;
LeaveCriticalSection( &gdi_section ); LeaveCriticalSection( &gdi_section );
TRACE( "executing delayed DeleteObject for %p\n", handle ); TRACE( "executing delayed DeleteObject for %p\n", handle );
DeleteObject( handle ); DeleteObject( handle );
@ -686,7 +690,7 @@ static void dump_gdi_objects( void )
} }
TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", TRACE( "handle %p obj %p type %s selcount %u deleted %u\n",
entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ), entry_to_handle( entry ), entry->obj, gdi_obj_type( entry->type ),
entry->selcount, entry->obj->deleted ); entry->selcount, entry->deleted );
} }
LeaveCriticalSection( &gdi_section ); LeaveCriticalSection( &gdi_section );
} }
@ -696,7 +700,7 @@ static void dump_gdi_objects( void )
* *
* Allocate a GDI handle for an object, which must have been allocated on the process heap. * Allocate a GDI handle for an object, which must have been allocated on the process heap.
*/ */
HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs )
{ {
struct gdi_handle_entry *entry; struct gdi_handle_entry *entry;
HGDIOBJ ret; HGDIOBJ ret;
@ -704,10 +708,6 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs
assert( type ); /* type 0 is reserved to mark free entries */ assert( type ); /* type 0 is reserved to mark free entries */
/* initialize the object header */
obj->system = 0;
obj->deleted = 0;
EnterCriticalSection( &gdi_section ); EnterCriticalSection( &gdi_section );
for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++) for (i = next_gdi_handle + 1; i < MAX_GDI_HANDLES; i++)
if (!gdi_handles[i].type) goto found; if (!gdi_handles[i].type) goto found;
@ -726,6 +726,8 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs
entry->hdcs = NULL; entry->hdcs = NULL;
entry->type = type; entry->type = type;
entry->selcount = 0; entry->selcount = 0;
entry->system = 0;
entry->deleted = 0;
next_gdi_handle = i; next_gdi_handle = i;
ret = entry_to_handle( entry ); ret = entry_to_handle( entry );
LeaveCriticalSection( &gdi_section ); LeaveCriticalSection( &gdi_section );
@ -837,7 +839,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj )
return FALSE; return FALSE;
} }
if (entry->obj->system) if (entry->system)
{ {
TRACE("Preserving system object %p\n", obj); TRACE("Preserving system object %p\n", obj);
LeaveCriticalSection( &gdi_section ); LeaveCriticalSection( &gdi_section );
@ -850,7 +852,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj )
if (entry->selcount) if (entry->selcount)
{ {
TRACE("delayed for %p because object in use, count %u\n", obj, entry->selcount ); TRACE("delayed for %p because object in use, count %u\n", obj, entry->selcount );
entry->obj->deleted = 1; /* mark for delete */ entry->deleted = 1; /* mark for delete */
} }
else funcs = entry->funcs; else funcs = entry->funcs;
@ -891,7 +893,7 @@ void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc)
TRACE("obj %p hdc %p\n", obj, hdc); TRACE("obj %p hdc %p\n", obj, hdc);
EnterCriticalSection( &gdi_section ); EnterCriticalSection( &gdi_section );
if ((entry = handle_entry( obj )) && !entry->obj->system) if ((entry = handle_entry( obj )) && !entry->system)
{ {
for (phdc = entry->hdcs; phdc; phdc = phdc->next) for (phdc = entry->hdcs; phdc; phdc = phdc->next)
if (phdc->hdc == hdc) break; if (phdc->hdc == hdc) break;
@ -919,7 +921,7 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc)
TRACE("obj %p hdc %p\n", obj, hdc); TRACE("obj %p hdc %p\n", obj, hdc);
EnterCriticalSection( &gdi_section ); EnterCriticalSection( &gdi_section );
if ((entry = handle_entry( obj )) && !entry->obj->system) if ((entry = handle_entry( obj )) && !entry->system)
{ {
for (pphdc = &entry->hdcs; *pphdc; pphdc = &(*pphdc)->next) for (pphdc = &entry->hdcs; *pphdc; pphdc = &(*pphdc)->next)
if ((*pphdc)->hdc == hdc) if ((*pphdc)->hdc == hdc)