Skip to content

W
wine-winehq
Commit 3f2850ae authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

gdi32: Remove no longer used driver entry points.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 22df510e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 92 deletions
dlls/gdi32/dibdrv/dc.c
View file @ 3f2850ae
...@@ -715,13 +715,8 @@ const struct gdi_dc_funcs dib_driver = ...@@ -715,13 +715,8 @@ const struct gdi_dc_funcs dib_driver =
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
dibdrv_SetDeviceClipping, /* pSetDeviceClipping */ dibdrv_SetDeviceClipping, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
dibdrv_SetPixel, /* pSetPixel */ dibdrv_SetPixel, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */ NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
...@@ -1302,13 +1297,8 @@ static const struct gdi_dc_funcs window_driver = ...@@ -1302,13 +1297,8 @@ static const struct gdi_dc_funcs window_driver =
windrv_SetDIBitsToDevice, /* pSetDIBitsToDevice */ windrv_SetDIBitsToDevice, /* pSetDIBitsToDevice */
windrv_SetDeviceClipping, /* pSetDeviceClipping */ windrv_SetDeviceClipping, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
windrv_SetPixel, /* pSetPixel */ windrv_SetPixel, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */ NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
......
dlls/gdi32/driver.c
View file @ 3f2850ae
...@@ -785,42 +785,22 @@ static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) ...@@ -785,42 +785,22 @@ static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn )
{ {
} }
static DWORD CDECL nulldrv_SetLayout( PHYSDEV dev, DWORD layout )
{
return layout;
}
static BOOL CDECL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) static BOOL CDECL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp )
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
return FALSE; return FALSE;
} }
static DWORD CDECL nulldrv_SetMapperFlags( PHYSDEV dev, DWORD flags )
{
return flags;
}
static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color )
{ {
return color; return color;
} }
static INT CDECL nulldrv_SetTextCharacterExtra( PHYSDEV dev, INT extra )
{
return extra;
}
static COLORREF CDECL nulldrv_SetTextColor( PHYSDEV dev, COLORREF color ) static COLORREF CDECL nulldrv_SetTextColor( PHYSDEV dev, COLORREF color )
{ {
return color; return color;
} }
static BOOL CDECL nulldrv_SetTextJustification( PHYSDEV dev, INT extra, INT breaks )
{
return TRUE;
}
static INT CDECL nulldrv_StartDoc( PHYSDEV dev, const DOCINFOW *info ) static INT CDECL nulldrv_StartDoc( PHYSDEV dev, const DOCINFOW *info )
{ {
return 0; return 0;
...@@ -951,13 +931,8 @@ const struct gdi_dc_funcs null_driver = ...@@ -951,13 +931,8 @@ const struct gdi_dc_funcs null_driver =
nulldrv_SetDIBitsToDevice, /* pSetDIBitsToDevice */ nulldrv_SetDIBitsToDevice, /* pSetDIBitsToDevice */
nulldrv_SetDeviceClipping, /* pSetDeviceClipping */ nulldrv_SetDeviceClipping, /* pSetDeviceClipping */
nulldrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ nulldrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */
nulldrv_SetLayout, /* pSetLayout */
nulldrv_SetMapMode, /* pSetMapMode */
nulldrv_SetMapperFlags, /* pSetMapperFlags */
nulldrv_SetPixel, /* pSetPixel */ nulldrv_SetPixel, /* pSetPixel */
nulldrv_SetTextCharacterExtra, /* pSetTextCharacterExtra */
nulldrv_SetTextColor, /* pSetTextColor */ nulldrv_SetTextColor, /* pSetTextColor */
nulldrv_SetTextJustification, /* pSetTextJustification */
nulldrv_SetViewportExtEx, /* pSetViewportExt */ nulldrv_SetViewportExtEx, /* pSetViewportExt */
nulldrv_SetViewportOrgEx, /* pSetViewportOrg */ nulldrv_SetViewportOrgEx, /* pSetViewportOrg */
nulldrv_SetWindowExtEx, /* pSetWindowExt */ nulldrv_SetWindowExtEx, /* pSetWindowExt */
......
dlls/gdi32/enhmfdrv/init.c
View file @ 3f2850ae
...@@ -129,13 +129,8 @@ static const struct gdi_dc_funcs emfdrv_driver = ...@@ -129,13 +129,8 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetPixel, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
EMFDRV_SetTextColor, /* pSetTextColor */ EMFDRV_SetTextColor, /* pSetTextColor */
NULL, /* pSetTextJustification */
EMFDRV_SetViewportExtEx, /* pSetViewportExtEx */ EMFDRV_SetViewportExtEx, /* pSetViewportExtEx */
EMFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ EMFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */
EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */ EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */
......
dlls/gdi32/font.c
View file @ 3f2850ae
...@@ -3906,13 +3906,8 @@ const struct gdi_dc_funcs font_driver = ...@@ -3906,13 +3906,8 @@ const struct gdi_dc_funcs font_driver =
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */ NULL, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */ NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
......
dlls/gdi32/mapping.c
View file @ 3f2850ae
...@@ -149,11 +149,6 @@ BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_ ...@@ -149,11 +149,6 @@ BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_
return TRUE; return TRUE;
} }
INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode )
{
return 0;
}
BOOL set_map_mode( DC *dc, int mode ) BOOL set_map_mode( DC *dc, int mode )
{ {
SIZE virtual_size, virtual_res; SIZE virtual_size, virtual_res;
......
dlls/gdi32/mfdrv/init.c
View file @ 3f2850ae
...@@ -194,13 +194,8 @@ static const struct gdi_dc_funcs MFDRV_Funcs = ...@@ -194,13 +194,8 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */ NULL, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
MFDRV_SetTextColor, /* pSetTextColor */ MFDRV_SetTextColor, /* pSetTextColor */
NULL, /* pSetTextJustification */
MFDRV_SetViewportExtEx, /* pSetViewportExtEx */ MFDRV_SetViewportExtEx, /* pSetViewportExtEx */
MFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ MFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */
MFDRV_SetWindowExtEx, /* pSetWindowExtEx */ MFDRV_SetWindowExtEx, /* pSetWindowExtEx */
......
dlls/gdi32/ntgdi_private.h
View file @ 3f2850ae
...@@ -594,7 +594,6 @@ extern BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDE ...@@ -594,7 +594,6 @@ extern BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDE
extern INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, extern INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height,
INT x_src, INT y_src, UINT start, UINT lines, INT x_src, INT y_src, UINT start, UINT lines,
const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;
extern INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN;
......
dlls/gdi32/path.c
View file @ 3f2850ae
...@@ -2167,13 +2167,8 @@ const struct gdi_dc_funcs path_driver = ...@@ -2167,13 +2167,8 @@ const struct gdi_dc_funcs path_driver =
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */ NULL, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */ NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
......
dlls/wineandroid.drv/init.c
View file @ 3f2850ae
...@@ -376,13 +376,8 @@ static const struct gdi_dc_funcs android_drv_funcs = ...@@ -376,13 +376,8 @@ static const struct gdi_dc_funcs android_drv_funcs =
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */ NULL, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */ NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
......
dlls/winemac.drv/gdi.c
View file @ 3f2850ae
...@@ -356,13 +356,8 @@ static const struct gdi_dc_funcs macdrv_funcs = ...@@ -356,13 +356,8 @@ static const struct gdi_dc_funcs macdrv_funcs =
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
macdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ macdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */ NULL, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */ NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
......
dlls/wineps.drv/init.c
View file @ 3f2850ae
...@@ -870,13 +870,8 @@ static const struct gdi_dc_funcs psdrv_funcs = ...@@ -870,13 +870,8 @@ static const struct gdi_dc_funcs psdrv_funcs =
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
PSDRV_SetPixel, /* pSetPixel */ PSDRV_SetPixel, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
PSDRV_SetTextColor, /* pSetTextColor */ PSDRV_SetTextColor, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
......
dlls/winex11.drv/init.c
View file @ 3f2850ae
...@@ -435,13 +435,8 @@ static const struct gdi_dc_funcs x11drv_funcs = ...@@ -435,13 +435,8 @@ static const struct gdi_dc_funcs x11drv_funcs =
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
X11DRV_SetDeviceClipping, /* pSetDeviceClipping */ X11DRV_SetDeviceClipping, /* pSetDeviceClipping */
X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
X11DRV_SetPixel, /* pSetPixel */ X11DRV_SetPixel, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */ NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
......
dlls/winex11.drv/xrender.c
View file @ 3f2850ae
...@@ -2247,13 +2247,8 @@ static const struct gdi_dc_funcs xrender_funcs = ...@@ -2247,13 +2247,8 @@ static const struct gdi_dc_funcs xrender_funcs =
NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDIBitsToDevice */
xrenderdrv_SetDeviceClipping, /* pSetDeviceClipping */ xrenderdrv_SetDeviceClipping, /* pSetDeviceClipping */
NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetDeviceGammaRamp */
NULL, /* pSetLayout */
NULL, /* pSetMapMode */
NULL, /* pSetMapperFlags */
NULL, /* pSetPixel */ NULL, /* pSetPixel */
NULL, /* pSetTextCharacterExtra */
NULL, /* pSetTextColor */ NULL, /* pSetTextColor */
NULL, /* pSetTextJustification */
NULL, /* pSetViewportExt */ NULL, /* pSetViewportExt */
NULL, /* pSetViewportOrg */ NULL, /* pSetViewportOrg */
NULL, /* pSetWindowExt */ NULL, /* pSetWindowExt */
......
include/wine/gdi_driver.h
View file @ 3f2850ae
...@@ -160,13 +160,8 @@ struct gdi_dc_funcs ...@@ -160,13 +160,8 @@ struct gdi_dc_funcs
INT (CDECL *pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,BITMAPINFO*,UINT); INT (CDECL *pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,BITMAPINFO*,UINT);
VOID (CDECL *pSetDeviceClipping)(PHYSDEV,HRGN); VOID (CDECL *pSetDeviceClipping)(PHYSDEV,HRGN);
BOOL (CDECL *pSetDeviceGammaRamp)(PHYSDEV,LPVOID); BOOL (CDECL *pSetDeviceGammaRamp)(PHYSDEV,LPVOID);
DWORD (CDECL *pSetLayout)(PHYSDEV,DWORD);
INT (CDECL *pSetMapMode)(PHYSDEV,INT);
DWORD (CDECL *pSetMapperFlags)(PHYSDEV,DWORD);
COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF); COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF);
INT (CDECL *pSetTextCharacterExtra)(PHYSDEV,INT);
COLORREF (CDECL *pSetTextColor)(PHYSDEV,COLORREF); COLORREF (CDECL *pSetTextColor)(PHYSDEV,COLORREF);
BOOL (CDECL *pSetTextJustification)(PHYSDEV,INT,INT);
BOOL (CDECL *pSetViewportExtEx)(PHYSDEV,INT,INT,SIZE*); BOOL (CDECL *pSetViewportExtEx)(PHYSDEV,INT,INT,SIZE*);
BOOL (CDECL *pSetViewportOrgEx)(PHYSDEV,INT,INT,POINT*); BOOL (CDECL *pSetViewportOrgEx)(PHYSDEV,INT,INT,POINT*);
BOOL (CDECL *pSetWindowExtEx)(PHYSDEV,INT,INT,SIZE*); BOOL (CDECL *pSetWindowExtEx)(PHYSDEV,INT,INT,SIZE*);
...@@ -190,7 +185,7 @@ struct gdi_dc_funcs ...@@ -190,7 +185,7 @@ struct gdi_dc_funcs
}; };
/* increment this when you change the DC function table */ /* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 56 #define WINE_GDI_DRIVER_VERSION 57
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
......
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