Skip to content

W
wine-winehq
Commit 131d0a79 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Alexandre Julliard
Browse files
Options

gdi32/winex11.drv: Change all gdi/opengl operations to use CDECL calling convention.

parent 4eca43e7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 262 additions and 264 deletions
dlls/gdi32/enhmfdrv/bitblt.c
View file @ 131d0a79
......@@ -27,7 +27,7 @@
#include "enhmetafiledrv.h"
#include "wine/debug.h"
BOOL EMFDRV_PatBlt( PHYSDEV dev, INT left, INT top,
BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, INT left, INT top,
INT width, INT height, DWORD rop )
{
EMRBITBLT emr;
......@@ -173,7 +173,7 @@ static BOOL EMFDRV_BitBlockTransfer(
return ret;
}
BOOL EMFDRV_BitBlt(
BOOL CDECL EMFDRV_BitBlt(
PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height,
PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop)
{
......@@ -182,7 +182,7 @@ BOOL EMFDRV_BitBlt(
rop, EMR_BITBLT );
}
BOOL EMFDRV_StretchBlt(
BOOL CDECL EMFDRV_StretchBlt(
PHYSDEV devDst, INT xDst, INT yDst, INT widthDst, INT heightDst,
PHYSDEV devSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop )
{
......@@ -191,7 +191,7 @@ BOOL EMFDRV_StretchBlt(
rop, EMR_STRETCHBLT );
}
INT EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst,
INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst,
INT heightDst, INT xSrc, INT ySrc,
INT widthSrc, INT heightSrc,
const void *bits, const BITMAPINFO *info,
......@@ -254,7 +254,7 @@ INT EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst,
return ret ? heightSrc : GDI_ERROR;
}
INT EMFDRV_SetDIBitsToDevice(
INT CDECL EMFDRV_SetDIBitsToDevice(
PHYSDEV dev, INT xDst, INT yDst, DWORD width, DWORD height,
INT xSrc, INT ySrc, UINT startscan, UINT lines,
LPCVOID bits, const BITMAPINFO *info, UINT wUsage )
......
dlls/gdi32/enhmfdrv/dc.c
View file @ 131d0a79
......@@ -23,7 +23,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
INT EMFDRV_SaveDC( PHYSDEV dev )
INT CDECL EMFDRV_SaveDC( PHYSDEV dev )
{
EMRSAVEDC emr;
emr.emr.iType = EMR_SAVEDC;
......@@ -31,7 +31,7 @@ INT EMFDRV_SaveDC( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level )
BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level )
{
EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev;
DC *dc = get_dc_ptr( physDev->hdc );
......@@ -51,7 +51,7 @@ BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level )
return TRUE;
}
UINT EMFDRV_SetTextAlign( PHYSDEV dev, UINT align )
UINT CDECL EMFDRV_SetTextAlign( PHYSDEV dev, UINT align )
{
EMRSETTEXTALIGN emr;
emr.emr.iType = EMR_SETTEXTALIGN;
......@@ -60,7 +60,7 @@ UINT EMFDRV_SetTextAlign( PHYSDEV dev, UINT align )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakCount)
BOOL CDECL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakCount)
{
EMRSETTEXTJUSTIFICATION emr;
emr.emr.iType = EMR_SETTEXTJUSTIFICATION;
......@@ -70,7 +70,7 @@ BOOL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakCount)
return EMFDRV_WriteRecord(dev, &emr.emr);
}
INT EMFDRV_SetBkMode( PHYSDEV dev, INT mode )
INT CDECL EMFDRV_SetBkMode( PHYSDEV dev, INT mode )
{
EMRSETBKMODE emr;
emr.emr.iType = EMR_SETBKMODE;
......@@ -79,7 +79,7 @@ INT EMFDRV_SetBkMode( PHYSDEV dev, INT mode )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_SetROP2( PHYSDEV dev, INT rop )
INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop )
{
EMRSETROP2 emr;
emr.emr.iType = EMR_SETROP2;
......@@ -88,7 +88,7 @@ INT EMFDRV_SetROP2( PHYSDEV dev, INT rop )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode )
INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode )
{
EMRSETPOLYFILLMODE emr;
emr.emr.iType = EMR_SETPOLYFILLMODE;
......@@ -97,7 +97,7 @@ INT EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode )
INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode )
{
EMRSETSTRETCHBLTMODE emr;
emr.emr.iType = EMR_SETSTRETCHBLTMODE;
......@@ -106,7 +106,7 @@ INT EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
{
EMREXCLUDECLIPRECT emr;
emr.emr.iType = EMR_EXCLUDECLIPRECT;
......@@ -118,7 +118,7 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom)
INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom)
{
EMRINTERSECTCLIPRECT emr;
emr.emr.iType = EMR_INTERSECTCLIPRECT;
......@@ -130,7 +130,7 @@ INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bot
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y )
INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y )
{
EMROFFSETCLIPRGN emr;
emr.emr.iType = EMR_OFFSETCLIPRGN;
......@@ -140,7 +140,7 @@ INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode )
INT CDECL EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode )
{
EMREXTSELECTCLIPRGN *emr;
DWORD size, rgnsize;
......@@ -167,7 +167,7 @@ INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode )
return ret ? SIMPLEREGION : ERROR;
}
DWORD EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags )
DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags )
{
EMRSETMAPPERFLAGS emr;
......@@ -178,7 +178,7 @@ DWORD EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_AbortPath( PHYSDEV dev )
BOOL CDECL EMFDRV_AbortPath( PHYSDEV dev )
{
EMRABORTPATH emr;
......@@ -188,7 +188,7 @@ BOOL EMFDRV_AbortPath( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_BeginPath( PHYSDEV dev )
BOOL CDECL EMFDRV_BeginPath( PHYSDEV dev )
{
EMRBEGINPATH emr;
......@@ -198,7 +198,7 @@ BOOL EMFDRV_BeginPath( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_CloseFigure( PHYSDEV dev )
BOOL CDECL EMFDRV_CloseFigure( PHYSDEV dev )
{
EMRCLOSEFIGURE emr;
......@@ -208,7 +208,7 @@ BOOL EMFDRV_CloseFigure( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_EndPath( PHYSDEV dev )
BOOL CDECL EMFDRV_EndPath( PHYSDEV dev )
{
EMRENDPATH emr;
......@@ -218,7 +218,7 @@ BOOL EMFDRV_EndPath( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_FillPath( PHYSDEV dev )
BOOL CDECL EMFDRV_FillPath( PHYSDEV dev )
{
EMRFILLPATH emr;
......@@ -232,7 +232,7 @@ BOOL EMFDRV_FillPath( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_FlattenPath( PHYSDEV dev )
BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev )
{
EMRFLATTENPATH emr;
......@@ -242,7 +242,7 @@ BOOL EMFDRV_FlattenPath( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode )
BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode )
{
EMRSELECTCLIPPATH emr;
......@@ -253,7 +253,7 @@ BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev )
BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev )
{
EMRSTROKEANDFILLPATH emr;
......@@ -267,7 +267,7 @@ BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_StrokePath( PHYSDEV dev )
BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev )
{
EMRSTROKEPATH emr;
......@@ -281,7 +281,7 @@ BOOL EMFDRV_StrokePath( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_WidenPath( PHYSDEV dev )
BOOL CDECL EMFDRV_WidenPath( PHYSDEV dev )
{
EMRWIDENPATH emr;
......@@ -291,7 +291,7 @@ BOOL EMFDRV_WidenPath( PHYSDEV dev )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap)
INT CDECL EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap)
{
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev;
......
dlls/gdi32/enhmfdrv/graphics.c
View file @ 131d0a79
......@@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
/**********************************************************************
* EMFDRV_MoveTo
*/
BOOL
BOOL CDECL
EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y)
{
EMRMOVETOEX emr;
......@@ -52,7 +52,7 @@ EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y)
/***********************************************************************
* EMFDRV_LineTo
*/
BOOL
BOOL CDECL
EMFDRV_LineTo( PHYSDEV dev, INT x, INT y )
{
POINT pt;
......@@ -188,7 +188,7 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* EMFDRV_Arc
*/
BOOL
BOOL CDECL
EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -199,7 +199,7 @@ EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* EMFDRV_Pie
*/
BOOL
BOOL CDECL
EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -211,7 +211,7 @@ EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* EMFDRV_Chord
*/
BOOL
BOOL CDECL
EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -222,7 +222,7 @@ EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* EMFDRV_Ellipse
*/
BOOL
BOOL CDECL
EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
{
EMRELLIPSE emr;
......@@ -255,7 +255,7 @@ EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
/***********************************************************************
* EMFDRV_Rectangle
*/
BOOL
BOOL CDECL
EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom)
{
EMRRECTANGLE emr;
......@@ -288,7 +288,7 @@ EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom)
/***********************************************************************
* EMFDRV_RoundRect
*/
BOOL
BOOL CDECL
EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right,
INT bottom, INT ell_width, INT ell_height )
{
......@@ -322,7 +322,7 @@ EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right,
/***********************************************************************
* EMFDRV_SetPixel
*/
COLORREF
COLORREF CDECL
EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color )
{
EMRSETPIXELV emr;
......@@ -447,7 +447,7 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType )
/**********************************************************************
* EMFDRV_Polyline
*/
BOOL
BOOL CDECL
EMFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count )
{
if( EMFDRV_Polylinegon16( dev, pt, count, EMR_POLYLINE16 ) )
......@@ -458,7 +458,7 @@ EMFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count )
/**********************************************************************
* EMFDRV_Polygon
*/
BOOL
BOOL CDECL
EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count )
{
if(count < 2) return FALSE;
......@@ -521,7 +521,7 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po
/**********************************************************************
* EMFDRV_PolyPolyline
*/
BOOL
BOOL CDECL
EMFDRV_PolyPolyline(PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys)
{
return EMFDRV_PolyPolylinegon( dev, pt, (const INT *)counts, polys,
......@@ -531,7 +531,7 @@ EMFDRV_PolyPolyline(PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD pol
/**********************************************************************
* EMFDRV_PolyPolygon
*/
BOOL
BOOL CDECL
EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys )
{
return EMFDRV_PolyPolylinegon( dev, pt, counts, polys, EMR_POLYPOLYGON );
......@@ -541,7 +541,7 @@ EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys
/**********************************************************************
* EMFDRV_ExtFloodFill
*/
BOOL
BOOL CDECL
EMFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType )
{
EMREXTFLOODFILL emr;
......@@ -560,7 +560,7 @@ EMFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType )
/*********************************************************************
* EMFDRV_FillRgn
*/
BOOL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush )
BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush )
{
EMRFILLRGN *emr;
DWORD size, rgnsize, index;
......@@ -593,7 +593,7 @@ BOOL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush )
/*********************************************************************
* EMFDRV_FrameRgn
*/
BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height )
BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height )
{
EMRFRAMERGN *emr;
DWORD size, rgnsize, index;
......@@ -662,7 +662,7 @@ static BOOL EMFDRV_PaintInvertRgn( PHYSDEV dev, HRGN hrgn, DWORD iType )
/**********************************************************************
* EMFDRV_PaintRgn
*/
BOOL
BOOL CDECL
EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn )
{
return EMFDRV_PaintInvertRgn( dev, hrgn, EMR_PAINTRGN );
......@@ -671,7 +671,7 @@ EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn )
/**********************************************************************
* EMFDRV_InvertRgn
*/
BOOL
BOOL CDECL
EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn )
{
return EMFDRV_PaintInvertRgn( dev, hrgn, EMR_INVERTRGN );
......@@ -680,7 +680,7 @@ EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn )
/**********************************************************************
* EMFDRV_SetBkColor
*/
COLORREF
COLORREF CDECL
EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color )
{
EMRSETBKCOLOR emr;
......@@ -696,7 +696,7 @@ EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color )
/**********************************************************************
* EMFDRV_SetTextColor
*/
COLORREF
COLORREF CDECL
EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color )
{
EMRSETTEXTCOLOR emr;
......@@ -711,7 +711,7 @@ EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color )
/**********************************************************************
* EMFDRV_ExtTextOut
*/
BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
const RECT *lprect, LPCWSTR str, UINT count,
const INT *lpDx )
{
......@@ -832,7 +832,7 @@ no_bounds:
/**********************************************************************
* EMFDRV_SetArcDirection
*/
INT EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection)
INT CDECL EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection)
{
EMRSETARCDIRECTION emr;
......
dlls/gdi32/enhmfdrv/mapping.c
View file @ 131d0a79
......@@ -20,7 +20,7 @@
#include "enhmfdrv/enhmetafiledrv.h"
INT EMFDRV_SetMapMode( PHYSDEV dev, INT mode )
INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode )
{
EMRSETMAPMODE emr;
emr.emr.iType = EMR_SETMAPMODE;
......@@ -30,7 +30,7 @@ INT EMFDRV_SetMapMode( PHYSDEV dev, INT mode )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_SetViewportExt( PHYSDEV dev, INT cx, INT cy )
INT CDECL EMFDRV_SetViewportExt( PHYSDEV dev, INT cx, INT cy )
{
EMRSETVIEWPORTEXTEX emr;
......@@ -42,7 +42,7 @@ INT EMFDRV_SetViewportExt( PHYSDEV dev, INT cx, INT cy )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_SetWindowExt( PHYSDEV dev, INT cx, INT cy )
INT CDECL EMFDRV_SetWindowExt( PHYSDEV dev, INT cx, INT cy )
{
EMRSETWINDOWEXTEX emr;
......@@ -54,7 +54,7 @@ INT EMFDRV_SetWindowExt( PHYSDEV dev, INT cx, INT cy )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_SetViewportOrg( PHYSDEV dev, INT x, INT y )
INT CDECL EMFDRV_SetViewportOrg( PHYSDEV dev, INT x, INT y )
{
EMRSETVIEWPORTORGEX emr;
......@@ -66,7 +66,7 @@ INT EMFDRV_SetViewportOrg( PHYSDEV dev, INT x, INT y )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_SetWindowOrg( PHYSDEV dev, INT x, INT y )
INT CDECL EMFDRV_SetWindowOrg( PHYSDEV dev, INT x, INT y )
{
EMRSETWINDOWORGEX emr;
......@@ -78,7 +78,7 @@ INT EMFDRV_SetWindowOrg( PHYSDEV dev, INT x, INT y )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_ScaleViewportExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum,
INT CDECL EMFDRV_ScaleViewportExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum,
INT yDenom )
{
EMRSCALEVIEWPORTEXTEX emr;
......@@ -93,7 +93,7 @@ INT EMFDRV_ScaleViewportExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum,
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_ScaleWindowExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum,
INT CDECL EMFDRV_ScaleWindowExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum,
INT yDenom )
{
EMRSCALEWINDOWEXTEX emr;
......@@ -108,7 +108,7 @@ INT EMFDRV_ScaleWindowExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum,
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform)
BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform)
{
EMRSETWORLDTRANSFORM emr;
......@@ -119,7 +119,7 @@ BOOL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform)
return EMFDRV_WriteRecord( dev, &emr.emr );
}
BOOL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode)
BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode)
{
EMRMODIFYWORLDTRANSFORM emr;
......@@ -131,7 +131,7 @@ BOOL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, INT mode)
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y )
INT CDECL EMFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y )
{
POINT pt;
EMRSETVIEWPORTORGEX emr;
......@@ -147,7 +147,7 @@ INT EMFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y )
return EMFDRV_WriteRecord( dev, &emr.emr );
}
INT EMFDRV_OffsetWindowOrg( PHYSDEV dev, INT x, INT y )
INT CDECL EMFDRV_OffsetWindowOrg( PHYSDEV dev, INT x, INT y )
{
POINT pt;
EMRSETWINDOWORGEX emr;
......
dlls/gdi32/enhmfdrv/objects.c
View file @ 131d0a79
......@@ -74,7 +74,7 @@ static UINT EMFDRV_FindObject( PHYSDEV dev, HGDIOBJ obj )
/******************************************************************
* EMFDRV_DeleteObject
*/
BOOL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj )
BOOL CDECL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj )
{
EMRDELETEOBJECT emr;
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev;
......@@ -99,7 +99,7 @@ BOOL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj )
/***********************************************************************
* EMFDRV_SelectBitmap
*/
HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap )
HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap )
{
return 0;
}
......@@ -273,7 +273,7 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush )
/***********************************************************************
* EMFDRV_SelectBrush
*/
HBRUSH EMFDRV_SelectBrush(PHYSDEV dev, HBRUSH hBrush )
HBRUSH CDECL EMFDRV_SelectBrush(PHYSDEV dev, HBRUSH hBrush )
{
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev;
EMRSELECTOBJECT emr;
......@@ -350,7 +350,7 @@ static BOOL EMFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont )
/***********************************************************************
* EMFDRV_SelectFont
*/
HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, HANDLE gdiFont )
HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, HANDLE gdiFont )
{
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev;
EMRSELECTOBJECT emr;
......@@ -429,7 +429,7 @@ static DWORD EMFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen)
/******************************************************************
* EMFDRV_SelectPen
*/
HPEN EMFDRV_SelectPen(PHYSDEV dev, HPEN hPen )
HPEN CDECL EMFDRV_SelectPen(PHYSDEV dev, HPEN hPen )
{
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev;
EMRSELECTOBJECT emr;
......@@ -495,7 +495,7 @@ static DWORD EMFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPal)
/******************************************************************
* EMFDRV_SelectPalette
*/
HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force )
HPALETTE CDECL EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force )
{
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev;
EMRSELECTPALETTE emr;
......@@ -524,7 +524,7 @@ found:
/******************************************************************
* EMFDRV_GdiComment
*/
BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer)
BOOL CDECL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer)
{
EMRGDICOMMENT *emr;
UINT total, rounded_size;
......
dlls/gdi32/mfdrv/bitblt.c
View file @ 131d0a79
......@@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile);
/***********************************************************************
* MFDRV_PatBlt
*/
BOOL MFDRV_PatBlt( PHYSDEV dev, INT left, INT top, INT width, INT height, DWORD rop )
BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, INT left, INT top, INT width, INT height, DWORD rop )
{
MFDRV_MetaParam6( dev, META_PATBLT, left, top, width, height, HIWORD(rop), LOWORD(rop) );
return TRUE;
......@@ -38,7 +38,7 @@ BOOL MFDRV_PatBlt( PHYSDEV dev, INT left, INT top, INT width, INT height, DWORD
/***********************************************************************
* MFDRV_BitBlt
*/
BOOL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height,
BOOL CDECL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height,
PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop )
{
return MFDRV_StretchBlt(devDst, xDst, yDst, width, height, devSrc,
......@@ -55,7 +55,7 @@ BOOL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height,
*/
#define STRETCH_VIA_DIB
BOOL MFDRV_StretchBlt( PHYSDEV devDst, INT xDst, INT yDst, INT widthDst,
BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, INT xDst, INT yDst, INT widthDst,
INT heightDst, PHYSDEV devSrc, INT xSrc, INT ySrc,
INT widthSrc, INT heightSrc, DWORD rop )
{
......@@ -141,7 +141,7 @@ BOOL MFDRV_StretchBlt( PHYSDEV devDst, INT xDst, INT yDst, INT widthDst,
/***********************************************************************
* MFDRV_StretchDIBits
*/
INT MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst,
INT CDECL MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst,
INT heightDst, INT xSrc, INT ySrc, INT widthSrc,
INT heightSrc, const void *bits,
const BITMAPINFO *info, UINT wUsage, DWORD dwRop )
......@@ -182,7 +182,7 @@ INT MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst,
/***********************************************************************
* MFDRV_SetDIBitsToDeivce
*/
INT MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD cx,
INT CDECL MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD cx,
DWORD cy, INT xSrc, INT ySrc, UINT startscan,
UINT lines, LPCVOID bits, const BITMAPINFO *info,
UINT coloruse )
......
dlls/gdi32/mfdrv/dc.c
View file @ 131d0a79
......@@ -20,128 +20,128 @@
#include "mfdrv/metafiledrv.h"
INT MFDRV_SaveDC( PHYSDEV dev )
INT CDECL MFDRV_SaveDC( PHYSDEV dev )
{
return MFDRV_MetaParam0( dev, META_SAVEDC );
}
BOOL MFDRV_RestoreDC( PHYSDEV dev, INT level )
BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level )
{
if(level != -1) return FALSE;
return MFDRV_MetaParam1( dev, META_RESTOREDC, level );
}
UINT MFDRV_SetTextAlign( PHYSDEV dev, UINT align )
UINT CDECL MFDRV_SetTextAlign( PHYSDEV dev, UINT align )
{
return MFDRV_MetaParam2( dev, META_SETTEXTALIGN, HIWORD(align), LOWORD(align));
}
INT MFDRV_SetBkMode( PHYSDEV dev, INT mode )
INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode )
{
return MFDRV_MetaParam1( dev, META_SETBKMODE, (WORD)mode);
}
INT MFDRV_SetROP2( PHYSDEV dev, INT rop )
INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop )
{
return MFDRV_MetaParam1( dev, META_SETROP2, (WORD)rop);
}
INT MFDRV_SetRelAbs( PHYSDEV dev, INT mode )
INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode )
{
return MFDRV_MetaParam1( dev, META_SETRELABS, (WORD)mode);
}
INT MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode )
INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode )
{
return MFDRV_MetaParam1( dev, META_SETPOLYFILLMODE, (WORD)mode);
}
INT MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode )
INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode )
{
return MFDRV_MetaParam1( dev, META_SETSTRETCHBLTMODE, (WORD)mode);
}
INT MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
{
return MFDRV_MetaParam4( dev, META_INTERSECTCLIPRECT, left, top, right,
bottom );
}
INT MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
{
return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right,
bottom );
}
INT MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y )
INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y )
{
return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y );
}
INT MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks )
INT CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks )
{
return MFDRV_MetaParam2( dev, META_SETTEXTJUSTIFICATION, extra, breaks );
}
INT MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra )
INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra )
{
if(!MFDRV_MetaParam1( dev, META_SETTEXTCHAREXTRA, extra ))
return 0x80000000;
return TRUE;
}
DWORD MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags )
DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags )
{
return MFDRV_MetaParam2( dev, META_SETMAPPERFLAGS, HIWORD(flags),
LOWORD(flags) );
}
BOOL MFDRV_AbortPath( PHYSDEV dev )
BOOL CDECL MFDRV_AbortPath( PHYSDEV dev )
{
return FALSE;
}
BOOL MFDRV_BeginPath( PHYSDEV dev )
BOOL CDECL MFDRV_BeginPath( PHYSDEV dev )
{
return FALSE;
}
BOOL MFDRV_CloseFigure( PHYSDEV dev )
BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev )
{
return FALSE;
}
BOOL MFDRV_EndPath( PHYSDEV dev )
BOOL CDECL MFDRV_EndPath( PHYSDEV dev )
{
return FALSE;
}
BOOL MFDRV_FillPath( PHYSDEV dev )
BOOL CDECL MFDRV_FillPath( PHYSDEV dev )
{
return FALSE;
}
BOOL MFDRV_FlattenPath( PHYSDEV dev )
BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev )
{
return FALSE;
}
BOOL MFDRV_SelectClipPath( PHYSDEV dev, INT iMode )
BOOL CDECL MFDRV_SelectClipPath( PHYSDEV dev, INT iMode )
{
return FALSE;
}
BOOL MFDRV_StrokeAndFillPath( PHYSDEV dev )
BOOL CDECL MFDRV_StrokeAndFillPath( PHYSDEV dev )
{
return FALSE;
}
BOOL MFDRV_StrokePath( PHYSDEV dev )
BOOL CDECL MFDRV_StrokePath( PHYSDEV dev )
{
return FALSE;
}
BOOL MFDRV_WidenPath( PHYSDEV dev )
BOOL CDECL MFDRV_WidenPath( PHYSDEV dev )
{
return FALSE;
}
dlls/gdi32/mfdrv/graphics.c
View file @ 131d0a79
......@@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile);
/**********************************************************************
* MFDRV_MoveTo
*/
BOOL
BOOL CDECL
MFDRV_MoveTo(PHYSDEV dev, INT x, INT y)
{
return MFDRV_MetaParam2(dev,META_MOVETO,x,y);
......@@ -38,7 +38,7 @@ MFDRV_MoveTo(PHYSDEV dev, INT x, INT y)
/***********************************************************************
* MFDRV_LineTo
*/
BOOL
BOOL CDECL
MFDRV_LineTo( PHYSDEV dev, INT x, INT y )
{
return MFDRV_MetaParam2(dev, META_LINETO, x, y);
......@@ -48,7 +48,7 @@ MFDRV_LineTo( PHYSDEV dev, INT x, INT y )
/***********************************************************************
* MFDRV_Arc
*/
BOOL
BOOL CDECL
MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -60,7 +60,7 @@ MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* MFDRV_Pie
*/
BOOL
BOOL CDECL
MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -72,7 +72,7 @@ MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* MFDRV_Chord
*/
BOOL
BOOL CDECL
MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -83,7 +83,7 @@ MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* MFDRV_Ellipse
*/
BOOL
BOOL CDECL
MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
{
return MFDRV_MetaParam4(dev, META_ELLIPSE, left, top, right, bottom);
......@@ -92,7 +92,7 @@ MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
/***********************************************************************
* MFDRV_Rectangle
*/
BOOL
BOOL CDECL
MFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom)
{
return MFDRV_MetaParam4(dev, META_RECTANGLE, left, top, right, bottom);
......@@ -101,7 +101,7 @@ MFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom)
/***********************************************************************
* MFDRV_RoundRect
*/
BOOL
BOOL CDECL
MFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right,
INT bottom, INT ell_width, INT ell_height )
{
......@@ -112,7 +112,7 @@ MFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right,
/***********************************************************************
* MFDRV_SetPixel
*/
COLORREF
COLORREF CDECL
MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color )
{
return MFDRV_MetaParam4(dev, META_SETPIXEL, x, y,HIWORD(color),
......@@ -146,7 +146,7 @@ static BOOL MFDRV_MetaPoly(PHYSDEV dev, short func, LPPOINT16 pt, short count)
/**********************************************************************
* MFDRV_Polyline
*/
BOOL
BOOL CDECL
MFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count )
{
register int i;
......@@ -170,7 +170,7 @@ MFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count )
/**********************************************************************
* MFDRV_Polygon
*/
BOOL
BOOL CDECL
MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count )
{
register int i;
......@@ -194,7 +194,7 @@ MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count )
/**********************************************************************
* MFDRV_PolyPolygon
*/
BOOL
BOOL CDECL
MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons)
{
BOOL ret;
......@@ -249,7 +249,7 @@ MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygon
/**********************************************************************
* MFDRV_ExtFloodFill
*/
BOOL
BOOL CDECL
MFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType )
{
return MFDRV_MetaParam4(dev,META_FLOODFILL,x,y,HIWORD(color),
......@@ -348,7 +348,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn)
/**********************************************************************
* MFDRV_PaintRgn
*/
BOOL
BOOL CDECL
MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn )
{
INT16 index;
......@@ -362,7 +362,7 @@ MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn )
/**********************************************************************
* MFDRV_InvertRgn
*/
BOOL
BOOL CDECL
MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn )
{
INT16 index;
......@@ -376,7 +376,7 @@ MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn )
/**********************************************************************
* MFDRV_FillRgn
*/
BOOL
BOOL CDECL
MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush )
{
INT16 iRgn, iBrush;
......@@ -392,7 +392,7 @@ MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush )
/**********************************************************************
* MFDRV_FrameRgn
*/
BOOL
BOOL CDECL
MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y )
{
INT16 iRgn, iBrush;
......@@ -409,7 +409,7 @@ MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y )
/**********************************************************************
* MFDRV_ExtSelectClipRgn
*/
INT MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode )
INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode )
{
INT16 iRgn;
INT ret;
......@@ -428,7 +428,7 @@ INT MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode )
/**********************************************************************
* MFDRV_SetBkColor
*/
COLORREF
COLORREF CDECL
MFDRV_SetBkColor( PHYSDEV dev, COLORREF color )
{
return MFDRV_MetaParam2(dev, META_SETBKCOLOR, HIWORD(color),
......@@ -439,7 +439,7 @@ MFDRV_SetBkColor( PHYSDEV dev, COLORREF color )
/**********************************************************************
* MFDRV_SetTextColor
*/
COLORREF
COLORREF CDECL
MFDRV_SetTextColor( PHYSDEV dev, COLORREF color )
{
return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color),
......@@ -452,7 +452,7 @@ MFDRV_SetTextColor( PHYSDEV dev, COLORREF color )
* Since MetaFiles don't record Beziers and they don't even record
* approximations to them using lines, we need this stub function.
*/
BOOL
BOOL CDECL
MFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count )
{
return FALSE;
......@@ -463,7 +463,7 @@ MFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count )
* Since MetaFiles don't record Beziers and they don't even record
* approximations to them using lines, we need this stub function.
*/
BOOL
BOOL CDECL
MFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count )
{
return FALSE;
......
dlls/gdi32/mfdrv/init.c
View file @ 131d0a79
......@@ -586,7 +586,7 @@ BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2,
/**********************************************************************
* MFDRV_ExtEscape
*/
INT MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data,
INT CDECL MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data,
INT cbOutput, LPVOID out_data )
{
METARECORD *mr;
......@@ -613,7 +613,7 @@ INT MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data,
*
*A very simple implementation that returns DT_METAFILE
*/
INT MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap)
INT CDECL MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap)
{
switch(cap)
{
......
dlls/gdi32/mfdrv/mapping.c
View file @ 131d0a79
......@@ -25,7 +25,7 @@
/***********************************************************************
* MFDRV_SetMapMode
*/
INT MFDRV_SetMapMode( PHYSDEV dev, INT mode )
INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode )
{
if(!MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ))
return FALSE;
......@@ -36,7 +36,7 @@ INT MFDRV_SetMapMode( PHYSDEV dev, INT mode )
/***********************************************************************
* MFDRV_SetViewportExt
*/
INT MFDRV_SetViewportExt( PHYSDEV dev, INT x, INT y )
INT CDECL MFDRV_SetViewportExt( PHYSDEV dev, INT x, INT y )
{
if(!MFDRV_MetaParam2( dev, META_SETVIEWPORTEXT, x, y ))
return FALSE;
......@@ -47,7 +47,7 @@ INT MFDRV_SetViewportExt( PHYSDEV dev, INT x, INT y )
/***********************************************************************
* MFDRV_SetViewportOrg
*/
INT MFDRV_SetViewportOrg( PHYSDEV dev, INT x, INT y )
INT CDECL MFDRV_SetViewportOrg( PHYSDEV dev, INT x, INT y )
{
if(!MFDRV_MetaParam2( dev, META_SETVIEWPORTORG, x, y ))
return FALSE;
......@@ -58,7 +58,7 @@ INT MFDRV_SetViewportOrg( PHYSDEV dev, INT x, INT y )
/***********************************************************************
* MFDRV_SetWindowExt
*/
INT MFDRV_SetWindowExt( PHYSDEV dev, INT x, INT y )
INT CDECL MFDRV_SetWindowExt( PHYSDEV dev, INT x, INT y )
{
if(!MFDRV_MetaParam2( dev, META_SETWINDOWEXT, x, y ))
return FALSE;
......@@ -69,7 +69,7 @@ INT MFDRV_SetWindowExt( PHYSDEV dev, INT x, INT y )
/***********************************************************************
* MFDRV_SetWindowOrg
*/
INT MFDRV_SetWindowOrg( PHYSDEV dev, INT x, INT y )
INT CDECL MFDRV_SetWindowOrg( PHYSDEV dev, INT x, INT y )
{
if(!MFDRV_MetaParam2( dev, META_SETWINDOWORG, x, y ))
return FALSE;
......@@ -80,7 +80,7 @@ INT MFDRV_SetWindowOrg( PHYSDEV dev, INT x, INT y )
/***********************************************************************
* MFDRV_OffsetViewportOrg
*/
INT MFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y )
INT CDECL MFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y )
{
if(!MFDRV_MetaParam2( dev, META_OFFSETVIEWPORTORG, x, y ))
return FALSE;
......@@ -91,7 +91,7 @@ INT MFDRV_OffsetViewportOrg( PHYSDEV dev, INT x, INT y )
/***********************************************************************
* MFDRV_OffsetWindowOrg
*/
INT MFDRV_OffsetWindowOrg( PHYSDEV dev, INT x, INT y )
INT CDECL MFDRV_OffsetWindowOrg( PHYSDEV dev, INT x, INT y )
{
if(!MFDRV_MetaParam2( dev, META_OFFSETWINDOWORG, x, y ))
return FALSE;
......@@ -102,7 +102,7 @@ INT MFDRV_OffsetWindowOrg( PHYSDEV dev, INT x, INT y )
/***********************************************************************
* MFDRV_ScaleViewportExt
*/
INT MFDRV_ScaleViewportExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom )
INT CDECL MFDRV_ScaleViewportExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom )
{
if(!MFDRV_MetaParam4( dev, META_SCALEVIEWPORTEXT, xNum, xDenom, yNum, yDenom ))
return FALSE;
......@@ -113,7 +113,7 @@ INT MFDRV_ScaleViewportExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDe
/***********************************************************************
* MFDRV_ScaleWindowExt
*/
INT MFDRV_ScaleWindowExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom )
INT CDECL MFDRV_ScaleWindowExt( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom )
{
if(!MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ))
return FALSE;
......
dlls/gdi32/mfdrv/objects.c
View file @ 131d0a79
......@@ -95,7 +95,7 @@ static INT16 MFDRV_FindObject( PHYSDEV dev, HGDIOBJ obj )
/******************************************************************
* MFDRV_DeleteObject
*/
BOOL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj )
BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj )
{
METARECORD mr;
METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
......@@ -137,7 +137,7 @@ static BOOL MFDRV_SelectObject( PHYSDEV dev, INT16 index)
/***********************************************************************
* MFDRV_SelectBitmap
*/
HBITMAP MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap )
HBITMAP CDECL MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap )
{
return 0;
}
......@@ -334,7 +334,7 @@ done:
/***********************************************************************
* MFDRV_SelectBrush
*/
HBRUSH MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush )
HBRUSH CDECL MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush )
{
METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
INT16 index;
......@@ -389,7 +389,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo
/***********************************************************************
* MFDRV_SelectFont
*/
HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont )
HFONT CDECL MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont )
{
METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
LOGFONTW font;
......@@ -428,7 +428,7 @@ static UINT16 MFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen, LOGPEN16 *logpen)
/***********************************************************************
* MFDRV_SelectPen
*/
HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN hpen )
HPEN CDECL MFDRV_SelectPen( PHYSDEV dev, HPEN hpen )
{
METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev;
LOGPEN16 logpen;
......@@ -511,7 +511,7 @@ static BOOL MFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPalette, LOGPALETTE* logP
/***********************************************************************
* MFDRV_SelectPalette
*/
HPALETTE MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackground )
HPALETTE CDECL MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackground )
{
#define PALVERSION 0x0300
......@@ -547,7 +547,7 @@ HPALETTE MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackgro
/***********************************************************************
* MFDRV_RealizePalette
*/
UINT MFDRV_RealizePalette(PHYSDEV dev, HPALETTE hPalette, BOOL dummy)
UINT CDECL MFDRV_RealizePalette(PHYSDEV dev, HPALETTE hPalette, BOOL dummy)
{
char buffer[sizeof(METARECORD) - sizeof(WORD)];
METARECORD *mr = (METARECORD *)&buffer;
......
dlls/gdi32/mfdrv/text.c
View file @ 131d0a79
......@@ -71,7 +71,7 @@ static BOOL MFDRV_MetaExtTextOut( PHYSDEV dev, short x, short y, UINT16 flags,
/***********************************************************************
* MFDRV_ExtTextOut
*/
BOOL
BOOL CDECL
MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
const RECT *lprect, LPCWSTR str, UINT count,
const INT *lpDx )
......
dlls/winex11.drv/bitblt.c
View file @ 131d0a79
......@@ -1502,7 +1502,7 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT
/***********************************************************************
* X11DRV_PatBlt
*/
BOOL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop )
BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop )
{
BOOL result;
......@@ -1637,7 +1637,7 @@ static BOOL X11DRV_ClientSideDIBCopy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT
/***********************************************************************
* X11DRV_BitBlt
*/
BOOL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
INT width, INT height, X11DRV_PDEVICE *physDevSrc,
INT xSrc, INT ySrc, DWORD rop )
{
......@@ -1736,7 +1736,7 @@ END:
/***********************************************************************
* X11DRV_StretchBlt
*/
BOOL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
INT widthDst, INT heightDst,
X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,
INT widthSrc, INT heightSrc, DWORD rop )
......
dlls/winex11.drv/bitmap.c
View file @ 131d0a79
......@@ -69,7 +69,7 @@ void X11DRV_BITMAP_Init(void)
/***********************************************************************
* SelectBitmap (X11DRV.@)
*/
HBITMAP X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
{
X_PHYSBITMAP *physBitmap;
BITMAP bitmap;
......@@ -111,7 +111,7 @@ HBITMAP X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
*
* Returns TRUE on success else FALSE
*/
BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBits )
BOOL CDECL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBits )
{
X_PHYSBITMAP *physBitmap;
BITMAP bitmap;
......@@ -175,7 +175,7 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit
* Success: Number of bytes copied
* Failure: 0
*/
LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count )
LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count )
{
BITMAP bitmap;
X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap );
......@@ -298,7 +298,7 @@ LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count )
* Success: Number of bytes used in setting the bitmap bits
* Failure: 0
*/
LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count )
LONG CDECL X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count )
{
BITMAP bitmap;
X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap );
......@@ -417,7 +417,7 @@ LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count )
/***********************************************************************
* DeleteBitmap (X11DRV.@)
*/
BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap )
BOOL CDECL X11DRV_DeleteBitmap( HBITMAP hbitmap )
{
X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap );
......
dlls/winex11.drv/brush.c
View file @ 131d0a79
......@@ -251,7 +251,7 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
/***********************************************************************
* SelectBrush (X11DRV.@)
*/
HBRUSH X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush )
HBRUSH CDECL X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush )
{
LOGBRUSH logbrush;
HBITMAP hBitmap;
......@@ -321,7 +321,7 @@ HBRUSH X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush )
/***********************************************************************
* SetDCBrushColor (X11DRV.@)
*/
COLORREF X11DRV_SetDCBrushColor( X11DRV_PDEVICE *physDev, COLORREF crColor )
COLORREF CDECL X11DRV_SetDCBrushColor( X11DRV_PDEVICE *physDev, COLORREF crColor )
{
if (GetCurrentObject(physDev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH ))
BRUSH_SelectSolidBrush( physDev, crColor );
......
dlls/winex11.drv/dib.c
View file @ 131d0a79
......@@ -3791,7 +3791,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
* X11DRV_SetDIBitsToDevice
*
*/
INT X11DRV_SetDIBitsToDevice( X11DRV_PDEVICE *physDev, INT xDest, INT yDest, DWORD cx,
INT CDECL X11DRV_SetDIBitsToDevice( X11DRV_PDEVICE *physDev, INT xDest, INT yDest, DWORD cx,
DWORD cy, INT xSrc, INT ySrc,
UINT startscan, UINT lines, LPCVOID bits,
const BITMAPINFO *info, UINT coloruse )
......@@ -3917,7 +3917,7 @@ INT X11DRV_SetDIBitsToDevice( X11DRV_PDEVICE *physDev, INT xDest, INT yDest, DWO
/***********************************************************************
* SetDIBits (X11DRV.@)
*/
INT X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse )
{
X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap );
......@@ -4030,7 +4030,7 @@ INT X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
/***********************************************************************
* GetDIBits (X11DRV.@)
*/
INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, UINT lines,
INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, UINT lines,
LPVOID bits, BITMAPINFO *info, UINT coloruse )
{
X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap );
......@@ -4675,7 +4675,7 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
/***********************************************************************
* X11DRV_CreateDIBSection (X11DRV.@)
*/
HBITMAP X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap,
HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap,
const BITMAPINFO *bmi, UINT usage )
{
X_PHYSBITMAP *physBitmap;
......@@ -4775,7 +4775,7 @@ void X11DRV_DIB_DeleteDIBSection(X_PHYSBITMAP *physBitmap, DIBSECTION *dib)
/***********************************************************************
* SetDIBColorTable (X11DRV.@)
*/
UINT X11DRV_SetDIBColorTable( X11DRV_PDEVICE *physDev, UINT start, UINT count, const RGBQUAD *colors )
UINT CDECL X11DRV_SetDIBColorTable( X11DRV_PDEVICE *physDev, UINT start, UINT count, const RGBQUAD *colors )
{
DIBSECTION dib;
UINT ret = 0;
......
dlls/winex11.drv/graphics.c
View file @ 131d0a79
......@@ -155,7 +155,7 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp )
/***********************************************************************
* X11DRV_SetDeviceClipping
*/
void X11DRV_SetDeviceClipping( X11DRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn )
void CDECL X11DRV_SetDeviceClipping( X11DRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn )
{
RGNDATA *data;
......@@ -433,7 +433,7 @@ INT X11DRV_YWStoDS( X11DRV_PDEVICE *physDev, INT height )
/***********************************************************************
* X11DRV_LineTo
*/
BOOL
BOOL CDECL
X11DRV_LineTo( X11DRV_PDEVICE *physDev, INT x, INT y )
{
POINT pt[2];
......@@ -629,7 +629,7 @@ X11DRV_DrawArc( X11DRV_PDEVICE *physDev, INT left, INT top, INT right,
/***********************************************************************
* X11DRV_Arc
*/
BOOL
BOOL CDECL
X11DRV_Arc( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -641,7 +641,7 @@ X11DRV_Arc( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* X11DRV_Pie
*/
BOOL
BOOL CDECL
X11DRV_Pie( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -652,7 +652,7 @@ X11DRV_Pie( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* X11DRV_Chord
*/
BOOL
BOOL CDECL
X11DRV_Chord( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend )
{
......@@ -664,7 +664,7 @@ X11DRV_Chord( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom,
/***********************************************************************
* X11DRV_Ellipse
*/
BOOL
BOOL CDECL
X11DRV_Ellipse( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom )
{
INT width, oldwidth;
......@@ -728,7 +728,7 @@ X11DRV_Ellipse( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT botto
/***********************************************************************
* X11DRV_Rectangle
*/
BOOL
BOOL CDECL
X11DRV_Rectangle(X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom)
{
INT width, oldwidth, oldjoinstyle;
......@@ -801,7 +801,7 @@ X11DRV_Rectangle(X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bott
/***********************************************************************
* X11DRV_RoundRect
*/
BOOL
BOOL CDECL
X11DRV_RoundRect( X11DRV_PDEVICE *physDev, INT left, INT top, INT right,
INT bottom, INT ell_width, INT ell_height )
{
......@@ -1011,7 +1011,7 @@ X11DRV_RoundRect( X11DRV_PDEVICE *physDev, INT left, INT top, INT right,
/***********************************************************************
* X11DRV_SetPixel
*/
COLORREF
COLORREF CDECL
X11DRV_SetPixel( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color )
{
unsigned long pixel;
......@@ -1043,7 +1043,7 @@ X11DRV_SetPixel( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color )
/***********************************************************************
* X11DRV_GetPixel
*/
COLORREF
COLORREF CDECL
X11DRV_GetPixel( X11DRV_PDEVICE *physDev, INT x, INT y )
{
static Pixmap pixmap = 0;
......@@ -1090,7 +1090,7 @@ X11DRV_GetPixel( X11DRV_PDEVICE *physDev, INT x, INT y )
/***********************************************************************
* X11DRV_PaintRgn
*/
BOOL
BOOL CDECL
X11DRV_PaintRgn( X11DRV_PDEVICE *physDev, HRGN hrgn )
{
if (X11DRV_SetupGCForBrush( physDev ))
......@@ -1120,7 +1120,7 @@ X11DRV_PaintRgn( X11DRV_PDEVICE *physDev, HRGN hrgn )
/**********************************************************************
* X11DRV_Polyline
*/
BOOL
BOOL CDECL
X11DRV_Polyline( X11DRV_PDEVICE *physDev, const POINT* pt, INT count )
{
int i;
......@@ -1157,7 +1157,7 @@ X11DRV_Polyline( X11DRV_PDEVICE *physDev, const POINT* pt, INT count )
/**********************************************************************
* X11DRV_Polygon
*/
BOOL
BOOL CDECL
X11DRV_Polygon( X11DRV_PDEVICE *physDev, const POINT* pt, INT count )
{
register int i;
......@@ -1209,7 +1209,7 @@ X11DRV_Polygon( X11DRV_PDEVICE *physDev, const POINT* pt, INT count )
/**********************************************************************
* X11DRV_PolyPolygon
*/
BOOL
BOOL CDECL
X11DRV_PolyPolygon( X11DRV_PDEVICE *physDev, const POINT* pt, const INT* counts, UINT polygons)
{
HRGN hrgn;
......@@ -1267,7 +1267,7 @@ X11DRV_PolyPolygon( X11DRV_PDEVICE *physDev, const POINT* pt, const INT* counts,
/**********************************************************************
* X11DRV_PolyPolyline
*/
BOOL
BOOL CDECL
X11DRV_PolyPolyline( X11DRV_PDEVICE *physDev, const POINT* pt, const DWORD* counts, DWORD polylines )
{
if (X11DRV_SetupGCForPen ( physDev ))
......@@ -1386,7 +1386,7 @@ static int ExtFloodFillXGetImageErrorHandler( Display *dpy, XErrorEvent *event,
/**********************************************************************
* X11DRV_ExtFloodFill
*/
BOOL
BOOL CDECL
X11DRV_ExtFloodFill( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color,
UINT fillType )
{
......@@ -1440,7 +1440,7 @@ X11DRV_ExtFloodFill( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color,
/**********************************************************************
* X11DRV_SetBkColor
*/
COLORREF
COLORREF CDECL
X11DRV_SetBkColor( X11DRV_PDEVICE *physDev, COLORREF color )
{
physDev->backgroundPixel = X11DRV_PALETTE_ToPhysical( physDev, color );
......@@ -1450,7 +1450,7 @@ X11DRV_SetBkColor( X11DRV_PDEVICE *physDev, COLORREF color )
/**********************************************************************
* X11DRV_SetTextColor
*/
COLORREF
COLORREF CDECL
X11DRV_SetTextColor( X11DRV_PDEVICE *physDev, COLORREF color )
{
physDev->textPixel = X11DRV_PALETTE_ToPhysical( physDev, color );
......@@ -1460,7 +1460,7 @@ X11DRV_SetTextColor( X11DRV_PDEVICE *physDev, COLORREF color )
/***********************************************************************
* GetDCOrgEx (X11DRV.@)
*/
BOOL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp )
BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp )
{
lpp->x = physDev->dc_rect.left + physDev->drawable_rect.left;
lpp->y = physDev->dc_rect.top + physDev->drawable_rect.top;
......@@ -1471,7 +1471,7 @@ BOOL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp )
/***********************************************************************
* SetDCOrg (X11DRV.@)
*/
DWORD X11DRV_SetDCOrg( X11DRV_PDEVICE *physDev, INT x, INT y )
DWORD CDECL X11DRV_SetDCOrg( X11DRV_PDEVICE *physDev, INT x, INT y )
{
DWORD ret = MAKELONG( physDev->dc_rect.left + physDev->drawable_rect.left,
physDev->dc_rect.top + physDev->drawable_rect.top );
......@@ -1516,7 +1516,7 @@ extern void WINAPI A_SHAFinal( sha_ctx *, unsigned char * );
/***********************************************************************
* GetICMProfile (X11DRV.@)
*/
BOOL X11DRV_GetICMProfile( X11DRV_PDEVICE *physDev, LPDWORD size, LPWSTR filename )
BOOL CDECL X11DRV_GetICMProfile( X11DRV_PDEVICE *physDev, LPDWORD size, LPWSTR filename )
{
static const WCHAR path[] =
{'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s',
......
dlls/winex11.drv/init.c
View file @ 131d0a79
......@@ -118,7 +118,7 @@ void X11DRV_GDI_Finalize(void)
/**********************************************************************
* X11DRV_CreateDC
*/
BOOL X11DRV_CreateDC( HDC hdc, X11DRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR device,
BOOL CDECL X11DRV_CreateDC( HDC hdc, X11DRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR device,
LPCWSTR output, const DEVMODEW* initData )
{
X11DRV_PDEVICE *physDev;
......@@ -165,7 +165,7 @@ BOOL X11DRV_CreateDC( HDC hdc, X11DRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR de
/**********************************************************************
* X11DRV_DeleteDC
*/
BOOL X11DRV_DeleteDC( X11DRV_PDEVICE *physDev )
BOOL CDECL X11DRV_DeleteDC( X11DRV_PDEVICE *physDev )
{
if(physDev->xrender)
X11DRV_XRender_DeleteDC( physDev );
......@@ -181,7 +181,7 @@ BOOL X11DRV_DeleteDC( X11DRV_PDEVICE *physDev )
/***********************************************************************
* GetDeviceCaps (X11DRV.@)
*/
INT X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap )
INT CDECL X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap )
{
switch(cap)
{
......@@ -276,7 +276,7 @@ INT X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap )
/**********************************************************************
* ExtEscape (X11DRV.@)
*/
INT X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID in_data,
INT CDECL X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID in_data,
INT out_count, LPVOID out_data )
{
switch(escape)
......
dlls/winex11.drv/pen.c
View file @ 131d0a79
......@@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
/***********************************************************************
* SelectPen (X11DRV.@)
*/
HPEN X11DRV_SelectPen( X11DRV_PDEVICE *physDev, HPEN hpen )
HPEN CDECL X11DRV_SelectPen( X11DRV_PDEVICE *physDev, HPEN hpen )
{
static const char PEN_dash[] = { 16,8 };
static const char PEN_dot[] = { 4,4 };
......@@ -126,7 +126,7 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *physDev, HPEN hpen )
/***********************************************************************
* SetDCPenColor (X11DRV.@)
*/
COLORREF X11DRV_SetDCPenColor( X11DRV_PDEVICE *physDev, COLORREF crColor )
COLORREF CDECL X11DRV_SetDCPenColor( X11DRV_PDEVICE *physDev, COLORREF crColor )
{
if (GetCurrentObject(physDev->hdc, OBJ_PEN) == GetStockObject( DC_PEN ))
physDev->pen.pixel = X11DRV_PALETTE_ToPhysical( physDev, crColor );
......
dlls/winex11.drv/text.c
View file @ 131d0a79
......@@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(text);
/***********************************************************************
* X11DRV_ExtTextOut
*/
BOOL
BOOL CDECL
X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags,
const RECT *lprect, LPCWSTR wstr, UINT count,
const INT *lpDx )
......@@ -201,7 +201,7 @@ END:
/***********************************************************************
* X11DRV_GetTextExtentExPoint
*/
BOOL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count,
BOOL CDECL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count,
INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size )
{
fontObject* pfo = XFONT_GetFontObject( physDev->font );
......
dlls/winex11.drv/x11drv.h
View file @ 131d0a79
......@@ -66,8 +66,8 @@ typedef int Status;
struct tagCURSORICONINFO;
extern void wine_tsx11_lock(void);
extern void wine_tsx11_unlock(void);
extern void CDECL wine_tsx11_lock(void);
extern void CDECL wine_tsx11_unlock(void);
/* X physical pen */
typedef struct
......@@ -152,82 +152,80 @@ extern X_PHYSBITMAP BITMAP_stock_phys_bitmap; /* phys bitmap for the default st
/* Wine driver X11 functions */
extern BOOL X11DRV_AlphaBlend( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
extern BOOL CDECL X11DRV_AlphaBlend( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
INT widthDst, INT heightDst,
X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,
INT widthSrc, INT heightSrc, BLENDFUNCTION blendfn );
extern BOOL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
extern BOOL CDECL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
INT width, INT height, X11DRV_PDEVICE *physDevSrc,
INT xSrc, INT ySrc, DWORD rop );
extern BOOL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf,
extern BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf,
FONTENUMPROCW dfeproc, LPARAM lp );
extern LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count );
extern BOOL X11DRV_GetCharWidth( X11DRV_PDEVICE *physDev, UINT firstChar,
extern LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count );
extern BOOL CDECL X11DRV_GetCharWidth( X11DRV_PDEVICE *physDev, UINT firstChar,
UINT lastChar, LPINT buffer );
extern BOOL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp );
extern BOOL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count,
extern BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp );
extern BOOL CDECL X11DRV_GetTextExtentExPoint( X11DRV_PDEVICE *physDev, LPCWSTR str, INT count,
INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size );
extern BOOL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics);
extern BOOL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top,
extern BOOL CDECL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics);
extern BOOL CDECL X11DRV_PatBlt( X11DRV_PDEVICE *physDev, INT left, INT top,
INT width, INT height, DWORD rop );
extern BOOL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
extern BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
INT widthDst, INT heightDst,
X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc,
INT widthSrc, INT heightSrc, DWORD rop );
extern BOOL X11DRV_LineTo( X11DRV_PDEVICE *physDev, INT x, INT y);
extern BOOL X11DRV_Arc( X11DRV_PDEVICE *physDev, INT left, INT top, INT right,
extern BOOL CDECL X11DRV_LineTo( X11DRV_PDEVICE *physDev, INT x, INT y);
extern BOOL CDECL X11DRV_Arc( X11DRV_PDEVICE *physDev, INT left, INT top, INT right,
INT bottom, INT xstart, INT ystart, INT xend, INT yend );
extern BOOL CDECL X11DRV_Pie( X11DRV_PDEVICE *physDev, INT left, INT top, INT right,
INT bottom, INT xstart, INT ystart, INT xend,
INT yend );
extern BOOL X11DRV_Pie( X11DRV_PDEVICE *physDev, INT left, INT top, INT right,
INT bottom, INT xstart, INT ystart, INT xend,
INT yend );
extern BOOL X11DRV_Chord( X11DRV_PDEVICE *physDev, INT left, INT top,
extern BOOL CDECL X11DRV_Chord( X11DRV_PDEVICE *physDev, INT left, INT top,
INT right, INT bottom, INT xstart,
INT ystart, INT xend, INT yend );
extern BOOL X11DRV_Ellipse( X11DRV_PDEVICE *physDev, INT left, INT top,
extern BOOL CDECL X11DRV_Ellipse( X11DRV_PDEVICE *physDev, INT left, INT top,
INT right, INT bottom );
extern BOOL X11DRV_Rectangle(X11DRV_PDEVICE *physDev, INT left, INT top,
extern BOOL CDECL X11DRV_Rectangle(X11DRV_PDEVICE *physDev, INT left, INT top,
INT right, INT bottom);
extern BOOL X11DRV_RoundRect( X11DRV_PDEVICE *physDev, INT left, INT top,
extern BOOL CDECL X11DRV_RoundRect( X11DRV_PDEVICE *physDev, INT left, INT top,
INT right, INT bottom, INT ell_width,
INT ell_height );
extern COLORREF X11DRV_SetPixel( X11DRV_PDEVICE *physDev, INT x, INT y,
COLORREF color );
extern COLORREF X11DRV_GetPixel( X11DRV_PDEVICE *physDev, INT x, INT y);
extern BOOL X11DRV_PaintRgn( X11DRV_PDEVICE *physDev, HRGN hrgn );
extern BOOL X11DRV_Polyline( X11DRV_PDEVICE *physDev,const POINT* pt,INT count);
extern BOOL X11DRV_Polygon( X11DRV_PDEVICE *physDev, const POINT* pt, INT count );
extern BOOL X11DRV_PolyPolygon( X11DRV_PDEVICE *physDev, const POINT* pt,
extern COLORREF CDECL X11DRV_SetPixel( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color );
extern COLORREF CDECL X11DRV_GetPixel( X11DRV_PDEVICE *physDev, INT x, INT y);
extern BOOL CDECL X11DRV_PaintRgn( X11DRV_PDEVICE *physDev, HRGN hrgn );
extern BOOL CDECL X11DRV_Polyline( X11DRV_PDEVICE *physDev,const POINT* pt,INT count);
extern BOOL CDECL X11DRV_Polygon( X11DRV_PDEVICE *physDev, const POINT* pt, INT count );
extern BOOL CDECL X11DRV_PolyPolygon( X11DRV_PDEVICE *physDev, const POINT* pt,
const INT* counts, UINT polygons);
extern BOOL X11DRV_PolyPolyline( X11DRV_PDEVICE *physDev, const POINT* pt,
extern BOOL CDECL X11DRV_PolyPolyline( X11DRV_PDEVICE *physDev, const POINT* pt,
const DWORD* counts, DWORD polylines);
extern COLORREF X11DRV_SetBkColor( X11DRV_PDEVICE *physDev, COLORREF color );
extern COLORREF X11DRV_SetTextColor( X11DRV_PDEVICE *physDev, COLORREF color );
extern BOOL X11DRV_ExtFloodFill( X11DRV_PDEVICE *physDev, INT x, INT y,
extern COLORREF CDECL X11DRV_SetBkColor( X11DRV_PDEVICE *physDev, COLORREF color );
extern COLORREF CDECL X11DRV_SetTextColor( X11DRV_PDEVICE *physDev, COLORREF color );
extern BOOL CDECL X11DRV_ExtFloodFill( X11DRV_PDEVICE *physDev, INT x, INT y,
COLORREF color, UINT fillType );
extern BOOL X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y,
extern BOOL CDECL X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y,
UINT flags, const RECT *lprect,
LPCWSTR str, UINT count, const INT *lpDx );
extern LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count );
extern void X11DRV_SetDeviceClipping( X11DRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn );
extern INT X11DRV_SetDIBitsToDevice( X11DRV_PDEVICE *physDev, INT xDest,
extern LONG CDECL X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count );
extern void CDECL X11DRV_SetDeviceClipping( X11DRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn );
extern INT CDECL X11DRV_SetDIBitsToDevice( X11DRV_PDEVICE *physDev, INT xDest,
INT yDest, DWORD cx, DWORD cy,
INT xSrc, INT ySrc,
UINT startscan, UINT lines,
LPCVOID bits, const BITMAPINFO *info,
UINT coloruse );
extern BOOL X11DRV_GetDeviceGammaRamp( X11DRV_PDEVICE *physDev, LPVOID ramp );
extern BOOL X11DRV_SetDeviceGammaRamp( X11DRV_PDEVICE *physDev, LPVOID ramp );
extern BOOL CDECL X11DRV_GetDeviceGammaRamp( X11DRV_PDEVICE *physDev, LPVOID ramp );
extern BOOL CDECL X11DRV_SetDeviceGammaRamp( X11DRV_PDEVICE *physDev, LPVOID ramp );
/* OpenGL / X11 driver functions */
extern int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev,
extern int CDECL X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev,
const PIXELFORMATDESCRIPTOR *pppfd);
extern int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev,
extern int CDECL X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev,
int iPixelFormat, UINT nBytes,
PIXELFORMATDESCRIPTOR *ppfd);
extern int X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev);
extern BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev);
extern int CDECL X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev);
extern BOOL CDECL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev);
/* X11 driver internal functions */
......
dlls/winex11.drv/xfont.c
View file @ 131d0a79
......@@ -3190,7 +3190,7 @@ XFontStruct* XFONT_GetFontStruct( X_PHYSFONT pFont )
/***********************************************************************
* SelectFont (X11DRV.@)
*/
HFONT X11DRV_SelectFont( X11DRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont )
HFONT CDECL X11DRV_SelectFont( X11DRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont )
{
LOGFONTW logfont;
LOGFONT16 lf;
......@@ -3283,7 +3283,7 @@ HFONT X11DRV_SelectFont( X11DRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont )
*
* X11DRV_EnumDeviceFonts
*/
BOOL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf,
BOOL CDECL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf,
FONTENUMPROCW proc, LPARAM lp )
{
ENUMLOGFONTEXW lf;
......@@ -3347,7 +3347,7 @@ BOOL X11DRV_EnumDeviceFonts( X11DRV_PDEVICE *physDev, LPLOGFONTW plf,
/***********************************************************************
* X11DRV_GetTextMetrics
*/
BOOL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics)
BOOL CDECL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics)
{
if( CHECK_PFONT(physDev->font) )
{
......@@ -3362,7 +3362,7 @@ BOOL X11DRV_GetTextMetrics(X11DRV_PDEVICE *physDev, TEXTMETRICW *metrics)
/***********************************************************************
* X11DRV_GetCharWidth
*/
BOOL X11DRV_GetCharWidth( X11DRV_PDEVICE *physDev, UINT firstChar, UINT lastChar,
BOOL CDECL X11DRV_GetCharWidth( X11DRV_PDEVICE *physDev, UINT firstChar, UINT lastChar,
LPINT buffer )
{
fontObject* pfo = XFONT_GetFontObject( physDev->font );
......
dlls/winex11.drv/xrender.c
View file @ 131d0a79
......@@ -1531,7 +1531,7 @@ done_unlock:
/******************************************************************************
* AlphaBlend (x11drv.@)
*/
BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, INT heightDst,
BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, INT heightDst,
X11DRV_PDEVICE *devSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc,
BLENDFUNCTION blendfn)
{
......
dlls/winex11.drv/xvidmode.c
View file @ 131d0a79
......@@ -432,7 +432,7 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp)
* the stuff in graphics/x11drv/ has been moved to dlls/x11drv, so that
* they can include xvidmode.h directly
*/
BOOL X11DRV_GetDeviceGammaRamp(X11DRV_PDEVICE *physDev, LPVOID ramp)
BOOL CDECL X11DRV_GetDeviceGammaRamp(X11DRV_PDEVICE *physDev, LPVOID ramp)
{
#ifdef SONAME_LIBXXF86VM
return X11DRV_XF86VM_GetGammaRamp(ramp);
......@@ -448,7 +448,7 @@ BOOL X11DRV_GetDeviceGammaRamp(X11DRV_PDEVICE *physDev, LPVOID ramp)
* the stuff in graphics/x11drv/ has been moved to dlls/x11drv, so that
* they can include xvidmode.h directly
*/
BOOL X11DRV_SetDeviceGammaRamp(X11DRV_PDEVICE *physDev, LPVOID ramp)
BOOL CDECL X11DRV_SetDeviceGammaRamp(X11DRV_PDEVICE *physDev, LPVOID ramp)
{
#ifdef SONAME_LIBXXF86VM
return X11DRV_XF86VM_SetGammaRamp(ramp);
......
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