ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Get rid of the DC_FUNCTIONS typedef.

This commit is contained in:
Alexandre Julliard 2011-10-17 20:39:54 +02:00
parent 2dfa00230d
commit 5267c1316b
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/gdi32/bitmap.c
View File

@ -762,7 +762,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc )
*/ */
static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) static BOOL BITMAP_DeleteObject( HGDIOBJ handle )
{ {
const DC_FUNCTIONS *funcs; const struct gdi_dc_funcs *funcs;
BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP ); BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP );
if (!bmp) return FALSE; if (!bmp) return FALSE;

2
dlls/gdi32/dc.c
View File

@ -598,7 +598,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
{ {
HDC hdc; HDC hdc;
DC * dc; DC * dc;
const DC_FUNCTIONS *funcs; const struct gdi_dc_funcs *funcs;
WCHAR buf[300]; WCHAR buf[300];
GDI_CheckNotLock(); GDI_CheckNotLock();

2
dlls/gdi32/dibdrv/dc.c
View File

@ -509,7 +509,7 @@ static INT dibdrv_SetROP2( PHYSDEV dev, INT rop )
return next->funcs->pSetROP2( next, rop ); return next->funcs->pSetROP2( next, rop );
} }
const DC_FUNCTIONS dib_driver = const struct gdi_dc_funcs dib_driver =
{ {
NULL, /* pAbortDoc */ NULL, /* pAbortDoc */
NULL, /* pAbortPath */ NULL, /* pAbortPath */

4
dlls/gdi32/driver.c
View File

@ -138,7 +138,7 @@ static const struct gdi_dc_funcs *get_display_driver(void)
/********************************************************************** /**********************************************************************
* DRIVER_load_driver * DRIVER_load_driver
*/ */
const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name )
{ {
HMODULE module; HMODULE module;
struct graphics_driver *driver, *new_driver; struct graphics_driver *driver, *new_driver;
@ -651,7 +651,7 @@ static BOOL nulldrv_wglUseFontBitmapsW( PHYSDEV dev, DWORD start, DWORD count, D
return FALSE; return FALSE;
} }
const DC_FUNCTIONS null_driver = const struct gdi_dc_funcs null_driver =
{ {
nulldrv_AbortDoc, /* pAbortDoc */ nulldrv_AbortDoc, /* pAbortDoc */
nulldrv_AbortPath, /* pAbortPath */ nulldrv_AbortPath, /* pAbortPath */

2
dlls/gdi32/enhmfdrv/init.c
View File

@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
static BOOL EMFDRV_DeleteDC( PHYSDEV dev ); static BOOL EMFDRV_DeleteDC( PHYSDEV dev );
static const DC_FUNCTIONS EMFDRV_Funcs = static const struct gdi_dc_funcs EMFDRV_Funcs =
{ {
NULL, /* pAbortDoc */ NULL, /* pAbortDoc */
EMFDRV_AbortPath, /* pAbortPath */ EMFDRV_AbortPath, /* pAbortPath */

10
dlls/gdi32/gdi_private.h
View File

@ -72,8 +72,6 @@ typedef struct tagGDIOBJHDR
struct hdc_list *hdcs; struct hdc_list *hdcs;
} GDIOBJHDR; } GDIOBJHDR;
typedef struct gdi_dc_funcs DC_FUNCTIONS;
/* It should not be necessary to access the contents of the GdiPath /* It should not be necessary to access the contents of the GdiPath
* structure directly; if you find that the exported functions don't * structure directly; if you find that the exported functions don't
* allow you to do what you want, then please place a new exported * allow you to do what you want, then please place a new exported
@ -198,7 +196,7 @@ typedef struct tagBITMAPOBJ
GDIOBJHDR header; GDIOBJHDR header;
BITMAP bitmap; BITMAP bitmap;
SIZE size; /* For SetBitmapDimension() */ SIZE size; /* For SetBitmapDimension() */
const DC_FUNCTIONS *funcs; /* DC function table */ const struct gdi_dc_funcs *funcs; /* DC function table */
/* For device-independent bitmaps: */ /* For device-independent bitmaps: */
DIBSECTION *dib; DIBSECTION *dib;
RGBQUAD *color_table; /* DIB color table if <= 8bpp */ RGBQUAD *color_table; /* DIB color table if <= 8bpp */
@ -270,9 +268,9 @@ extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struc
BLENDFUNCTION blend ) DECLSPEC_HIDDEN; BLENDFUNCTION blend ) DECLSPEC_HIDDEN;
/* driver.c */ /* driver.c */
extern const DC_FUNCTIONS null_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN;
extern const DC_FUNCTIONS dib_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN;
extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN;
extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN;
/* enhmetafile.c */ /* enhmetafile.c */

2
dlls/gdi32/mfdrv/init.c
View File

@ -79,7 +79,7 @@ static INT MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap)
} }
static const DC_FUNCTIONS MFDRV_Funcs = static const struct gdi_dc_funcs MFDRV_Funcs =
{ {
NULL, /* pAbortDoc */ NULL, /* pAbortDoc */
MFDRV_AbortPath, /* pAbortPath */ MFDRV_AbortPath, /* pAbortPath */