Skip to content

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

win32u: Don't use CDECL for gdi_dc_funcs entries.

parent 7aa10950
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 383 deletions
dlls/win32u/bitblt.c
View file @ 8c5dd221
...@@ -163,7 +163,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, ...@@ -163,7 +163,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst,
return intersect_vis_rectangles( dst, src ); 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 ); free( bits->ptr );
} }
...@@ -274,8 +274,8 @@ void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int cou ...@@ -274,8 +274,8 @@ void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int cou
* null driver fallback implementations * null driver fallback implementations
*/ */
BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop )
{ {
DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev ); DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev );
char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
...@@ -326,8 +326,8 @@ BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, ...@@ -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, BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func )
{ {
DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev ); DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev );
char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
...@@ -365,8 +365,8 @@ done: ...@@ -365,8 +365,8 @@ done:
} }
DWORD CDECL nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, DWORD nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits,
struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend )
{ {
char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
BITMAPINFO *dst_info = (BITMAPINFO *)buffer; BITMAPINFO *dst_info = (BITMAPINFO *)buffer;
...@@ -414,8 +414,8 @@ update_format: ...@@ -414,8 +414,8 @@ update_format:
return ERROR_BAD_FORMAT; return ERROR_BAD_FORMAT;
} }
BOOL CDECL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
void * grad_array, ULONG ngrad, ULONG mode ) void * grad_array, ULONG ngrad, ULONG mode )
{ {
DC *dc = get_nulldrv_dc( dev ); DC *dc = get_nulldrv_dc( dev );
char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
...@@ -499,7 +499,7 @@ done: ...@@ -499,7 +499,7 @@ done:
return ret; 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 ); DC *dc = get_nulldrv_dc( dev );
char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
......
dlls/win32u/dib.c
View file @ 8c5dd221
...@@ -476,9 +476,9 @@ fail: ...@@ -476,9 +476,9 @@ fail:
INT CDECL nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst,
INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits,
BITMAPINFO *src_info, UINT coloruse, DWORD rop ) BITMAPINFO *src_info, UINT coloruse, DWORD rop )
{ {
DC *dc = get_nulldrv_dc( dev ); DC *dc = get_nulldrv_dc( dev );
char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
...@@ -765,9 +765,9 @@ done: ...@@ -765,9 +765,9 @@ done:
} }
INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWORD cy, 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, INT x_src, INT y_src, UINT startscan, UINT lines,
const void *bits, BITMAPINFO *src_info, UINT coloruse ) const void *bits, BITMAPINFO *src_info, UINT coloruse )
{ {
DC *dc = get_nulldrv_dc( dev ); DC *dc = get_nulldrv_dc( dev );
char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
......
dlls/win32u/dibdrv/bitblt.c
View file @ 8c5dd221
...@@ -885,8 +885,8 @@ DWORD get_image_from_bitmap( BITMAPOBJ *bmp, BITMAPINFO *info, ...@@ -885,8 +885,8 @@ DWORD get_image_from_bitmap( BITMAPOBJ *bmp, BITMAPINFO *info,
/*********************************************************************** /***********************************************************************
* dibdrv_GetImage * dibdrv_GetImage
*/ */
DWORD CDECL dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, DWORD dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits,
struct bitblt_coords *src ) struct bitblt_coords *src )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
...@@ -988,9 +988,9 @@ static inline BOOL rop_uses_pat(DWORD rop) ...@@ -988,9 +988,9 @@ static inline BOOL rop_uses_pat(DWORD rop)
/*********************************************************************** /***********************************************************************
* dibdrv_PutImage * dibdrv_PutImage
*/ */
DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
const struct gdi_image_bits *bits, struct bitblt_coords *src, const struct gdi_image_bits *bits, struct bitblt_coords *src,
struct bitblt_coords *dst, DWORD rop ) struct bitblt_coords *dst, DWORD rop )
{ {
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
struct clipped_rects clipped_rects; struct clipped_rects clipped_rects;
...@@ -1051,8 +1051,8 @@ update_format: ...@@ -1051,8 +1051,8 @@ update_format:
/*********************************************************************** /***********************************************************************
* dibdrv_BlendImage * dibdrv_BlendImage
*/ */
DWORD CDECL dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits,
struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend ) struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION blend )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
dib_info src_dib; dib_info src_dib;
...@@ -1404,8 +1404,8 @@ COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt ...@@ -1404,8 +1404,8 @@ COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt
/*********************************************************************** /***********************************************************************
* dibdrv_StretchBlt * dibdrv_StretchBlt
*/ */
BOOL CDECL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop )
{ {
DC *dc_dst = get_physdev_dc( dst_dev ); DC *dc_dst = get_physdev_dc( dst_dev );
...@@ -1418,8 +1418,8 @@ BOOL CDECL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, ...@@ -1418,8 +1418,8 @@ BOOL CDECL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
/*********************************************************************** /***********************************************************************
* dibdrv_AlphaBlend * dibdrv_AlphaBlend
*/ */
BOOL CDECL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend )
{ {
DC *dc_dst = get_physdev_dc( dst_dev ); DC *dc_dst = get_physdev_dc( dst_dev );
...@@ -1429,8 +1429,8 @@ BOOL CDECL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, ...@@ -1429,8 +1429,8 @@ BOOL CDECL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
/*********************************************************************** /***********************************************************************
* dibdrv_GradientFill * dibdrv_GradientFill
*/ */
BOOL CDECL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
void *grad_array, ULONG ngrad, ULONG mode ) void *grad_array, ULONG ngrad, ULONG mode )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
......
dlls/win32u/dibdrv/dibdrv.h
View file @ 8c5dd221
...@@ -112,51 +112,51 @@ typedef struct dibdrv_physdev ...@@ -112,51 +112,51 @@ typedef struct dibdrv_physdev
BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region); BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region);
} dibdrv_physdev; } dibdrv_physdev;
extern BOOL CDECL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, extern BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN; 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, 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; 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, 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; 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, 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; 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, 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; 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 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 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, extern BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL dibdrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern DWORD CDECL dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits, extern DWORD dibdrv_GetImage( PHYSDEV dev, BITMAPINFO *info, struct gdi_image_bits *bits,
struct bitblt_coords *src ) DECLSPEC_HIDDEN; struct bitblt_coords *src ) DECLSPEC_HIDDEN;
extern COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
extern COLORREF CDECL dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, extern BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL 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 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 dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, 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; 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 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, extern BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts,
DWORD polylines ) DECLSPEC_HIDDEN; DWORD polylines ) DECLSPEC_HIDDEN;
extern DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, extern DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
const struct gdi_image_bits *bits, struct bitblt_coords *src, const struct gdi_image_bits *bits, struct bitblt_coords *src,
struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; 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 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, extern BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT ellipse_width, INT ellipse_height ) DECLSPEC_HIDDEN; 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 HBRUSH 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 HFONT 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 HPEN 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 dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
extern COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
extern COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, extern BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL dibdrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL dibdrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL dibdrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN;
static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev )
{ {
......
dlls/win32u/dibdrv/graphics.c
View file @ 8c5dd221
...@@ -894,8 +894,8 @@ BOOL render_aa_text_bitmapinfo( DC *dc, BITMAPINFO *info, struct gdi_image_bits ...@@ -894,8 +894,8 @@ BOOL render_aa_text_bitmapinfo( DC *dc, BITMAPINFO *info, struct gdi_image_bits
/*********************************************************************** /***********************************************************************
* dibdrv_ExtTextOut * dibdrv_ExtTextOut
*/ */
BOOL CDECL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) const RECT *rect, LPCWSTR str, UINT count, const INT *dx )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -943,7 +943,7 @@ done: ...@@ -943,7 +943,7 @@ done:
/*********************************************************************** /***********************************************************************
* dibdrv_SelectFont * 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); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -965,8 +965,8 @@ HFONT CDECL dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) ...@@ -965,8 +965,8 @@ HFONT CDECL dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags )
/*********************************************************************** /***********************************************************************
* dibdrv_Arc * dibdrv_Arc
*/ */
BOOL CDECL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, 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 ) 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 ); 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, ...@@ -974,8 +974,8 @@ BOOL CDECL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/*********************************************************************** /***********************************************************************
* dibdrv_ArcTo * dibdrv_ArcTo
*/ */
BOOL CDECL dibdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, 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 ) 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 ); 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, ...@@ -983,8 +983,8 @@ BOOL CDECL dibdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/*********************************************************************** /***********************************************************************
* dibdrv_Chord * dibdrv_Chord
*/ */
BOOL CDECL dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, 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 ) 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 ); 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, ...@@ -992,7 +992,7 @@ BOOL CDECL dibdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/*********************************************************************** /***********************************************************************
* dibdrv_Ellipse * 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 ); 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 ...@@ -1048,7 +1048,7 @@ static void fill_row( dib_info *dib, HRGN clip, RECT *row, DWORD pixel, UINT typ
/*********************************************************************** /***********************************************************************
* dibdrv_ExtFloodFill * 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 ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -1081,7 +1081,7 @@ BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT ...@@ -1081,7 +1081,7 @@ BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT
/*********************************************************************** /***********************************************************************
* dibdrv_FillPath * dibdrv_FillPath
*/ */
BOOL CDECL dibdrv_FillPath( PHYSDEV dev ) BOOL dibdrv_FillPath( PHYSDEV dev )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
...@@ -1091,7 +1091,7 @@ BOOL CDECL dibdrv_FillPath( PHYSDEV dev ) ...@@ -1091,7 +1091,7 @@ BOOL CDECL dibdrv_FillPath( PHYSDEV dev )
/*********************************************************************** /***********************************************************************
* dibdrv_GetNearestColor * dibdrv_GetNearestColor
*/ */
COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -1106,7 +1106,7 @@ COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) ...@@ -1106,7 +1106,7 @@ COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color )
/*********************************************************************** /***********************************************************************
* dibdrv_GetPixel * 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 ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -1132,7 +1132,7 @@ COLORREF CDECL dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) ...@@ -1132,7 +1132,7 @@ COLORREF CDECL dibdrv_GetPixel( PHYSDEV dev, INT x, INT y )
/*********************************************************************** /***********************************************************************
* dibdrv_LineTo * 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); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -1175,7 +1175,7 @@ static inline INT get_rop2_from_rop(INT rop) ...@@ -1175,7 +1175,7 @@ static inline INT get_rop2_from_rop(INT rop)
/*********************************************************************** /***********************************************************************
* dibdrv_PatBlt * 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); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
dib_brush *brush = &pdev->brush; dib_brush *brush = &pdev->brush;
...@@ -1213,7 +1213,7 @@ BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) ...@@ -1213,7 +1213,7 @@ BOOL CDECL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop )
/*********************************************************************** /***********************************************************************
* dibdrv_PaintRgn * dibdrv_PaintRgn
*/ */
BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
const WINEREGION *region; const WINEREGION *region;
...@@ -1244,7 +1244,7 @@ BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) ...@@ -1244,7 +1244,7 @@ BOOL CDECL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn )
/*********************************************************************** /***********************************************************************
* dibdrv_PolyPolygon * 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); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -1316,7 +1316,7 @@ done: ...@@ -1316,7 +1316,7 @@ done:
/*********************************************************************** /***********************************************************************
* dibdrv_PolyPolyline * 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); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -1368,7 +1368,7 @@ done: ...@@ -1368,7 +1368,7 @@ done:
/*********************************************************************** /***********************************************************************
* dibdrv_Rectangle * 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); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( 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 ...@@ -1444,8 +1444,8 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott
/*********************************************************************** /***********************************************************************
* dibdrv_RoundRect * dibdrv_RoundRect
*/ */
BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT ellipse_width, INT ellipse_height ) INT ellipse_width, INT ellipse_height )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
DC *dc = get_physdev_dc( 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 ...@@ -1557,8 +1557,8 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
/*********************************************************************** /***********************************************************************
* dibdrv_Pie * dibdrv_Pie
*/ */
BOOL CDECL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, 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 ) 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 ); 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, ...@@ -1566,7 +1566,7 @@ BOOL CDECL dibdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/*********************************************************************** /***********************************************************************
* dibdrv_SetPixel * 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 ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -1599,7 +1599,7 @@ COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) ...@@ -1599,7 +1599,7 @@ COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color )
/*********************************************************************** /***********************************************************************
* dibdrv_StrokeAndFillPath * dibdrv_StrokeAndFillPath
*/ */
BOOL CDECL dibdrv_StrokeAndFillPath( PHYSDEV dev ) BOOL dibdrv_StrokeAndFillPath( PHYSDEV dev )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
...@@ -1609,7 +1609,7 @@ BOOL CDECL dibdrv_StrokeAndFillPath( PHYSDEV dev ) ...@@ -1609,7 +1609,7 @@ BOOL CDECL dibdrv_StrokeAndFillPath( PHYSDEV dev )
/*********************************************************************** /***********************************************************************
* dibdrv_StrokePath * dibdrv_StrokePath
*/ */
BOOL CDECL dibdrv_StrokePath( PHYSDEV dev ) BOOL dibdrv_StrokePath( PHYSDEV dev )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); dibdrv_physdev *pdev = get_dibdrv_pdev( dev );
......
dlls/win32u/dibdrv/objects.c
View file @ 8c5dd221
...@@ -1774,7 +1774,7 @@ static inline int get_pen_device_width( DC *dc, int width ) ...@@ -1774,7 +1774,7 @@ static inline int get_pen_device_width( DC *dc, int width )
/*********************************************************************** /***********************************************************************
* dibdrv_SetDCPenColor * dibdrv_SetDCPenColor
*/ */
COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -2135,7 +2135,7 @@ static void select_brush( dibdrv_physdev *pdev, dib_brush *brush, ...@@ -2135,7 +2135,7 @@ static void select_brush( dibdrv_physdev *pdev, dib_brush *brush,
/*********************************************************************** /***********************************************************************
* dibdrv_SelectBrush * 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); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -2155,7 +2155,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_ ...@@ -2155,7 +2155,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_
/*********************************************************************** /***********************************************************************
* dibdrv_SelectPen * 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); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
...@@ -2260,7 +2260,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern ...@@ -2260,7 +2260,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern
/*********************************************************************** /***********************************************************************
* dibdrv_SetDCBrushColor * dibdrv_SetDCBrushColor
*/ */
COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color )
{ {
dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
......
dlls/win32u/emfdrv.c
View file @ 8c5dd221
...@@ -73,7 +73,7 @@ static void emfdrv_update_bounds( DC *dc, RECTL *rect ) ...@@ -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 ); DC *dc = get_physdev_dc( dev );
RECTL bounds; RECTL bounds;
...@@ -89,8 +89,8 @@ static BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) ...@@ -89,8 +89,8 @@ static BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y )
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, static BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right,
INT bottom, INT ell_width, INT ell_height ) INT bottom, INT ell_width, INT ell_height )
{ {
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
RECTL bounds; RECTL bounds;
...@@ -218,35 +218,35 @@ static BOOL EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT b ...@@ -218,35 +218,35 @@ static BOOL EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT b
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) INT xstart, INT ystart, INT xend, INT yend )
{ {
return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart,
xend, yend, EMR_ARC ); xend, yend, EMR_ARC );
} }
static BOOL CDECL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) INT xstart, INT ystart, INT xend, INT yend )
{ {
return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart,
xend, yend, EMR_ARCTO ); xend, yend, EMR_ARCTO );
} }
static BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) INT xstart, INT ystart, INT xend, INT yend )
{ {
return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart,
xend, yend, EMR_PIE ); xend, yend, EMR_PIE );
} }
static BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) INT xstart, INT ystart, INT xend, INT yend )
{ {
return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart,
xend, yend, EMR_CHORD ); 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 ); DC *dc = get_physdev_dc( dev );
RECTL bounds; RECTL bounds;
...@@ -267,7 +267,7 @@ static BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT ...@@ -267,7 +267,7 @@ static BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT
return TRUE; 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 ); DC *dc = get_physdev_dc( dev );
RECTL bounds; RECTL bounds;
...@@ -288,7 +288,7 @@ static BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, I ...@@ -288,7 +288,7 @@ static BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, I
return TRUE; 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 ); DC *dc = get_physdev_dc( dev );
RECTL bounds; RECTL bounds;
...@@ -299,115 +299,112 @@ static COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ...@@ -299,115 +299,112 @@ static COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color
return CLR_INVALID; 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 */ /* FIXME: update bounding rect */
return TRUE; 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 */ /* FIXME: update bounding rect */
return TRUE; 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 */ /* FIXME: update bounding rect */
return TRUE; 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 )
const DWORD *counts, DWORD polys )
{ {
/* FIXME: update bounding rect */ /* FIXME: update bounding rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT *pt, static BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, UINT polys )
const INT *counts, UINT polys )
{ {
/* FIXME: update bounding rect */ /* FIXME: update bounding rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, static BOOL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count )
const BYTE *types, DWORD count )
{ {
/* FIXME: update bounding rect */ /* FIXME: update bounding rect */
return TRUE; 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 */ /* FIXME: update bounding rect */
return TRUE; 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 */ /* FIXME: update bounding rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) static BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn )
{ {
/* FIXME: update bounding rect */ /* FIXME: update bounding rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, static BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect,
LPCWSTR str, UINT count, const INT *lpDx ) LPCWSTR str, UINT count, const INT *lpDx )
{ {
/* FIXME: update bounding rect */ /* FIXME: update bounding rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, static BOOL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
void *grad_array, ULONG ngrad, ULONG mode ) void *grad_array, ULONG ngrad, ULONG mode )
{ {
/* FIXME: update bounding rect */ /* FIXME: update bounding rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) static BOOL EMFDRV_FillPath( PHYSDEV dev )
{ {
/* FIXME: update bound rect */ /* FIXME: update bound rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) static BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev )
{ {
/* FIXME: update bound rect */ /* FIXME: update bound rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) static BOOL EMFDRV_StrokePath( PHYSDEV dev )
{ {
/* FIXME: update bound rect */ /* FIXME: update bound rect */
return TRUE; return TRUE;
} }
static BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, static BOOL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst,
PHYSDEV dev_src, struct bitblt_coords *src, PHYSDEV dev_src, struct bitblt_coords *src,
BLENDFUNCTION func ) BLENDFUNCTION func )
{ {
/* FIXME: update bound rect */ /* FIXME: update bound rect */
return TRUE; 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 */ /* FIXME: update bound rect */
return TRUE; return TRUE;
} }
static HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) static HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap )
{ {
return 0; 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 */ *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */
...@@ -415,7 +412,7 @@ static HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) ...@@ -415,7 +412,7 @@ static HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags )
return dev->funcs->pSelectFont( dev, font, 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 ); EMFDRV_PDEVICE *physDev = get_emf_physdev( dev );
...@@ -424,7 +421,7 @@ static INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) ...@@ -424,7 +421,7 @@ static INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap )
return 0; return 0;
} }
static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) static BOOL EMFDRV_DeleteDC( PHYSDEV dev )
{ {
EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMFDRV_PDEVICE *physDev = get_emf_physdev( dev );
free( physDev ); free( physDev );
......
dlls/win32u/font.c
View file @ 8c5dd221
...@@ -3232,8 +3232,7 @@ static void update_codepage( UINT screen_dpi ) ...@@ -3232,8 +3232,7 @@ static void update_codepage( UINT screen_dpi )
/************************************************************* /*************************************************************
* font_CreateDC * font_CreateDC
*/ */
static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, static BOOL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, const DEVMODEW *devmode )
const DEVMODEW *devmode )
{ {
struct font_physdev *physdev; struct font_physdev *physdev;
...@@ -3247,7 +3246,7 @@ static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, ...@@ -3247,7 +3246,7 @@ static BOOL CDECL font_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output,
/************************************************************* /*************************************************************
* font_DeleteDC * font_DeleteDC
*/ */
static BOOL CDECL font_DeleteDC( PHYSDEV dev ) static BOOL font_DeleteDC( PHYSDEV dev )
{ {
struct font_physdev *physdev = get_font_dev( dev ); struct font_physdev *physdev = get_font_dev( dev );
...@@ -3518,7 +3517,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi ...@@ -3518,7 +3517,7 @@ static BOOL enum_face_charsets( const struct gdi_font_family *family, struct gdi
/************************************************************* /*************************************************************
* font_EnumFonts * 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_family *family;
struct gdi_font_face *face; struct gdi_font_face *face;
...@@ -3883,7 +3882,7 @@ done: ...@@ -3883,7 +3882,7 @@ done:
/************************************************************* /*************************************************************
* font_FontIsLinked * font_FontIsLinked
*/ */
static BOOL CDECL font_FontIsLinked( PHYSDEV dev ) static BOOL font_FontIsLinked( PHYSDEV dev )
{ {
struct font_physdev *physdev = get_font_dev( dev ); struct font_physdev *physdev = get_font_dev( dev );
...@@ -3899,8 +3898,7 @@ static BOOL CDECL font_FontIsLinked( PHYSDEV dev ) ...@@ -3899,8 +3898,7 @@ static BOOL CDECL font_FontIsLinked( PHYSDEV dev )
/************************************************************* /*************************************************************
* font_GetCharABCWidths * font_GetCharABCWidths
*/ */
static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, static BOOL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, WCHAR *chars, ABC *buffer )
WCHAR *chars, ABC *buffer )
{ {
struct font_physdev *physdev = get_font_dev( dev ); struct font_physdev *physdev = get_font_dev( dev );
UINT c, i; UINT c, i;
...@@ -3927,7 +3925,7 @@ static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, ...@@ -3927,7 +3925,7 @@ static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count,
/************************************************************* /*************************************************************
* font_GetCharABCWidthsI * 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 ); struct font_physdev *physdev = get_font_dev( dev );
UINT c; UINT c;
...@@ -3952,8 +3950,7 @@ static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, W ...@@ -3952,8 +3950,7 @@ static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, W
/************************************************************* /*************************************************************
* font_GetCharWidth * font_GetCharWidth
*/ */
static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, static BOOL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer )
const WCHAR *chars, INT *buffer )
{ {
struct font_physdev *physdev = get_font_dev( dev ); struct font_physdev *physdev = get_font_dev( dev );
UINT c, i; UINT c, i;
...@@ -3984,7 +3981,7 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, ...@@ -3984,7 +3981,7 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count,
/************************************************************* /*************************************************************
* font_GetCharWidthInfo * 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 font_physdev *physdev = get_font_dev( dev );
struct char_width_info *info = ptr; struct char_width_info *info = ptr;
...@@ -4006,7 +4003,7 @@ static BOOL CDECL font_GetCharWidthInfo( PHYSDEV dev, void *ptr ) ...@@ -4006,7 +4003,7 @@ static BOOL CDECL font_GetCharWidthInfo( PHYSDEV dev, void *ptr )
/************************************************************* /*************************************************************
* font_GetFontData * 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 ); struct font_physdev *physdev = get_font_dev( dev );
...@@ -4022,7 +4019,7 @@ static DWORD CDECL font_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, voi ...@@ -4022,7 +4019,7 @@ static DWORD CDECL font_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, voi
/************************************************************* /*************************************************************
* font_GetFontRealizationInfo * 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_physdev *physdev = get_font_dev( dev );
struct font_realization_info *info = ptr; struct font_realization_info *info = ptr;
...@@ -4055,7 +4052,7 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) ...@@ -4055,7 +4052,7 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr )
/************************************************************* /*************************************************************
* font_GetFontUnicodeRanges * 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 ); struct font_physdev *physdev = get_font_dev( dev );
DWORD size, num_ranges; DWORD size, num_ranges;
...@@ -4081,7 +4078,7 @@ static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) ...@@ -4081,7 +4078,7 @@ static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset )
/************************************************************* /*************************************************************
* font_GetGlyphIndices * 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 ); struct font_physdev *physdev = get_font_dev( dev );
UINT default_char; UINT default_char;
...@@ -4138,8 +4135,8 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun ...@@ -4138,8 +4135,8 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun
/************************************************************* /*************************************************************
* font_GetGlyphOutline * font_GetGlyphOutline
*/ */
static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, static DWORD font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format,
GLYPHMETRICS *gm, DWORD buflen, void *buf, const MAT2 *mat ) GLYPHMETRICS *gm, DWORD buflen, void *buf, const MAT2 *mat )
{ {
struct font_physdev *physdev = get_font_dev( dev ); struct font_physdev *physdev = get_font_dev( dev );
DWORD ret; DWORD ret;
...@@ -4159,7 +4156,7 @@ static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, ...@@ -4159,7 +4156,7 @@ static DWORD CDECL font_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format,
/************************************************************* /*************************************************************
* font_GetKerningPairs * 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 ); struct font_physdev *physdev = get_font_dev( dev );
...@@ -4253,7 +4250,7 @@ static void scale_outline_font_metrics( const struct gdi_font *font, OUTLINETEXT ...@@ -4253,7 +4250,7 @@ static void scale_outline_font_metrics( const struct gdi_font *font, OUTLINETEXT
/************************************************************* /*************************************************************
* font_GetOutlineTextMetrics * 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 ); struct font_physdev *physdev = get_font_dev( dev );
UINT ret = 0; UINT ret = 0;
...@@ -4296,7 +4293,7 @@ static UINT CDECL font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEX ...@@ -4296,7 +4293,7 @@ static UINT CDECL font_GetOutlineTextMetrics( PHYSDEV dev, UINT size, OUTLINETEX
/************************************************************* /*************************************************************
* font_GetTextCharsetInfo * 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 ); struct font_physdev *physdev = get_font_dev( dev );
...@@ -4313,7 +4310,7 @@ static UINT CDECL font_GetTextCharsetInfo( PHYSDEV dev, FONTSIGNATURE *fs, DWORD ...@@ -4313,7 +4310,7 @@ static UINT CDECL font_GetTextCharsetInfo( PHYSDEV dev, FONTSIGNATURE *fs, DWORD
/************************************************************* /*************************************************************
* font_GetTextExtentExPoint * 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 ); struct font_physdev *physdev = get_font_dev( dev );
INT i, pos; INT i, pos;
...@@ -4342,7 +4339,7 @@ static BOOL CDECL font_GetTextExtentExPoint( PHYSDEV dev, const WCHAR *str, INT ...@@ -4342,7 +4339,7 @@ static BOOL CDECL font_GetTextExtentExPoint( PHYSDEV dev, const WCHAR *str, INT
/************************************************************* /*************************************************************
* font_GetTextExtentExPointI * 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 ); struct font_physdev *physdev = get_font_dev( dev );
INT i, pos; INT i, pos;
...@@ -4372,7 +4369,7 @@ static BOOL CDECL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, ...@@ -4372,7 +4369,7 @@ static BOOL CDECL font_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices,
/************************************************************* /*************************************************************
* font_GetTextFace * 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 ); struct font_physdev *physdev = get_font_dev( dev );
const WCHAR *font_name; const WCHAR *font_name;
...@@ -4442,7 +4439,7 @@ static void scale_font_metrics( struct gdi_font *font, TEXTMETRICW *tm ) ...@@ -4442,7 +4439,7 @@ static void scale_font_metrics( struct gdi_font *font, TEXTMETRICW *tm )
/************************************************************* /*************************************************************
* font_GetTextMetrics * 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 ); struct font_physdev *physdev = get_font_dev( dev );
BOOL ret = FALSE; BOOL ret = FALSE;
...@@ -4599,7 +4596,7 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit ...@@ -4599,7 +4596,7 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit
/************************************************************* /*************************************************************
* font_SelectFont * 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 font_physdev *physdev = get_font_dev( dev );
struct gdi_font *font = NULL, *prev = physdev->font; struct gdi_font *font = NULL, *prev = physdev->font;
...@@ -5695,8 +5692,8 @@ static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS * ...@@ -5695,8 +5692,8 @@ static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS *
/*********************************************************************** /***********************************************************************
* nulldrv_ExtTextOut * nulldrv_ExtTextOut
*/ */
BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect,
LPCWSTR str, UINT count, const INT *dx ) LPCWSTR str, UINT count, const INT *dx )
{ {
DC *dc = get_nulldrv_dc( dev ); DC *dc = get_nulldrv_dc( dev );
UINT i; UINT i;
......
dlls/win32u/ntgdi_private.h
View file @ 8c5dd221
...@@ -482,42 +482,42 @@ static inline int region_find_pt( const WINEREGION *rgn, int x, int y, BOOL *hit ...@@ -482,42 +482,42 @@ static inline int region_find_pt( const WINEREGION *rgn, int x, int y, BOOL *hit
} }
/* null driver entry points */ /* null driver entry points */
extern BOOL CDECL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func) DECLSPEC_HIDDEN; 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 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 nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern DWORD CDECL nulldrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, 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; struct bitblt_coords *src, struct bitblt_coords *dst, BLENDFUNCTION func ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, extern BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect,
LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDDEN; extern BOOL 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 BOOL 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 LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN;
extern COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
extern COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern COLORREF 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 UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; void * grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; extern BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL 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 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 nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL 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, 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, INT x_src, INT y_src, UINT start, UINT lines,
const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, extern BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; 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, 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, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits,
BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL nulldrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN;
static inline DC *get_nulldrv_dc( PHYSDEV dev ) static inline DC *get_nulldrv_dc( PHYSDEV dev )
{ {
...@@ -647,7 +647,7 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) ...@@ -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 )); 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; void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN;
......
dlls/win32u/painting.c
View file @ 8c5dd221
...@@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); ...@@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi);
* null driver fallback implementations * 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 ); DC *dc = get_physdev_dc( dev );
INT x1 = GDI_ROUND( x + cos( start * M_PI / 180 ) * radius ); INT x1 = GDI_ROUND( x + cos( start * M_PI / 180 ) * radius );
...@@ -58,8 +58,8 @@ BOOL CDECL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT star ...@@ -58,8 +58,8 @@ BOOL CDECL nulldrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT star
return ret; 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 xstart, INT ystart, INT xend, INT yend )
{ {
INT width = abs( right - left ); INT width = abs( right - left );
INT height = abs( bottom - top ); INT height = abs( bottom - top );
...@@ -78,7 +78,7 @@ BOOL CDECL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, ...@@ -78,7 +78,7 @@ BOOL CDECL nulldrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
xstart, ystart, xend, yend ); 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; BOOL ret = FALSE;
HBRUSH prev; HBRUSH prev;
...@@ -92,7 +92,7 @@ BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) ...@@ -92,7 +92,7 @@ BOOL CDECL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush )
return ret; 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; BOOL ret = FALSE;
HRGN tmp = NtGdiCreateRectRgn( 0, 0, 0, 0 ); HRGN tmp = NtGdiCreateRectRgn( 0, 0, 0, 0 );
...@@ -106,7 +106,7 @@ BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT ...@@ -106,7 +106,7 @@ BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT
return ret; return ret;
} }
BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn )
{ {
DC *dc = get_physdev_dc( dev ); DC *dc = get_physdev_dc( dev );
INT prev_rop = dc->attr->rop_mode; INT prev_rop = dc->attr->rop_mode;
...@@ -122,7 +122,7 @@ static BOOL polyline( HDC hdc, const POINT *points, ULONG count ) ...@@ -122,7 +122,7 @@ static BOOL polyline( HDC hdc, const POINT *points, ULONG count )
return NtGdiPolyPolyDraw( hdc, points, &count, 1, NtGdiPolyPolyline ); 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; BOOL ret = FALSE;
POINT *pts; POINT *pts;
...@@ -136,7 +136,7 @@ BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) ...@@ -136,7 +136,7 @@ BOOL CDECL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count )
return ret; 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 ); DC *dc = get_nulldrv_dc( dev );
BOOL ret = FALSE; BOOL ret = FALSE;
...@@ -153,7 +153,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) ...@@ -153,7 +153,7 @@ BOOL CDECL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count )
return ret; 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 ); DC *dc = get_nulldrv_dc( dev );
POINT *line_pts = NULL, *new_line_pts, *bzr_pts = NULL, bzr[4]; 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 ...@@ -234,7 +234,7 @@ BOOL CDECL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types
return TRUE; 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 ); DC *dc = get_nulldrv_dc( dev );
BOOL ret = FALSE; BOOL ret = FALSE;
......
dlls/win32u/palette.c
View file @ 8c5dd221
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(palette); WINE_DEFAULT_DEBUG_CHANNEL(palette);
typedef BOOL (CDECL *unrealize_function)(HPALETTE); typedef BOOL (*unrealize_function)(HPALETTE);
typedef struct tagPALETTEOBJ typedef struct tagPALETTEOBJ
{ {
...@@ -344,7 +344,7 @@ static UINT get_system_palette_entries( HDC hdc, UINT start, UINT count, PALETTE ...@@ -344,7 +344,7 @@ static UINT get_system_palette_entries( HDC hdc, UINT start, UINT count, PALETTE
/* null driver fallback implementation for GetSystemPaletteEntries */ /* 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; return 0;
} }
...@@ -390,7 +390,7 @@ UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ) ...@@ -390,7 +390,7 @@ UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color )
/* null driver fallback implementation for GetNearestColor */ /* 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; unsigned char spec_type;
DC *dc = get_nulldrv_dc( dev ); DC *dc = get_nulldrv_dc( dev );
......
dlls/wineandroid.drv/init.c
View file @ 8c5dd221
...@@ -223,8 +223,7 @@ static ANDROID_PDEVICE *create_android_physdev(void) ...@@ -223,8 +223,7 @@ static ANDROID_PDEVICE *create_android_physdev(void)
/********************************************************************** /**********************************************************************
* ANDROID_CreateDC * ANDROID_CreateDC
*/ */
static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, static BOOL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, const DEVMODEW *initData )
const DEVMODEW *initData )
{ {
ANDROID_PDEVICE *physdev = create_android_physdev(); ANDROID_PDEVICE *physdev = create_android_physdev();
...@@ -238,7 +237,7 @@ static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR outpu ...@@ -238,7 +237,7 @@ static BOOL CDECL ANDROID_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR outpu
/********************************************************************** /**********************************************************************
* ANDROID_CreateCompatibleDC * 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(); ANDROID_PDEVICE *physdev = create_android_physdev();
...@@ -252,7 +251,7 @@ static BOOL CDECL ANDROID_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) ...@@ -252,7 +251,7 @@ static BOOL CDECL ANDROID_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
/********************************************************************** /**********************************************************************
* ANDROID_DeleteDC * ANDROID_DeleteDC
*/ */
static BOOL CDECL ANDROID_DeleteDC( PHYSDEV dev ) static BOOL ANDROID_DeleteDC( PHYSDEV dev )
{ {
free( dev ); free( dev );
return TRUE; return TRUE;
......
dlls/winemac.drv/gdi.c
View file @ 8c5dd221
...@@ -170,8 +170,7 @@ static MACDRV_PDEVICE *create_mac_physdev(void) ...@@ -170,8 +170,7 @@ static MACDRV_PDEVICE *create_mac_physdev(void)
/********************************************************************** /**********************************************************************
* CreateDC (MACDRV.@) * CreateDC (MACDRV.@)
*/ */
static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, static BOOL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData)
const DEVMODEW* initData)
{ {
MACDRV_PDEVICE *physDev = create_mac_physdev(); MACDRV_PDEVICE *physDev = create_mac_physdev();
...@@ -188,7 +187,7 @@ static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, ...@@ -188,7 +187,7 @@ static BOOL CDECL macdrv_CreateDC(PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
/********************************************************************** /**********************************************************************
* CreateCompatibleDC (MACDRV.@) * 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(); MACDRV_PDEVICE *physDev = create_mac_physdev();
...@@ -205,7 +204,7 @@ static BOOL CDECL macdrv_CreateCompatibleDC(PHYSDEV orig, PHYSDEV *pdev) ...@@ -205,7 +204,7 @@ static BOOL CDECL macdrv_CreateCompatibleDC(PHYSDEV orig, PHYSDEV *pdev)
/********************************************************************** /**********************************************************************
* DeleteDC (MACDRV.@) * DeleteDC (MACDRV.@)
*/ */
static BOOL CDECL macdrv_DeleteDC(PHYSDEV dev) static BOOL macdrv_DeleteDC(PHYSDEV dev)
{ {
MACDRV_PDEVICE *physDev = get_macdrv_dev(dev); MACDRV_PDEVICE *physDev = get_macdrv_dev(dev);
...@@ -219,7 +218,7 @@ static BOOL CDECL macdrv_DeleteDC(PHYSDEV dev) ...@@ -219,7 +218,7 @@ static BOOL CDECL macdrv_DeleteDC(PHYSDEV dev)
/*********************************************************************** /***********************************************************************
* GetDeviceCaps (MACDRV.@) * GetDeviceCaps (MACDRV.@)
*/ */
static INT CDECL macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap)
{ {
INT ret; INT ret;
......
dlls/winemac.drv/macdrv.h
View file @ 8c5dd221
...@@ -83,8 +83,8 @@ extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; ...@@ -83,8 +83,8 @@ extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN;
extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN;
extern void macdrv_reset_device_metrics(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 macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN;
extern BOOL CDECL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN; extern BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DECLSPEC_HIDDEN;
/************************************************************************** /**************************************************************************
......
dlls/wineps.drv/unixlib.c
View file @ 8c5dd221
...@@ -221,7 +221,7 @@ static void dump_devmode(const DEVMODEW *dm) ...@@ -221,7 +221,7 @@ static void dump_devmode(const DEVMODEW *dm)
TRACE("dmPelsHeight %u\n", (unsigned int)dm->dmPelsHeight); 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); PSDRV_PDEVICE *pdev = get_psdrv_dev(dev);
...@@ -573,7 +573,7 @@ static void update_dev_caps(PSDRV_PDEVICE *pdev) ...@@ -573,7 +573,7 @@ static void update_dev_caps(PSDRV_PDEVICE *pdev)
pdev->horz_res, pdev->vert_res); 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); PSDRV_PDEVICE *pdev = get_psdrv_dev(dev);
...@@ -614,7 +614,7 @@ const struct glyph_info *uv_metrics(WCHAR wch, const struct font_data *font) ...@@ -614,7 +614,7 @@ const struct glyph_info *uv_metrics(WCHAR wch, const struct font_data *font)
return needle; 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) int output_size, void *output)
{ {
TRACE("%p,%d,%d,%p,%d,%p\n", TRACE("%p,%d,%d,%p,%d,%p\n",
...@@ -1108,7 +1108,7 @@ static BOOL select_builtin_font(PSDRV_PDEVICE *pdev, HFONT hfont, LOGFONTW *plf) ...@@ -1108,7 +1108,7 @@ static BOOL select_builtin_font(PSDRV_PDEVICE *pdev, HFONT hfont, LOGFONTW *plf)
return TRUE; 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); PSDRV_PDEVICE *pdev = get_psdrv_dev(dev);
PHYSDEV next = GET_NEXT_PHYSDEV(dev, pSelectFont); PHYSDEV next = GET_NEXT_PHYSDEV(dev, pSelectFont);
...@@ -1222,7 +1222,7 @@ static UINT get_font_metric(const struct font_data *font, ...@@ -1222,7 +1222,7 @@ static UINT get_font_metric(const struct font_data *font,
return DEVICE_FONTTYPE; 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); PSDRV_PDEVICE *pdev = get_psdrv_dev(dev);
PHYSDEV next = GET_NEXT_PHYSDEV(dev, pEnumFonts); PHYSDEV next = GET_NEXT_PHYSDEV(dev, pEnumFonts);
...@@ -1282,7 +1282,7 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP ...@@ -1282,7 +1282,7 @@ static BOOL CDECL enum_fonts(PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LP
return ret; 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); PSDRV_PDEVICE *pdev = get_psdrv_dev(dev);
UINT i, c; UINT i, c;
...@@ -1309,7 +1309,7 @@ static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHA ...@@ -1309,7 +1309,7 @@ static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHA
return TRUE; 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); PSDRV_PDEVICE *pdev = get_psdrv_dev(dev);
...@@ -1323,7 +1323,7 @@ static BOOL CDECL get_text_metrics(PHYSDEV dev, TEXTMETRICW *metrics) ...@@ -1323,7 +1323,7 @@ static BOOL CDECL get_text_metrics(PHYSDEV dev, TEXTMETRICW *metrics)
return TRUE; 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); PSDRV_PDEVICE *pdev = get_psdrv_dev(dev);
int i; int i;
...@@ -1404,7 +1404,7 @@ static PSDRV_PDEVICE *create_physdev(HDC hdc, const WCHAR *device, ...@@ -1404,7 +1404,7 @@ static PSDRV_PDEVICE *create_physdev(HDC hdc, const WCHAR *device,
return pdev; 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) const WCHAR *output, const DEVMODEW *devmode)
{ {
PSDRV_PDEVICE *pdev; PSDRV_PDEVICE *pdev;
...@@ -1417,7 +1417,7 @@ static BOOL CDECL create_dc(PHYSDEV *dev, const WCHAR *device, ...@@ -1417,7 +1417,7 @@ static BOOL CDECL create_dc(PHYSDEV *dev, const WCHAR *device,
return TRUE; 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); PSDRV_PDEVICE *pdev, *orig_dev = get_psdrv_dev(orig);
...@@ -1427,7 +1427,7 @@ static BOOL CDECL create_compatible_dc(PHYSDEV orig, PHYSDEV *dev) ...@@ -1427,7 +1427,7 @@ static BOOL CDECL create_compatible_dc(PHYSDEV orig, PHYSDEV *dev)
return TRUE; return TRUE;
} }
static BOOL CDECL delete_dc(PHYSDEV dev) static BOOL delete_dc(PHYSDEV dev)
{ {
PSDRV_PDEVICE *pdev = get_psdrv_dev(dev); PSDRV_PDEVICE *pdev = get_psdrv_dev(dev);
......
dlls/winex11.drv/bitblt.c
View file @ 8c5dd221
...@@ -754,7 +754,7 @@ void execute_rop( X11DRV_PDEVICE *physdev, Pixmap src_pixmap, GC gc, const RECT ...@@ -754,7 +754,7 @@ void execute_rop( X11DRV_PDEVICE *physdev, Pixmap src_pixmap, GC gc, const RECT
/*********************************************************************** /***********************************************************************
* X11DRV_PatBlt * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
BOOL usePat = (((rop >> 4) & 0x0f0000) != (rop & 0x0f0000)); BOOL usePat = (((rop >> 4) & 0x0f0000) != (rop & 0x0f0000));
...@@ -806,8 +806,8 @@ BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) ...@@ -806,8 +806,8 @@ BOOL CDECL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop )
/*********************************************************************** /***********************************************************************
* X11DRV_StretchBlt * X11DRV_StretchBlt
*/ */
BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop )
{ {
X11DRV_PDEVICE *physDevDst = get_x11drv_dev( dst_dev ); X11DRV_PDEVICE *physDevDst = get_x11drv_dev( dst_dev );
X11DRV_PDEVICE *physDevSrc = get_x11drv_dev( src_dev ); X11DRV_PDEVICE *physDevSrc = get_x11drv_dev( src_dev );
...@@ -926,12 +926,12 @@ BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, ...@@ -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 ); 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 ); XFree( bits->ptr );
} }
...@@ -1220,9 +1220,9 @@ DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, ...@@ -1220,9 +1220,9 @@ DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image,
/*********************************************************************** /***********************************************************************
* X11DRV_PutImage * X11DRV_PutImage
*/ */
DWORD CDECL X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, DWORD X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
const struct gdi_image_bits *bits, struct bitblt_coords *src, const struct gdi_image_bits *bits, struct bitblt_coords *src,
struct bitblt_coords *dst, DWORD rop ) struct bitblt_coords *dst, DWORD rop )
{ {
X11DRV_PDEVICE *physdev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physdev = get_x11drv_dev( dev );
DWORD ret; DWORD ret;
...@@ -1312,8 +1312,8 @@ update_format: ...@@ -1312,8 +1312,8 @@ update_format:
/*********************************************************************** /***********************************************************************
* X11DRV_GetImage * X11DRV_GetImage
*/ */
DWORD CDECL X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info,
struct gdi_image_bits *bits, struct bitblt_coords *src ) struct gdi_image_bits *bits, struct bitblt_coords *src )
{ {
X11DRV_PDEVICE *physdev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physdev = get_x11drv_dev( dev );
DWORD ret = ERROR_SUCCESS; DWORD ret = ERROR_SUCCESS;
......
dlls/winex11.drv/brush.c
View file @ 8c5dd221
...@@ -236,7 +236,7 @@ static BOOL select_pattern_brush( X11DRV_PDEVICE *physdev, const struct brush_pa ...@@ -236,7 +236,7 @@ static BOOL select_pattern_brush( X11DRV_PDEVICE *physdev, const struct brush_pa
/*********************************************************************** /***********************************************************************
* SelectBrush (X11DRV.@) * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
LOGBRUSH logbrush; LOGBRUSH logbrush;
...@@ -288,7 +288,7 @@ HBRUSH CDECL X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_ ...@@ -288,7 +288,7 @@ HBRUSH CDECL X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_
/*********************************************************************** /***********************************************************************
* SetDCBrushColor (X11DRV.@) * SetDCBrushColor (X11DRV.@)
*/ */
COLORREF CDECL X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) COLORREF X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor )
{ {
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
......
dlls/winex11.drv/graphics.c
View file @ 8c5dd221
...@@ -298,7 +298,7 @@ void restore_clipping_region( X11DRV_PDEVICE *dev ) ...@@ -298,7 +298,7 @@ void restore_clipping_region( X11DRV_PDEVICE *dev )
/*********************************************************************** /***********************************************************************
* X11DRV_SetDeviceClipping * X11DRV_SetDeviceClipping
*/ */
void CDECL X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn )
{ {
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
...@@ -547,7 +547,7 @@ INT X11DRV_YWStoDS( HDC hdc, INT height ) ...@@ -547,7 +547,7 @@ INT X11DRV_YWStoDS( HDC hdc, INT height )
/*********************************************************************** /***********************************************************************
* X11DRV_LineTo * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
POINT pt[2]; POINT pt[2];
...@@ -719,8 +719,8 @@ static BOOL X11DRV_DrawArc( PHYSDEV dev, INT left, INT top, INT right, INT botto ...@@ -719,8 +719,8 @@ static BOOL X11DRV_DrawArc( PHYSDEV dev, INT left, INT top, INT right, INT botto
/*********************************************************************** /***********************************************************************
* X11DRV_Arc * X11DRV_Arc
*/ */
BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) INT xstart, INT ystart, INT xend, INT yend )
{ {
return X11DRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 0 ); 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, ...@@ -729,8 +729,8 @@ BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/*********************************************************************** /***********************************************************************
* X11DRV_Pie * X11DRV_Pie
*/ */
BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, BOOL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) INT xstart, INT ystart, INT xend, INT yend )
{ {
return X11DRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 2 ); 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, ...@@ -738,8 +738,8 @@ BOOL CDECL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/*********************************************************************** /***********************************************************************
* X11DRV_Chord * X11DRV_Chord
*/ */
BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) INT xstart, INT ystart, INT xend, INT yend )
{ {
return X11DRV_DrawArc( dev, left, top, right, bottom, xstart, ystart, xend, yend, 1 ); 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, ...@@ -748,7 +748,7 @@ BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
/*********************************************************************** /***********************************************************************
* X11DRV_Ellipse * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
INT width, oldwidth; INT width, oldwidth;
...@@ -791,7 +791,7 @@ BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ...@@ -791,7 +791,7 @@ BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom
/*********************************************************************** /***********************************************************************
* X11DRV_Rectangle * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
INT width, oldwidth, oldjoinstyle; INT width, oldwidth, oldjoinstyle;
...@@ -844,8 +844,8 @@ BOOL CDECL X11DRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT botto ...@@ -844,8 +844,8 @@ BOOL CDECL X11DRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT botto
/*********************************************************************** /***********************************************************************
* X11DRV_RoundRect * X11DRV_RoundRect
*/ */
BOOL CDECL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, BOOL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT ell_width, INT ell_height ) INT ell_width, INT ell_height )
{ {
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
INT width, oldwidth, oldendcap; INT width, oldwidth, oldendcap;
...@@ -1035,7 +1035,7 @@ BOOL CDECL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott ...@@ -1035,7 +1035,7 @@ BOOL CDECL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
/*********************************************************************** /***********************************************************************
* X11DRV_SetPixel * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
unsigned long pixel; unsigned long pixel;
...@@ -1061,7 +1061,7 @@ COLORREF CDECL X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) ...@@ -1061,7 +1061,7 @@ COLORREF CDECL X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color )
/*********************************************************************** /***********************************************************************
* X11DRV_PaintRgn * X11DRV_PaintRgn
*/ */
BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) BOOL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn )
{ {
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
RECT rc; RECT rc;
...@@ -1136,7 +1136,7 @@ static BOOL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) ...@@ -1136,7 +1136,7 @@ static BOOL X11DRV_Polygon( PHYSDEV dev, const POINT* pt, INT count )
/********************************************************************** /**********************************************************************
* X11DRV_PolyPolygon * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
DWORD total = 0, max = 0, pos, i; DWORD total = 0, max = 0, pos, i;
...@@ -1212,7 +1212,7 @@ done: ...@@ -1212,7 +1212,7 @@ done:
/********************************************************************** /**********************************************************************
* X11DRV_PolyPolyline * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
DWORD total = 0, max = 0, pos, i, j; DWORD total = 0, max = 0, pos, i, j;
...@@ -1335,7 +1335,7 @@ done: ...@@ -1335,7 +1335,7 @@ done:
/********************************************************************** /**********************************************************************
* X11DRV_FillPath * X11DRV_FillPath
*/ */
BOOL CDECL X11DRV_FillPath( PHYSDEV dev ) BOOL X11DRV_FillPath( PHYSDEV dev )
{ {
return x11drv_stroke_and_fill_path( dev, FALSE, TRUE ); return x11drv_stroke_and_fill_path( dev, FALSE, TRUE );
} }
...@@ -1343,7 +1343,7 @@ BOOL CDECL X11DRV_FillPath( PHYSDEV dev ) ...@@ -1343,7 +1343,7 @@ BOOL CDECL X11DRV_FillPath( PHYSDEV dev )
/********************************************************************** /**********************************************************************
* X11DRV_StrokeAndFillPath * X11DRV_StrokeAndFillPath
*/ */
BOOL CDECL X11DRV_StrokeAndFillPath( PHYSDEV dev ) BOOL X11DRV_StrokeAndFillPath( PHYSDEV dev )
{ {
return x11drv_stroke_and_fill_path( dev, TRUE, TRUE ); return x11drv_stroke_and_fill_path( dev, TRUE, TRUE );
} }
...@@ -1351,7 +1351,7 @@ BOOL CDECL X11DRV_StrokeAndFillPath( PHYSDEV dev ) ...@@ -1351,7 +1351,7 @@ BOOL CDECL X11DRV_StrokeAndFillPath( PHYSDEV dev )
/********************************************************************** /**********************************************************************
* X11DRV_StrokePath * X11DRV_StrokePath
*/ */
BOOL CDECL X11DRV_StrokePath( PHYSDEV dev ) BOOL X11DRV_StrokePath( PHYSDEV dev )
{ {
return x11drv_stroke_and_fill_path( dev, TRUE, FALSE ); return x11drv_stroke_and_fill_path( dev, TRUE, FALSE );
} }
...@@ -1438,7 +1438,7 @@ static int ExtFloodFillXGetImageErrorHandler( Display *dpy, XErrorEvent *event, ...@@ -1438,7 +1438,7 @@ static int ExtFloodFillXGetImageErrorHandler( Display *dpy, XErrorEvent *event,
/********************************************************************** /**********************************************************************
* X11DRV_ExtFloodFill * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
XImage *image; XImage *image;
...@@ -1501,8 +1501,8 @@ BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT ...@@ -1501,8 +1501,8 @@ BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT
/********************************************************************** /**********************************************************************
* X11DRV_GradientFill * X11DRV_GradientFill
*/ */
BOOL CDECL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
void *grad_array, ULONG ngrad, ULONG mode ) void *grad_array, ULONG ngrad, ULONG mode )
{ {
X11DRV_PDEVICE *physdev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physdev = get_x11drv_dev( dev );
const GRADIENT_RECT *rect = grad_array; const GRADIENT_RECT *rect = grad_array;
...@@ -1656,7 +1656,7 @@ static const WCHAR color_path[] = ...@@ -1656,7 +1656,7 @@ static const WCHAR color_path[] =
/*********************************************************************** /***********************************************************************
* GetICMProfile (X11DRV.@) * 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[] = static const WCHAR srgb[] =
{'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ', {'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ',
......
dlls/winex11.drv/init.c
View file @ 8c5dd221
...@@ -96,8 +96,7 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) ...@@ -96,8 +96,7 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable )
/********************************************************************** /**********************************************************************
* X11DRV_CreateDC * X11DRV_CreateDC
*/ */
static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData )
const DEVMODEW* initData )
{ {
X11DRV_PDEVICE *physDev = create_x11_physdev( root_window ); X11DRV_PDEVICE *physDev = create_x11_physdev( root_window );
...@@ -116,7 +115,7 @@ static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output ...@@ -116,7 +115,7 @@ static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output
/********************************************************************** /**********************************************************************
* X11DRV_CreateCompatibleDC * 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 ); X11DRV_PDEVICE *physDev = create_x11_physdev( stock_bitmap_pixmap );
...@@ -134,7 +133,7 @@ static BOOL CDECL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) ...@@ -134,7 +133,7 @@ static BOOL CDECL X11DRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
/********************************************************************** /**********************************************************************
* X11DRV_DeleteDC * X11DRV_DeleteDC
*/ */
static BOOL CDECL X11DRV_DeleteDC( PHYSDEV dev ) static BOOL X11DRV_DeleteDC( PHYSDEV dev )
{ {
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
...@@ -159,7 +158,7 @@ void add_device_bounds( X11DRV_PDEVICE *dev, const RECT *rect ) ...@@ -159,7 +158,7 @@ void add_device_bounds( X11DRV_PDEVICE *dev, const RECT *rect )
/*********************************************************************** /***********************************************************************
* X11DRV_SetBoundsRect * 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 ); X11DRV_PDEVICE *pdev = get_x11drv_dev( dev );
...@@ -172,7 +171,7 @@ static UINT CDECL X11DRV_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) ...@@ -172,7 +171,7 @@ static UINT CDECL X11DRV_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags )
/*********************************************************************** /***********************************************************************
* GetDeviceCaps (X11DRV.@) * GetDeviceCaps (X11DRV.@)
*/ */
static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap )
{ {
switch(cap) switch(cap)
{ {
...@@ -188,7 +187,7 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) ...@@ -188,7 +187,7 @@ static INT CDECL X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap )
/*********************************************************************** /***********************************************************************
* SelectFont * 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 */ if (default_visual.depth <= 8) *aa_flags = GGO_BITMAP; /* no anti-aliasing on <= 8bpp */
dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); dev = GET_NEXT_PHYSDEV( dev, pSelectFont );
...@@ -198,8 +197,8 @@ static HFONT CDECL X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) ...@@ -198,8 +197,8 @@ static HFONT CDECL X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags )
/********************************************************************** /**********************************************************************
* ExtEscape (X11DRV.@) * ExtEscape (X11DRV.@)
*/ */
static INT CDECL X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data,
INT out_count, LPVOID out_data ) INT out_count, LPVOID out_data )
{ {
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
......
dlls/winex11.drv/palette.c
View file @ 8c5dd221
...@@ -1184,7 +1184,7 @@ static int X11DRV_LookupSysPaletteExact( BYTE r, BYTE g, BYTE b ) ...@@ -1184,7 +1184,7 @@ static int X11DRV_LookupSysPaletteExact( BYTE r, BYTE g, BYTE b )
/*********************************************************************** /***********************************************************************
* RealizePalette (X11DRV.@) * 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 ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
char flag; char flag;
...@@ -1298,7 +1298,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) ...@@ -1298,7 +1298,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary )
/*********************************************************************** /***********************************************************************
* UnrealizePalette (X11DRV.@) * UnrealizePalette (X11DRV.@)
*/ */
BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) BOOL X11DRV_UnrealizePalette( HPALETTE hpal )
{ {
int *mapping = palette_get_mapping( hpal ); int *mapping = palette_get_mapping( hpal );
...@@ -1314,7 +1314,7 @@ BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) ...@@ -1314,7 +1314,7 @@ BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal )
/*********************************************************************** /***********************************************************************
* GetSystemPaletteEntries (X11DRV.@) * 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; UINT i;
...@@ -1344,7 +1344,7 @@ UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, ...@@ -1344,7 +1344,7 @@ UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count,
/*********************************************************************** /***********************************************************************
* GetNearestColor (X11DRV.@) * GetNearestColor (X11DRV.@)
*/ */
COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) COLORREF X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color )
{ {
unsigned char spec_type = color >> 24; unsigned char spec_type = color >> 24;
COLORREF nearest; COLORREF nearest;
...@@ -1386,7 +1386,7 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) ...@@ -1386,7 +1386,7 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color )
/*********************************************************************** /***********************************************************************
* RealizeDefaultPalette (X11DRV.@) * RealizeDefaultPalette (X11DRV.@)
*/ */
UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) UINT X11DRV_RealizeDefaultPalette( PHYSDEV dev )
{ {
DWORD is_memdc; DWORD is_memdc;
UINT ret = 0; UINT ret = 0;
......
dlls/winex11.drv/pen.c
View file @ 8c5dd221
...@@ -58,7 +58,7 @@ static DWORD get_user_dashes( char *res, const DWORD *style, DWORD len ) ...@@ -58,7 +58,7 @@ static DWORD get_user_dashes( char *res, const DWORD *style, DWORD len )
/*********************************************************************** /***********************************************************************
* SelectPen (X11DRV.@) * 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_dash[] = { 16,8 };
static const char PEN_dot[] = { 4,4 }; static const char PEN_dot[] = { 4,4 };
...@@ -158,7 +158,7 @@ HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern ...@@ -158,7 +158,7 @@ HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern
/*********************************************************************** /***********************************************************************
* SetDCPenColor (X11DRV.@) * SetDCPenColor (X11DRV.@)
*/ */
COLORREF CDECL X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor )
{ {
X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); X11DRV_PDEVICE *physDev = get_x11drv_dev( dev );
......
dlls/winex11.drv/x11drv.h
View file @ 8c5dd221
...@@ -154,53 +154,53 @@ static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) ...@@ -154,53 +154,53 @@ static inline void add_bounds_rect( RECT *bounds, const RECT *rect )
/* Wine driver X11 functions */ /* Wine driver X11 functions */
extern BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, extern BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right,
INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; 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, extern BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;
extern NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) DECLSPEC_HIDDEN; extern NTSTATUS X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) DECLSPEC_HIDDEN;
extern NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) DECLSPEC_HIDDEN; extern NTSTATUS X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) DECLSPEC_HIDDEN;
extern NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) DECLSPEC_HIDDEN; extern NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) DECLSPEC_HIDDEN;
extern NTSTATUS CDECL X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) DECLSPEC_HIDDEN; extern NTSTATUS X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *desc ) DECLSPEC_HIDDEN;
extern NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) DECLSPEC_HIDDEN; extern NTSTATUS 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 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 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 X11DRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern BOOL 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 BOOL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN;
extern DWORD CDECL X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, extern DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info,
struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN;
extern COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
extern UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) DECLSPEC_HIDDEN; extern UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, LPPALETTEENTRY entries ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, extern BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_LineTo( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL X11DRV_LineTo( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL 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 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, extern BOOL X11DRV_Pie( PHYSDEV dev, INT left, INT top, INT right,
INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; 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 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 BOOL 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, extern DWORD X11DRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
const struct gdi_image_bits *bits, struct bitblt_coords *src, const struct gdi_image_bits *bits, struct bitblt_coords *src,
struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;
extern UINT CDECL X11DRV_RealizeDefaultPalette( PHYSDEV dev ) DECLSPEC_HIDDEN; extern UINT X11DRV_RealizeDefaultPalette( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) DECLSPEC_HIDDEN; extern UINT 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 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, extern BOOL X11DRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; 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 HBRUSH 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 HPEN 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 X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN;
extern COLORREF CDECL X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN;
extern void CDECL X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN;
extern COLORREF CDECL X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, extern BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL X11DRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL X11DRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;
extern BOOL X11DRV_ActivateKeyboardLayout( HKL hkl, UINT flags ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ActivateKeyboardLayout( HKL hkl, UINT flags ) DECLSPEC_HIDDEN;
extern void X11DRV_Beep(void) DECLSPEC_HIDDEN; extern void X11DRV_Beep(void) DECLSPEC_HIDDEN;
......
dlls/winex11.drv/x11drv_main.c
View file @ 8c5dd221
...@@ -833,7 +833,7 @@ BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, ...@@ -833,7 +833,7 @@ BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
return FALSE; /* let user32 handle it */ 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); const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION);
struct x11_d3dkmt_adapter *adapter; struct x11_d3dkmt_adapter *adapter;
...@@ -864,7 +864,7 @@ NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) ...@@ -864,7 +864,7 @@ NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc )
/********************************************************************** /**********************************************************************
* X11DRV_D3DKMTSetVidPnSourceOwner * X11DRV_D3DKMTSetVidPnSourceOwner
*/ */
NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) NTSTATUS X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc )
{ {
struct d3dkmt_vidpn_source *source, *source2; struct d3dkmt_vidpn_source *source, *source2;
NTSTATUS status = STATUS_SUCCESS; NTSTATUS status = STATUS_SUCCESS;
...@@ -979,7 +979,7 @@ done: ...@@ -979,7 +979,7 @@ done:
/********************************************************************** /**********************************************************************
* X11DRV_D3DKMTCheckVidPnExclusiveOwnership * X11DRV_D3DKMTCheckVidPnExclusiveOwnership
*/ */
NTSTATUS CDECL X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) NTSTATUS X11DRV_D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc )
{ {
struct d3dkmt_vidpn_source *source; struct d3dkmt_vidpn_source *source;
...@@ -1130,7 +1130,7 @@ static BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid ) ...@@ -1130,7 +1130,7 @@ static BOOL get_vulkan_uuid_from_luid( const LUID *luid, GUID *uuid )
return FALSE; return FALSE;
} }
NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) NTSTATUS X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc )
{ {
static const char *extensions[] = static const char *extensions[] =
{ {
...@@ -1244,7 +1244,7 @@ done: ...@@ -1244,7 +1244,7 @@ done:
return status; 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); const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION);
PFN_vkGetPhysicalDeviceMemoryProperties2KHR pvkGetPhysicalDeviceMemoryProperties2KHR; PFN_vkGetPhysicalDeviceMemoryProperties2KHR pvkGetPhysicalDeviceMemoryProperties2KHR;
......
dlls/winex11.drv/xrender.c
View file @ 8c5dd221
...@@ -813,7 +813,7 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) ...@@ -813,7 +813,7 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf )
/********************************************************************** /**********************************************************************
* xrenderdrv_SelectFont * 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; LFANDSIZE lfsz;
struct xrender_physdev *physdev = get_xrender_dev( dev ); struct xrender_physdev *physdev = get_xrender_dev( dev );
...@@ -929,8 +929,7 @@ static void set_color_info( XRenderPictFormat *format, BITMAPINFO *info ) ...@@ -929,8 +929,7 @@ static void set_color_info( XRenderPictFormat *format, BITMAPINFO *info )
/********************************************************************** /**********************************************************************
* xrenderdrv_CreateDC * xrenderdrv_CreateDC
*/ */
static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, static BOOL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData )
const DEVMODEW* initData )
{ {
return create_xrender_dc( pdev, default_format ); return create_xrender_dc( pdev, default_format );
} }
...@@ -938,7 +937,7 @@ static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR ou ...@@ -938,7 +937,7 @@ static BOOL CDECL xrenderdrv_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR ou
/********************************************************************** /**********************************************************************
* xrenderdrv_CreateCompatibleDC * 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 */ if (orig) /* chain to x11drv first */
{ {
...@@ -953,7 +952,7 @@ static BOOL CDECL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) ...@@ -953,7 +952,7 @@ static BOOL CDECL xrenderdrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev )
/********************************************************************** /**********************************************************************
* xrenderdrv_DeleteDC * xrenderdrv_DeleteDC
*/ */
static BOOL CDECL xrenderdrv_DeleteDC( PHYSDEV dev ) static BOOL xrenderdrv_DeleteDC( PHYSDEV dev )
{ {
struct xrender_physdev *physdev = get_xrender_dev( dev ); struct xrender_physdev *physdev = get_xrender_dev( dev );
...@@ -970,8 +969,8 @@ static BOOL CDECL xrenderdrv_DeleteDC( PHYSDEV dev ) ...@@ -970,8 +969,8 @@ static BOOL CDECL xrenderdrv_DeleteDC( PHYSDEV dev )
/********************************************************************** /**********************************************************************
* xrenderdrv_ExtEscape * xrenderdrv_ExtEscape
*/ */
static INT CDECL xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data,
INT out_count, LPVOID out_data ) INT out_count, LPVOID out_data )
{ {
struct xrender_physdev *physdev = get_xrender_dev( dev ); struct xrender_physdev *physdev = get_xrender_dev( dev );
...@@ -996,7 +995,7 @@ static INT CDECL xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LP ...@@ -996,7 +995,7 @@ static INT CDECL xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LP
/*********************************************************************** /***********************************************************************
* xrenderdrv_SetDeviceClipping * 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 ); struct xrender_physdev *physdev = get_xrender_dev( dev );
...@@ -1284,8 +1283,8 @@ static Picture get_mask_pict( int alpha ) ...@@ -1284,8 +1283,8 @@ static Picture get_mask_pict( int alpha )
/*********************************************************************** /***********************************************************************
* xrenderdrv_ExtTextOut * xrenderdrv_ExtTextOut
*/ */
static BOOL CDECL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx )
{ {
struct xrender_physdev *physdev = get_xrender_dev( dev ); struct xrender_physdev *physdev = get_xrender_dev( dev );
gsCacheEntry *entry; gsCacheEntry *entry;
...@@ -1711,8 +1710,8 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask ...@@ -1711,8 +1710,8 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask
/*********************************************************************** /***********************************************************************
* xrenderdrv_StretchBlt * xrenderdrv_StretchBlt
*/ */
static BOOL CDECL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop )
{ {
struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev );
struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev );
...@@ -1768,9 +1767,9 @@ x11drv_fallback: ...@@ -1768,9 +1767,9 @@ x11drv_fallback:
/*********************************************************************** /***********************************************************************
* xrenderdrv_PutImage * xrenderdrv_PutImage
*/ */
static DWORD CDECL xrenderdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, static DWORD xrenderdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info,
const struct gdi_image_bits *bits, struct bitblt_coords *src, const struct gdi_image_bits *bits, struct bitblt_coords *src,
struct bitblt_coords *dst, DWORD rop ) struct bitblt_coords *dst, DWORD rop )
{ {
struct xrender_physdev *physdev = get_xrender_dev( dev ); struct xrender_physdev *physdev = get_xrender_dev( dev );
DWORD ret; DWORD ret;
...@@ -1853,9 +1852,9 @@ x11drv_fallback: ...@@ -1853,9 +1852,9 @@ x11drv_fallback:
/*********************************************************************** /***********************************************************************
* xrenderdrv_BlendImage * xrenderdrv_BlendImage
*/ */
static DWORD CDECL xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits, static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_bits *bits,
struct bitblt_coords *src, struct bitblt_coords *dst, struct bitblt_coords *src, struct bitblt_coords *dst,
BLENDFUNCTION func ) BLENDFUNCTION func )
{ {
struct xrender_physdev *physdev = get_xrender_dev( dev ); struct xrender_physdev *physdev = get_xrender_dev( dev );
DWORD ret; DWORD ret;
...@@ -1923,8 +1922,8 @@ update_format: ...@@ -1923,8 +1922,8 @@ update_format:
/*********************************************************************** /***********************************************************************
* xrenderdrv_AlphaBlend * xrenderdrv_AlphaBlend
*/ */
static BOOL CDECL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,
PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blendfn ) PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blendfn )
{ {
struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev );
struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev );
...@@ -2007,8 +2006,8 @@ static BOOL CDECL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords * ...@@ -2007,8 +2006,8 @@ static BOOL CDECL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *
/*********************************************************************** /***********************************************************************
* xrenderdrv_GradientFill * xrenderdrv_GradientFill
*/ */
static BOOL CDECL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert,
void * grad_array, ULONG ngrad, ULONG mode ) void *grad_array, ULONG ngrad, ULONG mode )
{ {
#ifdef HAVE_XRENDERCREATELINEARGRADIENT #ifdef HAVE_XRENDERCREATELINEARGRADIENT
static const XFixed stops[2] = { 0, 1 << 16 }; static const XFixed stops[2] = { 0, 1 << 16 };
...@@ -2111,7 +2110,7 @@ fallback: ...@@ -2111,7 +2110,7 @@ fallback:
/*********************************************************************** /***********************************************************************
* xrenderdrv_SelectBrush * 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 ); struct xrender_physdev *physdev = get_xrender_dev( dev );
Pixmap pixmap; Pixmap pixmap;
......
dlls/winex11.drv/xvidmode.c
View file @ 8c5dd221
...@@ -553,13 +553,9 @@ void X11DRV_XF86VM_Init(void) ...@@ -553,13 +553,9 @@ void X11DRV_XF86VM_Init(void)
#endif /* SONAME_LIBXXF86VM */ #endif /* SONAME_LIBXXF86VM */
/*********************************************************************** /***********************************************************************
* GetDeviceGammaRamp (X11DRV.@) * GetDeviceGammaRamp
*
* FIXME: should move to somewhere appropriate, but probably not before
* 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 #ifdef SONAME_LIBXXF86VM
return X11DRV_XF86VM_GetGammaRamp(ramp); return X11DRV_XF86VM_GetGammaRamp(ramp);
...@@ -569,13 +565,9 @@ BOOL CDECL X11DRV_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) ...@@ -569,13 +565,9 @@ BOOL CDECL X11DRV_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp)
} }
/*********************************************************************** /***********************************************************************
* SetDeviceGammaRamp (X11DRV.@) * SetDeviceGammaRamp
*
* FIXME: should move to somewhere appropriate, but probably not before
* 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 #ifdef SONAME_LIBXXF86VM
return X11DRV_XF86VM_SetGammaRamp(ramp); return X11DRV_XF86VM_SetGammaRamp(ramp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment