Skip to content

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

gdi32: Remove unused argument from CreateDC driver entry point.

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 bdebdbaf
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 35 deletions
dlls/gdi32/dc.c
View file @ 6342e921
...@@ -149,7 +149,7 @@ DC *alloc_dc_ptr( DWORD magic ) ...@@ -149,7 +149,7 @@ DC *alloc_dc_ptr( DWORD magic )
dc->attr->hdc = dc->nulldrv.hdc = dc->hSelf; dc->attr->hdc = dc->nulldrv.hdc = dc->hSelf;
set_gdi_client_ptr( dc->hSelf, dc->attr ); set_gdi_client_ptr( dc->hSelf, dc->attr );
if (!font_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) if (!font_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL ))
{ {
free_dc_ptr( dc ); free_dc_ptr( dc );
return NULL; return NULL;
...@@ -666,7 +666,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, ...@@ -666,7 +666,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
if (funcs->pCreateDC) if (funcs->pCreateDC)
{ {
if (!funcs->pCreateDC( &dc->physDev, buf, device, output, initData )) if (!funcs->pCreateDC( &dc->physDev, device, output, initData ))
{ {
WARN("creation aborted by device\n" ); WARN("creation aborted by device\n" );
free_dc_ptr( dc ); free_dc_ptr( dc );
...@@ -743,7 +743,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) ...@@ -743,7 +743,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc )
return 0; return 0;
} }
if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL ))
{ {
free_dc_ptr( dc ); free_dc_ptr( dc );
return 0; return 0;
......
dlls/gdi32/dibdrv/dc.c
View file @ 6342e921
...@@ -321,8 +321,8 @@ void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) ...@@ -321,8 +321,8 @@ void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip )
/********************************************************************** /**********************************************************************
* dibdrv_CreateDC * dibdrv_CreateDC
*/ */
static BOOL CDECL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW *data ) const DEVMODEW *data )
{ {
dibdrv_physdev *pdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pdev) ); dibdrv_physdev *pdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pdev) );
...@@ -778,7 +778,7 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) ...@@ -778,7 +778,7 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface )
if (windev) push_dc_driver( &dc->physDev, windev, windev->funcs ); if (windev) push_dc_driver( &dc->physDev, windev, windev->funcs );
else else
{ {
if (!window_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) return; if (!window_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL )) return;
windev = find_dc_driver( dc, &window_driver ); windev = find_dc_driver( dc, &window_driver );
} }
...@@ -868,14 +868,14 @@ static BOOL CDECL windrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT b ...@@ -868,14 +868,14 @@ static BOOL CDECL windrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT b
return ret; return ret;
} }
static BOOL CDECL windrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW *devmode ) const DEVMODEW *devmode )
{ {
struct windrv_physdev *physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) ); struct windrv_physdev *physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) );
if (!physdev) return FALSE; if (!physdev) return FALSE;
if (!dib_driver.pCreateDC( dev, NULL, NULL, NULL, NULL )) if (!dib_driver.pCreateDC( dev, NULL, NULL, NULL ))
{ {
HeapFree( GetProcessHeap(), 0, physdev ); HeapFree( GetProcessHeap(), 0, physdev );
return FALSE; return FALSE;
......
dlls/gdi32/driver.c
View file @ 6342e921
...@@ -293,8 +293,8 @@ static BOOL CDECL nulldrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) ...@@ -293,8 +293,8 @@ static BOOL CDECL nulldrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
return display_driver->funcs->pCreateCompatibleDC( NULL, pdev ); return display_driver->funcs->pCreateCompatibleDC( NULL, pdev );
} }
static BOOL CDECL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW *devmode ) const DEVMODEW *devmode )
{ {
assert(0); /* should never be called */ assert(0); /* should never be called */
return FALSE; return FALSE;
......
dlls/gdi32/font.c
View file @ 6342e921
...@@ -2838,8 +2838,8 @@ static void update_codepage( UINT screen_dpi ) ...@@ -2838,8 +2838,8 @@ static void update_codepage( UINT screen_dpi )
/************************************************************* /*************************************************************
* font_CreateDC * font_CreateDC
*/ */
static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW *devmode ) const DEVMODEW *devmode )
{ {
struct font_physdev *physdev; struct font_physdev *physdev;
......
dlls/gdi32/path.c
View file @ 6342e921
...@@ -767,8 +767,8 @@ static BOOL CDECL pathdrv_EndPath( PHYSDEV dev ) ...@@ -767,8 +767,8 @@ static BOOL CDECL pathdrv_EndPath( PHYSDEV dev )
/*********************************************************************** /***********************************************************************
* pathdrv_CreateDC * pathdrv_CreateDC
*/ */
static BOOL CDECL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW *devmode ) const DEVMODEW *devmode )
{ {
struct path_physdev *physdev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physdev) ); struct path_physdev *physdev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physdev) );
...@@ -823,7 +823,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) ...@@ -823,7 +823,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src )
if (src->path && src->path_open) if (src->path && src->path_open)
{ {
if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL, NULL )) return FALSE; if (!path_driver.pCreateDC( &dst->physDev, NULL, NULL, NULL )) return FALSE;
physdev = get_path_physdev( find_dc_driver( dst, &path_driver )); physdev = get_path_physdev( find_dc_driver( dst, &path_driver ));
physdev->path = src->path; physdev->path = src->path;
src->path_open = FALSE; src->path_open = FALSE;
...@@ -1970,7 +1970,7 @@ BOOL CDECL nulldrv_BeginPath( PHYSDEV dev ) ...@@ -1970,7 +1970,7 @@ BOOL CDECL nulldrv_BeginPath( PHYSDEV dev )
struct gdi_path *path = alloc_gdi_path(0); struct gdi_path *path = alloc_gdi_path(0);
if (!path) return FALSE; if (!path) return FALSE;
if (!path_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) if (!path_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL ))
{ {
free_gdi_path( path ); free_gdi_path( path );
return FALSE; return FALSE;
......
dlls/wineandroid.drv/init.c
View file @ 6342e921
...@@ -151,8 +151,8 @@ static ANDROID_PDEVICE *create_android_physdev(void) ...@@ -151,8 +151,8 @@ static ANDROID_PDEVICE *create_android_physdev(void)
/********************************************************************** /**********************************************************************
* ANDROID_CreateDC * ANDROID_CreateDC
*/ */
static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW* initData ) const DEVMODEW *initData )
{ {
ANDROID_PDEVICE *physdev = create_android_physdev(); ANDROID_PDEVICE *physdev = create_android_physdev();
......
dlls/winemac.drv/gdi.c
View file @ 6342e921
...@@ -174,14 +174,13 @@ static MACDRV_PDEVICE *create_mac_physdev(void) ...@@ -174,14 +174,13 @@ static MACDRV_PDEVICE *create_mac_physdev(void)
/********************************************************************** /**********************************************************************
* CreateDC (MACDRV.@) * CreateDC (MACDRV.@)
*/ */
static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW* initData) const DEVMODEW* initData)
{ {
MACDRV_PDEVICE *physDev = create_mac_physdev(); MACDRV_PDEVICE *physDev = create_mac_physdev();
TRACE("pdev %p hdc %p driver %s device %s output %s initData %p\n", pdev, TRACE("pdev %p hdc %p device %s output %s initData %p\n", pdev,
(*pdev)->hdc, debugstr_w(driver),debugstr_w(device), debugstr_w(output), (*pdev)->hdc, debugstr_w(device), debugstr_w(output), initData);
initData);
if (!physDev) return FALSE; if (!physDev) return FALSE;
......
dlls/wineps.drv/init.c
View file @ 6342e921
...@@ -367,14 +367,13 @@ static PSDRV_PDEVICE *create_psdrv_physdev( PRINTERINFO *pi ) ...@@ -367,14 +367,13 @@ static PSDRV_PDEVICE *create_psdrv_physdev( PRINTERINFO *pi )
/********************************************************************** /**********************************************************************
* PSDRV_CreateDC * PSDRV_CreateDC
*/ */
static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW* initData ) const DEVMODEW *initData )
{ {
PSDRV_PDEVICE *physDev; PSDRV_PDEVICE *physDev;
PRINTERINFO *pi; PRINTERINFO *pi;
TRACE("(%s %s %s %p)\n", debugstr_w(driver), debugstr_w(device), TRACE("(%s %s %p)\n", debugstr_w(device), debugstr_w(output), initData);
debugstr_w(output), initData);
if (!device) return FALSE; if (!device) return FALSE;
pi = PSDRV_FindPrinterInfo( device ); pi = PSDRV_FindPrinterInfo( device );
......
dlls/winex11.drv/init.c
View file @ 6342e921
...@@ -82,8 +82,8 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) ...@@ -82,8 +82,8 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable )
/********************************************************************** /**********************************************************************
* X11DRV_CreateDC * X11DRV_CreateDC
*/ */
static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW* initData ) const DEVMODEW* initData )
{ {
X11DRV_PDEVICE *physDev = create_x11_physdev( root_window ); X11DRV_PDEVICE *physDev = create_x11_physdev( root_window );
...@@ -94,7 +94,7 @@ static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device ...@@ -94,7 +94,7 @@ static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device
physDev->dc_rect = get_virtual_screen_rect(); physDev->dc_rect = get_virtual_screen_rect();
OffsetRect( &physDev->dc_rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); OffsetRect( &physDev->dc_rect, -physDev->dc_rect.left, -physDev->dc_rect.top );
push_dc_driver( pdev, &physDev->dev, &x11drv_funcs ); push_dc_driver( pdev, &physDev->dev, &x11drv_funcs );
if (xrender_funcs && !xrender_funcs->pCreateDC( pdev, driver, device, output, initData )) return FALSE; if (xrender_funcs && !xrender_funcs->pCreateDC( pdev, device, output, initData )) return FALSE;
return TRUE; return TRUE;
} }
......
dlls/winex11.drv/xrender.c
View file @ 6342e921
...@@ -937,8 +937,8 @@ static void set_color_info( XRenderPictFormat *format, BITMAPINFO *info ) ...@@ -937,8 +937,8 @@ static void set_color_info( XRenderPictFormat *format, BITMAPINFO *info )
/********************************************************************** /**********************************************************************
* xrenderdrv_CreateDC * xrenderdrv_CreateDC
*/ */
static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
LPCWSTR output, const DEVMODEW* initData ) const DEVMODEW* initData )
{ {
return create_xrender_dc( pdev, default_format ); return create_xrender_dc( pdev, default_format );
} }
......
include/wine/gdi_driver.h
View file @ 6342e921
...@@ -78,7 +78,7 @@ struct gdi_dc_funcs ...@@ -78,7 +78,7 @@ struct gdi_dc_funcs
BOOL (CDECL *pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (CDECL *pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL (CDECL *pCloseFigure)(PHYSDEV); BOOL (CDECL *pCloseFigure)(PHYSDEV);
BOOL (CDECL *pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); BOOL (CDECL *pCreateCompatibleDC)(PHYSDEV,PHYSDEV*);
BOOL (CDECL *pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); BOOL (CDECL *pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,const DEVMODEW*);
BOOL (CDECL *pDeleteDC)(PHYSDEV); BOOL (CDECL *pDeleteDC)(PHYSDEV);
BOOL (CDECL *pDeleteObject)(PHYSDEV,HGDIOBJ); BOOL (CDECL *pDeleteObject)(PHYSDEV,HGDIOBJ);
BOOL (CDECL *pEllipse)(PHYSDEV,INT,INT,INT,INT); BOOL (CDECL *pEllipse)(PHYSDEV,INT,INT,INT,INT);
...@@ -166,7 +166,7 @@ struct gdi_dc_funcs ...@@ -166,7 +166,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 68 #define WINE_GDI_DRIVER_VERSION 69
#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