[PATCH 0/2] MR2938: win32u: Don't use CDECL for gdi_dc_funcs entries.
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/main.c | 1 - dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/bitmap.c | 8 +++--- dlls/wineps.drv/brush.c | 2 +- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/printproc.c | 24 +++++++++--------- dlls/wineps.drv/psdrv.h | 49 +++++++++++++++++++++++++++++-------- include/wine/gdi_driver.h | 8 +++--- 8 files changed, 62 insertions(+), 34 deletions(-) diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index e3d2f2c54b2..d2cd039b701 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "ntgdi.h" -#include "win32u_private.h" #include "wine/unixlib.h" extern void *__wine_syscall_dispatcher DECLSPEC_HIDDEN; diff --git a/dlls/wineps.drv/bitblt.c b/dlls/wineps.drv/bitblt.c index d357e5db00f..b61f2a631c1 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(print_ctx *ctx, struct bitblt_coords *dst, DWORD dwRop) +BOOL CDECL PSDRV_PatBlt(print_ctx *ctx, struct ps_bitblt_coords *dst, DWORD dwRop) { switch(dwRop) { case PATCOPY: diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 69f93b2ea69..05b2c1fe739 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -147,7 +147,7 @@ static inline DWORD max_ascii85_size(DWORD size) return (size + 3) / 4 * 5; } -static void CDECL free_heap_bits( struct gdi_image_bits *bits ) +static void free_heap_bits( struct ps_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } @@ -184,13 +184,13 @@ static void PSDRV_WriteImageBits( print_ctx *ctx, const BITMAPINFO *info, BOOL g * PSDRV_PutImage */ DWORD CDECL PSDRV_PutImage( print_ctx *ctx, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) + const struct ps_image_bits *bits, struct ps_bitblt_coords *src, + struct ps_bitblt_coords *dst, DWORD rop ) { int src_stride, dst_stride, size, x, y, width, height, bit_offset; int dst_x, dst_y, dst_width, dst_height; unsigned char *src_ptr, *dst_ptr; - struct gdi_image_bits dst_bits; + struct ps_image_bits dst_bits; BOOL grayscale = info->bmiHeader.biBitCount == 24 && ctx->pi->ppd->ColorDevice == CD_False; if (info->bmiHeader.biPlanes != 1) goto update_format; diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index 0c3dabd387f..2917cccff02 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( print_ctx *ctx, HBRUSH hbrush, const struct brush_pattern *pattern ) +HBRUSH CDECL PSDRV_SelectBrush( print_ctx *ctx, HBRUSH hbrush, const struct ps_brush_pattern *pattern ) { LOGBRUSH logbrush; diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index f8b828b3444..cfc063882b3 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -37,7 +37,7 @@ static const DWORD PEN_alternate[] = { 1 }; /*********************************************************************** * SelectPen (WINEPS.@) */ -HPEN CDECL PSDRV_SelectPen( print_ctx *ctx, HPEN hpen, const struct brush_pattern *pattern ) +HPEN CDECL PSDRV_SelectPen( print_ctx *ctx, HPEN hpen, const struct ps_brush_pattern *pattern ) { LOGPEN logpen; EXTLOGPEN *elp = NULL; diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 644f8872888..34b3ec897a4 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -45,7 +45,7 @@ struct pp_data print_ctx *ctx; - struct brush_pattern *patterns; + struct ps_brush_pattern *patterns; BOOL path; INT break_extra; INT break_rem; @@ -210,7 +210,7 @@ static inline void order_rect(RECT *rect) } } -static BOOL intersect_vis_rectangles(struct bitblt_coords *dst, struct bitblt_coords *src) +static BOOL intersect_vis_rectangles(struct ps_bitblt_coords *dst, struct ps_bitblt_coords *src) { RECT rect; @@ -299,8 +299,8 @@ static void clip_visrect(HDC hdc, RECT *dst, const RECT *src) DeleteObject(hrgn); } -static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, - const XFORM *xform, DWORD width, DWORD height, struct bitblt_coords *src) +static void get_vis_rectangles(HDC hdc, struct ps_bitblt_coords *dst, + const XFORM *xform, DWORD width, DWORD height, struct ps_bitblt_coords *src) { RECT rect; @@ -347,8 +347,8 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, { char dst_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; - struct bitblt_coords src, dst; - struct gdi_image_bits bits; + struct ps_bitblt_coords src, dst; + struct ps_image_bits bits; DWORD err; dst.log_x = blt->xDest; @@ -968,8 +968,8 @@ static BOOL gradient_fill(print_ctx *ctx, const TRIVERTEX *vert_array, DWORD nve { char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *info = (BITMAPINFO *)buffer; - struct bitblt_coords src, dst; - struct gdi_image_bits bits; + struct ps_bitblt_coords src, dst; + struct ps_image_bits bits; HBITMAP bmp, old_bmp; BOOL ret = FALSE; TRIVERTEX *pts; @@ -1084,7 +1084,7 @@ static BOOL gradient_fill(print_ctx *ctx, const TRIVERTEX *vert_array, DWORD nve } static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, - DWORD i, struct brush_pattern **pattern) + DWORD i, struct ps_brush_pattern **pattern) { if (i & 0x80000000) { @@ -1097,7 +1097,7 @@ static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, static BOOL select_hbrush(struct pp_data *data, HANDLETABLE *htable, int handle_count, HBRUSH brush) { - struct brush_pattern *pattern = NULL; + struct ps_brush_pattern *pattern = NULL; int i; for (i = 0; i < handle_count; i++) @@ -2090,7 +2090,7 @@ done: static BOOL fill_rgn(struct pp_data *data, HANDLETABLE *htable, int handle_count, DWORD brush, HRGN rgn) { - struct brush_pattern *pattern; + struct ps_brush_pattern *pattern; HBRUSH hbrush; int ret; @@ -2297,7 +2297,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec; - struct brush_pattern *pattern; + struct ps_brush_pattern *pattern; UINT aa_flags; HGDIOBJ obj; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 6173bdfc413..f4cdfb1f653 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -25,14 +25,41 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" +#include "ntgdi.h" #include "winspool.h" #include "unixlib.h" -#include "wine/gdi_driver.h" #include "wine/list.h" +struct ps_bitblt_coords +{ + int log_x; /* original position and size, in logical coords */ + int log_y; + int log_width; + int log_height; + int x; /* mapped position and size, in device coords */ + int y; + int width; + int height; + RECT visrect; /* rectangle clipped to the visible part, in device coords */ + DWORD layout; /* DC layout */ +}; + +struct ps_image_bits +{ + void *ptr; /* pointer to the bits */ + BOOL is_copy; /* whether this is a copy of the bits that can be modified */ + void (*free)(struct ps_image_bits *); /* callback for freeing the bits */ +}; + +struct ps_brush_pattern +{ + BITMAPINFO *info; /* DIB info */ + struct ps_image_bits bits; /* DIB bits */ + UINT usage; /* color usage for DIB info */ +}; + typedef struct { INT index; LPCSTR sz; @@ -292,9 +319,9 @@ typedef struct { } PSFONT; typedef struct { - PSCOLOR color; - BOOL set; - struct brush_pattern pattern; + PSCOLOR color; + BOOL set; + struct ps_brush_pattern pattern; } PSBRUSH; #define MAX_DASHLEN 16 @@ -384,7 +411,7 @@ extern BOOL CDECL PSDRV_ExtTextOut( print_ctx *ctx, INT x, INT y, UINT flags, extern BOOL CDECL PSDRV_FillPath( print_ctx *ctx ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_LineTo(print_ctx *ctx, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_PaintRgn( print_ctx *ctx, HRGN hrgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_PatBlt(print_ctx *ctx, struct bitblt_coords *dst, DWORD dwRop) DECLSPEC_HIDDEN; +extern BOOL CDECL PSDRV_PatBlt(print_ctx *ctx, struct ps_bitblt_coords *dst, DWORD dwRop) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_Pie( print_ctx *ctx, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_PolyBezier( print_ctx *ctx, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; @@ -392,14 +419,16 @@ extern BOOL CDECL PSDRV_PolyBezierTo( print_ctx *ctx, const POINT *pts, DWORD co extern BOOL CDECL PSDRV_PolyPolygon( print_ctx *ctx, const POINT* pts, const INT* counts, UINT polygons ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_PolyPolyline( print_ctx *ctx, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; extern DWORD CDECL PSDRV_PutImage( print_ctx *ctx, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; + const struct ps_image_bits *bits, struct ps_bitblt_coords *src, + struct ps_bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_Rectangle( print_ctx *ctx, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_RoundRect( print_ctx *ctx, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; -extern HBRUSH CDECL PSDRV_SelectBrush( print_ctx *ctx, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern HBRUSH CDECL PSDRV_SelectBrush( print_ctx *ctx, HBRUSH hbrush, + const struct ps_brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HFONT CDECL PSDRV_SelectFont( print_ctx *ctx, HFONT hfont, UINT *aa_flags ) DECLSPEC_HIDDEN; -extern HPEN CDECL PSDRV_SelectPen( print_ctx *ctx, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern HPEN CDECL PSDRV_SelectPen( print_ctx *ctx, HPEN hpen, + const struct ps_brush_pattern *pattern ) DECLSPEC_HIDDEN; extern COLORREF CDECL PSDRV_SetBkColor( print_ctx *ctx, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL PSDRV_SetDCBrushColor( print_ctx *ctx, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL PSDRV_SetDCPenColor( print_ctx *ctx, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 8561d0fc52b..8042cb667b0 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -21,6 +21,10 @@ #ifndef __WINE_WINE_GDI_DRIVER_H #define __WINE_WINE_GDI_DRIVER_H +#ifndef WINE_UNIX_LIB +#error requires unixlib +#endif + #include "winternl.h" #include "ntuser.h" #include "immdev.h" @@ -197,8 +201,6 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g /* support for window surfaces */ -#ifdef WINE_UNIX_LIB - struct window_surface; struct window_surface_funcs @@ -348,6 +350,4 @@ extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal ); extern int win32u_get_window_pixel_format( HWND hwnd ); -#endif /* WINE_UNIX_LIB */ - #endif /* __WINE_WINE_GDI_DRIVER_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2938
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/bitblt.c | 20 ++-- dlls/win32u/dib.c | 12 +-- dlls/win32u/dibdrv/bitblt.c | 26 ++--- dlls/win32u/dibdrv/dc.c | 104 +++++++++--------- dlls/win32u/dibdrv/dibdrv.h | 90 ++++++++-------- dlls/win32u/dibdrv/graphics.c | 54 +++++----- dlls/win32u/dibdrv/objects.c | 8 +- dlls/win32u/driver.c | 159 ++++++++++++++------------- dlls/win32u/emfdrv.c | 79 +++++++------- dlls/win32u/font.c | 54 +++++----- dlls/win32u/ntgdi_private.h | 74 ++++++------- dlls/win32u/painting.c | 18 ++-- dlls/win32u/palette.c | 6 +- dlls/win32u/path.c | 72 ++++++------- dlls/wineandroid.drv/init.c | 8 +- dlls/winemac.drv/gdi.c | 10 +- dlls/winemac.drv/macdrv.h | 4 +- dlls/wineps.drv/unixlib.c | 22 ++-- dlls/winex11.drv/bitblt.c | 20 ++-- dlls/winex11.drv/brush.c | 4 +- dlls/winex11.drv/graphics.c | 46 ++++---- dlls/winex11.drv/init.c | 18 ++-- dlls/winex11.drv/palette.c | 10 +- dlls/winex11.drv/pen.c | 4 +- dlls/winex11.drv/x11drv.h | 94 ++++++++-------- dlls/winex11.drv/x11drv_main.c | 10 +- dlls/winex11.drv/xrender.c | 46 ++++---- dlls/winex11.drv/xvidmode.c | 4 +- include/wine/gdi_driver.h | 192 ++++++++++++++++----------------- 29 files changed, 633 insertions(+), 635 deletions(-) diff --git a/dlls/win32u/bitblt.c b/dlls/win32u/bitblt.c index 8383a1d9dcd..48c76bac676 100644 --- a/dlls/win32u/bitblt.c +++ b/dlls/win32u/bitblt.c @@ -163,7 +163,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, return intersect_vis_rectangles( dst, src ); } -void CDECL free_heap_bits( struct gdi_image_bits *bits ) +void free_heap_bits( struct gdi_image_bits *bits ) { free( bits->ptr ); } @@ -274,8 +274,8 @@ void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int cou * null driver fallback implementations */ -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_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev ); char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -326,8 +326,8 @@ BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } -BOOL CDECL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) +BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) { DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev ); char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -365,8 +365,8 @@ done: } -DWORD CDECL nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, - struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) +DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info = (BITMAPINFO *)buffer; @@ -414,8 +414,8 @@ update_format: return ERROR_BAD_FORMAT; } -BOOL CDECL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void * grad_array, ULONG ngrad, ULONG mode ) +BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void * grad_array, ULONG ngrad, ULONG mode ) { DC *dc = get_nulldrv_dc( dev ); char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -499,7 +499,7 @@ done: return ret; } -COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) +COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { DC *dc = get_nulldrv_dc( dev ); char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c index 7b6b364fb71..acd3f442e49 100644 --- a/dlls/win32u/dib.c +++ b/dlls/win32u/dib.c @@ -476,9 +476,9 @@ fail: -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, - BITMAPINFO *src_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, + BITMAPINFO *src_info, UINT coloruse, DWORD rop ) { DC *dc = get_nulldrv_dc( dev ); char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -765,9 +765,9 @@ done: } -INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWORD cy, - INT x_src, INT y_src, UINT startscan, UINT lines, - const void *bits, BITMAPINFO *src_info, UINT coloruse ) +INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWORD cy, + INT x_src, INT y_src, UINT startscan, UINT lines, + const void *bits, BITMAPINFO *src_info, UINT coloruse ) { DC *dc = get_nulldrv_dc( dev ); char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; diff --git a/dlls/win32u/dibdrv/bitblt.c b/dlls/win32u/dibdrv/bitblt.c index bb3593b7640..fd63673d9b5 100644 --- a/dlls/win32u/dibdrv/bitblt.c +++ b/dlls/win32u/dibdrv/bitblt.c @@ -885,8 +885,8 @@ DWORD get_image_from_bitmap( BITMAPOBJ *bmp, BITMAPINFO *info, /*********************************************************************** * dibdrv_GetImage */ -DWORD CDECL dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, - struct bitblt_coords *src ) +DWORD dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, + struct bitblt_coords *src ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); @@ -988,9 +988,9 @@ static inline BOOL rop_uses_pat(DWORD rop) /*********************************************************************** * dibdrv_PutImage */ -DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) +DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) { DC *dc = get_physdev_dc( dev ); struct clipped_rects clipped_rects; @@ -1051,8 +1051,8 @@ update_format: /*********************************************************************** * dibdrv_BlendImage */ -DWORD CDECL dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, - struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) +DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dib_info src_dib; @@ -1404,8 +1404,8 @@ COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt /*********************************************************************** * dibdrv_StretchBlt */ -BOOL CDECL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) +BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { DC *dc_dst = get_physdev_dc( dst_dev ); @@ -1418,8 +1418,8 @@ BOOL CDECL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, /*********************************************************************** * dibdrv_AlphaBlend */ -BOOL CDECL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) +BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) { DC *dc_dst = get_physdev_dc( dst_dev ); @@ -1429,8 +1429,8 @@ BOOL CDECL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, /*********************************************************************** * dibdrv_GradientFill */ -BOOL CDECL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void *grad_array, ULONG ngrad, ULONG mode ) +BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); DC *dc = get_physdev_dc( dev ); diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 23ef7f64390..5245a6e0dd3 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -325,8 +325,8 @@ void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) /********************************************************************** * dibdrv_CreateDC */ -static BOOL CDECL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, - const DEVMODEW *data ) +static BOOL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *data ) { dibdrv_physdev *pdev = calloc( 1, sizeof(*pdev) ); @@ -341,7 +341,7 @@ static BOOL CDECL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, /*********************************************************************** * 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); @@ -355,7 +355,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 ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, NTGDI_OBJ_BITMAP ); @@ -379,7 +379,7 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) /*********************************************************************** * dibdrv_SetDeviceClipping */ -static void CDECL dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) +static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p, %p)\n", dev, rgn); @@ -390,7 +390,7 @@ static void CDECL dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) /*********************************************************************** * dibdrv_SetBoundsRect */ -static UINT CDECL dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +static UINT dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); @@ -755,7 +755,7 @@ static inline void unlock_surface( struct windrv_physdev *dev ) if (should_flush) dev->surface->funcs->flush( dev->surface ); } -static void CDECL unlock_bits_surface( struct gdi_image_bits *bits ) +static void unlock_bits_surface( struct gdi_image_bits *bits ) { struct window_surface *surface = bits->param; surface->funcs->unlock( surface ); @@ -804,8 +804,8 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) } } -static BOOL CDECL windrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) +static BOOL windrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) { struct windrv_physdev *physdev = get_windrv_physdev( dst_dev ); BOOL ret; @@ -817,8 +817,8 @@ static BOOL CDECL windrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, return ret; } -static BOOL CDECL windrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL windrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -830,8 +830,8 @@ static BOOL CDECL windrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bot return ret; } -static BOOL CDECL windrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL windrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -843,8 +843,8 @@ static BOOL CDECL windrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT b return ret; } -static DWORD CDECL windrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, - struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) +static DWORD windrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); DWORD ret; @@ -856,8 +856,8 @@ static DWORD CDECL windrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struc return ret; } -static BOOL CDECL windrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL windrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -869,8 +869,8 @@ static BOOL CDECL windrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT b return ret; } -static BOOL CDECL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, - const DEVMODEW *devmode ) +static BOOL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *devmode ) { struct windrv_physdev *physdev = calloc( 1, sizeof(*physdev) ); @@ -886,7 +886,7 @@ static BOOL CDECL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, return TRUE; } -static BOOL CDECL windrv_DeleteDC( PHYSDEV dev ) +static BOOL windrv_DeleteDC( PHYSDEV dev ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); @@ -895,7 +895,7 @@ static BOOL CDECL windrv_DeleteDC( PHYSDEV dev ) return TRUE; } -static BOOL CDECL windrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +static BOOL windrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -907,7 +907,7 @@ static BOOL CDECL windrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT return ret; } -static BOOL CDECL windrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) +static BOOL windrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -919,8 +919,8 @@ static BOOL CDECL windrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color return ret; } -static BOOL CDECL windrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, - LPCWSTR str, UINT count, const INT *dx ) +static BOOL windrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, + LPCWSTR str, UINT count, const INT *dx ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -932,8 +932,8 @@ static BOOL CDECL windrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, cons return ret; } -static DWORD CDECL windrv_GetImage( PHYSDEV dev, BITMAPINFO *info, - struct gdi_image_bits *bits, struct bitblt_coords *src ) +static DWORD windrv_GetImage( PHYSDEV dev, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); DWORD ret; @@ -965,7 +965,7 @@ static DWORD CDECL windrv_GetImage( PHYSDEV dev, BITMAPINFO *info, return ret; } -static COLORREF CDECL windrv_GetPixel( PHYSDEV dev, INT x, INT y ) +static COLORREF windrv_GetPixel( PHYSDEV dev, INT x, INT y ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); COLORREF ret; @@ -977,8 +977,8 @@ static COLORREF CDECL windrv_GetPixel( PHYSDEV dev, INT x, INT y ) return ret; } -static BOOL CDECL windrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void * grad_array, ULONG ngrad, ULONG mode ) +static BOOL windrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void * grad_array, ULONG ngrad, ULONG mode ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -990,7 +990,7 @@ static BOOL CDECL windrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG return ret; } -static BOOL CDECL windrv_LineTo( PHYSDEV dev, INT x, INT y ) +static BOOL windrv_LineTo( PHYSDEV dev, INT x, INT y ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -1002,7 +1002,7 @@ static BOOL CDECL windrv_LineTo( PHYSDEV dev, INT x, INT y ) return ret; } -static BOOL CDECL windrv_PaintRgn( PHYSDEV dev, HRGN rgn ) +static BOOL windrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -1014,7 +1014,7 @@ static BOOL CDECL windrv_PaintRgn( PHYSDEV dev, HRGN rgn ) return ret; } -static BOOL CDECL windrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +static BOOL windrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -1026,7 +1026,7 @@ static BOOL CDECL windrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD r return ret; } -static BOOL CDECL windrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, +static BOOL windrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); @@ -1039,7 +1039,7 @@ static BOOL CDECL windrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bot return ret; } -static BOOL CDECL windrv_PolyPolygon( PHYSDEV dev, const POINT *points, const INT *counts, UINT polygons ) +static BOOL windrv_PolyPolygon( PHYSDEV dev, const POINT *points, const INT *counts, UINT polygons ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -1051,7 +1051,7 @@ static BOOL CDECL windrv_PolyPolygon( PHYSDEV dev, const POINT *points, const IN return ret; } -static BOOL CDECL windrv_PolyPolyline( PHYSDEV dev, const POINT *points, const DWORD *counts, DWORD lines ) +static BOOL windrv_PolyPolyline( PHYSDEV dev, const POINT *points, const DWORD *counts, DWORD lines ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -1063,9 +1063,9 @@ static BOOL CDECL windrv_PolyPolyline( PHYSDEV dev, const POINT *points, const D return ret; } -static DWORD CDECL windrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) +static DWORD windrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); DWORD ret; @@ -1077,7 +1077,7 @@ static DWORD CDECL windrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, return ret; } -static BOOL CDECL windrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +static BOOL windrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -1089,8 +1089,8 @@ static BOOL CDECL windrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, I return ret; } -static BOOL CDECL windrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT ell_width, INT ell_height ) +static BOOL windrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT ell_width, INT ell_height ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); BOOL ret; @@ -1102,15 +1102,15 @@ static BOOL CDECL windrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, I return ret; } -static UINT CDECL windrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +static UINT windrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { /* do nothing, we use the dibdrv bounds tracking for our own purpose */ return DCB_RESET; } -static INT CDECL windrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWORD cy, - INT x_src, INT y_src, UINT startscan, UINT lines, - const void *bits, BITMAPINFO *src_info, UINT coloruse ) +static INT windrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWORD cy, + INT x_src, INT y_src, UINT startscan, UINT lines, + const void *bits, BITMAPINFO *src_info, UINT coloruse ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); INT ret; @@ -1123,7 +1123,7 @@ static INT CDECL windrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DW return ret; } -static void CDECL windrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) +static void windrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { dev = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); dev->funcs->pSetDeviceClipping( dev, rgn ); @@ -1135,7 +1135,7 @@ static void CDECL windrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) } } -static COLORREF CDECL windrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +static COLORREF windrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); COLORREF ret; @@ -1147,8 +1147,8 @@ static COLORREF CDECL windrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color return ret; } -static BOOL CDECL windrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) +static BOOL windrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { struct windrv_physdev *physdev = get_windrv_physdev( dst_dev ); BOOL ret; @@ -1160,9 +1160,9 @@ static BOOL CDECL windrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, return ret; } -static INT CDECL windrv_StretchDIBits( PHYSDEV dev, INT x_dst, INT y_dst, INT width_dst, INT height_dst, - INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, - BITMAPINFO *src_info, UINT coloruse, DWORD rop ) +static INT windrv_StretchDIBits( PHYSDEV dev, INT x_dst, INT y_dst, INT width_dst, INT height_dst, + INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, + BITMAPINFO *src_info, UINT coloruse, DWORD rop ) { struct windrv_physdev *physdev = get_windrv_physdev( dev ); INT ret; diff --git a/dlls/win32u/dibdrv/dibdrv.h b/dlls/win32u/dibdrv/dibdrv.h index 75dca64d1f2..c0a07cba95e 100644 --- a/dlls/win32u/dibdrv/dibdrv.h +++ b/dlls/win32u/dibdrv/dibdrv.h @@ -112,51 +112,51 @@ typedef struct dibdrv_physdev BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region); } dibdrv_physdev; -extern BOOL CDECL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; -extern DWORD CDECL dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, - struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern DWORD CDECL dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, - struct bitblt_coords *src ) DECLSPEC_HIDDEN; -extern COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; -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_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, - DWORD polylines ) DECLSPEC_HIDDEN; -extern DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT ellipse_width, INT ellipse_height ) DECLSPEC_HIDDEN; -extern HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern HFONT CDECL dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) DECLSPEC_HIDDEN; -extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) 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 COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL dibdrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; +extern DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern DWORD dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, + struct bitblt_coords *src ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) 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_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT start_x, INT start_y, INT end_x, INT end_y ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, + DWORD polylines ) DECLSPEC_HIDDEN; +extern DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT ellipse_width, INT ellipse_height ) DECLSPEC_HIDDEN; +extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern HFONT dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) DECLSPEC_HIDDEN; +extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c index 55982e0afa4..009143bc2d2 100644 --- a/dlls/win32u/dibdrv/graphics.c +++ b/dlls/win32u/dibdrv/graphics.c @@ -894,8 +894,8 @@ BOOL render_aa_text_bitmapinfo( DC *dc, BITMAPINFO *info, struct gdi_image_bits /*********************************************************************** * dibdrv_ExtTextOut */ -BOOL CDECL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) +BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -943,7 +943,7 @@ done: /*********************************************************************** * dibdrv_SelectFont */ -HFONT CDECL dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +HFONT dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -965,8 +965,8 @@ HFONT CDECL dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) /*********************************************************************** * dibdrv_Arc */ -BOOL CDECL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT start_x, INT start_y, INT end_x, INT end_y ) +BOOL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT start_x, INT start_y, INT end_x, INT end_y ) { return draw_arc( dev, left, top, right, bottom, start_x, start_y, end_x, end_y, 0 ); } @@ -974,8 +974,8 @@ BOOL CDECL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * dibdrv_ArcTo */ -BOOL CDECL dibdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT start_x, INT start_y, INT end_x, INT end_y ) +BOOL dibdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT start_x, INT start_y, INT end_x, INT end_y ) { return draw_arc( dev, left, top, right, bottom, start_x, start_y, end_x, end_y, -1 ); } @@ -983,8 +983,8 @@ BOOL CDECL dibdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * dibdrv_Chord */ -BOOL CDECL dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT start_x, INT start_y, INT end_x, INT end_y ) +BOOL dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT start_x, INT start_y, INT end_x, INT end_y ) { return draw_arc( dev, left, top, right, bottom, start_x, start_y, end_x, end_y, 1 ); } @@ -992,7 +992,7 @@ BOOL CDECL dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * dibdrv_Ellipse */ -BOOL CDECL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +BOOL dibdrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return dibdrv_RoundRect( dev, left, top, right, bottom, right - left, bottom - top ); } @@ -1048,7 +1048,7 @@ static void fill_row( dib_info *dib, HRGN clip, RECT *row, DWORD pixel, UINT typ /*********************************************************************** * dibdrv_ExtFloodFill */ -BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) +BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1081,7 +1081,7 @@ BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT /*********************************************************************** * dibdrv_FillPath */ -BOOL CDECL dibdrv_FillPath( PHYSDEV dev ) +BOOL dibdrv_FillPath( PHYSDEV dev ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); @@ -1091,7 +1091,7 @@ BOOL CDECL dibdrv_FillPath( PHYSDEV dev ) /*********************************************************************** * dibdrv_GetNearestColor */ -COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) +COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1106,7 +1106,7 @@ COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) /*********************************************************************** * dibdrv_GetPixel */ -COLORREF CDECL dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) +COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1132,7 +1132,7 @@ COLORREF CDECL dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) /*********************************************************************** * dibdrv_LineTo */ -BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) +BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -1175,7 +1175,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 ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dib_brush *brush = &pdev->brush; @@ -1213,7 +1213,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 ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); const WINEREGION *region; @@ -1244,7 +1244,7 @@ BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) /*********************************************************************** * dibdrv_PolyPolygon */ -BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons ) +BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polygons ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -1316,7 +1316,7 @@ done: /*********************************************************************** * dibdrv_PolyPolyline */ -BOOL CDECL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) +BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -1368,7 +1368,7 @@ done: /*********************************************************************** * 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 ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -1444,8 +1444,8 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott /*********************************************************************** * dibdrv_RoundRect */ -BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT ellipse_width, INT ellipse_height ) +BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT ellipse_width, INT ellipse_height ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1557,8 +1557,8 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott /*********************************************************************** * dibdrv_Pie */ -BOOL CDECL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT start_x, INT start_y, INT end_x, INT end_y ) +BOOL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT start_x, INT start_y, INT end_x, INT end_y ) { return draw_arc( dev, left, top, right, bottom, start_x, start_y, end_x, end_y, 2 ); } @@ -1566,7 +1566,7 @@ BOOL CDECL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /*********************************************************************** * dibdrv_SetPixel */ -COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1599,7 +1599,7 @@ COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) /*********************************************************************** * dibdrv_StrokeAndFillPath */ -BOOL CDECL dibdrv_StrokeAndFillPath( PHYSDEV dev ) +BOOL dibdrv_StrokeAndFillPath( PHYSDEV dev ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); @@ -1609,7 +1609,7 @@ BOOL CDECL dibdrv_StrokeAndFillPath( PHYSDEV dev ) /*********************************************************************** * dibdrv_StrokePath */ -BOOL CDECL dibdrv_StrokePath( PHYSDEV dev ) +BOOL dibdrv_StrokePath( PHYSDEV dev ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); diff --git a/dlls/win32u/dibdrv/objects.c b/dlls/win32u/dibdrv/objects.c index a6f5e8d2e3d..9825d95fe16 100644 --- a/dlls/win32u/dibdrv/objects.c +++ b/dlls/win32u/dibdrv/objects.c @@ -1774,7 +1774,7 @@ static inline int get_pen_device_width( DC *dc, int width ) /*********************************************************************** * dibdrv_SetDCPenColor */ -COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) +COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -2135,7 +2135,7 @@ static void select_brush( dibdrv_physdev *pdev, dib_brush *brush, /*********************************************************************** * dibdrv_SelectBrush */ -HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) +HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -2155,7 +2155,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_ /*********************************************************************** * dibdrv_SelectPen */ -HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) +HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); @@ -2260,7 +2260,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern /*********************************************************************** * dibdrv_SetDCBrushColor */ -COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 7a2e4c3bcdd..60fd55dc2b1 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -58,111 +58,110 @@ static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); static pthread_mutex_t driver_lock = PTHREAD_MUTEX_INITIALIZER; static WCHAR driver_load_error[80]; -static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) +static INT nulldrv_AbortDoc( PHYSDEV dev ) { return 0; } -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 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_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) +static BOOL nulldrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) { if (!user_driver->dc_funcs.pCreateCompatibleDC) return TRUE; return user_driver->dc_funcs.pCreateCompatibleDC( NULL, pdev ); } -static BOOL CDECL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, - const DEVMODEW *devmode ) +static BOOL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *devmode ) { assert(0); /* should never be called */ return FALSE; } -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 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_EnumFonts( PHYSDEV dev, LOGFONTW *logfont, FONTENUMPROCW proc, LPARAM lParam ) +static BOOL nulldrv_EnumFonts( PHYSDEV dev, LOGFONTW *logfont, FONTENUMPROCW proc, LPARAM lParam ) { return TRUE; } -static INT CDECL nulldrv_ExtEscape( PHYSDEV dev, INT escape, INT in_size, const void *in_data, - INT out_size, void *out_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_FontIsLinked( PHYSDEV dev ) +static BOOL nulldrv_FontIsLinked( PHYSDEV dev ) { return FALSE; } -static UINT CDECL nulldrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +static UINT nulldrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { return DCB_RESET; } -static BOOL CDECL nulldrv_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, - WCHAR *chars, ABC *abc ) +static BOOL nulldrv_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, WCHAR *chars, ABC *abc ) { return FALSE; } -static BOOL CDECL nulldrv_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, WORD *indices, LPABC abc ) +static BOOL nulldrv_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, WORD *indices, LPABC abc ) { return FALSE; } -static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT count, - const WCHAR *chars, INT *buffer ) +static BOOL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT count, + const WCHAR *chars, INT *buffer ) { return FALSE; } -static BOOL CDECL nulldrv_GetCharWidthInfo( PHYSDEV dev, void *info ) +static BOOL nulldrv_GetCharWidthInfo( PHYSDEV dev, void *info ) { return FALSE; } -static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) +static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) { int bpp; @@ -305,75 +304,75 @@ 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 ) { RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); return FALSE; } -static DWORD CDECL nulldrv_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, LPVOID buffer, DWORD length ) +static DWORD nulldrv_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, LPVOID buffer, DWORD length ) { return FALSE; } -static BOOL CDECL nulldrv_GetFontRealizationInfo( PHYSDEV dev, void *info ) +static BOOL nulldrv_GetFontRealizationInfo( PHYSDEV dev, void *info ) { return FALSE; } -static DWORD CDECL nulldrv_GetFontUnicodeRanges( PHYSDEV dev, LPGLYPHSET glyphs ) +static DWORD nulldrv_GetFontUnicodeRanges( PHYSDEV dev, LPGLYPHSET glyphs ) { return 0; } -static DWORD CDECL nulldrv_GetGlyphIndices( PHYSDEV dev, LPCWSTR str, INT count, LPWORD indices, DWORD flags ) +static DWORD nulldrv_GetGlyphIndices( PHYSDEV dev, LPCWSTR str, INT count, LPWORD indices, DWORD flags ) { return GDI_ERROR; } -static DWORD CDECL nulldrv_GetGlyphOutline( PHYSDEV dev, UINT ch, UINT format, LPGLYPHMETRICS metrics, - DWORD size, LPVOID buffer, const MAT2 *mat ) +static DWORD nulldrv_GetGlyphOutline( PHYSDEV dev, UINT ch, UINT format, LPGLYPHMETRICS metrics, + DWORD size, LPVOID buffer, const MAT2 *mat ) { return GDI_ERROR; } -static BOOL CDECL nulldrv_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, LPWSTR filename ) +static BOOL nulldrv_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, LPWSTR filename ) { return FALSE; } -static DWORD CDECL nulldrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, - struct bitblt_coords *src ) +static DWORD nulldrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, + struct bitblt_coords *src ) { return ERROR_NOT_SUPPORTED; } -static DWORD CDECL nulldrv_GetKerningPairs( PHYSDEV dev, DWORD count, LPKERNINGPAIR pairs ) +static DWORD nulldrv_GetKerningPairs( PHYSDEV dev, DWORD count, LPKERNINGPAIR pairs ) { return 0; } -static UINT CDECL nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXTMETRICW otm ) +static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXTMETRICW otm ) { return 0; } -static UINT CDECL nulldrv_GetTextCharsetInfo( PHYSDEV dev, LPFONTSIGNATURE fs, DWORD flags ) +static UINT nulldrv_GetTextCharsetInfo( PHYSDEV dev, LPFONTSIGNATURE fs, DWORD flags ) { return DEFAULT_CHARSET; } -static BOOL CDECL nulldrv_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT *dx ) +static BOOL nulldrv_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT *dx ) { return FALSE; } -static BOOL CDECL nulldrv_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, INT *dx ) +static BOOL nulldrv_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, INT *dx ) { return FALSE; } -static INT CDECL nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) +static INT nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) { INT ret = 0; LOGFONTW font; @@ -391,176 +390,176 @@ static INT CDECL nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) return ret; } -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 ) { 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 ) { return TRUE; } -static DWORD CDECL nulldrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) +static DWORD nulldrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) { return ERROR_SUCCESS; } -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 BOOL CDECL nulldrv_ResetDC( PHYSDEV dev, const DEVMODEW *devmode ) +static BOOL nulldrv_ResetDC( PHYSDEV dev, const DEVMODEW *devmode ) { return FALSE; } -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, const struct brush_pattern *pattern ) +static HBRUSH nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush, const struct brush_pattern *pattern ) { return brush; } -static HFONT CDECL nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) { return font; } -static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen, const struct brush_pattern *pattern ) +static HPEN nulldrv_SelectPen( PHYSDEV dev, HPEN pen, const struct brush_pattern *pattern ) { return pen; } -static COLORREF CDECL nulldrv_SetBkColor( PHYSDEV dev, COLORREF color ) +static COLORREF nulldrv_SetBkColor( PHYSDEV dev, COLORREF color ) { return color; } -static UINT CDECL nulldrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +static UINT nulldrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { return DCB_RESET; } -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 void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) +static void nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { } -static BOOL CDECL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +static BOOL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) { RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); return FALSE; } -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 COLORREF CDECL nulldrv_SetTextColor( PHYSDEV dev, COLORREF color ) +static COLORREF nulldrv_SetTextColor( PHYSDEV dev, COLORREF color ) { return color; } -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_UnrealizePalette( HPALETTE palette ) +static BOOL nulldrv_UnrealizePalette( HPALETTE palette ) { return FALSE; } -static NTSTATUS CDECL nulldrv_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +static NTSTATUS nulldrv_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) { return STATUS_PROCEDURE_NOT_FOUND; } -static NTSTATUS CDECL nulldrv_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +static NTSTATUS nulldrv_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { return STATUS_PROCEDURE_NOT_FOUND; } -static NTSTATUS CDECL nulldrv_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) +static NTSTATUS nulldrv_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) { return STATUS_PROCEDURE_NOT_FOUND; } -static NTSTATUS CDECL nulldrv_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) +static NTSTATUS nulldrv_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) { return STATUS_PROCEDURE_NOT_FOUND; } -static NTSTATUS CDECL nulldrv_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +static NTSTATUS nulldrv_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { return STATUS_PROCEDURE_NOT_FOUND; } diff --git a/dlls/win32u/emfdrv.c b/dlls/win32u/emfdrv.c index 848a5bbaa4b..76ddb38f73d 100644 --- a/dlls/win32u/emfdrv.c +++ b/dlls/win32u/emfdrv.c @@ -73,7 +73,7 @@ static void emfdrv_update_bounds( DC *dc, RECTL *rect ) } } -static BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +static BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) { DC *dc = get_physdev_dc( dev ); RECTL bounds; @@ -89,8 +89,8 @@ static BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) return TRUE; } -static BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) +static BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ) { DC *dc = get_physdev_dc( dev ); RECTL bounds; @@ -218,35 +218,35 @@ static BOOL EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT b return TRUE; } -static BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static 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 ); } -static BOOL CDECL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL EMFDRV_ArcTo( 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_ARCTO ); } -static BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static 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 ); } -static BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static 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 ); } -static BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +static BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { DC *dc = get_physdev_dc( dev ); RECTL bounds; @@ -267,7 +267,7 @@ static BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT return TRUE; } -static BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +static BOOL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { DC *dc = get_physdev_dc( dev ); RECTL bounds; @@ -288,7 +288,7 @@ static BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, I return TRUE; } -static COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +static COLORREF EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) { DC *dc = get_physdev_dc( dev ); RECTL bounds; @@ -299,115 +299,114 @@ static COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color return CLR_INVALID; } -static BOOL CDECL EMFDRV_PolylineTo( PHYSDEV dev, const POINT *pt, INT count ) +static BOOL EMFDRV_PolylineTo( PHYSDEV dev, const POINT *pt, INT count ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) +static BOOL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) +static BOOL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT *pt, +static BOOL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT *pt, const DWORD *counts, DWORD polys ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT *pt, - const INT *counts, UINT polys ) +static BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT *pt, + const INT *counts, UINT polys ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, - const BYTE *types, DWORD count ) +static BOOL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) +static BOOL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) +static BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) +static BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, - LPCWSTR str, UINT count, const INT *lpDx ) +static BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, + LPCWSTR str, UINT count, const INT *lpDx ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void *grad_array, ULONG ngrad, ULONG mode ) +static BOOL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) { /* FIXME: update bounding rect */ return TRUE; } -static BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) +static BOOL EMFDRV_FillPath( PHYSDEV dev ) { /* FIXME: update bound rect */ return TRUE; } -static BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) +static BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) { /* FIXME: update bound rect */ return TRUE; } -static BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) +static BOOL EMFDRV_StrokePath( PHYSDEV dev ) { /* FIXME: update bound rect */ return TRUE; } -static BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, - PHYSDEV dev_src, struct bitblt_coords *src, - BLENDFUNCTION func ) +static BOOL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, + PHYSDEV dev_src, struct bitblt_coords *src, + BLENDFUNCTION func ) { /* FIXME: update bound rect */ return TRUE; } -static BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +static BOOL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { /* FIXME: update bound rect */ return TRUE; } -static HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) +static HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) { return 0; } -static HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +static HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) { *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ @@ -415,7 +414,7 @@ static HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) return dev->funcs->pSelectFont( dev, font, aa_flags ); } -static INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) +static INT EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); @@ -424,7 +423,7 @@ static INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) return 0; } -static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) +static BOOL EMFDRV_DeleteDC( PHYSDEV dev ) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); free( physDev ); diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index c8187e9d07b..8ea199db799 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -3232,8 +3232,8 @@ static void update_codepage( UINT screen_dpi ) /************************************************************* * font_CreateDC */ -static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, - const DEVMODEW *devmode ) +static BOOL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *devmode ) { struct font_physdev *physdev; @@ -3247,7 +3247,7 @@ static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, /************************************************************* * font_DeleteDC */ -static BOOL CDECL font_DeleteDC( PHYSDEV dev ) +static BOOL font_DeleteDC( PHYSDEV dev ) { struct font_physdev *physdev = get_font_dev( dev ); @@ -3518,7 +3518,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi /************************************************************* * font_EnumFonts */ -static BOOL CDECL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ) +static BOOL font_EnumFonts( PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ) { struct gdi_font_family *family; struct gdi_font_face *face; @@ -3883,7 +3883,7 @@ done: /************************************************************* * font_FontIsLinked */ -static BOOL CDECL font_FontIsLinked( PHYSDEV dev ) +static BOOL font_FontIsLinked( PHYSDEV dev ) { struct font_physdev *physdev = get_font_dev( dev ); @@ -3899,8 +3899,8 @@ static BOOL CDECL font_FontIsLinked( PHYSDEV dev ) /************************************************************* * font_GetCharABCWidths */ -static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, - WCHAR *chars, ABC *buffer ) +static BOOL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, + WCHAR *chars, ABC *buffer ) { struct font_physdev *physdev = get_font_dev( dev ); UINT c, i; @@ -3927,7 +3927,7 @@ static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, /************************************************************* * font_GetCharABCWidthsI */ -static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, WORD *gi, ABC *buffer ) +static BOOL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, WORD *gi, ABC *buffer ) { struct font_physdev *physdev = get_font_dev( dev ); UINT c; @@ -3952,8 +3952,8 @@ static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, W /************************************************************* * font_GetCharWidth */ -static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, - const WCHAR *chars, INT *buffer ) +static BOOL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, + const WCHAR *chars, INT *buffer ) { struct font_physdev *physdev = get_font_dev( dev ); UINT c, i; @@ -3984,7 +3984,7 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, /************************************************************* * font_GetCharWidthInfo */ -static BOOL CDECL font_GetCharWidthInfo( PHYSDEV dev, void *ptr ) +static BOOL font_GetCharWidthInfo( PHYSDEV dev, void *ptr ) { struct font_physdev *physdev = get_font_dev( dev ); struct char_width_info *info = ptr; @@ -4006,7 +4006,7 @@ static BOOL CDECL font_GetCharWidthInfo( PHYSDEV dev, void *ptr ) /************************************************************* * font_GetFontData */ -static DWORD CDECL font_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, void *buf, DWORD size ) +static DWORD font_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, void *buf, DWORD size ) { struct font_physdev *physdev = get_font_dev( dev ); @@ -4022,7 +4022,7 @@ static DWORD CDECL font_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, voi /************************************************************* * font_GetFontRealizationInfo */ -static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) +static BOOL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) { struct font_physdev *physdev = get_font_dev( dev ); struct font_realization_info *info = ptr; @@ -4055,7 +4055,7 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) /************************************************************* * font_GetFontUnicodeRanges */ -static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) +static DWORD font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) { struct font_physdev *physdev = get_font_dev( dev ); DWORD size, num_ranges; @@ -4081,7 +4081,7 @@ static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) /************************************************************* * font_GetGlyphIndices */ -static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT count, WORD *gi, DWORD flags ) +static DWORD font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT count, WORD *gi, DWORD flags ) { struct font_physdev *physdev = get_font_dev( dev ); UINT default_char; @@ -4138,8 +4138,8 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun /************************************************************* * font_GetGlyphOutline */ -static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, - GLYPHMETRICS *gm, DWORD buflen, void *buf, const MAT2 *mat ) +static DWORD font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, + GLYPHMETRICS *gm, DWORD buflen, void *buf, const MAT2 *mat ) { struct font_physdev *physdev = get_font_dev( dev ); DWORD ret; @@ -4159,7 +4159,7 @@ static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, /************************************************************* * font_GetKerningPairs */ -static DWORD CDECL font_GetKerningPairs( PHYSDEV dev, DWORD count, KERNINGPAIR *pairs ) +static DWORD font_GetKerningPairs( PHYSDEV dev, DWORD count, KERNINGPAIR *pairs ) { struct font_physdev *physdev = get_font_dev( dev ); @@ -4253,7 +4253,7 @@ static void scale_outline_font_metrics( const struct gdi_font *font, OUTLINETEXT /************************************************************* * font_GetOutlineTextMetrics */ -static UINT CDECL font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEXTMETRICW *metrics ) +static UINT font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEXTMETRICW *metrics ) { struct font_physdev *physdev = get_font_dev( dev ); UINT ret = 0; @@ -4296,7 +4296,7 @@ static UINT CDECL font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEX /************************************************************* * font_GetTextCharsetInfo */ -static UINT CDECL font_GetTextCharsetInfo( PHYSDEV dev, FONTSIGNATURE *fs, DWORD flags ) +static UINT font_GetTextCharsetInfo( PHYSDEV dev, FONTSIGNATURE *fs, DWORD flags ) { struct font_physdev *physdev = get_font_dev( dev ); @@ -4313,7 +4313,7 @@ static UINT CDECL font_GetTextCharsetInfo( PHYSDEV dev, FONTSIGNATURE *fs, DWORD /************************************************************* * font_GetTextExtentExPoint */ -static BOOL CDECL font_GetTextExtentExPoint( PHYSDEV dev, const WCHAR *str, INT count, INT *dxs ) +static BOOL font_GetTextExtentExPoint( PHYSDEV dev, const WCHAR *str, INT count, INT *dxs ) { struct font_physdev *physdev = get_font_dev( dev ); INT i, pos; @@ -4342,7 +4342,7 @@ static BOOL CDECL font_GetTextExtentExPoint( PHYSDEV dev, const WCHAR *str, INT /************************************************************* * font_GetTextExtentExPointI */ -static BOOL CDECL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, INT *dxs ) +static BOOL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, INT *dxs ) { struct font_physdev *physdev = get_font_dev( dev ); INT i, pos; @@ -4372,7 +4372,7 @@ static BOOL CDECL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, /************************************************************* * font_GetTextFace */ -static INT CDECL font_GetTextFace( PHYSDEV dev, INT count, WCHAR *str ) +static INT font_GetTextFace( PHYSDEV dev, INT count, WCHAR *str ) { struct font_physdev *physdev = get_font_dev( dev ); const WCHAR *font_name; @@ -4442,7 +4442,7 @@ static void scale_font_metrics( struct gdi_font *font, TEXTMETRICW *tm ) /************************************************************* * font_GetTextMetrics */ -static BOOL CDECL font_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) +static BOOL font_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics ) { struct font_physdev *physdev = get_font_dev( dev ); BOOL ret = FALSE; @@ -4599,7 +4599,7 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit /************************************************************* * font_SelectFont */ -static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) +static HFONT font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { struct font_physdev *physdev = get_font_dev( dev ); struct gdi_font *font = NULL, *prev = physdev->font; @@ -5695,8 +5695,8 @@ static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS * /*********************************************************************** * nulldrv_ExtTextOut */ -BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, - LPCWSTR str, UINT count, const INT *dx ) +BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, + LPCWSTR str, UINT count, const INT *dx ) { DC *dc = get_nulldrv_dc( dev ); UINT i; diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index cd714f8ec0d..87b7d943295 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -482,42 +482,42 @@ static inline int region_find_pt( const WINEREGION *rgn, int x, int y, BOOL *hit } /* null driver entry points */ -extern BOOL CDECL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func) 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 DWORD CDECL nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, - struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, - LPCWSTR str, UINT count, const INT *dx ) 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_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 COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern UINT CDECL nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; -extern BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) 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 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, BITMAPINFO *info, UINT coloruse ) 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, - 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 nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func) 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 DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, + LPCWSTR str, UINT count, const INT *dx ) 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_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 COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; +extern UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) 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 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, BITMAPINFO *info, UINT coloruse ) 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, + BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL nulldrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; static inline DC *get_nulldrv_dc( PHYSDEV dev ) { @@ -647,7 +647,7 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } -extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; +extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/painting.c b/dlls/win32u/painting.c index 6ec6806896e..8dab62f838c 100644 --- a/dlls/win32u/painting.c +++ b/dlls/win32u/painting.c @@ -42,7 +42,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 ) { DC *dc = get_physdev_dc( dev ); INT x1 = GDI_ROUND( x + cos( start * M_PI / 180 ) * radius ); @@ -58,7 +58,7 @@ 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, +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 ); @@ -78,7 +78,7 @@ BOOL CDECL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT 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; @@ -92,7 +92,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 = NtGdiCreateRectRgn( 0, 0, 0, 0 ); @@ -106,7 +106,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 ) { DC *dc = get_physdev_dc( dev ); INT prev_rop = dc->attr->rop_mode; @@ -122,7 +122,7 @@ static BOOL polyline( HDC hdc, const POINT *points, ULONG count ) return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyPolyline ); } -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; @@ -136,7 +136,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 ) { DC *dc = get_nulldrv_dc( dev ); BOOL ret = FALSE; @@ -153,7 +153,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 ) { DC *dc = get_nulldrv_dc( dev ); POINT *line_pts = NULL, *new_line_pts, *bzr_pts = NULL, bzr[4]; @@ -234,7 +234,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 ) { DC *dc = get_nulldrv_dc( dev ); BOOL ret = FALSE; diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 57bb3e1fa57..8ae07e72edc 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(palette); -typedef BOOL (CDECL *unrealize_function)(HPALETTE); +typedef BOOL (*unrealize_function)(HPALETTE); typedef struct tagPALETTEOBJ { @@ -344,7 +344,7 @@ static UINT get_system_palette_entries( HDC hdc, UINT start, UINT count, PALETTE /* null driver fallback implementation for GetSystemPaletteEntries */ -UINT CDECL nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) +UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) { return 0; } @@ -390,7 +390,7 @@ UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ) /* 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; DC *dc = get_nulldrv_dc( dev ); diff --git a/dlls/win32u/path.c b/dlls/win32u/path.c index 5490d885693..9775ed16480 100644 --- a/dlls/win32u/path.c +++ b/dlls/win32u/path.c @@ -733,7 +733,7 @@ BOOL WINAPI NtGdiSelectClipPath( HDC hdc, INT mode ) /*********************************************************************** * pathdrv_BeginPath */ -static BOOL CDECL pathdrv_BeginPath( PHYSDEV dev ) +static BOOL pathdrv_BeginPath( PHYSDEV dev ) { /* path already open, nothing to do */ return TRUE; @@ -743,7 +743,7 @@ static BOOL CDECL pathdrv_BeginPath( PHYSDEV dev ) /*********************************************************************** * pathdrv_AbortPath */ -static BOOL CDECL pathdrv_AbortPath( PHYSDEV dev ) +static BOOL pathdrv_AbortPath( PHYSDEV dev ) { DC *dc = get_physdev_dc( dev ); @@ -755,7 +755,7 @@ static BOOL CDECL pathdrv_AbortPath( PHYSDEV dev ) /*********************************************************************** * pathdrv_EndPath */ -static BOOL CDECL pathdrv_EndPath( PHYSDEV dev ) +static BOOL pathdrv_EndPath( PHYSDEV dev ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -770,8 +770,8 @@ static BOOL CDECL pathdrv_EndPath( PHYSDEV dev ) /*********************************************************************** * pathdrv_CreateDC */ -static BOOL CDECL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, - const DEVMODEW *devmode ) +static BOOL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *devmode ) { struct path_physdev *physdev = malloc( sizeof(*physdev) ); @@ -784,7 +784,7 @@ static BOOL CDECL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output /************************************************************* * pathdrv_DeleteDC */ -static BOOL CDECL pathdrv_DeleteDC( PHYSDEV dev ) +static BOOL pathdrv_DeleteDC( PHYSDEV dev ) { struct path_physdev *physdev = get_path_physdev( dev ); @@ -843,7 +843,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) /************************************************************* * pathdrv_MoveTo */ -static BOOL CDECL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) +static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -859,7 +859,7 @@ static BOOL CDECL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) /************************************************************* * pathdrv_LineTo */ -static BOOL CDECL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) +static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -874,7 +874,7 @@ static BOOL CDECL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) /************************************************************* * pathdrv_Rectangle */ -static BOOL CDECL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) +static BOOL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -901,7 +901,7 @@ static BOOL CDECL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 /************************************************************* * pathdrv_RoundRect */ -static BOOL CDECL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height ) +static BOOL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height ) { const double factor = 0.55428475; /* 4 / 3 * (sqrt(2) - 1) */ struct path_physdev *physdev = get_path_physdev( dev ); @@ -976,7 +976,7 @@ static BOOL CDECL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 /************************************************************* * pathdrv_Ellipse */ -static BOOL CDECL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) +static BOOL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) { const double factor = 0.55428475; /* 4 / 3 * (sqrt(2) - 1) */ struct path_physdev *physdev = get_path_physdev( dev ); @@ -1183,7 +1183,7 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, /************************************************************* * pathdrv_AngleArc */ -static BOOL CDECL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT eStartAngle, FLOAT eSweepAngle) +static BOOL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT eStartAngle, FLOAT eSweepAngle) { int x1 = GDI_ROUND( x + cos(eStartAngle*M_PI/180) * radius ); int y1 = GDI_ROUND( y - sin(eStartAngle*M_PI/180) * radius ); @@ -1197,8 +1197,8 @@ static BOOL CDECL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLO /************************************************************* * pathdrv_Arc */ -static BOOL CDECL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, @@ -1209,8 +1209,8 @@ static BOOL CDECL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bo /************************************************************* * pathdrv_ArcTo */ -static BOOL CDECL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, @@ -1221,8 +1221,8 @@ static BOOL CDECL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT /************************************************************* * pathdrv_Chord */ -static BOOL CDECL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, @@ -1233,8 +1233,8 @@ static BOOL CDECL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT /************************************************************* * pathdrv_Pie */ -static BOOL CDECL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) +static BOOL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, @@ -1245,7 +1245,7 @@ static BOOL CDECL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bo /************************************************************* * pathdrv_PolyBezierTo */ -static BOOL CDECL pathdrv_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) +static BOOL pathdrv_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1257,7 +1257,7 @@ static BOOL CDECL pathdrv_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD cbP /************************************************************* * pathdrv_PolyBezier */ -static BOOL CDECL pathdrv_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) +static BOOL pathdrv_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1272,7 +1272,7 @@ static BOOL CDECL pathdrv_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD cbPoi /************************************************************* * pathdrv_PolyDraw */ -static BOOL CDECL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD cbPoints ) +static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); struct gdi_path *path = physdev->path; @@ -1325,7 +1325,7 @@ static BOOL CDECL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *t /************************************************************* * pathdrv_PolylineTo */ -static BOOL CDECL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count ) +static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1338,7 +1338,7 @@ static BOOL CDECL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count ) /************************************************************* * pathdrv_PolyPolygon */ -static BOOL CDECL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) +static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1368,7 +1368,7 @@ static BOOL CDECL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* /************************************************************* * pathdrv_PolyPolyline */ -static BOOL CDECL pathdrv_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) +static BOOL pathdrv_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) { struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_physdev_dc( dev ); @@ -1521,8 +1521,8 @@ static BOOL PATH_add_outline(struct path_physdev *physdev, INT x, INT y, /************************************************************* * pathdrv_ExtTextOut */ -static BOOL CDECL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprc, - LPCWSTR str, UINT count, const INT *dx ) +static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprc, + LPCWSTR str, UINT count, const INT *dx ) { struct path_physdev *physdev = get_path_physdev( dev ); unsigned int idx, ggo_flags = GGO_NATIVE; @@ -1576,7 +1576,7 @@ static BOOL CDECL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, con /************************************************************* * pathdrv_CloseFigure */ -static BOOL CDECL pathdrv_CloseFigure( PHYSDEV dev ) +static BOOL pathdrv_CloseFigure( PHYSDEV dev ) { struct path_physdev *physdev = get_path_physdev( dev ); @@ -1965,7 +1965,7 @@ BOOL WINAPI NtGdiWidenPath( HDC hdc ) * null driver fallback implementations */ -BOOL CDECL nulldrv_BeginPath( PHYSDEV dev ) +BOOL nulldrv_BeginPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); struct path_physdev *physdev; @@ -1986,13 +1986,13 @@ BOOL CDECL nulldrv_BeginPath( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_EndPath( PHYSDEV dev ) +BOOL nulldrv_EndPath( PHYSDEV dev ) { RtlSetLastWin32Error( ERROR_CAN_NOT_COMPLETE ); return FALSE; } -BOOL CDECL nulldrv_AbortPath( PHYSDEV dev ) +BOOL nulldrv_AbortPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); @@ -2001,27 +2001,27 @@ BOOL CDECL nulldrv_AbortPath( PHYSDEV dev ) return TRUE; } -BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) +BOOL nulldrv_CloseFigure( PHYSDEV dev ) { RtlSetLastWin32Error( ERROR_CAN_NOT_COMPLETE ); return FALSE; } -BOOL CDECL nulldrv_FillPath( PHYSDEV dev ) +BOOL nulldrv_FillPath( PHYSDEV dev ) { if (NtGdiGetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; NtGdiAbortPath( dev->hdc ); return TRUE; } -BOOL CDECL nulldrv_StrokeAndFillPath( PHYSDEV dev ) +BOOL nulldrv_StrokeAndFillPath( PHYSDEV dev ) { if (NtGdiGetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; NtGdiAbortPath( dev->hdc ); return TRUE; } -BOOL CDECL nulldrv_StrokePath( PHYSDEV dev ) +BOOL nulldrv_StrokePath( PHYSDEV dev ) { if (NtGdiGetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; NtGdiAbortPath( dev->hdc ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index d4308df5eba..076c32b2c79 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -223,8 +223,8 @@ static ANDROID_PDEVICE *create_android_physdev(void) /********************************************************************** * ANDROID_CreateDC */ -static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, - const DEVMODEW *initData ) +static BOOL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *initData ) { ANDROID_PDEVICE *physdev = create_android_physdev(); @@ -238,7 +238,7 @@ static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR outpu /********************************************************************** * ANDROID_CreateCompatibleDC */ -static BOOL CDECL ANDROID_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) +static BOOL ANDROID_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) { ANDROID_PDEVICE *physdev = create_android_physdev(); @@ -252,7 +252,7 @@ static BOOL CDECL ANDROID_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) /********************************************************************** * ANDROID_DeleteDC */ -static BOOL CDECL ANDROID_DeleteDC( PHYSDEV dev ) +static BOOL ANDROID_DeleteDC( PHYSDEV dev ) { free( dev ); return TRUE; diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 4d2f25983f8..a19189e1171 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -170,8 +170,8 @@ static MACDRV_PDEVICE *create_mac_physdev(void) /********************************************************************** * CreateDC (MACDRV.@) */ -static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, - const DEVMODEW* initData) +static BOOL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *initData) { MACDRV_PDEVICE *physDev = create_mac_physdev(); @@ -188,7 +188,7 @@ static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, /********************************************************************** * CreateCompatibleDC (MACDRV.@) */ -static BOOL CDECL macdrv_CreateCompatibleDC(PHYSDEV orig, PHYSDEV *pdev) +static BOOL macdrv_CreateCompatibleDC(PHYSDEV orig, PHYSDEV *pdev) { MACDRV_PDEVICE *physDev = create_mac_physdev(); @@ -205,7 +205,7 @@ static BOOL CDECL macdrv_CreateCompatibleDC(PHYSDEV orig, PHYSDEV *pdev) /********************************************************************** * DeleteDC (MACDRV.@) */ -static BOOL CDECL macdrv_DeleteDC(PHYSDEV dev) +static BOOL macdrv_DeleteDC(PHYSDEV dev) { MACDRV_PDEVICE *physDev = get_macdrv_dev(dev); @@ -219,7 +219,7 @@ static BOOL CDECL macdrv_DeleteDC(PHYSDEV dev) /*********************************************************************** * GetDeviceCaps (MACDRV.@) */ -static INT CDECL macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) +static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) { INT ret; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d0fddcc0f21..af104a130fe 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -83,8 +83,8 @@ extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; extern void macdrv_reset_device_metrics(void) DECLSPEC_HIDDEN; -extern BOOL CDECL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; -extern BOOL CDECL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; +extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; +extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; /************************************************************************** diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 26b1232f63e..6afbe5ffde6 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -221,7 +221,7 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmPelsHeight %u\n", (unsigned int)dm->dmPelsHeight); } -static INT CDECL get_device_caps(PHYSDEV dev, INT cap) +static INT get_device_caps(PHYSDEV dev, INT cap) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); @@ -573,7 +573,7 @@ static void update_dev_caps(PSDRV_PDEVICE *pdev) pdev->horz_res, pdev->vert_res); } -static BOOL CDECL reset_dc(PHYSDEV dev, const DEVMODEW *devmode) +static BOOL reset_dc(PHYSDEV dev, const DEVMODEW *devmode) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); @@ -614,7 +614,7 @@ const struct glyph_info *uv_metrics(WCHAR wch, const struct font_data *font) return needle; } -static int CDECL ext_escape(PHYSDEV dev, int escape, int input_size, const void *input, +static int ext_escape(PHYSDEV dev, int escape, int input_size, const void *input, int output_size, void *output) { TRACE("%p,%d,%d,%p,%d,%p\n", @@ -1108,7 +1108,7 @@ static BOOL select_builtin_font(PSDRV_PDEVICE *pdev, HFONT hfont, LOGFONTW *plf) return TRUE; } -static HFONT CDECL select_font(PHYSDEV dev, HFONT hfont, UINT *aa_flags) +static HFONT select_font(PHYSDEV dev, HFONT hfont, UINT *aa_flags) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); PHYSDEV next = GET_NEXT_PHYSDEV(dev, pSelectFont); @@ -1222,7 +1222,7 @@ static UINT get_font_metric(const struct font_data *font, return DEVICE_FONTTYPE; } -static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp) +static BOOL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lp) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); PHYSDEV next = GET_NEXT_PHYSDEV(dev, pEnumFonts); @@ -1282,7 +1282,7 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP return ret; } -static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) +static BOOL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); UINT i, c; @@ -1309,7 +1309,7 @@ static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHA return TRUE; } -static BOOL CDECL get_text_metrics(PHYSDEV dev, TEXTMETRICW *metrics) +static BOOL get_text_metrics(PHYSDEV dev, TEXTMETRICW *metrics) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); @@ -1323,7 +1323,7 @@ static BOOL CDECL get_text_metrics(PHYSDEV dev, TEXTMETRICW *metrics) return TRUE; } -static BOOL CDECL get_text_extent_ex_point(PHYSDEV dev, const WCHAR *str, int count, int *dx) +static BOOL get_text_extent_ex_point(PHYSDEV dev, const WCHAR *str, int count, int *dx) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); int i; @@ -1404,7 +1404,7 @@ static PSDRV_PDEVICE *create_physdev(HDC hdc, const WCHAR *device, return pdev; } -static BOOL CDECL create_dc(PHYSDEV *dev, const WCHAR *device, +static BOOL create_dc(PHYSDEV *dev, const WCHAR *device, const WCHAR *output, const DEVMODEW *devmode) { PSDRV_PDEVICE *pdev; @@ -1417,7 +1417,7 @@ static BOOL CDECL create_dc(PHYSDEV *dev, const WCHAR *device, return TRUE; } -static BOOL CDECL create_compatible_dc(PHYSDEV orig, PHYSDEV *dev) +static BOOL create_compatible_dc(PHYSDEV orig, PHYSDEV *dev) { PSDRV_PDEVICE *pdev, *orig_dev = get_psdrv_dev(orig); @@ -1427,7 +1427,7 @@ static BOOL CDECL create_compatible_dc(PHYSDEV orig, PHYSDEV *dev) return TRUE; } -static BOOL CDECL delete_dc(PHYSDEV dev) +static BOOL delete_dc(PHYSDEV dev) { PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 19fc0b0887c..94aa06773a7 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -754,7 +754,7 @@ void execute_rop( X11DRV_PDEVICE *physdev, Pixmap src_pixmap, GC gc, const RECT /*********************************************************************** * 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)); @@ -806,8 +806,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 ); @@ -926,12 +926,12 @@ BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } -static void CDECL free_heap_bits( struct gdi_image_bits *bits ) +static void free_heap_bits( struct gdi_image_bits *bits ) { free( bits->ptr ); } -static void CDECL free_ximage_bits( struct gdi_image_bits *bits ) +static void free_ximage_bits( struct gdi_image_bits *bits ) { XFree( bits->ptr ); } @@ -1220,9 +1220,9 @@ DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, /*********************************************************************** * X11DRV_PutImage */ -DWORD CDECL X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) +DWORD X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) { X11DRV_PDEVICE *physdev = get_x11drv_dev( dev ); DWORD ret; @@ -1312,8 +1312,8 @@ update_format: /*********************************************************************** * X11DRV_GetImage */ -DWORD CDECL X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, - struct gdi_image_bits *bits, struct bitblt_coords *src ) +DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) { X11DRV_PDEVICE *physdev = get_x11drv_dev( dev ); DWORD ret = ERROR_SUCCESS; diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 9ecb5ec5eda..0a6f24c7a49 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -236,7 +236,7 @@ static BOOL select_pattern_brush( X11DRV_PDEVICE *physdev, const struct brush_pa /*********************************************************************** * SelectBrush (X11DRV.@) */ -HBRUSH CDECL X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) +HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGBRUSH logbrush; @@ -288,7 +288,7 @@ HBRUSH CDECL X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_ /*********************************************************************** * 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/graphics.c b/dlls/winex11.drv/graphics.c index e3b0445379a..4a0564392bd 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -298,7 +298,7 @@ void restore_clipping_region( X11DRV_PDEVICE *dev ) /*********************************************************************** * X11DRV_SetDeviceClipping */ -void CDECL X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) +void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -547,7 +547,7 @@ INT X11DRV_YWStoDS( HDC hdc, 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]; @@ -719,8 +719,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 ); } @@ -729,8 +729,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 ); } @@ -738,8 +738,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 ); } @@ -748,7 +748,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; @@ -791,7 +791,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; @@ -844,8 +844,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; @@ -1035,7 +1035,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; @@ -1061,7 +1061,7 @@ COLORREF CDECL X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) /*********************************************************************** * X11DRV_PaintRgn */ -BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) +BOOL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); RECT rc; @@ -1136,7 +1136,7 @@ static BOOL 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 ); DWORD total = 0, max = 0, pos, i; @@ -1212,7 +1212,7 @@ done: /********************************************************************** * 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 ); DWORD total = 0, max = 0, pos, i, j; @@ -1335,7 +1335,7 @@ done: /********************************************************************** * X11DRV_FillPath */ -BOOL CDECL X11DRV_FillPath( PHYSDEV dev ) +BOOL X11DRV_FillPath( PHYSDEV dev ) { return x11drv_stroke_and_fill_path( dev, FALSE, TRUE ); } @@ -1343,7 +1343,7 @@ BOOL CDECL X11DRV_FillPath( PHYSDEV dev ) /********************************************************************** * X11DRV_StrokeAndFillPath */ -BOOL CDECL X11DRV_StrokeAndFillPath( PHYSDEV dev ) +BOOL X11DRV_StrokeAndFillPath( PHYSDEV dev ) { return x11drv_stroke_and_fill_path( dev, TRUE, TRUE ); } @@ -1351,7 +1351,7 @@ BOOL CDECL X11DRV_StrokeAndFillPath( PHYSDEV dev ) /********************************************************************** * X11DRV_StrokePath */ -BOOL CDECL X11DRV_StrokePath( PHYSDEV dev ) +BOOL X11DRV_StrokePath( PHYSDEV dev ) { return x11drv_stroke_and_fill_path( dev, TRUE, FALSE ); } @@ -1438,7 +1438,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; @@ -1501,8 +1501,8 @@ BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT /********************************************************************** * X11DRV_GradientFill */ -BOOL CDECL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void *grad_array, ULONG ngrad, ULONG mode ) +BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) { X11DRV_PDEVICE *physdev = get_x11drv_dev( dev ); const GRADIENT_RECT *rect = grad_array; @@ -1656,7 +1656,7 @@ static const WCHAR color_path[] = /*********************************************************************** * GetICMProfile (X11DRV.@) */ -BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, LPWSTR filename ) +BOOL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, LPWSTR filename ) { static const WCHAR srgb[] = {'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ', diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 57e24c6aeba..07c8fd772e2 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -96,8 +96,8 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) /********************************************************************** * X11DRV_CreateDC */ -static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, - const DEVMODEW* initData ) +static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *initData ) { X11DRV_PDEVICE *physDev = create_x11_physdev( root_window ); @@ -116,7 +116,7 @@ static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output /********************************************************************** * X11DRV_CreateCompatibleDC */ -static BOOL CDECL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) +static BOOL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) { X11DRV_PDEVICE *physDev = create_x11_physdev( stock_bitmap_pixmap ); @@ -134,7 +134,7 @@ static BOOL CDECL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) /********************************************************************** * X11DRV_DeleteDC */ -static BOOL CDECL X11DRV_DeleteDC( PHYSDEV dev ) +static BOOL X11DRV_DeleteDC( PHYSDEV dev ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); @@ -159,7 +159,7 @@ void add_device_bounds( X11DRV_PDEVICE *dev, const RECT *rect ) /*********************************************************************** * X11DRV_SetBoundsRect */ -static UINT CDECL X11DRV_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +static UINT X11DRV_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { X11DRV_PDEVICE *pdev = get_x11drv_dev( dev ); @@ -172,7 +172,7 @@ static UINT CDECL X11DRV_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) /*********************************************************************** * GetDeviceCaps (X11DRV.@) */ -static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) +static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { switch(cap) { @@ -188,7 +188,7 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) /*********************************************************************** * SelectFont */ -static HFONT CDECL X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) +static HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { if (default_visual.depth <= 8) *aa_flags = GGO_BITMAP; /* no anti-aliasing on <= 8bpp */ dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); @@ -198,8 +198,8 @@ static HFONT CDECL X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) /********************************************************************** * ExtEscape (X11DRV.@) */ -static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, - INT out_count, LPVOID out_data ) +static 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/palette.c b/dlls/winex11.drv/palette.c index 0fb6c1cb90b..43974fe8896 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -1184,7 +1184,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; @@ -1298,7 +1298,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 ); @@ -1314,7 +1314,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; @@ -1344,7 +1344,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; @@ -1386,7 +1386,7 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) /*********************************************************************** * RealizeDefaultPalette (X11DRV.@) */ -UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) +UINT X11DRV_RealizeDefaultPalette( PHYSDEV dev ) { DWORD is_memdc; UINT ret = 0; diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index 3baf6a0a74e..c34d9fe6114 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -58,7 +58,7 @@ static DWORD get_user_dashes( char *res, const DWORD *style, DWORD len ) /*********************************************************************** * SelectPen (X11DRV.@) */ -HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) +HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) { static const char PEN_dash[] = { 16,8 }; static const char PEN_dot[] = { 4,4 }; @@ -158,7 +158,7 @@ HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern /*********************************************************************** * 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/x11drv.h b/dlls/winex11.drv/x11drv.h index 40729741aad..3fe072c901e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -154,53 +154,53 @@ static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) /* Wine driver X11 functions */ -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 NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN; -extern DWORD CDECL X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, - struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void *grad_array, ULONG ngrad, ULONG mode ) 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_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 DWORD CDECL X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) 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 HBRUSH CDECL X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) 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 rgn ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; -extern COLORREF CDECL X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, 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_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) 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 NTSTATUS X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) DECLSPEC_HIDDEN; +extern NTSTATUS X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) DECLSPEC_HIDDEN; +extern NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) DECLSPEC_HIDDEN; +extern NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) DECLSPEC_HIDDEN; +extern NTSTATUS X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN; +extern DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) 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_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 DWORD X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) 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 HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) 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 rgn ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; +extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, 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_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ActivateKeyboardLayout( HKL hkl, UINT flags ) DECLSPEC_HIDDEN; extern void X11DRV_Beep(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 5b79e6ce7c7..b0630a06926 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -833,7 +833,7 @@ BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, return FALSE; /* let user32 handle it */ } -NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +NTSTATUS X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); struct x11_d3dkmt_adapter *adapter; @@ -864,7 +864,7 @@ NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) /********************************************************************** * X11DRV_D3DKMTSetVidPnSourceOwner */ -NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +NTSTATUS X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { struct d3dkmt_vidpn_source *source, *source2; NTSTATUS status = STATUS_SUCCESS; @@ -979,7 +979,7 @@ done: /********************************************************************** * X11DRV_D3DKMTCheckVidPnExclusiveOwnership */ -NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +NTSTATUS X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) { struct d3dkmt_vidpn_source *source; @@ -1130,7 +1130,7 @@ static BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid ) return FALSE; } -NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) +NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) { static const char *extensions[] = { @@ -1244,7 +1244,7 @@ done: return status; } -NTSTATUS CDECL X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) +NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) { const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); PFN_vkGetPhysicalDeviceMemoryProperties2KHR pvkGetPhysicalDeviceMemoryProperties2KHR; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index bb38fd90584..8a6155862b9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -813,7 +813,7 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) /********************************************************************** * xrenderdrv_SelectFont */ -static HFONT CDECL xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) +static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { LFANDSIZE lfsz; struct xrender_physdev *physdev = get_xrender_dev( dev ); @@ -929,8 +929,8 @@ static void set_color_info( XRenderPictFormat *format, BITMAPINFO *info ) /********************************************************************** * xrenderdrv_CreateDC */ -static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, - const DEVMODEW* initData ) +static BOOL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, + const DEVMODEW *initData ) { return create_xrender_dc( pdev, default_format ); } @@ -938,7 +938,7 @@ static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR ou /********************************************************************** * xrenderdrv_CreateCompatibleDC */ -static BOOL CDECL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) +static BOOL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) { if (orig) /* chain to x11drv first */ { @@ -953,7 +953,7 @@ static BOOL CDECL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) /********************************************************************** * xrenderdrv_DeleteDC */ -static BOOL CDECL xrenderdrv_DeleteDC( PHYSDEV dev ) +static BOOL xrenderdrv_DeleteDC( PHYSDEV dev ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); @@ -970,8 +970,8 @@ static BOOL CDECL xrenderdrv_DeleteDC( PHYSDEV dev ) /********************************************************************** * xrenderdrv_ExtEscape */ -static INT CDECL xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, - INT out_count, LPVOID out_data ) +static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, + INT out_count, LPVOID out_data ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); @@ -996,7 +996,7 @@ static INT CDECL xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LP /*********************************************************************** * xrenderdrv_SetDeviceClipping */ -static void CDECL xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) +static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); @@ -1284,8 +1284,8 @@ static Picture get_mask_pict( int alpha ) /*********************************************************************** * xrenderdrv_ExtTextOut */ -static BOOL CDECL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) +static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); gsCacheEntry *entry; @@ -1711,8 +1711,8 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask /*********************************************************************** * xrenderdrv_StretchBlt */ -static BOOL CDECL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) +static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); @@ -1768,9 +1768,9 @@ x11drv_fallback: /*********************************************************************** * xrenderdrv_PutImage */ -static DWORD CDECL xrenderdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) +static DWORD xrenderdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); DWORD ret; @@ -1853,9 +1853,9 @@ x11drv_fallback: /*********************************************************************** * xrenderdrv_BlendImage */ -static DWORD CDECL xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, - struct bitblt_coords *src, struct bitblt_coords *dst, - BLENDFUNCTION func ) +static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, + struct bitblt_coords *src, struct bitblt_coords *dst, + BLENDFUNCTION func ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); DWORD ret; @@ -1923,8 +1923,8 @@ update_format: /*********************************************************************** * xrenderdrv_AlphaBlend */ -static BOOL CDECL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, - PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blendfn ) +static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blendfn ) { struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); @@ -2007,8 +2007,8 @@ static BOOL CDECL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords * /*********************************************************************** * xrenderdrv_GradientFill */ -static BOOL CDECL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void * grad_array, ULONG ngrad, ULONG mode ) +static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) { #ifdef HAVE_XRENDERCREATELINEARGRADIENT static const XFixed stops[2] = { 0, 1 << 16 }; @@ -2111,7 +2111,7 @@ fallback: /*********************************************************************** * xrenderdrv_SelectBrush */ -static HBRUSH CDECL xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) +static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) { struct xrender_physdev *physdev = get_xrender_dev( dev ); Pixmap pixmap; diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 4d1aa3ab8e8..9d6e1bbc876 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -559,7 +559,7 @@ void X11DRV_XF86VM_Init(void) * 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); @@ -575,7 +575,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 8042cb667b0..b1537f93109 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -60,7 +60,7 @@ struct gdi_image_bits { void *ptr; /* pointer to the bits */ BOOL is_copy; /* whether this is a copy of the bits that can be modified */ - void (CDECL *free)(struct gdi_image_bits *); /* callback for freeing the bits */ + void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */ void *param; /* extra parameter for callback private use */ }; @@ -73,107 +73,107 @@ struct brush_pattern 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); - DWORD (CDECL *pBlendImage)(PHYSDEV,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,BLENDFUNCTION); - BOOL (CDECL *pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); - BOOL (CDECL *pCloseFigure)(PHYSDEV); - BOOL (CDECL *pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); - BOOL (CDECL *pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,const DEVMODEW*); - BOOL (CDECL *pDeleteDC)(PHYSDEV); - BOOL (CDECL *pDeleteObject)(PHYSDEV,HGDIOBJ); - BOOL (CDECL *pEllipse)(PHYSDEV,INT,INT,INT,INT); - INT (CDECL *pEndDoc)(PHYSDEV); - INT (CDECL *pEndPage)(PHYSDEV); - BOOL (CDECL *pEndPath)(PHYSDEV); - BOOL (CDECL *pEnumFonts)(PHYSDEV,LPLOGFONTW,FONTENUMPROCW,LPARAM); - INT (CDECL *pExtEscape)(PHYSDEV,INT,INT,LPCVOID,INT,LPVOID); - BOOL (CDECL *pExtFloodFill)(PHYSDEV,INT,INT,COLORREF,UINT); - 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 *pFontIsLinked)(PHYSDEV); - BOOL (CDECL *pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); - UINT (CDECL *pGetBoundsRect)(PHYSDEV,RECT*,UINT); - BOOL (CDECL *pGetCharABCWidths)(PHYSDEV,UINT,UINT,WCHAR*,LPABC); - BOOL (CDECL *pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); - BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,const WCHAR*,LPINT); - BOOL (CDECL *pGetCharWidthInfo)(PHYSDEV,void*); - INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); - BOOL (CDECL *pGetDeviceGammaRamp)(PHYSDEV,LPVOID); - DWORD (CDECL *pGetFontData)(PHYSDEV,DWORD,DWORD,LPVOID,DWORD); - BOOL (CDECL *pGetFontRealizationInfo)(PHYSDEV,void*); - DWORD (CDECL *pGetFontUnicodeRanges)(PHYSDEV,LPGLYPHSET); - DWORD (CDECL *pGetGlyphIndices)(PHYSDEV,LPCWSTR,INT,LPWORD,DWORD); - DWORD (CDECL *pGetGlyphOutline)(PHYSDEV,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*); - BOOL (CDECL *pGetICMProfile)(PHYSDEV,BOOL,LPDWORD,LPWSTR); - DWORD (CDECL *pGetImage)(PHYSDEV,BITMAPINFO*,struct gdi_image_bits*,struct bitblt_coords*); - DWORD (CDECL *pGetKerningPairs)(PHYSDEV,DWORD,LPKERNINGPAIR); - COLORREF (CDECL *pGetNearestColor)(PHYSDEV,COLORREF); - UINT (CDECL *pGetOutlineTextMetrics)(PHYSDEV,UINT,LPOUTLINETEXTMETRICW); - COLORREF (CDECL *pGetPixel)(PHYSDEV,INT,INT); - UINT (CDECL *pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); - UINT (CDECL *pGetTextCharsetInfo)(PHYSDEV,LPFONTSIGNATURE,DWORD); - BOOL (CDECL *pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,LPINT); - BOOL (CDECL *pGetTextExtentExPointI)(PHYSDEV,const WORD*,INT,LPINT); - INT (CDECL *pGetTextFace)(PHYSDEV,INT,LPWSTR); - BOOL (CDECL *pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); - BOOL (CDECL *pGradientFill)(PHYSDEV,TRIVERTEX*,ULONG,void*,ULONG,ULONG); - BOOL (CDECL *pInvertRgn)(PHYSDEV,HRGN); - BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT); - BOOL (CDECL *pMoveTo)(PHYSDEV,INT,INT); - 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 *pPolylineTo)(PHYSDEV,const POINT*,INT); - DWORD (CDECL *pPutImage)(PHYSDEV,HRGN,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,DWORD); - UINT (CDECL *pRealizeDefaultPalette)(PHYSDEV); - UINT (CDECL *pRealizePalette)(PHYSDEV,HPALETTE,BOOL); - BOOL (CDECL *pRectangle)(PHYSDEV,INT,INT,INT,INT); - BOOL (CDECL *pResetDC)(PHYSDEV,const DEVMODEW*); - BOOL (CDECL *pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT); - HBITMAP (CDECL *pSelectBitmap)(PHYSDEV,HBITMAP); - HBRUSH (CDECL *pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); - HFONT (CDECL *pSelectFont)(PHYSDEV,HFONT,UINT*); - HPEN (CDECL *pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*); - COLORREF (CDECL *pSetBkColor)(PHYSDEV,COLORREF); - UINT (CDECL *pSetBoundsRect)(PHYSDEV,RECT*,UINT); - COLORREF (CDECL *pSetDCBrushColor)(PHYSDEV, COLORREF); - COLORREF (CDECL *pSetDCPenColor)(PHYSDEV, COLORREF); - INT (CDECL *pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,BITMAPINFO*,UINT); - VOID (CDECL *pSetDeviceClipping)(PHYSDEV,HRGN); - BOOL (CDECL *pSetDeviceGammaRamp)(PHYSDEV,LPVOID); - COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF); - COLORREF (CDECL *pSetTextColor)(PHYSDEV,COLORREF); - 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*,BITMAPINFO*,UINT,DWORD); - BOOL (CDECL *pStrokeAndFillPath)(PHYSDEV); - BOOL (CDECL *pStrokePath)(PHYSDEV); - BOOL (CDECL *pUnrealizePalette)(HPALETTE); - NTSTATUS (CDECL *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); - NTSTATUS (CDECL *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); - NTSTATUS (CDECL *pD3DKMTOpenAdapterFromLuid)(D3DKMT_OPENADAPTERFROMLUID *); - NTSTATUS (CDECL *pD3DKMTQueryVideoMemoryInfo)(D3DKMT_QUERYVIDEOMEMORYINFO *); - NTSTATUS (CDECL *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); + 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); + DWORD (*pBlendImage)(PHYSDEV,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,BLENDFUNCTION); + BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); + BOOL (*pCloseFigure)(PHYSDEV); + BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); + BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,const DEVMODEW*); + BOOL (*pDeleteDC)(PHYSDEV); + BOOL (*pDeleteObject)(PHYSDEV,HGDIOBJ); + BOOL (*pEllipse)(PHYSDEV,INT,INT,INT,INT); + INT (*pEndDoc)(PHYSDEV); + INT (*pEndPage)(PHYSDEV); + BOOL (*pEndPath)(PHYSDEV); + BOOL (*pEnumFonts)(PHYSDEV,LPLOGFONTW,FONTENUMPROCW,LPARAM); + INT (*pExtEscape)(PHYSDEV,INT,INT,LPCVOID,INT,LPVOID); + BOOL (*pExtFloodFill)(PHYSDEV,INT,INT,COLORREF,UINT); + BOOL (*pExtTextOut)(PHYSDEV,INT,INT,UINT,const RECT*,LPCWSTR,UINT,const INT*); + BOOL (*pFillPath)(PHYSDEV); + BOOL (*pFillRgn)(PHYSDEV,HRGN,HBRUSH); + BOOL (*pFontIsLinked)(PHYSDEV); + BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); + UINT (*pGetBoundsRect)(PHYSDEV,RECT*,UINT); + BOOL (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,WCHAR*,LPABC); + BOOL (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); + BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,const WCHAR*,LPINT); + BOOL (*pGetCharWidthInfo)(PHYSDEV,void*); + INT (*pGetDeviceCaps)(PHYSDEV,INT); + BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID); + DWORD (*pGetFontData)(PHYSDEV,DWORD,DWORD,LPVOID,DWORD); + BOOL (*pGetFontRealizationInfo)(PHYSDEV,void*); + DWORD (*pGetFontUnicodeRanges)(PHYSDEV,LPGLYPHSET); + DWORD (*pGetGlyphIndices)(PHYSDEV,LPCWSTR,INT,LPWORD,DWORD); + DWORD (*pGetGlyphOutline)(PHYSDEV,UINT,UINT,LPGLYPHMETRICS,DWORD,LPVOID,const MAT2*); + BOOL (*pGetICMProfile)(PHYSDEV,BOOL,LPDWORD,LPWSTR); + DWORD (*pGetImage)(PHYSDEV,BITMAPINFO*,struct gdi_image_bits*,struct bitblt_coords*); + DWORD (*pGetKerningPairs)(PHYSDEV,DWORD,LPKERNINGPAIR); + COLORREF (*pGetNearestColor)(PHYSDEV,COLORREF); + UINT (*pGetOutlineTextMetrics)(PHYSDEV,UINT,LPOUTLINETEXTMETRICW); + COLORREF (*pGetPixel)(PHYSDEV,INT,INT); + UINT (*pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); + UINT (*pGetTextCharsetInfo)(PHYSDEV,LPFONTSIGNATURE,DWORD); + BOOL (*pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,LPINT); + BOOL (*pGetTextExtentExPointI)(PHYSDEV,const WORD*,INT,LPINT); + INT (*pGetTextFace)(PHYSDEV,INT,LPWSTR); + BOOL (*pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); + BOOL (*pGradientFill)(PHYSDEV,TRIVERTEX*,ULONG,void*,ULONG,ULONG); + BOOL (*pInvertRgn)(PHYSDEV,HRGN); + BOOL (*pLineTo)(PHYSDEV,INT,INT); + BOOL (*pMoveTo)(PHYSDEV,INT,INT); + 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 (*pPolylineTo)(PHYSDEV,const POINT*,INT); + DWORD (*pPutImage)(PHYSDEV,HRGN,BITMAPINFO*,const struct gdi_image_bits*,struct bitblt_coords*,struct bitblt_coords*,DWORD); + UINT (*pRealizeDefaultPalette)(PHYSDEV); + UINT (*pRealizePalette)(PHYSDEV,HPALETTE,BOOL); + BOOL (*pRectangle)(PHYSDEV,INT,INT,INT,INT); + BOOL (*pResetDC)(PHYSDEV,const DEVMODEW*); + BOOL (*pRoundRect)(PHYSDEV,INT,INT,INT,INT,INT,INT); + HBITMAP (*pSelectBitmap)(PHYSDEV,HBITMAP); + HBRUSH (*pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); + HFONT (*pSelectFont)(PHYSDEV,HFONT,UINT*); + HPEN (*pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*); + COLORREF (*pSetBkColor)(PHYSDEV,COLORREF); + UINT (*pSetBoundsRect)(PHYSDEV,RECT*,UINT); + COLORREF (*pSetDCBrushColor)(PHYSDEV, COLORREF); + COLORREF (*pSetDCPenColor)(PHYSDEV, COLORREF); + INT (*pSetDIBitsToDevice)(PHYSDEV,INT,INT,DWORD,DWORD,INT,INT,UINT,UINT,LPCVOID,BITMAPINFO*,UINT); + VOID (*pSetDeviceClipping)(PHYSDEV,HRGN); + BOOL (*pSetDeviceGammaRamp)(PHYSDEV,LPVOID); + COLORREF (*pSetPixel)(PHYSDEV,INT,INT,COLORREF); + COLORREF (*pSetTextColor)(PHYSDEV,COLORREF); + 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*,BITMAPINFO*,UINT,DWORD); + BOOL (*pStrokeAndFillPath)(PHYSDEV); + BOOL (*pStrokePath)(PHYSDEV); + BOOL (*pUnrealizePalette)(HPALETTE); + NTSTATUS (*pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); + NTSTATUS (*pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); + NTSTATUS (*pD3DKMTOpenAdapterFromLuid)(D3DKMT_OPENADAPTERFROMLUID *); + NTSTATUS (*pD3DKMTQueryVideoMemoryInfo)(D3DKMT_QUERYVIDEOMEMORYINFO *); + NTSTATUS (*pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); /* priority order for the driver on the stack */ UINT priority; }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 81 +#define WINE_GDI_DRIVER_VERSION 82 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2938
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2938
This merge request was approved by Piotr Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2938
participants (4)
-
Huw Davies (＠huw) -
Jacek Caban
-
Jacek Caban (＠jacek)
-
Piotr Caban (＠piotr)