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

gdi32: Remove unused argument from CreateDC driver entry point. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-09-29 14:07:26 +02:00 committed by Alexandre Julliard
parent bdebdbafe9
commit 6342e9217d
11 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/gdi32/dc.c
View File

@ -149,7 +149,7 @@ DC *alloc_dc_ptr( DWORD magic )
dc->attr->hdc = dc->nulldrv.hdc = dc->hSelf;
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 );
return NULL;
@ -666,7 +666,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
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" );
free_dc_ptr( dc );
@ -743,7 +743,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc )
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 );
return 0;

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

@ -321,8 +321,8 @@ void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip )
/**********************************************************************
* dibdrv_CreateDC
*/
static BOOL CDECL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW *data )
static BOOL CDECL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
const DEVMODEW *data )
{
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 )
if (windev) push_dc_driver( &dc->physDev, windev, windev->funcs );
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 );
}
@ -868,14 +868,14 @@ static BOOL CDECL windrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT b
return ret;
}
static BOOL CDECL windrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW *devmode )
static BOOL CDECL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
const DEVMODEW *devmode )
{
struct windrv_physdev *physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) );
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 );
return FALSE;

4
dlls/gdi32/driver.c
View File

@ -293,8 +293,8 @@ static BOOL CDECL nulldrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
return display_driver->funcs->pCreateCompatibleDC( NULL, pdev );
}
static BOOL CDECL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW *devmode )
static BOOL CDECL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
const DEVMODEW *devmode )
{
assert(0); /* should never be called */
return FALSE;

4
dlls/gdi32/font.c
View File

@ -2838,8 +2838,8 @@ static void update_codepage( UINT screen_dpi )
/*************************************************************
* font_CreateDC
*/
static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW *devmode )
static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
const DEVMODEW *devmode )
{
struct font_physdev *physdev;

8
dlls/gdi32/path.c
View File

@ -767,8 +767,8 @@ static BOOL CDECL pathdrv_EndPath( PHYSDEV dev )
/***********************************************************************
* pathdrv_CreateDC
*/
static BOOL CDECL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW *devmode )
static BOOL CDECL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
const DEVMODEW *devmode )
{
struct path_physdev *physdev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physdev) );
@ -823,7 +823,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src )
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->path = src->path;
src->path_open = FALSE;
@ -1970,7 +1970,7 @@ BOOL CDECL nulldrv_BeginPath( PHYSDEV dev )
struct gdi_path *path = alloc_gdi_path(0);
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 );
return FALSE;

4
dlls/wineandroid.drv/init.c
View File

@ -151,8 +151,8 @@ static ANDROID_PDEVICE *create_android_physdev(void)
/**********************************************************************
* ANDROID_CreateDC
*/
static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData )
static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
const DEVMODEW *initData )
{
ANDROID_PDEVICE *physdev = create_android_physdev();

9
dlls/winemac.drv/gdi.c
View File

@ -174,14 +174,13 @@ static MACDRV_PDEVICE *create_mac_physdev(void)
/**********************************************************************
* CreateDC (MACDRV.@)
*/
static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData)
static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
const DEVMODEW* initData)
{
MACDRV_PDEVICE *physDev = create_mac_physdev();
TRACE("pdev %p hdc %p driver %s device %s output %s initData %p\n", pdev,
(*pdev)->hdc, debugstr_w(driver),debugstr_w(device), debugstr_w(output),
initData);
TRACE("pdev %p hdc %p device %s output %s initData %p\n", pdev,
(*pdev)->hdc, debugstr_w(device), debugstr_w(output), initData);
if (!physDev) return FALSE;

7
dlls/wineps.drv/init.c
View File

@ -367,14 +367,13 @@ static PSDRV_PDEVICE *create_psdrv_physdev( PRINTERINFO *pi )
/**********************************************************************
* PSDRV_CreateDC
*/
static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData )
static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
const DEVMODEW *initData )
{
PSDRV_PDEVICE *physDev;
PRINTERINFO *pi;
TRACE("(%s %s %s %p)\n", debugstr_w(driver), debugstr_w(device),
debugstr_w(output), initData);
TRACE("(%s %s %p)\n", debugstr_w(device), debugstr_w(output), initData);
if (!device) return FALSE;
pi = PSDRV_FindPrinterInfo( device );

6
dlls/winex11.drv/init.c
View File

@ -82,8 +82,8 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable )
/**********************************************************************
* X11DRV_CreateDC
*/
static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData )
static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
const DEVMODEW* initData )
{
X11DRV_PDEVICE *physDev = create_x11_physdev( root_window );
@ -94,7 +94,7 @@ static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device
physDev->dc_rect = get_virtual_screen_rect();
OffsetRect( &physDev->dc_rect, -physDev->dc_rect.left, -physDev->dc_rect.top );
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;
}

4
dlls/winex11.drv/xrender.c
View File

@ -937,8 +937,8 @@ static void set_color_info( XRenderPictFormat *format, BITMAPINFO *info )
/**********************************************************************
* xrenderdrv_CreateDC
*/
static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData )
static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
const DEVMODEW* initData )
{
return create_xrender_dc( pdev, default_format );
}

4
include/wine/gdi_driver.h
View File

@ -78,7 +78,7 @@ struct gdi_dc_funcs
BOOL (CDECL *pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT);
BOOL (CDECL *pCloseFigure)(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 *pDeleteObject)(PHYSDEV,HGDIOBJ);
BOOL (CDECL *pEllipse)(PHYSDEV,INT,INT,INT,INT);
@ -166,7 +166,7 @@ struct gdi_dc_funcs
};
/* 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_FONT_DRV 100 /* any font driver */