diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 9a9d7157f0c..c9f1c26bc98 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -165,8 +165,8 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, } /* nulldrv fallback implementation using StretchDIBits */ -BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) +BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { DC *dc = get_nulldrv_dc( dst_dev ); BITMAP bm; diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 460f47934fc..36a04a71a36 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -50,7 +50,7 @@ static const struct gdi_obj_funcs bitmap_funcs = * null driver fallback implementations */ -LONG CDECL nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) +LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) { BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); @@ -60,7 +60,7 @@ LONG CDECL nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) return size; } -LONG CDECL nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) +LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) { BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); @@ -79,15 +79,15 @@ LONG CDECL nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) return size; } -INT CDECL nulldrv_GetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, LPVOID bits, - BITMAPINFO *info, UINT coloruse ) +INT nulldrv_GetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, LPVOID bits, + BITMAPINFO *info, UINT coloruse ) { /* FIXME: transfer bits from bmp->bitmap.bmBits */ return 0; } -INT CDECL nulldrv_SetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, - const void *bits, const BITMAPINFO *info, UINT coloruse ) +INT nulldrv_SetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, + const void *bits, const BITMAPINFO *info, UINT coloruse ) { /* FIXME: transfer bits to bmp->bitmap.bmBits */ return 0; diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index e9978c3ffe1..70e0e325f9f 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -129,7 +129,7 @@ static inline void create_default_clip_region( DC * dc ) * null driver fallback implementations */ -INT CDECL nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) +INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) { DC *dc = get_nulldrv_dc( dev ); INT ret; @@ -170,7 +170,7 @@ INT CDECL nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) return ret; } -INT CDECL nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { DC *dc = get_nulldrv_dc( dev ); RECT rect = get_clip_rect( dc, left, top, right, bottom ); @@ -185,7 +185,7 @@ INT CDECL nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, IN return ret; } -INT CDECL nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { DC *dc = get_nulldrv_dc( dev ); RECT rect = get_clip_rect( dc, left, top, right, bottom ); @@ -207,7 +207,7 @@ INT CDECL nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, return ret; } -INT CDECL nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) +INT nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { DC *dc = get_nulldrv_dc( dev ); INT ret = NULLREGION; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 86b6a4602e4..6ecbe370618 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -382,7 +382,7 @@ void DC_UpdateXforms( DC *dc ) /*********************************************************************** * nulldrv_SaveDC */ -INT CDECL nulldrv_SaveDC( PHYSDEV dev ) +INT nulldrv_SaveDC( PHYSDEV dev ) { DC *newdc, *dc = get_nulldrv_dc( dev ); @@ -470,7 +470,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) /*********************************************************************** * restore_dc_state */ -BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) +BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) { DC *dcs, *first_dcs, *dc = get_nulldrv_dc( dev ); INT save_level; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index e0073f16630..cebe474fb9a 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -180,9 +180,9 @@ int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, } /* nulldrv fallback implementation using SetDIBits/StretchBlt */ -INT CDECL nulldrv_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 coloruse, DWORD rop ) +INT nulldrv_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 coloruse, DWORD rop ) { DC *dc = get_nulldrv_dc( dev ); INT ret; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index a6823c95767..89246d828d1 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -297,7 +297,7 @@ static void update_masks( dibdrv_physdev *pdev, INT rop ) /*********************************************************************** * dibdrv_DeleteDC */ -static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) +static BOOL dibdrv_DeleteDC( PHYSDEV dev ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p)\n", dev); @@ -310,7 +310,7 @@ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) /*********************************************************************** * dibdrv_SelectBitmap */ -static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) +static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectBitmap ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -339,7 +339,7 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) /*********************************************************************** * dibdrv_SetBkColor */ -static COLORREF CDECL dibdrv_SetBkColor( PHYSDEV dev, COLORREF color ) +static COLORREF dibdrv_SetBkColor( PHYSDEV dev, COLORREF color ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetBkColor ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -362,7 +362,7 @@ static COLORREF CDECL dibdrv_SetBkColor( PHYSDEV dev, COLORREF color ) /*********************************************************************** * dibdrv_SetBkMode */ -static INT CDECL dibdrv_SetBkMode( PHYSDEV dev, INT mode ) +static INT dibdrv_SetBkMode( PHYSDEV dev, INT mode ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetBkMode ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -381,7 +381,7 @@ static INT CDECL dibdrv_SetBkMode( PHYSDEV dev, INT mode ) /*********************************************************************** * dibdrv_SetDeviceClipping */ -static void CDECL dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -394,7 +394,7 @@ static void CDECL dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip /*********************************************************************** * dibdrv_SetDIBColorTable */ -static UINT CDECL dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RGBQUAD *colors ) +static UINT dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RGBQUAD *colors ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDIBColorTable ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -416,7 +416,7 @@ static UINT CDECL dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, co /*********************************************************************** * dibdrv_SetROP2 */ -static INT CDECL dibdrv_SetROP2( PHYSDEV dev, INT rop ) +static INT dibdrv_SetROP2( PHYSDEV dev, INT rop ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetROP2 ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index e142a9b034c..7889ebb5acb 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; -extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; -extern COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; +extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index b4280582dc9..a7a2fd8d780 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -59,7 +59,7 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, /*********************************************************************** * dibdrv_LineTo */ -BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pLineTo ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -93,7 +93,7 @@ static inline INT get_rop2_from_rop(INT rop) /*********************************************************************** * dibdrv_PatBlt */ -BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPatBlt ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -120,7 +120,7 @@ BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) /*********************************************************************** * dibdrv_PaintRgn */ -BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) +BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPaintRgn ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -149,7 +149,7 @@ BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) /*********************************************************************** * dibdrv_Rectangle */ -BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 1a3e989ccbe..75b63fa4e6a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -926,7 +926,7 @@ static const dash_pattern dash_patterns[5] = /*********************************************************************** * dibdrv_SelectPen */ -HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) +HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -1003,7 +1003,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) /*********************************************************************** * dibdrv_SetDCPenColor */ -COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) +COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCPenColor ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -1245,7 +1245,7 @@ void update_brush_rop( dibdrv_physdev *pdev, INT rop ) /*********************************************************************** * dibdrv_SelectBrush */ -HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) +HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectBrush ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -1323,7 +1323,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) /*********************************************************************** * dibdrv_SetDCBrushColor */ -COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCBrushColor ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e870b170264..04db5e0db10 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -185,140 +185,137 @@ done: } -static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) +static INT nulldrv_AbortDoc( PHYSDEV dev ) { return 0; } -static BOOL CDECL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func) +static BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func) { return TRUE; } -static BOOL CDECL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return TRUE; } -static INT CDECL nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr ) +static INT nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr ) { return 0; } -static BOOL CDECL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return TRUE; } -static BOOL CDECL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap, LPVOID bits ) +static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap, LPVOID bits ) { return TRUE; } -static BOOL CDECL nulldrv_CreateDC( HDC hdc, PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW *devmode ) +static BOOL nulldrv_CreateDC( HDC hdc, PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW *devmode ) { assert(0); /* should never be called */ return FALSE; } -static HBITMAP CDECL nulldrv_CreateDIBSection( PHYSDEV dev, HBITMAP bitmap, - const BITMAPINFO *info, UINT usage ) +static HBITMAP nulldrv_CreateDIBSection( PHYSDEV dev, HBITMAP bitmap, const BITMAPINFO *info, UINT usage ) { return bitmap; } -static BOOL CDECL nulldrv_DeleteBitmap( HBITMAP bitmap ) +static BOOL nulldrv_DeleteBitmap( HBITMAP bitmap ) { return TRUE; } -static BOOL CDECL nulldrv_DeleteDC( PHYSDEV dev ) +static BOOL nulldrv_DeleteDC( PHYSDEV dev ) { assert(0); /* should never be called */ return TRUE; } -static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) +static BOOL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) { return TRUE; } -static INT CDECL nulldrv_DescribePixelFormat( PHYSDEV dev, INT format, - UINT size, PIXELFORMATDESCRIPTOR * descr ) +static INT nulldrv_DescribePixelFormat( PHYSDEV dev, INT format, UINT size, PIXELFORMATDESCRIPTOR * descr ) { return 0; } -static DWORD CDECL nulldrv_DeviceCapabilities( LPSTR buffer, LPCSTR device, LPCSTR port, - WORD cap, LPSTR output, DEVMODEA *devmode ) +static DWORD nulldrv_DeviceCapabilities( LPSTR buffer, LPCSTR device, LPCSTR port, + WORD cap, LPSTR output, DEVMODEA *devmode ) { return -1; } -static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +static BOOL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return TRUE; } -static INT CDECL nulldrv_EndDoc( PHYSDEV dev ) +static INT nulldrv_EndDoc( PHYSDEV dev ) { return 0; } -static INT CDECL nulldrv_EndPage( PHYSDEV dev ) +static INT nulldrv_EndPage( PHYSDEV dev ) { return 0; } -static BOOL CDECL nulldrv_EnumDeviceFonts( PHYSDEV dev, LOGFONTW *logfont, - FONTENUMPROCW proc, LPARAM lParam ) +static BOOL nulldrv_EnumDeviceFonts( PHYSDEV dev, LOGFONTW *logfont, FONTENUMPROCW proc, LPARAM lParam ) { return FALSE; } -static INT CDECL nulldrv_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW func, LPARAM lparam ) +static INT nulldrv_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW func, LPARAM lparam ) { return -1; } -static INT CDECL nulldrv_ExtDeviceMode( LPSTR buffer, HWND hwnd, DEVMODEA *output, LPSTR device, - LPSTR port, DEVMODEA *input, LPSTR profile, DWORD mode ) +static INT nulldrv_ExtDeviceMode( LPSTR buffer, HWND hwnd, DEVMODEA *output, LPSTR device, + LPSTR port, DEVMODEA *input, LPSTR profile, DWORD mode ) { return -1; } -static INT CDECL nulldrv_ExtEscape( PHYSDEV dev, INT escape, INT in_size, const void *in_data, +static INT nulldrv_ExtEscape( PHYSDEV dev, INT escape, INT in_size, const void *in_data, INT out_size, void *out_data ) { return 0; } -static BOOL CDECL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) +static BOOL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { return TRUE; } -static BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, - LPCWSTR str, UINT count, const INT *dx ) +static BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, + LPCWSTR str, UINT count, const INT *dx ) { return TRUE; } -static BOOL CDECL nulldrv_GdiComment( PHYSDEV dev, UINT size, const BYTE *data ) +static BOOL nulldrv_GdiComment( PHYSDEV dev, UINT size, const BYTE *data ) { return FALSE; } -static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer ) +static BOOL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer ) { return FALSE; } -static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) +static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch (cap) /* return meaningful values for some entries */ { @@ -340,325 +337,323 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) } } -static BOOL CDECL nulldrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +static BOOL nulldrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) { return FALSE; } -static BOOL CDECL nulldrv_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) +static BOOL nulldrv_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) { return FALSE; } -static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) +static COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { return 0; } -static INT CDECL nulldrv_GetPixelFormat( PHYSDEV dev ) +static INT nulldrv_GetPixelFormat( PHYSDEV dev ) { return 0; } -static UINT CDECL nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, - UINT count, PALETTEENTRY *entries ) +static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) { return 0; } -static BOOL CDECL nulldrv_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT max_ext, - INT *fit, INT *dx, SIZE *size ) +static BOOL nulldrv_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT max_ext, + INT *fit, INT *dx, SIZE *size ) { return FALSE; } -static BOOL CDECL nulldrv_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) +static BOOL nulldrv_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) { return FALSE; } -static BOOL CDECL nulldrv_LineTo( PHYSDEV dev, INT x, INT y ) +static BOOL nulldrv_LineTo( PHYSDEV dev, INT x, INT y ) { return TRUE; } -static BOOL CDECL nulldrv_MoveTo( PHYSDEV dev, INT x, INT y ) +static BOOL nulldrv_MoveTo( PHYSDEV dev, INT x, INT y ) { return TRUE; } -static BOOL CDECL nulldrv_PaintRgn( PHYSDEV dev, HRGN rgn ) +static BOOL nulldrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { return TRUE; } -static BOOL CDECL nulldrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +static BOOL nulldrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { return TRUE; } -static BOOL CDECL nulldrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL nulldrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return TRUE; } -static BOOL CDECL nulldrv_PolyPolygon( PHYSDEV dev, const POINT *points, const INT *counts, UINT polygons ) +static BOOL nulldrv_PolyPolygon( PHYSDEV dev, const POINT *points, const INT *counts, UINT polygons ) { /* FIXME: could be implemented with Polygon */ return TRUE; } -static BOOL CDECL nulldrv_PolyPolyline( PHYSDEV dev, const POINT *points, const DWORD *counts, DWORD lines ) +static BOOL nulldrv_PolyPolyline( PHYSDEV dev, const POINT *points, const DWORD *counts, DWORD lines ) { /* FIXME: could be implemented with Polyline */ return TRUE; } -static BOOL CDECL nulldrv_Polygon( PHYSDEV dev, const POINT *points, INT count ) +static BOOL nulldrv_Polygon( PHYSDEV dev, const POINT *points, INT count ) { return TRUE; } -static BOOL CDECL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count ) +static BOOL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count ) { return TRUE; } -static UINT CDECL nulldrv_RealizeDefaultPalette( PHYSDEV dev ) +static UINT nulldrv_RealizeDefaultPalette( PHYSDEV dev ) { return 0; } -static UINT CDECL nulldrv_RealizePalette( PHYSDEV dev, HPALETTE palette, BOOL primary ) +static UINT nulldrv_RealizePalette( PHYSDEV dev, HPALETTE palette, BOOL primary ) { return 0; } -static BOOL CDECL nulldrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +static BOOL nulldrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return TRUE; } -static HDC CDECL nulldrv_ResetDC( PHYSDEV dev, const DEVMODEW *devmode ) +static HDC nulldrv_ResetDC( PHYSDEV dev, const DEVMODEW *devmode ) { return 0; } -static BOOL CDECL nulldrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT ell_width, INT ell_height ) +static BOOL nulldrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT ell_width, INT ell_height ) { return TRUE; } -static HBITMAP CDECL nulldrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) +static HBITMAP nulldrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) { return bitmap; } -static HBRUSH CDECL nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush ) +static HBRUSH nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush ) { return brush; } -static HFONT CDECL nulldrv_SelectFont( PHYSDEV dev, HFONT font, HANDLE gdi_font ) +static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, HANDLE gdi_font ) { return 0; } -static HPALETTE CDECL nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd ) +static HPALETTE nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd ) { return palette; } -static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen ) +static HPEN nulldrv_SelectPen( PHYSDEV dev, HPEN pen ) { return pen; } -static INT CDECL nulldrv_SetArcDirection( PHYSDEV dev, INT dir ) +static INT nulldrv_SetArcDirection( PHYSDEV dev, INT dir ) { return dir; } -static COLORREF CDECL nulldrv_SetBkColor( PHYSDEV dev, COLORREF color ) +static COLORREF nulldrv_SetBkColor( PHYSDEV dev, COLORREF color ) { return color; } -static INT CDECL nulldrv_SetBkMode( PHYSDEV dev, INT mode ) +static INT nulldrv_SetBkMode( PHYSDEV dev, INT mode ) { return mode; } -static COLORREF CDECL nulldrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +static COLORREF nulldrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { return color; } -static COLORREF CDECL nulldrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) +static COLORREF nulldrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) { return color; } -static UINT CDECL nulldrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RGBQUAD *colors ) +static UINT nulldrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RGBQUAD *colors ) { return 0; } -static INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, - INT x_src, INT y_src, UINT start, UINT lines, - const void *bits, const BITMAPINFO *info, UINT coloruse ) +static INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, + INT x_src, INT y_src, UINT start, UINT lines, + const void *bits, const BITMAPINFO *info, UINT coloruse ) { return 0; } -static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +static void nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { } -static DWORD CDECL nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) +static DWORD nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) { return layout; } -static BOOL CDECL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +static BOOL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) { return FALSE; } -static DWORD CDECL nulldrv_SetMapperFlags( PHYSDEV dev, DWORD flags ) +static DWORD nulldrv_SetMapperFlags( PHYSDEV dev, DWORD flags ) { return flags; } -static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +static COLORREF nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { return color; } -static BOOL CDECL nulldrv_SetPixelFormat( PHYSDEV dev, INT format, const PIXELFORMATDESCRIPTOR *descr ) +static BOOL nulldrv_SetPixelFormat( PHYSDEV dev, INT format, const PIXELFORMATDESCRIPTOR *descr ) { return FALSE; } -static INT CDECL nulldrv_SetPolyFillMode( PHYSDEV dev, INT mode ) +static INT nulldrv_SetPolyFillMode( PHYSDEV dev, INT mode ) { return mode; } -static INT CDECL nulldrv_SetROP2( PHYSDEV dev, INT rop ) +static INT nulldrv_SetROP2( PHYSDEV dev, INT rop ) { return rop; } -static INT CDECL nulldrv_SetRelAbs( PHYSDEV dev, INT mode ) +static INT nulldrv_SetRelAbs( PHYSDEV dev, INT mode ) { return mode; } -static INT CDECL nulldrv_SetStretchBltMode( PHYSDEV dev, INT mode ) +static INT nulldrv_SetStretchBltMode( PHYSDEV dev, INT mode ) { return mode; } -static UINT CDECL nulldrv_SetTextAlign( PHYSDEV dev, UINT align ) +static UINT nulldrv_SetTextAlign( PHYSDEV dev, UINT align ) { return align; } -static INT CDECL nulldrv_SetTextCharacterExtra( PHYSDEV dev, INT extra ) +static INT nulldrv_SetTextCharacterExtra( PHYSDEV dev, INT extra ) { return extra; } -static COLORREF CDECL nulldrv_SetTextColor( PHYSDEV dev, COLORREF color ) +static COLORREF nulldrv_SetTextColor( PHYSDEV dev, COLORREF color ) { return color; } -static BOOL CDECL nulldrv_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) +static BOOL nulldrv_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) { return TRUE; } -static INT CDECL nulldrv_StartDoc( PHYSDEV dev, const DOCINFOW *info ) +static INT nulldrv_StartDoc( PHYSDEV dev, const DOCINFOW *info ) { return 0; } -static INT CDECL nulldrv_StartPage( PHYSDEV dev ) +static INT nulldrv_StartPage( PHYSDEV dev ) { return 1; } -static BOOL CDECL nulldrv_SwapBuffers( PHYSDEV dev ) +static BOOL nulldrv_SwapBuffers( PHYSDEV dev ) { return TRUE; } -static BOOL CDECL nulldrv_UnrealizePalette( HPALETTE palette ) +static BOOL nulldrv_UnrealizePalette( HPALETTE palette ) { return FALSE; } -static BOOL CDECL nulldrv_wglCopyContext( HGLRC ctx_src, HGLRC ctx_dst, UINT mask ) +static BOOL nulldrv_wglCopyContext( HGLRC ctx_src, HGLRC ctx_dst, UINT mask ) { return FALSE; } -static HGLRC CDECL nulldrv_wglCreateContext( PHYSDEV dev ) +static HGLRC nulldrv_wglCreateContext( PHYSDEV dev ) { return 0; } -static HGLRC CDECL nulldrv_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC share_ctx, const int *attribs ) +static HGLRC nulldrv_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC share_ctx, const int *attribs ) { return 0; } -static BOOL CDECL nulldrv_wglDeleteContext( HGLRC ctx ) +static BOOL nulldrv_wglDeleteContext( HGLRC ctx ) { return FALSE; } -static PROC CDECL nulldrv_wglGetProcAddress( LPCSTR name ) +static PROC nulldrv_wglGetProcAddress( LPCSTR name ) { return NULL; } -static HDC CDECL nulldrv_wglGetPbufferDCARB( PHYSDEV dev, void *pbuffer ) +static HDC nulldrv_wglGetPbufferDCARB( PHYSDEV dev, void *pbuffer ) { return 0; } -static BOOL CDECL nulldrv_wglMakeCurrent( PHYSDEV dev, HGLRC ctx ) +static BOOL nulldrv_wglMakeCurrent( PHYSDEV dev, HGLRC ctx ) { return FALSE; } -static BOOL CDECL nulldrv_wglMakeContextCurrentARB( PHYSDEV dev_draw, PHYSDEV dev_read, HGLRC ctx ) +static BOOL nulldrv_wglMakeContextCurrentARB( PHYSDEV dev_draw, PHYSDEV dev_read, HGLRC ctx ) { return FALSE; } -static BOOL CDECL nulldrv_wglSetPixelFormatWINE( PHYSDEV dev, INT format, - const PIXELFORMATDESCRIPTOR *descr ) +static BOOL nulldrv_wglSetPixelFormatWINE( PHYSDEV dev, INT format, const PIXELFORMATDESCRIPTOR *descr ) { return FALSE; } -static BOOL CDECL nulldrv_wglShareLists( HGLRC ctx1, HGLRC ctx2 ) +static BOOL nulldrv_wglShareLists( HGLRC ctx1, HGLRC ctx2 ) { return FALSE; } -static BOOL CDECL nulldrv_wglUseFontBitmapsA( PHYSDEV dev, DWORD start, DWORD count, DWORD base ) +static BOOL nulldrv_wglUseFontBitmapsA( PHYSDEV dev, DWORD start, DWORD count, DWORD base ) { return FALSE; } -static BOOL CDECL nulldrv_wglUseFontBitmapsW( PHYSDEV dev, DWORD start, DWORD count, DWORD base ) +static BOOL nulldrv_wglUseFontBitmapsW( PHYSDEV dev, DWORD start, DWORD count, DWORD base ) { return FALSE; } diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index abf22c12d84..e6b0261b63f 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -27,7 +27,7 @@ #include "enhmetafiledrv.h" #include "wine/debug.h" -BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +BOOL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { EMRBITBLT emr; BOOL ret; @@ -64,8 +64,8 @@ BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) return ret; } -BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, - PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) +BOOL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, + PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) { BOOL ret; PEMRBITBLT pEMR; @@ -169,11 +169,9 @@ BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, return ret; } -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, - UINT wUsage, DWORD dwRop ) +INT 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, UINT wUsage, DWORD dwRop ) { EMRSTRETCHDIBITS *emr; BOOL ret; @@ -232,10 +230,9 @@ INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, return ret ? heightSrc : GDI_ERROR; } -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 ) +INT 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 ) { EMRSETDIBITSTODEVICE* pEMR; DWORD size, bmiSize, bitsSize; diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 7a84265140e..86ad961fe61 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); -INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) +INT EMFDRV_SaveDC( PHYSDEV dev ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSaveDC ); INT ret = next->funcs->pSaveDC( next ); @@ -38,7 +38,7 @@ INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) return ret; } -BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) +BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRestoreDC ); EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev; @@ -63,7 +63,7 @@ BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) return ret; } -UINT CDECL EMFDRV_SetTextAlign( PHYSDEV dev, UINT align ) +UINT EMFDRV_SetTextAlign( PHYSDEV dev, UINT align ) { EMRSETTEXTALIGN emr; emr.emr.iType = EMR_SETTEXTALIGN; @@ -72,7 +72,7 @@ UINT CDECL EMFDRV_SetTextAlign( PHYSDEV dev, UINT align ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? align : GDI_ERROR; } -BOOL CDECL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakCount) +BOOL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakCount) { EMRSETTEXTJUSTIFICATION emr; emr.emr.iType = EMR_SETTEXTJUSTIFICATION; @@ -82,7 +82,7 @@ BOOL CDECL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakC return EMFDRV_WriteRecord(dev, &emr.emr); } -INT CDECL EMFDRV_SetBkMode( PHYSDEV dev, INT mode ) +INT EMFDRV_SetBkMode( PHYSDEV dev, INT mode ) { EMRSETBKMODE emr; emr.emr.iType = EMR_SETBKMODE; @@ -91,7 +91,7 @@ INT CDECL EMFDRV_SetBkMode( PHYSDEV dev, INT mode ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; } -COLORREF CDECL EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) +COLORREF EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) { EMRSETBKCOLOR emr; EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev; @@ -105,7 +105,7 @@ COLORREF CDECL EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) } -COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) +COLORREF EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) { EMRSETTEXTCOLOR emr; EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev; @@ -118,7 +118,7 @@ COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? color : CLR_INVALID; } -INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop ) +INT EMFDRV_SetROP2( PHYSDEV dev, INT rop ) { EMRSETROP2 emr; emr.emr.iType = EMR_SETROP2; @@ -127,7 +127,7 @@ INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? rop : 0; } -INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) +INT EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) { EMRSETPOLYFILLMODE emr; emr.emr.iType = EMR_SETPOLYFILLMODE; @@ -136,7 +136,7 @@ INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; } -INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) +INT EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) { EMRSETSTRETCHBLTMODE emr; emr.emr.iType = EMR_SETSTRETCHBLTMODE; @@ -145,7 +145,7 @@ INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; } -INT CDECL EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) +INT EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) { EMRSETARCDIRECTION emr; @@ -155,7 +155,7 @@ INT CDECL EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) return EMFDRV_WriteRecord(dev, &emr.emr) ? arcDirection : 0; } -INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { EMREXCLUDECLIPRECT emr; emr.emr.iType = EMR_EXCLUDECLIPRECT; @@ -167,7 +167,7 @@ INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT return EMFDRV_WriteRecord( dev, &emr.emr ); } -INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) +INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) { EMRINTERSECTCLIPRECT emr; emr.emr.iType = EMR_INTERSECTCLIPRECT; @@ -179,7 +179,7 @@ INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, I return EMFDRV_WriteRecord( dev, &emr.emr ); } -INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) +INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { EMROFFSETCLIPRGN emr; emr.emr.iType = EMR_OFFSETCLIPRGN; @@ -189,7 +189,7 @@ INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -INT CDECL EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) +INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) { EMREXTSELECTCLIPRGN *emr; DWORD size, rgnsize; @@ -216,7 +216,7 @@ INT CDECL EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) return ret ? SIMPLEREGION : ERROR; } -INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) +INT EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetMapMode ); EMRSETMAPMODE emr; @@ -228,7 +228,7 @@ INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) return next->funcs->pSetMapMode( next, mode ); } -BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) +BOOL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetViewportExtEx ); EMRSETVIEWPORTEXTEX emr; @@ -242,7 +242,7 @@ BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) return next->funcs->pSetViewportExtEx( next, cx, cy, size ); } -BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) +BOOL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetWindowExtEx ); EMRSETWINDOWEXTEX emr; @@ -256,7 +256,7 @@ BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) return next->funcs->pSetWindowExtEx( next, cx, cy, size ); } -BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetViewportOrgEx ); EMRSETVIEWPORTORGEX emr; @@ -270,7 +270,7 @@ BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return next->funcs->pSetViewportOrgEx( next, x, y, pt ); } -BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetWindowOrgEx ); EMRSETWINDOWORGEX emr; @@ -284,7 +284,7 @@ BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return next->funcs->pSetWindowOrgEx( next, x, y, pt ); } -BOOL CDECL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pScaleViewportExtEx ); EMRSCALEVIEWPORTEXTEX emr; @@ -300,7 +300,7 @@ BOOL CDECL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNu return next->funcs->pScaleViewportExtEx( next, xNum, xDenom, yNum, yDenom, size ); } -BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pScaleWindowExtEx ); EMRSCALEWINDOWEXTEX emr; @@ -316,7 +316,7 @@ BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, return next->funcs->pScaleWindowExtEx( next, xNum, xDenom, yNum, yDenom, size ); } -DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) +DWORD EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) { EMRSETLAYOUT emr; @@ -326,7 +326,7 @@ DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? layout : GDI_ERROR; } -BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) +BOOL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetWorldTransform ); EMRSETWORLDTRANSFORM emr; @@ -339,7 +339,7 @@ BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) return next->funcs->pSetWorldTransform( next, xform ); } -BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode) +BOOL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pModifyWorldTransform ); EMRMODIFYWORLDTRANSFORM emr; @@ -353,7 +353,7 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m return next->funcs->pModifyWorldTransform( next, xform, mode ); } -BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetViewportOrgEx ); EMRSETVIEWPORTORGEX emr; @@ -370,7 +370,7 @@ BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return next->funcs->pOffsetViewportOrgEx( next, x, y, pt ); } -BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetWindowOrgEx ); EMRSETWINDOWORGEX emr; @@ -387,7 +387,7 @@ BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return next->funcs->pOffsetWindowOrgEx( next, x, y, pt ); } -DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) +DWORD EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) { EMRSETMAPPERFLAGS emr; @@ -398,7 +398,7 @@ DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? flags : GDI_ERROR; } -BOOL CDECL EMFDRV_AbortPath( PHYSDEV dev ) +BOOL EMFDRV_AbortPath( PHYSDEV dev ) { EMRABORTPATH emr; @@ -408,7 +408,7 @@ BOOL CDECL EMFDRV_AbortPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_BeginPath( PHYSDEV dev ) +BOOL EMFDRV_BeginPath( PHYSDEV dev ) { EMRBEGINPATH emr; @@ -418,7 +418,7 @@ BOOL CDECL EMFDRV_BeginPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_CloseFigure( PHYSDEV dev ) +BOOL EMFDRV_CloseFigure( PHYSDEV dev ) { EMRCLOSEFIGURE emr; @@ -428,7 +428,7 @@ BOOL CDECL EMFDRV_CloseFigure( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_EndPath( PHYSDEV dev ) +BOOL EMFDRV_EndPath( PHYSDEV dev ) { EMRENDPATH emr; @@ -438,7 +438,7 @@ BOOL CDECL EMFDRV_EndPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) +BOOL EMFDRV_FillPath( PHYSDEV dev ) { EMRFILLPATH emr; @@ -452,7 +452,7 @@ BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) +BOOL EMFDRV_FlattenPath( PHYSDEV dev ) { EMRFLATTENPATH emr; @@ -462,7 +462,7 @@ BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) +BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) { EMRSELECTCLIPPATH emr; @@ -473,7 +473,7 @@ BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) +BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) { EMRSTROKEANDFILLPATH emr; @@ -487,7 +487,7 @@ BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) +BOOL EMFDRV_StrokePath( PHYSDEV dev ) { EMRSTROKEPATH emr; @@ -501,7 +501,7 @@ BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_WidenPath( PHYSDEV dev ) +BOOL EMFDRV_WidenPath( PHYSDEV dev ) { EMRWIDENPATH emr; @@ -511,7 +511,7 @@ BOOL CDECL EMFDRV_WidenPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -INT CDECL EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) +INT EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index f8d389a1295..2cef011124e 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -59,108 +59,92 @@ extern DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_H #define HANDLE_LIST_INC 20 /* Metafile driver functions */ -extern BOOL CDECL EMFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, - INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, - INT width, INT height, PHYSDEV devSrc, - INT xSrc, INT ySrc, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, - INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, - INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, - UINT flags, const RECT *lprect, LPCWSTR str, - UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, - INT height ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, CONST BYTE *buffer ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, - INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, - INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, - const INT* counts, UINT polys) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT* pt, - const DWORD* counts, DWORD polys) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Polyline( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, - INT right, INT bottom) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, - INT right, INT bottom, INT ell_width, - INT ell_height ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, - INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, - INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; -extern HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; -extern HBRUSH CDECL EMFDRV_SelectBrush( PHYSDEV dev, HBRUSH handle ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; -extern HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, HANDLE gdiFont ) DECLSPEC_HIDDEN; -extern HPEN CDECL EMFDRV_SelectPen( PHYSDEV dev, HPEN handle ) DECLSPEC_HIDDEN; -extern HPALETTE CDECL EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; -extern COLORREF CDECL EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, - DWORD cx, DWORD cy, INT xSrc, - INT ySrc, UINT startscan, UINT lines, - LPCVOID bits, const BITMAPINFO *info, - UINT coloruse ) DECLSPEC_HIDDEN; -extern DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern UINT CDECL EMFDRV_SetTextAlign( PHYSDEV dev, UINT align ) DECLSPEC_HIDDEN; -extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, - INT nBreakCount ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, - PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; -extern 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, - UINT wUsage, DWORD dwRop ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_WidenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height, + PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; +extern INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, + UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, CONST BYTE *buffer ) DECLSPEC_HIDDEN; +extern INT EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; +extern INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_Polyline( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern INT EMFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, + INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, + INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; +extern HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; +extern HBRUSH EMFDRV_SelectBrush( PHYSDEV dev, HBRUSH handle ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; +extern HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, HANDLE gdiFont ) DECLSPEC_HIDDEN; +extern HPEN EMFDRV_SelectPen( PHYSDEV dev, HPEN handle ) DECLSPEC_HIDDEN; +extern HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; +extern INT EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; +extern COLORREF EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern INT EMFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern COLORREF EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern INT EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, + INT ySrc, UINT startscan, UINT lines, LPCVOID bits, + const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; +extern DWORD EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; +extern INT EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern DWORD EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; +extern COLORREF EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern INT EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern INT EMFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; +extern INT EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern UINT EMFDRV_SetTextAlign( PHYSDEV dev, UINT align ) DECLSPEC_HIDDEN; +extern COLORREF EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, + PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern INT 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, + UINT wUsage, DWORD dwRop ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_WidenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; #endif /* __WINE_METAFILEDRV_H */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 93cef82f958..71fd1189581 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -36,8 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); /********************************************************************** * EMFDRV_MoveTo */ -BOOL CDECL -EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) +BOOL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) { EMRMOVETOEX emr; @@ -52,8 +51,7 @@ EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) /*********************************************************************** * EMFDRV_LineTo */ -BOOL CDECL -EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) { POINT pt; EMRLINETO emr; @@ -186,9 +184,8 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * EMFDRV_Arc */ -BOOL CDECL -EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, xend, yend, EMR_ARC ); @@ -197,9 +194,8 @@ EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * EMFDRV_Pie */ -BOOL CDECL -EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, xend, yend, EMR_PIE ); @@ -209,9 +205,8 @@ EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * EMFDRV_Chord */ -BOOL CDECL -EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, xend, yend, EMR_CHORD ); @@ -220,8 +215,7 @@ EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * EMFDRV_Ellipse */ -BOOL CDECL -EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { EMRELLIPSE emr; INT temp; @@ -252,8 +246,7 @@ EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) /*********************************************************************** * EMFDRV_Rectangle */ -BOOL CDECL -EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) +BOOL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) { EMRRECTANGLE emr; INT temp; @@ -284,8 +277,7 @@ EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) /*********************************************************************** * EMFDRV_RoundRect */ -BOOL CDECL -EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, +BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) { EMRROUNDRECT emr; @@ -317,8 +309,7 @@ EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, /*********************************************************************** * EMFDRV_SetPixel */ -COLORREF CDECL -EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +COLORREF EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { EMRSETPIXELV emr; @@ -442,8 +433,7 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) /********************************************************************** * EMFDRV_Polyline */ -BOOL CDECL -EMFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) +BOOL EMFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) { if( EMFDRV_Polylinegon16( dev, pt, count, EMR_POLYLINE16 ) ) return TRUE; @@ -453,8 +443,7 @@ EMFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) /********************************************************************** * EMFDRV_Polygon */ -BOOL CDECL -EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) +BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) { if(count < 2) return FALSE; if( EMFDRV_Polylinegon16( dev, pt, count, EMR_POLYGON16 ) ) @@ -516,8 +505,7 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po /********************************************************************** * EMFDRV_PolyPolyline */ -BOOL CDECL -EMFDRV_PolyPolyline(PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) +BOOL EMFDRV_PolyPolyline(PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) { return EMFDRV_PolyPolylinegon( dev, pt, (const INT *)counts, polys, EMR_POLYPOLYLINE ); @@ -526,8 +514,7 @@ EMFDRV_PolyPolyline(PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD pol /********************************************************************** * EMFDRV_PolyPolygon */ -BOOL CDECL -EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys ) +BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys ) { return EMFDRV_PolyPolylinegon( dev, pt, counts, polys, EMR_POLYPOLYGON ); } @@ -536,8 +523,7 @@ EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys /********************************************************************** * EMFDRV_ExtFloodFill */ -BOOL CDECL -EMFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) +BOOL EMFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) { EMREXTFLOODFILL emr; @@ -555,7 +541,7 @@ EMFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) /********************************************************************* * EMFDRV_FillRgn */ -BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) +BOOL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) { EMRFILLRGN *emr; DWORD size, rgnsize, index; @@ -588,7 +574,7 @@ BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) /********************************************************************* * EMFDRV_FrameRgn */ -BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) +BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) { EMRFRAMERGN *emr; DWORD size, rgnsize, index; @@ -657,8 +643,7 @@ static BOOL EMFDRV_PaintInvertRgn( PHYSDEV dev, HRGN hrgn, DWORD iType ) /********************************************************************** * EMFDRV_PaintRgn */ -BOOL CDECL -EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) +BOOL EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) { return EMFDRV_PaintInvertRgn( dev, hrgn, EMR_PAINTRGN ); } @@ -666,8 +651,7 @@ EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) /********************************************************************** * EMFDRV_InvertRgn */ -BOOL CDECL -EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) +BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) { return EMFDRV_PaintInvertRgn( dev, hrgn, EMR_INVERTRGN ); } @@ -675,9 +659,8 @@ EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) /********************************************************************** * EMFDRV_ExtTextOut */ -BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR str, UINT count, - const INT *lpDx ) +BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, + LPCWSTR str, UINT count, const INT *lpDx ) { EMREXTTEXTOUTW *pemr; DWORD nSize; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 839c21f4c08..49202663d16 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); -static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ); +static BOOL EMFDRV_DeleteDC( PHYSDEV dev ); static const DC_FUNCTIONS EMFDRV_Funcs = { @@ -161,7 +161,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = /********************************************************************** * EMFDRV_DeleteDC */ -static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) +static BOOL EMFDRV_DeleteDC( PHYSDEV dev ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev; UINT index; diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index a8de0314cca..68927ba6c53 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -74,7 +74,7 @@ static UINT EMFDRV_FindObject( PHYSDEV dev, HGDIOBJ obj ) /****************************************************************** * EMFDRV_DeleteObject */ -BOOL CDECL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) +BOOL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) { EMRDELETEOBJECT emr; EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; @@ -99,7 +99,7 @@ BOOL CDECL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) /*********************************************************************** * EMFDRV_SelectBitmap */ -HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) +HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) { return 0; } @@ -273,7 +273,7 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) /*********************************************************************** * EMFDRV_SelectBrush */ -HBRUSH CDECL EMFDRV_SelectBrush(PHYSDEV dev, HBRUSH hBrush ) +HBRUSH EMFDRV_SelectBrush(PHYSDEV dev, HBRUSH hBrush ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; EMRSELECTOBJECT emr; @@ -352,7 +352,7 @@ static BOOL EMFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont ) /*********************************************************************** * EMFDRV_SelectFont */ -HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, HANDLE gdiFont ) +HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, HANDLE gdiFont ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; EMRSELECTOBJECT emr; @@ -433,7 +433,7 @@ static DWORD EMFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen) /****************************************************************** * EMFDRV_SelectPen */ -HPEN CDECL EMFDRV_SelectPen(PHYSDEV dev, HPEN hPen ) +HPEN EMFDRV_SelectPen(PHYSDEV dev, HPEN hPen ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; EMRSELECTOBJECT emr; @@ -501,7 +501,7 @@ static DWORD EMFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPal) /****************************************************************** * EMFDRV_SelectPalette */ -HPALETTE CDECL EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) +HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; EMRSELECTPALETTE emr; @@ -531,7 +531,7 @@ found: /****************************************************************** * EMFDRV_SetDCBrushColor */ -COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +COLORREF EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; EMRSELECTOBJECT emr; @@ -552,7 +552,7 @@ COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) /****************************************************************** * EMFDRV_SetDCPenColor */ -COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) +COLORREF EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; EMRSELECTOBJECT emr; @@ -574,7 +574,7 @@ COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) /****************************************************************** * EMFDRV_GdiComment */ -BOOL CDECL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer) +BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer) { EMRGDICOMMENT *emr; UINT total, rounded_size; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d10ea2b6a24..a48ac871b10 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -464,52 +464,52 @@ static inline void release_wine_region(HRGN rgn) } /* null driver entry points */ -extern BOOL CDECL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN; -extern LONG CDECL nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_GetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, LPVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; -extern COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern LONG CDECL nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_SetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, const void *bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; -extern INT CDECL nulldrv_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 coloruse, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_WidenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN; +extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; +extern INT nulldrv_GetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, LPVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; +extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; +extern INT nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; +extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) DECLSPEC_HIDDEN; +extern INT nulldrv_SetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, const void *bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; +extern INT nulldrv_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern INT nulldrv_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 coloruse, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_WidenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; static inline DC *get_nulldrv_dc( PHYSDEV dev ) { diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index a9dc1b41461..42206584bb2 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -60,7 +60,7 @@ static void MAPPING_FixIsotropic( DC * dc ) * null driver fallback implementations */ -BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { DC *dc = get_nulldrv_dc( dev ); @@ -75,7 +75,7 @@ BOOL CDECL nulldrv_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return TRUE; } -BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { DC *dc = get_nulldrv_dc( dev ); @@ -90,8 +90,7 @@ BOOL CDECL nulldrv_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return TRUE; } -BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, - SIZE *size ) +BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) { DC *dc = get_nulldrv_dc( dev ); @@ -112,8 +111,7 @@ BOOL CDECL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT return TRUE; } -BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, - SIZE *size ) +BOOL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) { DC *dc = get_nulldrv_dc( dev ); @@ -134,7 +132,7 @@ BOOL CDECL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_ return TRUE; } -INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode ) +INT nulldrv_SetMapMode( PHYSDEV dev, INT mode ) { DC *dc = get_nulldrv_dc( dev ); INT ret = dc->MapMode; @@ -196,7 +194,7 @@ INT CDECL nulldrv_SetMapMode( PHYSDEV dev, INT mode ) return ret; } -BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) +BOOL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) { DC *dc = get_nulldrv_dc( dev ); @@ -214,7 +212,7 @@ BOOL CDECL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) return TRUE; } -BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { DC *dc = get_nulldrv_dc( dev ); @@ -229,7 +227,7 @@ BOOL CDECL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return TRUE; } -BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) +BOOL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) { DC *dc = get_nulldrv_dc( dev ); @@ -250,7 +248,7 @@ BOOL CDECL nulldrv_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) return TRUE; } -BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { DC *dc = get_nulldrv_dc( dev ); @@ -265,7 +263,7 @@ BOOL CDECL nulldrv_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) return TRUE; } -BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) +BOOL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) { DC *dc = get_nulldrv_dc( dev ); @@ -292,7 +290,7 @@ BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD return TRUE; } -BOOL CDECL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) +BOOL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) { DC *dc = get_nulldrv_dc( dev ); diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index 3b6ed4e4b68..fa56ecf5ba6 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); /*********************************************************************** * MFDRV_PatBlt */ -BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +BOOL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { MFDRV_MetaParam6( dev, META_PATBLT, dst->log_x, dst->log_y, dst->log_width, dst->log_height, HIWORD(rop), LOWORD(rop) ); @@ -44,8 +44,8 @@ BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) */ #define STRETCH_VIA_DIB -BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, - PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) +BOOL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, + PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) { BOOL ret; DWORD len; @@ -130,10 +130,10 @@ BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, /*********************************************************************** * MFDRV_StretchDIBits */ -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 ) +INT 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 ) { DWORD len, infosize, imagesize; METARECORD *mr; @@ -171,10 +171,10 @@ INT CDECL MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, /*********************************************************************** * MFDRV_SetDIBitsToDeivce */ -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 ) +INT 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 ) { DWORD len, infosize, imagesize; diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index fb66d2bc6db..c00b5041f8d 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -20,187 +20,187 @@ #include "mfdrv/metafiledrv.h" -INT CDECL MFDRV_SaveDC( PHYSDEV dev ) +INT MFDRV_SaveDC( PHYSDEV dev ) { return MFDRV_MetaParam0( dev, META_SAVEDC ); } -BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) +BOOL MFDRV_RestoreDC( PHYSDEV dev, INT level ) { return MFDRV_MetaParam1( dev, META_RESTOREDC, level ); } -UINT CDECL MFDRV_SetTextAlign( PHYSDEV dev, UINT align ) +UINT MFDRV_SetTextAlign( PHYSDEV dev, UINT align ) { return MFDRV_MetaParam2( dev, META_SETTEXTALIGN, HIWORD(align), LOWORD(align)) ? align : GDI_ERROR; } -INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode ) +INT MFDRV_SetBkMode( PHYSDEV dev, INT mode ) { return MFDRV_MetaParam1( dev, META_SETBKMODE, (WORD)mode) ? mode : 0; } -COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) +COLORREF MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) { return MFDRV_MetaParam2(dev, META_SETBKCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID; } -COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) +COLORREF MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) { return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID; } -INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) +INT MFDRV_SetROP2( PHYSDEV dev, INT rop ) { return MFDRV_MetaParam1( dev, META_SETROP2, (WORD)rop) ? rop : 0; } -INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) +INT MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) { return MFDRV_MetaParam1( dev, META_SETRELABS, (WORD)mode) ? mode : 0; } -INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) +INT MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) { return MFDRV_MetaParam1( dev, META_SETPOLYFILLMODE, (WORD)mode) ? mode : 0; } -INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) +INT MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) { return MFDRV_MetaParam1( dev, META_SETSTRETCHBLTMODE, (WORD)mode) ? mode : 0; } -INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +INT MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return MFDRV_MetaParam4( dev, META_INTERSECTCLIPRECT, left, top, right, bottom ); } -INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +INT MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, bottom ); } -INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) +INT MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y ); } -INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) +INT MFDRV_SetMapMode( PHYSDEV dev, INT mode ) { return MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ); } -BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +BOOL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) { return MFDRV_MetaParam2( dev, META_SETVIEWPORTEXT, x, y ); } -BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { return MFDRV_MetaParam2( dev, META_SETVIEWPORTORG, x, y ); } -BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +BOOL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) { return MFDRV_MetaParam2( dev, META_SETWINDOWEXT, x, y ); } -BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { return MFDRV_MetaParam2( dev, META_SETWINDOWORG, x, y ); } -BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { return MFDRV_MetaParam2( dev, META_OFFSETVIEWPORTORG, x, y ); } -BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +BOOL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) { return MFDRV_MetaParam2( dev, META_OFFSETWINDOWORG, x, y ); } -BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) { return MFDRV_MetaParam4( dev, META_SCALEVIEWPORTEXT, xNum, xDenom, yNum, yDenom ); } -BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +BOOL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) { return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); } -BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) +BOOL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) { return MFDRV_MetaParam2( dev, META_SETTEXTJUSTIFICATION, extra, breaks ); } -INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) +INT MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) { return MFDRV_MetaParam1( dev, META_SETTEXTCHAREXTRA, extra ) ? extra : 0x80000000; } -DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) +DWORD MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) { return MFDRV_MetaParam2( dev, META_SETMAPPERFLAGS, HIWORD(flags), LOWORD(flags) ) ? flags : GDI_ERROR; } -BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) +BOOL MFDRV_AbortPath( PHYSDEV dev ) { return FALSE; } -BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) +BOOL MFDRV_BeginPath( PHYSDEV dev ) { return FALSE; } -BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev ) +BOOL MFDRV_CloseFigure( PHYSDEV dev ) { return FALSE; } -BOOL CDECL MFDRV_EndPath( PHYSDEV dev ) +BOOL MFDRV_EndPath( PHYSDEV dev ) { return FALSE; } -BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) +BOOL MFDRV_FillPath( PHYSDEV dev ) { return FALSE; } -BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) +BOOL MFDRV_FlattenPath( PHYSDEV dev ) { return FALSE; } -BOOL CDECL MFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) +BOOL MFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) { return FALSE; } -BOOL CDECL MFDRV_StrokeAndFillPath( PHYSDEV dev ) +BOOL MFDRV_StrokeAndFillPath( PHYSDEV dev ) { return FALSE; } -BOOL CDECL MFDRV_StrokePath( PHYSDEV dev ) +BOOL MFDRV_StrokePath( PHYSDEV dev ) { return FALSE; } -BOOL CDECL MFDRV_WidenPath( PHYSDEV dev ) +BOOL MFDRV_WidenPath( PHYSDEV dev ) { return FALSE; } -COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +COLORREF MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { return CLR_INVALID; } -COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) +COLORREF MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) { return CLR_INVALID; } diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 0ee1b0c3270..665926bba97 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -33,8 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); /********************************************************************** * MFDRV_MoveTo */ -BOOL CDECL -MFDRV_MoveTo(PHYSDEV dev, INT x, INT y) +BOOL MFDRV_MoveTo(PHYSDEV dev, INT x, INT y) { return MFDRV_MetaParam2(dev,META_MOVETO,x,y); } @@ -42,8 +41,7 @@ MFDRV_MoveTo(PHYSDEV dev, INT x, INT y) /*********************************************************************** * MFDRV_LineTo */ -BOOL CDECL -MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) { return MFDRV_MetaParam2(dev, META_LINETO, x, y); } @@ -52,9 +50,8 @@ MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) /*********************************************************************** * MFDRV_Arc */ -BOOL CDECL -MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return MFDRV_MetaParam8(dev, META_ARC, left, top, right, bottom, xstart, ystart, xend, yend); @@ -64,9 +61,8 @@ MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * MFDRV_Pie */ -BOOL CDECL -MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return MFDRV_MetaParam8(dev, META_PIE, left, top, right, bottom, xstart, ystart, xend, yend); @@ -76,9 +72,8 @@ MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * MFDRV_Chord */ -BOOL CDECL -MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return MFDRV_MetaParam8(dev, META_CHORD, left, top, right, bottom, xstart, ystart, xend, yend); @@ -87,8 +82,7 @@ MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * MFDRV_Ellipse */ -BOOL CDECL -MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +BOOL MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return MFDRV_MetaParam4(dev, META_ELLIPSE, left, top, right, bottom); } @@ -96,8 +90,7 @@ MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) /*********************************************************************** * MFDRV_Rectangle */ -BOOL CDECL -MFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) +BOOL MFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) { return MFDRV_MetaParam4(dev, META_RECTANGLE, left, top, right, bottom); } @@ -105,9 +98,8 @@ MFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) /*********************************************************************** * MFDRV_RoundRect */ -BOOL CDECL -MFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) +BOOL MFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ) { return MFDRV_MetaParam6(dev, META_ROUNDRECT, left, top, right, bottom, ell_width, ell_height); @@ -116,8 +108,7 @@ MFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, /*********************************************************************** * MFDRV_SetPixel */ -COLORREF CDECL -MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +COLORREF MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { return MFDRV_MetaParam4(dev, META_SETPIXEL, x, y,HIWORD(color), LOWORD(color)); @@ -150,8 +141,7 @@ static BOOL MFDRV_MetaPoly(PHYSDEV dev, short func, POINTS *pt, short count) /********************************************************************** * MFDRV_Polyline */ -BOOL CDECL -MFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) +BOOL MFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) { int i; POINTS *pts; @@ -174,8 +164,7 @@ MFDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) /********************************************************************** * MFDRV_Polygon */ -BOOL CDECL -MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) +BOOL MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) { int i; POINTS *pts; @@ -198,8 +187,7 @@ MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) /********************************************************************** * MFDRV_PolyPolygon */ -BOOL CDECL -MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) +BOOL MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) { BOOL ret; DWORD len; @@ -253,8 +241,7 @@ MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygon /********************************************************************** * MFDRV_ExtFloodFill */ -BOOL CDECL -MFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) +BOOL MFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) { return MFDRV_MetaParam4(dev,META_FLOODFILL,x,y,HIWORD(color), LOWORD(color)); @@ -352,8 +339,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn) /********************************************************************** * MFDRV_PaintRgn */ -BOOL CDECL -MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) +BOOL MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) { INT16 index; index = MFDRV_CreateRegion( dev, hrgn ); @@ -366,8 +352,7 @@ MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) /********************************************************************** * MFDRV_InvertRgn */ -BOOL CDECL -MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) +BOOL MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) { INT16 index; index = MFDRV_CreateRegion( dev, hrgn ); @@ -380,8 +365,7 @@ MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) /********************************************************************** * MFDRV_FillRgn */ -BOOL CDECL -MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) +BOOL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) { INT16 iRgn, iBrush; iRgn = MFDRV_CreateRegion( dev, hrgn ); @@ -396,8 +380,7 @@ MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) /********************************************************************** * MFDRV_FrameRgn */ -BOOL CDECL -MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) +BOOL MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) { INT16 iRgn, iBrush; iRgn = MFDRV_CreateRegion( dev, hrgn ); @@ -413,7 +396,7 @@ MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) /********************************************************************** * MFDRV_ExtSelectClipRgn */ -INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) +INT MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) { INT16 iRgn; INT ret; @@ -434,8 +417,7 @@ INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) * Since MetaFiles don't record Beziers and they don't even record * approximations to them using lines, we need this stub function. */ -BOOL CDECL -MFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) +BOOL MFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) { return FALSE; } @@ -445,8 +427,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 CDECL -MFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) +BOOL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) { return FALSE; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a8ecf3f8c13..ae791c20b3f 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -30,14 +30,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); -static BOOL CDECL MFDRV_DeleteDC( PHYSDEV dev ); +static BOOL MFDRV_DeleteDC( PHYSDEV dev ); /********************************************************************** * MFDRV_ExtEscape */ -static INT CDECL MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, - INT cbOutput, LPVOID out_data ) +static INT MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, + INT cbOutput, LPVOID out_data ) { METARECORD *mr; DWORD len; @@ -63,7 +63,7 @@ static INT CDECL MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID * *A very simple implementation that returns DT_METAFILE */ -static INT CDECL MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) +static INT MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) { switch(cap) { @@ -250,7 +250,7 @@ static DC *MFDRV_AllocMetaFile(void) /********************************************************************** * MFDRV_DeleteDC */ -static BOOL CDECL MFDRV_DeleteDC( PHYSDEV dev ) +static BOOL MFDRV_DeleteDC( PHYSDEV dev ) { METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; DWORD index; diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 61d7ec20649..838cfe77c28 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -60,98 +60,87 @@ extern INT16 MFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HI /* Metafile driver functions */ -extern BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, +extern BOOL MFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, - INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, - INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, - INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, - UINT flags, const RECT *lprect, LPCWSTR str, - UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, - INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, - UINT polygons) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Polyline( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Rectangle( PHYSDEV dev, INT left, INT top, - INT right, INT bottom) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_RoundRect( PHYSDEV dev, INT left, INT top, - INT right, INT bottom, INT ell_width, - INT ell_height ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, - INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, - INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; -extern HBITMAP CDECL MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; -extern HBRUSH CDECL MFDRV_SelectBrush( PHYSDEV dev, HBRUSH handle ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; -extern HFONT CDECL MFDRV_SelectFont( PHYSDEV dev, HFONT handle, HANDLE gdiFont ) DECLSPEC_HIDDEN; -extern HPEN CDECL MFDRV_SelectPen( PHYSDEV dev, HPEN handle ) DECLSPEC_HIDDEN; -extern HPALETTE CDECL MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackground) DECLSPEC_HIDDEN; -extern UINT CDECL MFDRV_RealizePalette(PHYSDEV dev, HPALETTE hPalette, BOOL primary) DECLSPEC_HIDDEN; -extern COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern COLORREF CDECL MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern UINT CDECL MFDRV_SetTextAlign( PHYSDEV dev, UINT align ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; -extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, - PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, - DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, - const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; -extern 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 ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_WidenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern INT MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; +extern INT MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, + UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) DECLSPEC_HIDDEN; +extern INT MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_MoveTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern INT MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN; +extern BOOL MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_Polyline( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; +extern BOOL MFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; +extern BOOL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern INT MFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; +extern HBITMAP MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; +extern HBRUSH MFDRV_SelectBrush( PHYSDEV dev, HBRUSH handle ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; +extern HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT handle, HANDLE gdiFont ) DECLSPEC_HIDDEN; +extern HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN handle ) DECLSPEC_HIDDEN; +extern HPALETTE MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackground) DECLSPEC_HIDDEN; +extern UINT MFDRV_RealizePalette(PHYSDEV dev, HPALETTE hPalette, BOOL primary) DECLSPEC_HIDDEN; +extern COLORREF MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern INT MFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern COLORREF MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern INT MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern DWORD MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; +extern COLORREF MFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern INT MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern INT MFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN; +extern INT MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern INT MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern UINT MFDRV_SetTextAlign( PHYSDEV dev, UINT align ) DECLSPEC_HIDDEN; +extern INT MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; +extern COLORREF MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, + PHYSDEV devSrc, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern INT MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, + DWORD cy, INT xSrc, INT ySrc, + UINT startscan, UINT lines, LPCVOID bits, + const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; +extern INT 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 ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL MFDRV_WidenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; #endif /* __WINE_METAFILEDRV_H */ diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index eea46894473..76722f5d098 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -95,7 +95,7 @@ static INT16 MFDRV_FindObject( PHYSDEV dev, HGDIOBJ obj ) /****************************************************************** * MFDRV_DeleteObject */ -BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) +BOOL 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 CDECL MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) +HBITMAP MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) { return 0; } @@ -338,7 +338,7 @@ done: /*********************************************************************** * MFDRV_SelectBrush */ -HBRUSH CDECL MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) +HBRUSH MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { INT16 index; @@ -394,7 +394,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo /*********************************************************************** * MFDRV_SelectFont */ -HFONT CDECL MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) +HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) { LOGFONTW font; INT16 index; @@ -432,7 +432,7 @@ static UINT16 MFDRV_CreatePenIndirect(PHYSDEV dev, HPEN hPen, LOGPEN16 *logpen) /*********************************************************************** * MFDRV_SelectPen */ -HPEN CDECL MFDRV_SelectPen( PHYSDEV dev, HPEN hpen ) +HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN hpen ) { LOGPEN16 logpen; INT16 index; @@ -514,7 +514,7 @@ static BOOL MFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPalette, LOGPALETTE* logP /*********************************************************************** * MFDRV_SelectPalette */ -HPALETTE CDECL MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackground ) +HPALETTE MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackground ) { #define PALVERSION 0x0300 @@ -550,7 +550,7 @@ HPALETTE CDECL MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceB /*********************************************************************** * MFDRV_RealizePalette */ -UINT CDECL MFDRV_RealizePalette(PHYSDEV dev, HPALETTE hPalette, BOOL dummy) +UINT MFDRV_RealizePalette(PHYSDEV dev, HPALETTE hPalette, BOOL dummy) { char buffer[sizeof(METARECORD) - sizeof(WORD)]; METARECORD *mr = (METARECORD *)&buffer; diff --git a/dlls/gdi32/mfdrv/text.c b/dlls/gdi32/mfdrv/text.c index 5722211c140..c05ad267a84 100644 --- a/dlls/gdi32/mfdrv/text.c +++ b/dlls/gdi32/mfdrv/text.c @@ -72,10 +72,8 @@ static BOOL MFDRV_MetaExtTextOut( PHYSDEV dev, short x, short y, UINT16 flags, /*********************************************************************** * MFDRV_ExtTextOut */ -BOOL CDECL -MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR str, UINT count, - const INT *lpDx ) +BOOL MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) { RECT16 rect16; LPINT16 lpdx16 = NULL; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 22cc50cfdf5..60b28983dfb 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); * null driver fallback implementations */ -BOOL CDECL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) +BOOL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) { INT x1 = GDI_ROUND( x + cos( start * M_PI / 180 ) * radius ); INT y1 = GDI_ROUND( y - sin( start * M_PI / 180 ) * radius ); @@ -53,8 +53,8 @@ BOOL CDECL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT star return ret; } -BOOL CDECL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { INT width = abs( right - left ); INT height = abs( bottom - top ); @@ -72,7 +72,7 @@ BOOL CDECL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, return Arc( dev->hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } -BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) +BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) { BOOL ret = FALSE; HBRUSH prev; @@ -85,7 +85,7 @@ BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) return ret; } -BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) +BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) { BOOL ret = FALSE; HRGN tmp = CreateRectRgn( 0, 0, 0, 0 ); @@ -98,7 +98,7 @@ BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT return ret; } -BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) +BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) { HBRUSH prev_brush = SelectObject( dev->hdc, GetStockObject(BLACK_BRUSH) ); INT prev_rop = SetROP2( dev->hdc, R2_NOT ); @@ -108,7 +108,7 @@ BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) return ret; } -BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) +BOOL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) { BOOL ret = FALSE; POINT *pts; @@ -122,7 +122,7 @@ BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) return ret; } -BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) +BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) { BOOL ret = FALSE; POINT *pts = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * (count + 1) ); @@ -137,7 +137,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) return ret; } -BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) +BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) { POINT *line_pts = NULL, *bzr_pts = NULL, bzr[4]; INT i, num_pts, num_bzr_pts, space, size; @@ -210,7 +210,7 @@ BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types return TRUE; } -BOOL CDECL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) +BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) { BOOL ret = FALSE; POINT *pts; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 37e425d1605..f172897491c 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(palette); -typedef BOOL (CDECL *unrealize_function)(HPALETTE); +typedef BOOL (*unrealize_function)(HPALETTE); typedef struct tagPALETTEOBJ { @@ -564,7 +564,7 @@ UINT WINAPI GetNearestPaletteIndex( /* null driver fallback implementation for GetNearestColor */ -COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) +COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) { unsigned char spec_type; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 592affa5c8d..3c8b6eaa701 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2118,7 +2118,7 @@ BOOL WINAPI WidenPath(HDC hdc) * null driver fallback implementations */ -BOOL CDECL nulldrv_BeginPath( PHYSDEV dev ) +BOOL nulldrv_BeginPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2132,7 +2132,7 @@ BOOL CDECL nulldrv_BeginPath( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_EndPath( PHYSDEV dev ) +BOOL nulldrv_EndPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2145,7 +2145,7 @@ BOOL CDECL nulldrv_EndPath( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_AbortPath( PHYSDEV dev ) +BOOL nulldrv_AbortPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2153,7 +2153,7 @@ BOOL CDECL nulldrv_AbortPath( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) +BOOL nulldrv_CloseFigure( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2172,7 +2172,7 @@ BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) +BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) { BOOL ret; HRGN hrgn; @@ -2191,7 +2191,7 @@ BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) return ret; } -BOOL CDECL nulldrv_FillPath( PHYSDEV dev ) +BOOL nulldrv_FillPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2206,7 +2206,7 @@ BOOL CDECL nulldrv_FillPath( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_StrokeAndFillPath( PHYSDEV dev ) +BOOL nulldrv_StrokeAndFillPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2221,7 +2221,7 @@ BOOL CDECL nulldrv_StrokeAndFillPath( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_StrokePath( PHYSDEV dev ) +BOOL nulldrv_StrokePath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2235,7 +2235,7 @@ BOOL CDECL nulldrv_StrokePath( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_FlattenPath( PHYSDEV dev ) +BOOL nulldrv_FlattenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2247,7 +2247,7 @@ BOOL CDECL nulldrv_FlattenPath( PHYSDEV dev ) return PATH_FlattenPath( &dc->path ); } -BOOL CDECL nulldrv_WidenPath( PHYSDEV dev ) +BOOL nulldrv_WidenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); diff --git a/dlls/wineps.drv/bitblt.c b/dlls/wineps.drv/bitblt.c index 710b1b8a828..5e54b706065 100644 --- a/dlls/wineps.drv/bitblt.c +++ b/dlls/wineps.drv/bitblt.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); * * PSDRV_PatBlt */ -BOOL CDECL PSDRV_PatBlt(PHYSDEV dev, struct bitblt_coords *dst, DWORD dwRop) +BOOL PSDRV_PatBlt(PHYSDEV dev, struct bitblt_coords *dst, DWORD dwRop) { switch(dwRop) { case PATCOPY: diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index a329a0bf4b9..681307db767 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -222,10 +222,9 @@ static inline DWORD max_ascii85_size(DWORD size) * bit depths. * Compression not implemented. */ -INT CDECL PSDRV_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 ) +INT PSDRV_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 ) { LONG fullSrcWidth, fullSrcHeight; INT stride; diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index c24f48ffc9f..1e42c1f5626 100644 --- a/dlls/wineps.drv/brush.c +++ b/dlls/wineps.drv/brush.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * SelectBrush (WINEPS.@) */ -HBRUSH CDECL PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) +HBRUSH PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); LOGBRUSH logbrush; @@ -69,7 +69,7 @@ HBRUSH CDECL PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) /*********************************************************************** * SetDCBrushColor (WINEPS.@) */ -COLORREF CDECL PSDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +COLORREF PSDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 8b1a1c54cdf..c74f1a679a1 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -260,7 +260,7 @@ BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) /*********************************************************************** * PSDRV_GetTextMetrics */ -BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) +BOOL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -313,8 +313,8 @@ const AFMMETRICS *PSDRV_UVMetrics(LONG UV, const AFM *afm) /*********************************************************************** * PSDRV_GetTextExtentExPoint */ -BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size) +BOOL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, + INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); int nfit = 0; @@ -352,7 +352,7 @@ BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, /*********************************************************************** * PSDRV_GetCharWidth */ -BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) +BOOL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); UINT i; @@ -413,7 +413,7 @@ static UINT PSDRV_GetFontMetric(HDC hdc, const AFM *afm, /*********************************************************************** * PSDRV_EnumDeviceFonts */ -BOOL CDECL PSDRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) +BOOL PSDRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); ENUMLOGFONTEXW lf; diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c index 12a7e46adc0..1f82253399c 100644 --- a/dlls/wineps.drv/color.c +++ b/dlls/wineps.drv/color.c @@ -90,7 +90,7 @@ void PSDRV_CreateColor( PHYSDEV dev, PSCOLOR *pscolor, COLORREF wincolor ) /*********************************************************************** * PSDRV_SetBkColor */ -COLORREF CDECL PSDRV_SetBkColor( PHYSDEV dev, COLORREF color ) +COLORREF PSDRV_SetBkColor( PHYSDEV dev, COLORREF color ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); PSDRV_CreateColor(dev, &physDev->bkColor, color); @@ -101,7 +101,7 @@ COLORREF CDECL PSDRV_SetBkColor( PHYSDEV dev, COLORREF color ) /*********************************************************************** * PSDRV_SetTextColor */ -COLORREF CDECL PSDRV_SetTextColor( PHYSDEV dev, COLORREF color ) +COLORREF PSDRV_SetTextColor( PHYSDEV dev, COLORREF color ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); PSDRV_CreateColor(dev, &physDev->font.color, color); diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index ec16488ecf9..a62abb15f3b 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -322,9 +322,9 @@ static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); * * Just returns default devmode at the moment. No use of initialization file. */ -INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, - LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, - LPSTR lpszProfile, DWORD dwMode) +INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, + LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, + LPSTR lpszProfile, DWORD dwMode) { PRINTERINFO *pi = PSDRV_FindPrinterInfo(lpszDevice); if(!pi) return -1; @@ -413,8 +413,8 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput * Returns * Result depends on the setting of fwCapability. -1 indicates failure. */ -DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, LPDEVMODEA lpDevMode) +DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszPort, + WORD fwCapability, LPSTR lpszOutput, LPDEVMODEA lpDevMode) { PRINTERINFO *pi; DEVMODEA *lpdm; diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index d3f0c28b7ac..0f7697370c3 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -61,8 +61,8 @@ DWORD write_spool( PHYSDEV dev, const void *data, DWORD num ) /********************************************************************** * ExtEscape (WINEPS.@) */ -INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, - INT cbOutput, LPVOID out_data ) +INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, + INT cbOutput, LPVOID out_data ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -368,7 +368,7 @@ INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_dat /************************************************************************ * PSDRV_StartPage */ -INT CDECL PSDRV_StartPage( PHYSDEV dev ) +INT PSDRV_StartPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -392,7 +392,7 @@ INT CDECL PSDRV_StartPage( PHYSDEV dev ) /************************************************************************ * PSDRV_EndPage */ -INT CDECL PSDRV_EndPage( PHYSDEV dev ) +INT PSDRV_EndPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -469,7 +469,7 @@ static INT PSDRV_StartDocA( PHYSDEV dev, const DOCINFOA *doc ) /************************************************************************ * PSDRV_StartDoc */ -INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) +INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) { DOCINFOA docA; INT ret, len; @@ -514,7 +514,7 @@ INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) /************************************************************************ * PSDRV_EndDoc */ -INT CDECL PSDRV_EndDoc( PHYSDEV dev ) +INT PSDRV_EndDoc( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); INT ret = 1; diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index 915d0cd2b33..7b2bb867fc2 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * SelectFont (WINEPS.@) */ -HFONT CDECL PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) +HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); LOGFONTW lf; diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 85745c98682..ac3e82e8879 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -70,7 +70,7 @@ static void PSDRV_DrawLine( PHYSDEV dev ) /*********************************************************************** * PSDRV_LineTo */ -BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) +BOOL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) { POINT pt[2]; @@ -96,7 +96,7 @@ BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) /*********************************************************************** * PSDRV_Rectangle */ -BOOL CDECL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); RECT rect; @@ -135,8 +135,8 @@ BOOL CDECL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT botto /*********************************************************************** * PSDRV_RoundRect */ -BOOL CDECL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) +BOOL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ) { RECT rect[2]; @@ -254,8 +254,8 @@ static BOOL PSDRV_DrawArc( PHYSDEV dev, INT left, INT top, /*********************************************************************** * PSDRV_Arc */ -BOOL CDECL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return PSDRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 0 ); } @@ -263,8 +263,8 @@ BOOL CDECL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * PSDRV_Chord */ -BOOL CDECL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return PSDRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 1 ); } @@ -273,8 +273,8 @@ BOOL CDECL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * PSDRV_Pie */ -BOOL CDECL PSDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL PSDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return PSDRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 2 ); } @@ -283,7 +283,7 @@ BOOL CDECL PSDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * PSDRV_Ellipse */ -BOOL CDECL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) +BOOL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) { INT x, y, w, h; RECT rect; @@ -318,8 +318,7 @@ BOOL CDECL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) /*********************************************************************** * PSDRV_PolyPolyline */ -BOOL CDECL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, - DWORD polylines ) +BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) { DWORD polyline, line, total; POINT *dev_pts, *pt; @@ -354,7 +353,7 @@ BOOL CDECL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* count /*********************************************************************** * PSDRV_Polyline */ -BOOL CDECL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) +BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) { return PSDRV_PolyPolyline( dev, pt, (LPDWORD) &count, 1 ); } @@ -363,8 +362,7 @@ BOOL CDECL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) /*********************************************************************** * PSDRV_PolyPolygon */ -BOOL CDECL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, - UINT polygons ) +BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) { DWORD polygon, total; INT line; @@ -407,7 +405,7 @@ BOOL CDECL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, /*********************************************************************** * PSDRV_Polygon */ -BOOL CDECL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) +BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) { return PSDRV_PolyPolygon( dev, pt, &count, 1 ); } @@ -416,7 +414,7 @@ BOOL CDECL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) /*********************************************************************** * PSDRV_SetPixel */ -COLORREF CDECL PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +COLORREF PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { PSCOLOR pscolor; POINT pt; @@ -441,7 +439,7 @@ COLORREF CDECL PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) /*********************************************************************** * PSDRV_PaintRgn */ -BOOL CDECL PSDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) +BOOL PSDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) { RGNDATA *rgndata = NULL; RECT *pRect; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index c7cc4787573..ca80f4ed9f4 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -301,8 +301,8 @@ static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) /********************************************************************** * PSDRV_CreateDC */ -BOOL CDECL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData ) { PSDRV_PDEVICE *physDev; PRINTERINFO *pi; @@ -380,7 +380,7 @@ BOOL CDECL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR devic /********************************************************************** * PSDRV_DeleteDC */ -BOOL CDECL PSDRV_DeleteDC( PHYSDEV dev ) +BOOL PSDRV_DeleteDC( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -397,7 +397,7 @@ BOOL CDECL PSDRV_DeleteDC( PHYSDEV dev ) /********************************************************************** * ResetDC (WINEPS.@) */ -HDC CDECL PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) +HDC PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -413,7 +413,7 @@ HDC CDECL PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) /*********************************************************************** * GetDeviceCaps (WINEPS.@) */ -INT CDECL PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) +INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index 79543e2545b..55379dbb11b 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -37,7 +37,7 @@ static const char PEN_alternate[] = "1"; /*********************************************************************** * SelectPen (WINEPS.@) */ -HPEN CDECL PSDRV_SelectPen( PHYSDEV dev, HPEN hpen ) +HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); LOGPEN logpen; @@ -130,7 +130,7 @@ HPEN CDECL PSDRV_SelectPen( PHYSDEV dev, HPEN hpen ) /*********************************************************************** * SetDCPenColor (WINEPS.@) */ -COLORREF CDECL PSDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) +COLORREF PSDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index a1744a7ca93..b9b6a797407 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -413,53 +413,53 @@ extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; /* GDI driver functions */ -extern BOOL CDECL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, LPDEVMODEA lpDevMode) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_EndDoc( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_EndPage( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, - LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, - LPSTR lpszProfile, DWORD dwMode) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, - INT cbOutput, LPVOID out_data ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_PatBlt(PHYSDEV dev, struct bitblt_coords *dst, DWORD dwRop) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; -extern HBRUSH CDECL PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; -extern HBRUSH CDECL PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; -extern HFONT CDECL PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) DECLSPEC_HIDDEN; -extern HPEN CDECL PSDRV_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; -extern COLORREF CDECL PSDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL PSDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL PSDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL PSDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_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 ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszPort, + WORD fwCapability, LPSTR lpszOutput, LPDEVMODEA lpDevMode) DECLSPEC_HIDDEN; +extern BOOL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; +extern INT PSDRV_EndDoc( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern INT PSDRV_EndPage( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) DECLSPEC_HIDDEN; +extern INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, + LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, + LPSTR lpszProfile, DWORD dwMode) DECLSPEC_HIDDEN; +extern INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, + INT cbOutput, LPVOID out_data ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) DECLSPEC_HIDDEN; +extern BOOL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, + INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size) DECLSPEC_HIDDEN; +extern BOOL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; +extern BOOL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; +extern BOOL PSDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_PatBlt(PHYSDEV dev, struct bitblt_coords *dst, DWORD dwRop) DECLSPEC_HIDDEN; +extern BOOL PSDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern HBRUSH PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; +extern HBRUSH PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; +extern HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) DECLSPEC_HIDDEN; +extern HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; +extern COLORREF PSDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF PSDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF PSDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF PSDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) DECLSPEC_HIDDEN; +extern INT PSDRV_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 ) DECLSPEC_HIDDEN; extern void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2, PRINTERINFO *pi) DECLSPEC_HIDDEN; @@ -527,7 +527,7 @@ extern BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, BITMAPINFO *bmi, UINT usage) extern BOOL PSDRV_WriteArrayPut(PHYSDEV dev, CHAR *pszArrayName, INT nIndex, LONG lCoord) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteArrayDef(PHYSDEV dev, CHAR *pszArrayName, INT nSize) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_StartPage( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern INT PSDRV_StartPage( PHYSDEV dev ) DECLSPEC_HIDDEN; INT PSDRV_GlyphListInit(void) DECLSPEC_HIDDEN; const GLYPHNAME *PSDRV_GlyphName(LPCSTR szName) DECLSPEC_HIDDEN; diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index afd01cb00ea..a35945a230c 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -36,9 +36,8 @@ static BOOL PSDRV_Text(PHYSDEV dev, INT x, INT y, UINT flags, /*********************************************************************** * PSDRV_ExtTextOut */ -BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR str, UINT count, - const INT *lpDx ) +BOOL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, + const INT *lpDx ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); BOOL bResult = TRUE; diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index f649a46cee9..176b9ac2f4b 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -1,42 +1 @@ @ cdecl wine_get_gdi_driver(long) PSDRV_get_gdi_driver - -# GDI driver - -@ cdecl Arc(ptr long long long long long long long long) PSDRV_Arc -@ cdecl Chord(ptr long long long long long long long long) PSDRV_Chord -@ cdecl CreateDC(long ptr wstr wstr wstr ptr) PSDRV_CreateDC -@ cdecl DeleteDC(ptr) PSDRV_DeleteDC -@ cdecl DeviceCapabilities(ptr ptr ptr long ptr ptr) PSDRV_DeviceCapabilities -@ cdecl Ellipse(ptr long long long long) PSDRV_Ellipse -@ cdecl EndDoc(ptr) PSDRV_EndDoc -@ cdecl EndPage(ptr) PSDRV_EndPage -@ cdecl EnumDeviceFonts(ptr ptr ptr long) PSDRV_EnumDeviceFonts -@ cdecl ExtDeviceMode(ptr long ptr ptr ptr ptr ptr long) PSDRV_ExtDeviceMode -@ cdecl ExtEscape(ptr long long ptr long ptr) PSDRV_ExtEscape -@ cdecl ExtTextOut(ptr long long long ptr ptr long ptr) PSDRV_ExtTextOut -@ cdecl GetCharWidth(ptr long long ptr) PSDRV_GetCharWidth -@ cdecl GetDeviceCaps(ptr long) PSDRV_GetDeviceCaps -@ cdecl GetTextExtentExPoint(ptr ptr long long ptr ptr ptr) PSDRV_GetTextExtentExPoint -@ cdecl GetTextMetrics(ptr ptr) PSDRV_GetTextMetrics -@ cdecl LineTo(ptr long long) PSDRV_LineTo -@ cdecl PaintRgn(ptr long) PSDRV_PaintRgn -@ cdecl PatBlt(ptr ptr long) PSDRV_PatBlt -@ cdecl Pie(ptr long long long long long long long long) PSDRV_Pie -@ cdecl PolyPolygon(ptr ptr ptr long) PSDRV_PolyPolygon -@ cdecl PolyPolyline(ptr ptr ptr long) PSDRV_PolyPolyline -@ cdecl Polygon(ptr ptr long) PSDRV_Polygon -@ cdecl Polyline(ptr ptr long) PSDRV_Polyline -@ cdecl Rectangle(ptr long long long long) PSDRV_Rectangle -@ cdecl ResetDC(ptr ptr) PSDRV_ResetDC -@ cdecl RoundRect(ptr long long long long long long) PSDRV_RoundRect -@ cdecl SelectBrush(ptr long) PSDRV_SelectBrush -@ cdecl SelectFont(ptr long long) PSDRV_SelectFont -@ cdecl SelectPen(ptr long) PSDRV_SelectPen -@ cdecl SetBkColor(ptr long) PSDRV_SetBkColor -@ cdecl SetDCBrushColor(ptr long) PSDRV_SetDCBrushColor -@ cdecl SetDCPenColor(ptr long) PSDRV_SetDCPenColor -@ cdecl SetPixel(ptr long long long) PSDRV_SetPixel -@ cdecl SetTextColor(ptr long) PSDRV_SetTextColor -@ cdecl StartDoc(ptr ptr) PSDRV_StartDoc -@ cdecl StartPage(ptr) PSDRV_StartPage -@ cdecl StretchDIBits(ptr long long long long long long long long ptr ptr long long) PSDRV_StretchDIBits diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 277cfb57bc5..54e635a19b1 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1298,7 +1298,7 @@ static BOOL same_format(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst) /*********************************************************************** * X11DRV_PatBlt */ -BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +BOOL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); BOOL usePat = (((rop >> 4) & 0x0f0000) != (rop & 0x0f0000)); @@ -1356,8 +1356,8 @@ BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) /*********************************************************************** * X11DRV_StretchBlt */ -BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) +BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { X11DRV_PDEVICE *physDevDst = get_x11drv_dev( dst_dev ); X11DRV_PDEVICE *physDevSrc = get_x11drv_dev( src_dev ); /* FIXME: check that it's really an x11 dev */ @@ -1529,8 +1529,8 @@ done: /*********************************************************************** * X11DRV_AlphaBlend */ -BOOL CDECL X11DRV_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blendfn ) +BOOL X11DRV_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blendfn ) { X11DRV_PDEVICE *physDevDst = get_x11drv_dev( dst_dev ); X11DRV_PDEVICE *physDevSrc = get_x11drv_dev( src_dev ); /* FIXME: check that it's really an x11 dev */ diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 08c359cf460..7ed008a3e35 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -87,7 +87,7 @@ void X11DRV_BITMAP_Init(void) /*********************************************************************** * SelectBitmap (X11DRV.@) */ -HBITMAP CDECL X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) +HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X_PHYSBITMAP *physBitmap; @@ -132,7 +132,7 @@ HBITMAP CDECL X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) * * Returns TRUE on success else FALSE */ -BOOL CDECL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) +BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) { X_PHYSBITMAP *physBitmap; BITMAP bitmap; @@ -211,7 +211,7 @@ BOOL CDECL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) * Success: Number of bytes copied * Failure: 0 */ -LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) +LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) { BITMAP bitmap; X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); @@ -334,7 +334,7 @@ LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) * Success: Number of bytes used in setting the bitmap bits * Failure: 0 */ -LONG CDECL X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) +LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) { BITMAP bitmap; X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); @@ -453,7 +453,7 @@ LONG CDECL X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) /*********************************************************************** * DeleteBitmap (X11DRV.@) */ -BOOL CDECL X11DRV_DeleteBitmap( HBITMAP hbitmap ) +BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap ) { X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 1a25658d452..8f3e5762dcb 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -250,7 +250,7 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) /*********************************************************************** * SelectBrush (X11DRV.@) */ -HBRUSH CDECL X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) +HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGBRUSH logbrush; @@ -321,7 +321,7 @@ HBRUSH CDECL X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) /*********************************************************************** * SetDCBrushColor (X11DRV.@) */ -COLORREF CDECL X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) +COLORREF X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 40501ae8ba2..b2e1c5f9c54 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3842,10 +3842,9 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) * X11DRV_SetDIBitsToDevice * */ -INT CDECL X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, - DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, - const BITMAPINFO *info, UINT coloruse ) +INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, + INT xSrc, INT ySrc, UINT startscan, UINT lines, LPCVOID bits, + const BITMAPINFO *info, UINT coloruse ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_DIB_IMAGEBITS_DESCR descr; @@ -3971,8 +3970,8 @@ INT CDECL X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, /*********************************************************************** * SetDIBits (X11DRV.@) */ -INT CDECL X11DRV_SetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, - UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) +INT X11DRV_SetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, + UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); @@ -4088,8 +4087,8 @@ INT CDECL X11DRV_SetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, /*********************************************************************** * GetDIBits (X11DRV.@) */ -INT CDECL X11DRV_GetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse ) +INT X11DRV_GetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines, + LPVOID bits, BITMAPINFO *info, UINT coloruse ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); @@ -4753,8 +4752,7 @@ static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps ) /*********************************************************************** * X11DRV_CreateDIBSection (X11DRV.@) */ -HBITMAP CDECL X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, - const BITMAPINFO *bmi, UINT usage ) +HBITMAP X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, const BITMAPINFO *bmi, UINT usage ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X_PHYSBITMAP *physBitmap; @@ -4924,7 +4922,7 @@ void X11DRV_DIB_DeleteDIBSection(X_PHYSBITMAP *physBitmap, DIBSECTION *dib) /*********************************************************************** * SetDIBColorTable (X11DRV.@) */ -UINT CDECL X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) +UINT X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); DIBSECTION dib; diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 301d84dbbd4..e8676703e18 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -188,7 +188,7 @@ RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) /*********************************************************************** * X11DRV_SetDeviceClipping */ -void CDECL X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); RGNDATA *data; @@ -470,7 +470,7 @@ INT X11DRV_YWStoDS( X11DRV_PDEVICE *physDev, INT height ) /*********************************************************************** * X11DRV_LineTo */ -BOOL CDECL X11DRV_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL X11DRV_LineTo( PHYSDEV dev, INT x, INT y ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); POINT pt[2]; @@ -661,8 +661,8 @@ static BOOL X11DRV_DrawArc( PHYSDEV dev, INT left, INT top, INT right, INT botto /*********************************************************************** * X11DRV_Arc */ -BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return X11DRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 0 ); } @@ -671,8 +671,8 @@ BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * X11DRV_Pie */ -BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return X11DRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 2 ); } @@ -680,8 +680,8 @@ BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * X11DRV_Chord */ -BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { return X11DRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 1 ); } @@ -690,7 +690,7 @@ BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * X11DRV_Ellipse */ -BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +BOOL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); INT width, oldwidth; @@ -748,7 +748,7 @@ BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom /*********************************************************************** * X11DRV_Rectangle */ -BOOL CDECL X11DRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) +BOOL X11DRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); INT width, oldwidth, oldjoinstyle; @@ -815,8 +815,8 @@ BOOL CDECL X11DRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT botto /*********************************************************************** * X11DRV_RoundRect */ -BOOL CDECL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT ell_width, INT ell_height ) +BOOL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT ell_width, INT ell_height ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); INT width, oldwidth, oldendcap; @@ -1017,7 +1017,7 @@ BOOL CDECL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott /*********************************************************************** * X11DRV_SetPixel */ -COLORREF CDECL X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); unsigned long pixel; @@ -1049,7 +1049,7 @@ COLORREF CDECL X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) /*********************************************************************** * X11DRV_GetPixel */ -COLORREF CDECL X11DRV_GetPixel( PHYSDEV dev, INT x, INT y ) +COLORREF X11DRV_GetPixel( PHYSDEV dev, INT x, INT y ) { static Pixmap pixmap = 0; X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -1101,7 +1101,7 @@ COLORREF CDECL X11DRV_GetPixel( PHYSDEV dev, INT x, INT y ) /*********************************************************************** * X11DRV_PaintRgn */ -BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) +BOOL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -1132,7 +1132,7 @@ BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) /********************************************************************** * X11DRV_Polyline */ -BOOL CDECL X11DRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) +BOOL X11DRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); int i; @@ -1169,7 +1169,7 @@ BOOL CDECL X11DRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) /********************************************************************** * X11DRV_Polygon */ -BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) +BOOL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); int i; @@ -1221,7 +1221,7 @@ BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) /********************************************************************** * X11DRV_PolyPolygon */ -BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons ) +BOOL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); HRGN hrgn; @@ -1279,7 +1279,7 @@ BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, /********************************************************************** * X11DRV_PolyPolyline */ -BOOL CDECL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) +BOOL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -1399,7 +1399,7 @@ static int ExtFloodFillXGetImageErrorHandler( Display *dpy, XErrorEvent *event, /********************************************************************** * X11DRV_ExtFloodFill */ -BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) +BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); XImage *image; @@ -1452,7 +1452,7 @@ BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT /********************************************************************** * X11DRV_SetBkColor */ -COLORREF CDECL X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) +COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -1463,7 +1463,7 @@ COLORREF CDECL X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) /********************************************************************** * X11DRV_SetTextColor */ -COLORREF CDECL X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) +COLORREF X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -1516,7 +1516,7 @@ static const WCHAR color_path[] = /*********************************************************************** * GetICMProfile (X11DRV.@) */ -BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) +BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) { static const WCHAR srgb[] = {'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ', @@ -1590,7 +1590,7 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) /*********************************************************************** * EnumICMProfiles (X11DRV.@) */ -INT CDECL X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) +INT X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); HKEY hkey; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 15680c40ffd..f86c17cb530 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -118,8 +118,8 @@ void X11DRV_GDI_Finalize(void) /********************************************************************** * X11DRV_CreateDC */ -BOOL CDECL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +BOOL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData ) { X11DRV_PDEVICE *physDev; @@ -166,7 +166,7 @@ BOOL CDECL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR devi /********************************************************************** * X11DRV_DeleteDC */ -BOOL CDECL X11DRV_DeleteDC( PHYSDEV dev ) +BOOL X11DRV_DeleteDC( PHYSDEV dev ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -184,7 +184,7 @@ BOOL CDECL X11DRV_DeleteDC( PHYSDEV dev ) /*********************************************************************** * GetDeviceCaps (X11DRV.@) */ -INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) +INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { @@ -285,8 +285,8 @@ INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) /********************************************************************** * ExtEscape (X11DRV.@) */ -INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, - INT out_count, LPVOID out_data ) +INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, + INT out_count, LPVOID out_data ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 00596601f08..dec40e70f97 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1199,7 +1199,7 @@ static XID create_bitmap_glxpixmap(X11DRV_PDEVICE *physDev, WineGLPixelFormat *f * * Equivalent to glXChooseVisual. */ -int CDECL X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd) +int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); WineGLPixelFormat *list; @@ -1449,8 +1449,8 @@ int CDECL X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppf * * Get the pixel-format descriptor associated to the given id */ -int CDECL X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, - UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) +int X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, + UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); /*XVisualInfo *vis;*/ @@ -1593,7 +1593,7 @@ int CDECL X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, * * Get the pixel-format id used by this DC */ -int CDECL X11DRV_GetPixelFormat(PHYSDEV dev) +int X11DRV_GetPixelFormat(PHYSDEV dev) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); WineGLPixelFormat *fmt; @@ -1704,7 +1704,7 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev, * * Set the pixel-format id used by this DC */ -BOOL CDECL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) +BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -1723,7 +1723,8 @@ BOOL CDECL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMA * * For OpenGL32 wglCopyContext. */ -BOOL CDECL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { +BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) +{ Wine_GLContext *src = (Wine_GLContext*)hglrcSrc; Wine_GLContext *dst = (Wine_GLContext*)hglrcDst; @@ -1742,7 +1743,7 @@ BOOL CDECL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { * * For OpenGL32 wglCreateContext. */ -HGLRC CDECL X11DRV_wglCreateContext(PHYSDEV dev) +HGLRC X11DRV_wglCreateContext(PHYSDEV dev) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); Wine_GLContext *ret; @@ -1786,7 +1787,7 @@ HGLRC CDECL X11DRV_wglCreateContext(PHYSDEV dev) * * For OpenGL32 wglDeleteContext. */ -BOOL CDECL X11DRV_wglDeleteContext(HGLRC hglrc) +BOOL X11DRV_wglDeleteContext(HGLRC hglrc) { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; @@ -1845,7 +1846,7 @@ static HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) * * For OpenGL32 wglGetProcAddress. */ -PROC CDECL X11DRV_wglGetProcAddress(LPCSTR lpszProc) +PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc) { int i, j; const WineGLExtension *ext; @@ -1882,7 +1883,7 @@ PROC CDECL X11DRV_wglGetProcAddress(LPCSTR lpszProc) * * For OpenGL32 wglMakeCurrent. */ -BOOL CDECL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) +BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); BOOL ret; @@ -1962,7 +1963,7 @@ BOOL CDECL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) * * For OpenGL32 wglMakeContextCurrentARB */ -BOOL CDECL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc ) +BOOL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc ) { X11DRV_PDEVICE *pDrawDev = get_x11drv_dev( draw_dev ); X11DRV_PDEVICE *pReadDev = get_x11drv_dev( read_dev ); @@ -2026,7 +2027,8 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, * * For OpenGL32 wglShareLists. */ -BOOL CDECL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { +BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) +{ Wine_GLContext *org = (Wine_GLContext *) hglrc1; Wine_GLContext *dest = (Wine_GLContext *) hglrc2; @@ -2194,7 +2196,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD * * For OpenGL32 wglUseFontBitmapsA. */ -BOOL CDECL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase) +BOOL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); Font fid = physDev->font; @@ -2219,7 +2221,7 @@ BOOL CDECL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWOR * * For OpenGL32 wglUseFontBitmapsW. */ -BOOL CDECL X11DRV_wglUseFontBitmapsW(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase) +BOOL X11DRV_wglUseFontBitmapsW(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); Font fid = physDev->font; @@ -2333,7 +2335,7 @@ static void WINAPI X11DRV_wglFlush(void) * * WGL_ARB_create_context: wglCreateContextAttribsARB */ -HGLRC CDECL X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const int* attribList) +HGLRC X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const int* attribList) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); Wine_GLContext *ret; @@ -2684,7 +2686,7 @@ static GLboolean WINAPI X11DRV_wglDestroyPbufferARB(HPBUFFERARB hPbuffer) * Gdi32 implements the part of this function which creates a device context. * This part associates the physDev with the X drawable of the pbuffer. */ -HDC CDECL X11DRV_wglGetPbufferDCARB(PHYSDEV dev, HPBUFFERARB hPbuffer) +HDC X11DRV_wglGetPbufferDCARB(PHYSDEV dev, HPBUFFERARB hPbuffer) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); Wine_GLPBuffer* object = hPbuffer; @@ -3529,7 +3531,7 @@ static void WINAPI X11DRV_wglFreeMemoryNV(GLvoid* pointer) { * WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE * This is a WINE-specific wglSetPixelFormat which can set the pixel format multiple times. */ -BOOL CDECL X11DRV_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) +BOOL X11DRV_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -3825,7 +3827,7 @@ BOOL destroy_glxpixmap(Display *display, XID glxpixmap) * * Swap the buffers of this DC */ -BOOL CDECL X11DRV_SwapBuffers(PHYSDEV dev) +BOOL X11DRV_SwapBuffers(PHYSDEV dev) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); GLXDrawable drawable; @@ -3944,7 +3946,7 @@ Drawable create_glxpixmap(Display *display, XVisualInfo *vis, Pixmap parent) /*********************************************************************** * ChoosePixelFormat (X11DRV.@) */ -int CDECL X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd) +int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd) { opengl_error(); return 0; @@ -3953,8 +3955,7 @@ int CDECL X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppf /*********************************************************************** * DescribePixelFormat (X11DRV.@) */ -int CDECL X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, - UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) +int X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) { opengl_error(); return 0; @@ -3963,7 +3964,7 @@ int CDECL X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, /*********************************************************************** * GetPixelFormat (X11DRV.@) */ -int CDECL X11DRV_GetPixelFormat(PHYSDEV dev) +int X11DRV_GetPixelFormat(PHYSDEV dev) { opengl_error(); return 0; @@ -3972,7 +3973,7 @@ int CDECL X11DRV_GetPixelFormat(PHYSDEV dev) /*********************************************************************** * SetPixelFormat (X11DRV.@) */ -BOOL CDECL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) +BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { opengl_error(); return FALSE; @@ -3981,7 +3982,7 @@ BOOL CDECL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMA /*********************************************************************** * SwapBuffers (X11DRV.@) */ -BOOL CDECL X11DRV_SwapBuffers(PHYSDEV dev) +BOOL X11DRV_SwapBuffers(PHYSDEV dev) { opengl_error(); return FALSE; @@ -3992,7 +3993,8 @@ BOOL CDECL X11DRV_SwapBuffers(PHYSDEV dev) * * For OpenGL32 wglCopyContext. */ -BOOL CDECL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { +BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) +{ opengl_error(); return FALSE; } @@ -4002,7 +4004,7 @@ BOOL CDECL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { * * For OpenGL32 wglCreateContext. */ -HGLRC CDECL X11DRV_wglCreateContext(PHYSDEV dev) +HGLRC X11DRV_wglCreateContext(PHYSDEV dev) { opengl_error(); return NULL; @@ -4013,7 +4015,7 @@ HGLRC CDECL X11DRV_wglCreateContext(PHYSDEV dev) * * WGL_ARB_create_context: wglCreateContextAttribsARB */ -HGLRC CDECL X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const int* attribList) +HGLRC X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const int* attribList) { opengl_error(); return NULL; @@ -4024,7 +4026,8 @@ HGLRC CDECL X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, * * For OpenGL32 wglDeleteContext. */ -BOOL CDECL X11DRV_wglDeleteContext(HGLRC hglrc) { +BOOL X11DRV_wglDeleteContext(HGLRC hglrc) +{ opengl_error(); return FALSE; } @@ -4034,18 +4037,19 @@ BOOL CDECL X11DRV_wglDeleteContext(HGLRC hglrc) { * * For OpenGL32 wglGetProcAddress. */ -PROC CDECL X11DRV_wglGetProcAddress(LPCSTR lpszProc) { - opengl_error(); - return NULL; -} - -HDC CDECL X11DRV_wglGetPbufferDCARB(PHYSDEV dev, void *hPbuffer) +PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc) { opengl_error(); return NULL; } -BOOL CDECL X11DRV_wglMakeContextCurrentARB(PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc) +HDC X11DRV_wglGetPbufferDCARB(PHYSDEV dev, void *hPbuffer) +{ + opengl_error(); + return NULL; +} + +BOOL X11DRV_wglMakeContextCurrentARB(PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc) { opengl_error(); return FALSE; @@ -4056,7 +4060,7 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB(PHYSDEV draw_dev, PHYSDEV read_dev, H * * For OpenGL32 wglMakeCurrent. */ -BOOL CDECL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) +BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) { opengl_error(); return FALSE; @@ -4067,7 +4071,8 @@ BOOL CDECL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) * * For OpenGL32 wglShareLists. */ -BOOL CDECL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { +BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) +{ opengl_error(); return FALSE; } @@ -4077,7 +4082,7 @@ BOOL CDECL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { * * For OpenGL32 wglUseFontBitmapsA. */ -BOOL CDECL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase) +BOOL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase) { opengl_error(); return FALSE; @@ -4088,7 +4093,7 @@ BOOL CDECL X11DRV_wglUseFontBitmapsA(PHYSDEV dev, DWORD first, DWORD count, DWOR * * For OpenGL32 wglUseFontBitmapsW. */ -BOOL CDECL X11DRV_wglUseFontBitmapsW(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase) +BOOL X11DRV_wglUseFontBitmapsW(PHYSDEV dev, DWORD first, DWORD count, DWORD listBase) { opengl_error(); return FALSE; @@ -4100,7 +4105,7 @@ BOOL CDECL X11DRV_wglUseFontBitmapsW(PHYSDEV dev, DWORD first, DWORD count, DWOR * WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE * This is a WINE-specific wglSetPixelFormat which can set the pixel format multiple times. */ -BOOL CDECL X11DRV_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) +BOOL X11DRV_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { opengl_error(); return FALSE; diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 27f6f0b2dc2..3e11a3ddf70 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -1213,7 +1213,7 @@ static int X11DRV_LookupSysPaletteExact( BYTE r, BYTE g, BYTE b ) /*********************************************************************** * RealizePalette (X11DRV.@) */ -UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) +UINT X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); char flag; @@ -1332,7 +1332,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) /*********************************************************************** * UnrealizePalette (X11DRV.@) */ -BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) +BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) { int *mapping = palette_get_mapping( hpal ); @@ -1350,7 +1350,7 @@ BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) /*********************************************************************** * GetSystemPaletteEntries (X11DRV.@) */ -UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) +UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) { UINT i; @@ -1375,7 +1375,7 @@ UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, /*********************************************************************** * GetNearestColor (X11DRV.@) */ -COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) +COLORREF X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) { unsigned char spec_type = color >> 24; COLORREF nearest; @@ -1417,7 +1417,7 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) /*********************************************************************** * RealizeDefaultPalette (X11DRV.@) */ -UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) +UINT X11DRV_RealizeDefaultPalette( PHYSDEV dev ) { UINT ret = 0; diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index fb355784216..54883b208d7 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /*********************************************************************** * SelectPen (X11DRV.@) */ -HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) +HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) { static const char PEN_dash[] = { 16,8 }; static const char PEN_dot[] = { 4,4 }; @@ -127,7 +127,7 @@ HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) /*********************************************************************** * SetDCPenColor (X11DRV.@) */ -COLORREF CDECL X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) +COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index e3a556e2fda..89af8f6eca7 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -37,8 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(text); /*********************************************************************** * X11DRV_ExtTextOut */ -BOOL CDECL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) +BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); unsigned int i; @@ -198,8 +198,8 @@ END: /*********************************************************************** * X11DRV_GetTextExtentExPoint */ -BOOL CDECL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) +BOOL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, + INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); fontObject* pfo = XFONT_GetFontObject( physDev->font ); diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index ef97cddd905..038c3e47d5e 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -2,66 +2,6 @@ @ cdecl wine_get_gdi_driver(long) X11DRV_get_gdi_driver -@ cdecl AlphaBlend(ptr ptr ptr ptr long) X11DRV_AlphaBlend -@ cdecl Arc(ptr long long long long long long long long) X11DRV_Arc -@ cdecl ChoosePixelFormat(ptr ptr) X11DRV_ChoosePixelFormat -@ cdecl Chord(ptr long long long long long long long long) X11DRV_Chord -@ cdecl CreateBitmap(ptr long ptr) X11DRV_CreateBitmap -@ cdecl CreateDC(long ptr wstr wstr wstr ptr) X11DRV_CreateDC -@ cdecl CreateDIBSection(ptr long ptr long) X11DRV_CreateDIBSection -@ cdecl DeleteBitmap(long) X11DRV_DeleteBitmap -@ cdecl DeleteDC(ptr) X11DRV_DeleteDC -@ cdecl DescribePixelFormat(ptr long long ptr) X11DRV_DescribePixelFormat -@ cdecl Ellipse(ptr long long long long) X11DRV_Ellipse -@ cdecl EnumDeviceFonts(ptr ptr ptr long) X11DRV_EnumDeviceFonts -@ cdecl EnumICMProfiles(ptr ptr long) X11DRV_EnumICMProfiles -@ cdecl ExtEscape(ptr long long ptr long ptr) X11DRV_ExtEscape -@ cdecl ExtFloodFill(ptr long long long long) X11DRV_ExtFloodFill -@ cdecl ExtTextOut(ptr long long long ptr ptr long ptr) X11DRV_ExtTextOut -@ cdecl GetBitmapBits(long ptr long) X11DRV_GetBitmapBits -@ cdecl GetCharWidth(ptr long long ptr) X11DRV_GetCharWidth -@ cdecl GetDIBits(ptr long long long ptr ptr long) X11DRV_GetDIBits -@ cdecl GetDeviceCaps(ptr long) X11DRV_GetDeviceCaps -@ cdecl GetDeviceGammaRamp(ptr ptr) X11DRV_GetDeviceGammaRamp -@ cdecl GetICMProfile(ptr ptr ptr) X11DRV_GetICMProfile -@ cdecl GetNearestColor(ptr long) X11DRV_GetNearestColor -@ cdecl GetPixel(ptr long long) X11DRV_GetPixel -@ cdecl GetPixelFormat(ptr) X11DRV_GetPixelFormat -@ cdecl GetSystemPaletteEntries(ptr long long ptr) X11DRV_GetSystemPaletteEntries -@ cdecl GetTextExtentExPoint(ptr ptr long long ptr ptr ptr) X11DRV_GetTextExtentExPoint -@ cdecl GetTextMetrics(ptr ptr) X11DRV_GetTextMetrics -@ cdecl LineTo(ptr long long) X11DRV_LineTo -@ cdecl PaintRgn(ptr long) X11DRV_PaintRgn -@ cdecl PatBlt(ptr ptr long) X11DRV_PatBlt -@ cdecl Pie(ptr long long long long long long long long) X11DRV_Pie -@ cdecl PolyPolygon(ptr ptr ptr long) X11DRV_PolyPolygon -@ cdecl PolyPolyline(ptr ptr ptr long) X11DRV_PolyPolyline -@ cdecl Polygon(ptr ptr long) X11DRV_Polygon -@ cdecl Polyline(ptr ptr long) X11DRV_Polyline -@ cdecl RealizeDefaultPalette(ptr) X11DRV_RealizeDefaultPalette -@ cdecl RealizePalette(ptr long long) X11DRV_RealizePalette -@ cdecl Rectangle(ptr long long long long) X11DRV_Rectangle -@ cdecl RoundRect(ptr long long long long long long) X11DRV_RoundRect -@ cdecl SelectBitmap(ptr long) X11DRV_SelectBitmap -@ cdecl SelectBrush(ptr long) X11DRV_SelectBrush -@ cdecl SelectFont(ptr long long) X11DRV_SelectFont -@ cdecl SelectPen(ptr long) X11DRV_SelectPen -@ cdecl SetBitmapBits(long ptr long) X11DRV_SetBitmapBits -@ cdecl SetBkColor(ptr long) X11DRV_SetBkColor -@ cdecl SetDCBrushColor(ptr long) X11DRV_SetDCBrushColor -@ cdecl SetDCPenColor(ptr long) X11DRV_SetDCPenColor -@ cdecl SetDIBColorTable(ptr long long ptr) X11DRV_SetDIBColorTable -@ cdecl SetDIBits(ptr long long long ptr ptr long) X11DRV_SetDIBits -@ cdecl SetDIBitsToDevice(ptr long long long long long long long long ptr ptr long) X11DRV_SetDIBitsToDevice -@ cdecl SetDeviceClipping(ptr long long) X11DRV_SetDeviceClipping -@ cdecl SetDeviceGammaRamp(ptr ptr) X11DRV_SetDeviceGammaRamp -@ cdecl SetPixel(ptr long long long) X11DRV_SetPixel -@ cdecl SetPixelFormat(ptr long ptr) X11DRV_SetPixelFormat -@ cdecl SetTextColor(ptr long) X11DRV_SetTextColor -@ cdecl StretchBlt(ptr ptr ptr ptr long) X11DRV_StretchBlt -@ cdecl SwapBuffers(ptr) X11DRV_SwapBuffers -@ cdecl UnrealizePalette(long) X11DRV_UnrealizePalette - # USER driver @ cdecl ActivateKeyboardLayout(long long) X11DRV_ActivateKeyboardLayout @@ -131,20 +71,6 @@ # System tray @ cdecl wine_notify_icon(long ptr) -# OpenGL -@ cdecl wglCopyContext(long long long) X11DRV_wglCopyContext -@ cdecl wglCreateContext(ptr) X11DRV_wglCreateContext -@ cdecl wglCreateContextAttribsARB(ptr long ptr) X11DRV_wglCreateContextAttribsARB -@ cdecl wglDeleteContext(long) X11DRV_wglDeleteContext -@ cdecl wglGetProcAddress(str) X11DRV_wglGetProcAddress -@ cdecl wglGetPbufferDCARB(ptr ptr) X11DRV_wglGetPbufferDCARB -@ cdecl wglMakeContextCurrentARB(ptr ptr long) X11DRV_wglMakeContextCurrentARB -@ cdecl wglMakeCurrent(ptr long) X11DRV_wglMakeCurrent -@ cdecl wglSetPixelFormatWINE(ptr long ptr) X11DRV_wglSetPixelFormatWINE -@ cdecl wglShareLists(long long) X11DRV_wglShareLists -@ cdecl wglUseFontBitmapsA(ptr long long long) X11DRV_wglUseFontBitmapsA -@ cdecl wglUseFontBitmapsW(ptr long long long) X11DRV_wglUseFontBitmapsW - #IME Interface @ stdcall ImeInquire(ptr ptr wstr) @ stdcall ImeConfigure(long long long ptr) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 320bc237aee..5575b89e85c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -180,101 +180,92 @@ extern GC get_bitmap_gc(int depth) DECLSPEC_HIDDEN; /* Wine driver X11 functions */ -extern BOOL CDECL X11DRV_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, - BLENDFUNCTION blendfn ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, - INT right, INT bottom, INT xstart, - INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) DECLSPEC_HIDDEN; -extern HBITMAP CDECL X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, - const BITMAPINFO *bmi, UINT usage ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_DeleteBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, - INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, - FONTENUMPROCW dfeproc, LPARAM lp ) DECLSPEC_HIDDEN; -extern INT CDECL X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, - COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, - UINT flags, const RECT *lprect, - LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; -extern LONG CDECL X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_GetCharWidth( PHYSDEV dev, UINT firstChar, - UINT lastChar, LPINT buffer ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; -extern INT CDECL X11DRV_GetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_GetPixel( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; -extern UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_LineTo( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Polyline( PHYSDEV dev,const POINT* pt,INT count) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, - const INT* counts, UINT polygons) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, - const DWORD* counts, DWORD polylines) DECLSPEC_HIDDEN; -extern UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Rectangle(PHYSDEV dev, INT left, INT top, - INT right, INT bottom) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, - INT right, INT bottom, INT ell_width, - INT ell_height ) DECLSPEC_HIDDEN; -extern HBITMAP CDECL X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) DECLSPEC_HIDDEN; -extern HBRUSH CDECL X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; -extern HFONT CDECL X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) DECLSPEC_HIDDEN; -extern HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; -extern LONG CDECL X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; -extern void CDECL X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; -extern UINT CDECL X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) DECLSPEC_HIDDEN; -extern INT CDECL X11DRV_SetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, - UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; -extern INT CDECL X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_wglCopyContext( HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask ) DECLSPEC_HIDDEN; -extern HGLRC CDECL X11DRV_wglCreateContext( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern HGLRC CDECL X11DRV_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC hShareContext, const int* attribList ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_wglDeleteContext( HGLRC hglrc ) DECLSPEC_HIDDEN; -extern PROC CDECL X11DRV_wglGetProcAddress( LPCSTR proc ) DECLSPEC_HIDDEN; -extern HDC CDECL X11DRV_wglGetPbufferDCARB( PHYSDEV dev, void *pbuffer ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_wglMakeCurrent( PHYSDEV dev, HGLRC hglrc ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_wglSetPixelFormatWINE( PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_wglShareLists( HGLRC hglrc1, HGLRC hglrc2 ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_wglUseFontBitmapsA( PHYSDEV dev, DWORD first, DWORD count, DWORD listBase ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_wglUseFontBitmapsW( PHYSDEV dev, DWORD first, DWORD count, DWORD listBase ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, + BLENDFUNCTION blendfn ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap, LPVOID bmBits ) DECLSPEC_HIDDEN; +extern HBITMAP X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, + const BITMAPINFO *bmi, UINT usage ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, + FONTENUMPROCW dfeproc, LPARAM lp ) DECLSPEC_HIDDEN; +extern INT X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, + LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; +extern LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; +extern INT X11DRV_GetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines, + LPVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_GetPixel( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; +extern UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT maxExt, + LPINT lpnFit, LPINT alpDx, LPSIZE size ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; +extern BOOL X11DRV_LineTo( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; +extern BOOL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_Polyline( PHYSDEV dev,const POINT* pt,INT count) DECLSPEC_HIDDEN; +extern BOOL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN; +extern BOOL X11DRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines) DECLSPEC_HIDDEN; +extern UINT X11DRV_RealizeDefaultPalette( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern UINT X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; +extern BOOL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) DECLSPEC_HIDDEN; +extern HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; +extern HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) DECLSPEC_HIDDEN; +extern HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; +extern LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; +extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; +extern UINT X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) DECLSPEC_HIDDEN; +extern INT X11DRV_SetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines, + LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; +extern INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, + UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_wglCopyContext( HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask ) DECLSPEC_HIDDEN; +extern HGLRC X11DRV_wglCreateContext( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern HGLRC X11DRV_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC hShareContext, const int* attribList ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_wglDeleteContext( HGLRC hglrc ) DECLSPEC_HIDDEN; +extern PROC X11DRV_wglGetProcAddress( LPCSTR proc ) DECLSPEC_HIDDEN; +extern HDC X11DRV_wglGetPbufferDCARB( PHYSDEV dev, void *pbuffer ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC hglrc ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_wglMakeCurrent( PHYSDEV dev, HGLRC hglrc ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_wglSetPixelFormatWINE( PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_wglShareLists( HGLRC hglrc1, HGLRC hglrc2 ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_wglUseFontBitmapsA( PHYSDEV dev, DWORD first, DWORD count, DWORD listBase ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_wglUseFontBitmapsW( PHYSDEV dev, DWORD first, DWORD count, DWORD listBase ) DECLSPEC_HIDDEN; /* OpenGL / X11 driver functions */ -extern int CDECL X11DRV_ChoosePixelFormat(PHYSDEV dev, +extern int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *pppfd) DECLSPEC_HIDDEN; -extern int CDECL X11DRV_DescribePixelFormat(PHYSDEV dev, +extern int X11DRV_DescribePixelFormat(PHYSDEV dev, int iPixelFormat, UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN; -extern int CDECL X11DRV_GetPixelFormat(PHYSDEV dev) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_SwapBuffers(PHYSDEV dev) DECLSPEC_HIDDEN; +extern int X11DRV_GetPixelFormat(PHYSDEV dev) DECLSPEC_HIDDEN; +extern BOOL X11DRV_SwapBuffers(PHYSDEV dev) DECLSPEC_HIDDEN; extern void X11DRV_OpenGL_Cleanup(void) DECLSPEC_HIDDEN; /* X11 driver internal functions */ diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index a11717dc3f7..1e6e47c7ebc 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3226,7 +3226,7 @@ XFontStruct* XFONT_GetFontStruct( X_PHYSFONT pFont ) /*********************************************************************** * SelectFont (X11DRV.@) */ -HFONT CDECL X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) +HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGFONTW logfont; @@ -3320,8 +3320,7 @@ HFONT CDECL X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) * * X11DRV_EnumDeviceFonts */ -BOOL CDECL X11DRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, - FONTENUMPROCW proc, LPARAM lp ) +BOOL X11DRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); ENUMLOGFONTEXW lf; @@ -3386,7 +3385,7 @@ BOOL CDECL X11DRV_EnumDeviceFonts( PHYSDEV dev, LPLOGFONTW plf, /*********************************************************************** * X11DRV_GetTextMetrics */ -BOOL CDECL X11DRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) +BOOL X11DRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -3403,7 +3402,7 @@ BOOL CDECL X11DRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) /*********************************************************************** * X11DRV_GetCharWidth */ -BOOL CDECL X11DRV_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer ) +BOOL X11DRV_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); fontObject* pfo = XFONT_GetFontObject( physDev->font ); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index fe62fb088fc..c432c01499a 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -426,7 +426,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 CDECL X11DRV_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) +BOOL X11DRV_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) { #ifdef SONAME_LIBXXF86VM return X11DRV_XF86VM_GetGammaRamp(ramp); @@ -442,7 +442,7 @@ BOOL CDECL X11DRV_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) * the stuff in graphics/x11drv/ has been moved to dlls/x11drv, so that * they can include xvidmode.h directly */ -BOOL CDECL X11DRV_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) +BOOL X11DRV_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) { #ifdef SONAME_LIBXXF86VM return X11DRV_XF86VM_SetGammaRamp(ramp); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index c28e4d35b11..d8040ac8f06 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -46,143 +46,143 @@ struct bitblt_coords struct gdi_dc_funcs { - INT (CDECL *pAbortDoc)(PHYSDEV); - BOOL (CDECL *pAbortPath)(PHYSDEV); - BOOL (CDECL *pAlphaBlend)(PHYSDEV,struct bitblt_coords*,PHYSDEV,struct bitblt_coords*,BLENDFUNCTION); - BOOL (CDECL *pAngleArc)(PHYSDEV,INT,INT,DWORD,FLOAT,FLOAT); - BOOL (CDECL *pArc)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); - BOOL (CDECL *pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); - BOOL (CDECL *pBeginPath)(PHYSDEV); - INT (CDECL *pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); - BOOL (CDECL *pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); - BOOL (CDECL *pCloseFigure)(PHYSDEV); - BOOL (CDECL *pCreateBitmap)(PHYSDEV,HBITMAP,LPVOID); - BOOL (CDECL *pCreateDC)(HDC,PHYSDEV *,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); - HBITMAP (CDECL *pCreateDIBSection)(PHYSDEV,HBITMAP,const BITMAPINFO *,UINT); - BOOL (CDECL *pDeleteBitmap)(HBITMAP); - BOOL (CDECL *pDeleteDC)(PHYSDEV); - BOOL (CDECL *pDeleteObject)(PHYSDEV,HGDIOBJ); - INT (CDECL *pDescribePixelFormat)(PHYSDEV,INT,UINT,PIXELFORMATDESCRIPTOR *); - DWORD (CDECL *pDeviceCapabilities)(LPSTR,LPCSTR,LPCSTR,WORD,LPSTR,LPDEVMODEA); - BOOL (CDECL *pEllipse)(PHYSDEV,INT,INT,INT,INT); - INT (CDECL *pEndDoc)(PHYSDEV); - INT (CDECL *pEndPage)(PHYSDEV); - BOOL (CDECL *pEndPath)(PHYSDEV); - BOOL (CDECL *pEnumDeviceFonts)(PHYSDEV,LPLOGFONTW,FONTENUMPROCW,LPARAM); - INT (CDECL *pEnumICMProfiles)(PHYSDEV,ICMENUMPROCW,LPARAM); - INT (CDECL *pExcludeClipRect)(PHYSDEV,INT,INT,INT,INT); - INT (CDECL *pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); - INT (CDECL *pExtEscape)(PHYSDEV,INT,INT,LPCVOID,INT,LPVOID); - BOOL (CDECL *pExtFloodFill)(PHYSDEV,INT,INT,COLORREF,UINT); - INT (CDECL *pExtSelectClipRgn)(PHYSDEV,HRGN,INT); - BOOL (CDECL *pExtTextOut)(PHYSDEV,INT,INT,UINT,const RECT*,LPCWSTR,UINT,const INT*); - BOOL (CDECL *pFillPath)(PHYSDEV); - BOOL (CDECL *pFillRgn)(PHYSDEV,HRGN,HBRUSH); - BOOL (CDECL *pFlattenPath)(PHYSDEV); - BOOL (CDECL *pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); - BOOL (CDECL *pGdiComment)(PHYSDEV,UINT,CONST BYTE*); - LONG (CDECL *pGetBitmapBits)(HBITMAP,void*,LONG); - BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); - INT (CDECL *pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT); - INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); - BOOL (CDECL *pGetDeviceGammaRamp)(PHYSDEV,LPVOID); - BOOL (CDECL *pGetICMProfile)(PHYSDEV,LPDWORD,LPWSTR); - COLORREF (CDECL *pGetNearestColor)(PHYSDEV,COLORREF); - COLORREF (CDECL *pGetPixel)(PHYSDEV,INT,INT); - INT (CDECL *pGetPixelFormat)(PHYSDEV); - UINT (CDECL *pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); - BOOL (CDECL *pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE); - BOOL (CDECL *pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); - INT (CDECL *pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT); - BOOL (CDECL *pInvertRgn)(PHYSDEV,HRGN); - BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT); - BOOL (CDECL *pModifyWorldTransform)(PHYSDEV,const XFORM*,DWORD); - BOOL (CDECL *pMoveTo)(PHYSDEV,INT,INT); - INT (CDECL *pOffsetClipRgn)(PHYSDEV,INT,INT); - BOOL (CDECL *pOffsetViewportOrgEx)(PHYSDEV,INT,INT,POINT*); - BOOL (CDECL *pOffsetWindowOrgEx)(PHYSDEV,INT,INT,POINT*); - BOOL (CDECL *pPaintRgn)(PHYSDEV,HRGN); - BOOL (CDECL *pPatBlt)(PHYSDEV,struct bitblt_coords*,DWORD); - BOOL (CDECL *pPie)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); - BOOL (CDECL *pPolyBezier)(PHYSDEV,const POINT*,DWORD); - BOOL (CDECL *pPolyBezierTo)(PHYSDEV,const POINT*,DWORD); - BOOL (CDECL *pPolyDraw)(PHYSDEV,const POINT*,const BYTE *,DWORD); - BOOL (CDECL *pPolyPolygon)(PHYSDEV,const POINT*,const INT*,UINT); - BOOL (CDECL *pPolyPolyline)(PHYSDEV,const POINT*,const DWORD*,DWORD); - BOOL (CDECL *pPolygon)(PHYSDEV,const POINT*,INT); - BOOL (CDECL *pPolyline)(PHYSDEV,const POINT*,INT); - BOOL (CDECL *pPolylineTo)(PHYSDEV,const POINT*,INT); - UINT (CDECL *pRealizeDefaultPalette)(PHYSDEV); - UINT (CDECL *pRealizePalette)(PHYSDEV,HPALETTE,BOOL); - BOOL (CDECL *pRectangle)(PHYSDEV,INT,INT,INT,INT); - HDC (CDECL *pResetDC)(PHYSDEV,const DEVMODEW*); - BOOL (CDECL *pRestoreDC)(PHYSDEV,INT); - BOOL (CDECL *pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT); - INT (CDECL *pSaveDC)(PHYSDEV); - BOOL (CDECL *pScaleViewportExtEx)(PHYSDEV,INT,INT,INT,INT,SIZE*); - BOOL (CDECL *pScaleWindowExtEx)(PHYSDEV,INT,INT,INT,INT,SIZE*); - HBITMAP (CDECL *pSelectBitmap)(PHYSDEV,HBITMAP); - HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH); - BOOL (CDECL *pSelectClipPath)(PHYSDEV,INT); - HFONT (CDECL *pSelectFont)(PHYSDEV,HFONT,HANDLE); - HPALETTE (CDECL *pSelectPalette)(PHYSDEV,HPALETTE,BOOL); - HPEN (CDECL *pSelectPen)(PHYSDEV,HPEN); - INT (CDECL *pSetArcDirection)(PHYSDEV,INT); - LONG (CDECL *pSetBitmapBits)(HBITMAP,const void*,LONG); - COLORREF (CDECL *pSetBkColor)(PHYSDEV,COLORREF); - INT (CDECL *pSetBkMode)(PHYSDEV,INT); - COLORREF (CDECL *pSetDCBrushColor)(PHYSDEV, COLORREF); - COLORREF (CDECL *pSetDCPenColor)(PHYSDEV, COLORREF); - UINT (CDECL *pSetDIBColorTable)(PHYSDEV,UINT,UINT,const RGBQUAD*); - INT (CDECL *pSetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); - INT (CDECL *pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); - VOID (CDECL *pSetDeviceClipping)(PHYSDEV,HRGN,HRGN); - BOOL (CDECL *pSetDeviceGammaRamp)(PHYSDEV,LPVOID); - DWORD (CDECL *pSetLayout)(PHYSDEV,DWORD); - INT (CDECL *pSetMapMode)(PHYSDEV,INT); - DWORD (CDECL *pSetMapperFlags)(PHYSDEV,DWORD); - COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF); - BOOL (CDECL *pSetPixelFormat)(PHYSDEV,INT,const PIXELFORMATDESCRIPTOR *); - INT (CDECL *pSetPolyFillMode)(PHYSDEV,INT); - INT (CDECL *pSetROP2)(PHYSDEV,INT); - INT (CDECL *pSetRelAbs)(PHYSDEV,INT); - INT (CDECL *pSetStretchBltMode)(PHYSDEV,INT); - UINT (CDECL *pSetTextAlign)(PHYSDEV,UINT); - INT (CDECL *pSetTextCharacterExtra)(PHYSDEV,INT); - COLORREF (CDECL *pSetTextColor)(PHYSDEV,COLORREF); - BOOL (CDECL *pSetTextJustification)(PHYSDEV,INT,INT); - BOOL (CDECL *pSetViewportExtEx)(PHYSDEV,INT,INT,SIZE*); - BOOL (CDECL *pSetViewportOrgEx)(PHYSDEV,INT,INT,POINT*); - BOOL (CDECL *pSetWindowExtEx)(PHYSDEV,INT,INT,SIZE*); - BOOL (CDECL *pSetWindowOrgEx)(PHYSDEV,INT,INT,POINT*); - BOOL (CDECL *pSetWorldTransform)(PHYSDEV,const XFORM*); - INT (CDECL *pStartDoc)(PHYSDEV,const DOCINFOW*); - INT (CDECL *pStartPage)(PHYSDEV); - BOOL (CDECL *pStretchBlt)(PHYSDEV,struct bitblt_coords*,PHYSDEV,struct bitblt_coords*,DWORD); - INT (CDECL *pStretchDIBits)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT,const void*,const BITMAPINFO*,UINT,DWORD); - BOOL (CDECL *pStrokeAndFillPath)(PHYSDEV); - BOOL (CDECL *pStrokePath)(PHYSDEV); - BOOL (CDECL *pSwapBuffers)(PHYSDEV); - BOOL (CDECL *pUnrealizePalette)(HPALETTE); - BOOL (CDECL *pWidenPath)(PHYSDEV); + INT (*pAbortDoc)(PHYSDEV); + BOOL (*pAbortPath)(PHYSDEV); + BOOL (*pAlphaBlend)(PHYSDEV,struct bitblt_coords*,PHYSDEV,struct bitblt_coords*,BLENDFUNCTION); + BOOL (*pAngleArc)(PHYSDEV,INT,INT,DWORD,FLOAT,FLOAT); + BOOL (*pArc)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); + BOOL (*pArcTo)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); + BOOL (*pBeginPath)(PHYSDEV); + INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); + BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); + BOOL (*pCloseFigure)(PHYSDEV); + BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP,LPVOID); + BOOL (*pCreateDC)(HDC,PHYSDEV *,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); + HBITMAP (*pCreateDIBSection)(PHYSDEV,HBITMAP,const BITMAPINFO *,UINT); + BOOL (*pDeleteBitmap)(HBITMAP); + BOOL (*pDeleteDC)(PHYSDEV); + BOOL (*pDeleteObject)(PHYSDEV,HGDIOBJ); + INT (*pDescribePixelFormat)(PHYSDEV,INT,UINT,PIXELFORMATDESCRIPTOR *); + DWORD (*pDeviceCapabilities)(LPSTR,LPCSTR,LPCSTR,WORD,LPSTR,LPDEVMODEA); + BOOL (*pEllipse)(PHYSDEV,INT,INT,INT,INT); + INT (*pEndDoc)(PHYSDEV); + INT (*pEndPage)(PHYSDEV); + BOOL (*pEndPath)(PHYSDEV); + BOOL (*pEnumDeviceFonts)(PHYSDEV,LPLOGFONTW,FONTENUMPROCW,LPARAM); + INT (*pEnumICMProfiles)(PHYSDEV,ICMENUMPROCW,LPARAM); + INT (*pExcludeClipRect)(PHYSDEV,INT,INT,INT,INT); + INT (*pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); + INT (*pExtEscape)(PHYSDEV,INT,INT,LPCVOID,INT,LPVOID); + BOOL (*pExtFloodFill)(PHYSDEV,INT,INT,COLORREF,UINT); + INT (*pExtSelectClipRgn)(PHYSDEV,HRGN,INT); + BOOL (*pExtTextOut)(PHYSDEV,INT,INT,UINT,const RECT*,LPCWSTR,UINT,const INT*); + BOOL (*pFillPath)(PHYSDEV); + BOOL (*pFillRgn)(PHYSDEV,HRGN,HBRUSH); + BOOL (*pFlattenPath)(PHYSDEV); + BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); + BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*); + LONG (*pGetBitmapBits)(HBITMAP,void*,LONG); + BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); + INT (*pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT); + INT (*pGetDeviceCaps)(PHYSDEV,INT); + BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID); + BOOL (*pGetICMProfile)(PHYSDEV,LPDWORD,LPWSTR); + COLORREF (*pGetNearestColor)(PHYSDEV,COLORREF); + COLORREF (*pGetPixel)(PHYSDEV,INT,INT); + INT (*pGetPixelFormat)(PHYSDEV); + UINT (*pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); + BOOL (*pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE); + BOOL (*pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); + INT (*pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT); + BOOL (*pInvertRgn)(PHYSDEV,HRGN); + BOOL (*pLineTo)(PHYSDEV,INT,INT); + BOOL (*pModifyWorldTransform)(PHYSDEV,const XFORM*,DWORD); + BOOL (*pMoveTo)(PHYSDEV,INT,INT); + INT (*pOffsetClipRgn)(PHYSDEV,INT,INT); + BOOL (*pOffsetViewportOrgEx)(PHYSDEV,INT,INT,POINT*); + BOOL (*pOffsetWindowOrgEx)(PHYSDEV,INT,INT,POINT*); + BOOL (*pPaintRgn)(PHYSDEV,HRGN); + BOOL (*pPatBlt)(PHYSDEV,struct bitblt_coords*,DWORD); + BOOL (*pPie)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); + BOOL (*pPolyBezier)(PHYSDEV,const POINT*,DWORD); + BOOL (*pPolyBezierTo)(PHYSDEV,const POINT*,DWORD); + BOOL (*pPolyDraw)(PHYSDEV,const POINT*,const BYTE *,DWORD); + BOOL (*pPolyPolygon)(PHYSDEV,const POINT*,const INT*,UINT); + BOOL (*pPolyPolyline)(PHYSDEV,const POINT*,const DWORD*,DWORD); + BOOL (*pPolygon)(PHYSDEV,const POINT*,INT); + BOOL (*pPolyline)(PHYSDEV,const POINT*,INT); + BOOL (*pPolylineTo)(PHYSDEV,const POINT*,INT); + UINT (*pRealizeDefaultPalette)(PHYSDEV); + UINT (*pRealizePalette)(PHYSDEV,HPALETTE,BOOL); + BOOL (*pRectangle)(PHYSDEV,INT,INT,INT,INT); + HDC (*pResetDC)(PHYSDEV,const DEVMODEW*); + BOOL (*pRestoreDC)(PHYSDEV,INT); + BOOL (*pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT); + INT (*pSaveDC)(PHYSDEV); + BOOL (*pScaleViewportExtEx)(PHYSDEV,INT,INT,INT,INT,SIZE*); + BOOL (*pScaleWindowExtEx)(PHYSDEV,INT,INT,INT,INT,SIZE*); + HBITMAP (*pSelectBitmap)(PHYSDEV,HBITMAP); + HBRUSH (*pSelectBrush)(PHYSDEV,HBRUSH); + BOOL (*pSelectClipPath)(PHYSDEV,INT); + HFONT (*pSelectFont)(PHYSDEV,HFONT,HANDLE); + HPALETTE (*pSelectPalette)(PHYSDEV,HPALETTE,BOOL); + HPEN (*pSelectPen)(PHYSDEV,HPEN); + INT (*pSetArcDirection)(PHYSDEV,INT); + LONG (*pSetBitmapBits)(HBITMAP,const void*,LONG); + COLORREF (*pSetBkColor)(PHYSDEV,COLORREF); + INT (*pSetBkMode)(PHYSDEV,INT); + COLORREF (*pSetDCBrushColor)(PHYSDEV, COLORREF); + COLORREF (*pSetDCPenColor)(PHYSDEV, COLORREF); + UINT (*pSetDIBColorTable)(PHYSDEV,UINT,UINT,const RGBQUAD*); + INT (*pSetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); + INT (*pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); + VOID (*pSetDeviceClipping)(PHYSDEV,HRGN,HRGN); + BOOL (*pSetDeviceGammaRamp)(PHYSDEV,LPVOID); + DWORD (*pSetLayout)(PHYSDEV,DWORD); + INT (*pSetMapMode)(PHYSDEV,INT); + DWORD (*pSetMapperFlags)(PHYSDEV,DWORD); + COLORREF (*pSetPixel)(PHYSDEV,INT,INT,COLORREF); + BOOL (*pSetPixelFormat)(PHYSDEV,INT,const PIXELFORMATDESCRIPTOR *); + INT (*pSetPolyFillMode)(PHYSDEV,INT); + INT (*pSetROP2)(PHYSDEV,INT); + INT (*pSetRelAbs)(PHYSDEV,INT); + INT (*pSetStretchBltMode)(PHYSDEV,INT); + UINT (*pSetTextAlign)(PHYSDEV,UINT); + INT (*pSetTextCharacterExtra)(PHYSDEV,INT); + COLORREF (*pSetTextColor)(PHYSDEV,COLORREF); + BOOL (*pSetTextJustification)(PHYSDEV,INT,INT); + BOOL (*pSetViewportExtEx)(PHYSDEV,INT,INT,SIZE*); + BOOL (*pSetViewportOrgEx)(PHYSDEV,INT,INT,POINT*); + BOOL (*pSetWindowExtEx)(PHYSDEV,INT,INT,SIZE*); + BOOL (*pSetWindowOrgEx)(PHYSDEV,INT,INT,POINT*); + BOOL (*pSetWorldTransform)(PHYSDEV,const XFORM*); + INT (*pStartDoc)(PHYSDEV,const DOCINFOW*); + INT (*pStartPage)(PHYSDEV); + BOOL (*pStretchBlt)(PHYSDEV,struct bitblt_coords*,PHYSDEV,struct bitblt_coords*,DWORD); + INT (*pStretchDIBits)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT,const void*,const BITMAPINFO*,UINT,DWORD); + BOOL (*pStrokeAndFillPath)(PHYSDEV); + BOOL (*pStrokePath)(PHYSDEV); + BOOL (*pSwapBuffers)(PHYSDEV); + BOOL (*pUnrealizePalette)(HPALETTE); + BOOL (*pWidenPath)(PHYSDEV); /* OpenGL32 */ - BOOL (CDECL *pwglCopyContext)(HGLRC,HGLRC,UINT); - HGLRC (CDECL *pwglCreateContext)(PHYSDEV); - HGLRC (CDECL *pwglCreateContextAttribsARB)(PHYSDEV,HGLRC,const int*); - BOOL (CDECL *pwglDeleteContext)(HGLRC); - HDC (CDECL *pwglGetPbufferDCARB)(PHYSDEV,void*); - PROC (CDECL *pwglGetProcAddress)(LPCSTR); - BOOL (CDECL *pwglMakeContextCurrentARB)(PHYSDEV,PHYSDEV,HGLRC); - BOOL (CDECL *pwglMakeCurrent)(PHYSDEV,HGLRC); - BOOL (CDECL *pwglSetPixelFormatWINE)(PHYSDEV,INT,const PIXELFORMATDESCRIPTOR*); - BOOL (CDECL *pwglShareLists)(HGLRC,HGLRC); - BOOL (CDECL *pwglUseFontBitmapsA)(PHYSDEV,DWORD,DWORD,DWORD); - BOOL (CDECL *pwglUseFontBitmapsW)(PHYSDEV,DWORD,DWORD,DWORD); + BOOL (*pwglCopyContext)(HGLRC,HGLRC,UINT); + HGLRC (*pwglCreateContext)(PHYSDEV); + HGLRC (*pwglCreateContextAttribsARB)(PHYSDEV,HGLRC,const int*); + BOOL (*pwglDeleteContext)(HGLRC); + HDC (*pwglGetPbufferDCARB)(PHYSDEV,void*); + PROC (*pwglGetProcAddress)(LPCSTR); + BOOL (*pwglMakeContextCurrentARB)(PHYSDEV,PHYSDEV,HGLRC); + BOOL (*pwglMakeCurrent)(PHYSDEV,HGLRC); + BOOL (*pwglSetPixelFormatWINE)(PHYSDEV,INT,const PIXELFORMATDESCRIPTOR*); + BOOL (*pwglShareLists)(HGLRC,HGLRC); + BOOL (*pwglUseFontBitmapsA)(PHYSDEV,DWORD,DWORD,DWORD); + BOOL (*pwglUseFontBitmapsW)(PHYSDEV,DWORD,DWORD,DWORD); }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 2 +#define WINE_GDI_DRIVER_VERSION 3 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {