Module: wine Branch: master Commit: df357093ccfd78156e7db3c0a7ff5bead6317341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df357093ccfd78156e7db3c0a7...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Oct 17 13:48:45 2012 +0200
gdi32: Get rid of the GDIOBJHDR type.
---
dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/brush.c | 3 +-- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/enhmetafile.c | 3 +-- dlls/gdi32/font.c | 3 +-- dlls/gdi32/gdi_private.h | 6 ------ dlls/gdi32/gdiobj.c | 4 ++-- dlls/gdi32/palette.c | 3 +-- dlls/gdi32/pen.c | 5 ++--- 10 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 0055fe4..821f879 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -211,7 +211,7 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) bmpobj->dib.dsBm = bm; bmpobj->dib.dsBm.bmBits = NULL;
- if (!(hbitmap = alloc_gdi_handle( &bmpobj->header, OBJ_BITMAP, &bitmap_funcs ))) + if (!(hbitmap = alloc_gdi_handle( bmpobj, OBJ_BITMAP, &bitmap_funcs ))) { HeapFree( GetProcessHeap(), 0, bmpobj ); return 0; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 0516a0f..4f0c17d 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical brush object */ typedef struct { - GDIOBJHDR header; LOGBRUSH logbrush; struct brush_pattern pattern; } BRUSHOBJ; @@ -201,7 +200,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) ptr->logbrush = *brush;
if (store_brush_pattern( &ptr->logbrush, &ptr->pattern ) && - (hbrush = alloc_gdi_handle( &ptr->header, OBJ_BRUSH, &brush_funcs ))) + (hbrush = alloc_gdi_handle( ptr, OBJ_BRUSH, &brush_funcs ))) { TRACE("%p\n", hbrush); return hbrush; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5a68aa6..8d4cde0 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -118,7 +118,7 @@ DC *alloc_dc_ptr( WORD magic )
reset_bounds( &dc->bounds );
- if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) + if (!(dc->hSelf = alloc_gdi_handle( dc, magic, &dc_funcs ))) { HeapFree( GetProcessHeap(), 0, dc ); return NULL; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 89ac980..e5361c1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1549,7 +1549,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage,
if (!bmp->dib.dsBm.bmBits) goto error;
- if (!(ret = alloc_gdi_handle( &bmp->header, OBJ_BITMAP, &dib_funcs ))) goto error; + if (!(ret = alloc_gdi_handle( bmp, OBJ_BITMAP, &dib_funcs ))) goto error;
if (bits) *bits = bmp->dib.dsBm.bmBits; return ret; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index ea0ce3b..796796e 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
typedef struct { - GDIOBJHDR header; ENHMETAHEADER *emh; BOOL on_disk; /* true if metafile is on disk */ } ENHMETAFILEOBJ; @@ -270,7 +269,7 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) metaObj->emh = emh; metaObj->on_disk = on_disk;
- if (!(hmf = alloc_gdi_handle( &metaObj->header, OBJ_ENHMETAFILE, NULL ))) + if (!(hmf = alloc_gdi_handle( metaObj, OBJ_ENHMETAFILE, NULL ))) HeapFree( GetProcessHeap(), 0, metaObj ); return hmf; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 85a27f1..1f26772 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -110,7 +110,6 @@ static const struct gdi_obj_funcs font_funcs =
typedef struct { - GDIOBJHDR header; LOGFONTW logfont; } FONTOBJ;
@@ -447,7 +446,7 @@ HFONT WINAPI CreateFontIndirectExW( const ENUMLOGFONTEXDVW *penumex ) plf->lfOrientation/10., plf->lfEscapement/10., fontPtr); }
- if (!(hFont = alloc_gdi_handle( &fontPtr->header, OBJ_FONT, &font_funcs ))) + if (!(hFont = alloc_gdi_handle( fontPtr, OBJ_FONT, &font_funcs ))) { HeapFree( GetProcessHeap(), 0, fontPtr ); return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c3e342a..2f4c297 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,15 +57,10 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); };
-typedef struct tagGDIOBJHDR -{ -} GDIOBJHDR; - typedef struct tagGdiFont GdiFont;
typedef struct tagDC { - GDIOBJHDR header; HDC hSelf; /* Handle to this DC */ struct gdi_physdev nulldrv; /* physdev for the null driver */ PHYSDEV physDev; /* current top of the physdev stack */ @@ -180,7 +175,6 @@ static inline PHYSDEV find_dc_driver( DC *dc, const struct gdi_dc_funcs *funcs )
typedef struct tagBITMAPOBJ { - GDIOBJHDR header; DIBSECTION dib; SIZE size; /* For SetBitmapDimension() */ RGBQUAD *color_table; /* DIB color table if <= 8bpp (always 1 << bpp in size) */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 46c9ec3..aa8db8c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -744,7 +744,7 @@ HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *func */ void *free_gdi_handle( HGDIOBJ handle ) { - GDIOBJHDR *object = NULL; + void *object = NULL; struct gdi_handle_entry *entry;
EnterCriticalSection( &gdi_section ); @@ -769,7 +769,7 @@ void *free_gdi_handle( HGDIOBJ handle ) */ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) { - GDIOBJHDR *ptr = NULL; + void *ptr = NULL; struct gdi_handle_entry *entry;
EnterCriticalSection( &gdi_section ); diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index afb723b..6a29c76 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -42,7 +42,6 @@ typedef BOOL (*unrealize_function)(HPALETTE);
typedef struct tagPALETTEOBJ { - GDIOBJHDR header; unrealize_function unrealize; WORD version; /* palette version */ WORD count; /* count of palette entries */ @@ -130,7 +129,7 @@ HPALETTE WINAPI CreatePalette( return 0; } memcpy( palettePtr->entries, palette->palPalEntry, size ); - if (!(hpalette = alloc_gdi_handle( &palettePtr->header, OBJ_PAL, &palette_funcs ))) + if (!(hpalette = alloc_gdi_handle( palettePtr, OBJ_PAL, &palette_funcs ))) { HeapFree( GetProcessHeap(), 0, palettePtr->entries ); HeapFree( GetProcessHeap(), 0, palettePtr ); diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 94c3933..2ae2f2b 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -36,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); /* GDI logical pen object */ typedef struct { - GDIOBJHDR header; struct brush_pattern pattern; EXTLOGPEN logpen; } PENOBJ; @@ -113,7 +112,7 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) break; }
- if (!(hpen = alloc_gdi_handle( &penPtr->header, OBJ_PEN, &pen_funcs ))) + if (!(hpen = alloc_gdi_handle( penPtr, OBJ_PEN, &pen_funcs ))) HeapFree( GetProcessHeap(), 0, penPtr ); return hpen; } @@ -203,7 +202,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, penPtr->logpen.elpNumEntries = style_count; memcpy(penPtr->logpen.elpStyleEntry, style_bits, style_count * sizeof(DWORD));
- if (!(hpen = alloc_gdi_handle( &penPtr->header, OBJ_EXTPEN, &pen_funcs ))) + if (!(hpen = alloc_gdi_handle( penPtr, OBJ_EXTPEN, &pen_funcs ))) { free_brush_pattern( &penPtr->pattern ); HeapFree( GetProcessHeap(), 0, penPtr );
-
Alexandre Julliard