Skip to content

W
wine-cw
Commit b16f552e authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

gdi32: Use explicit CDECL in window_surface_funcs.

Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a404eb72
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
dlls/gdi.exe16/gdi.c
View file @ b16f552e
...@@ -449,7 +449,7 @@ static struct dib_window_surface *get_dib_surface( struct window_surface *surfac ...@@ -449,7 +449,7 @@ static struct dib_window_surface *get_dib_surface( struct window_surface *surfac
/*********************************************************************** /***********************************************************************
* dib_surface_lock * dib_surface_lock
*/ */
static void dib_surface_lock( struct window_surface *window_surface ) static void CDECL dib_surface_lock( struct window_surface *window_surface )
{ {
/* nothing to do */ /* nothing to do */
} }
...@@ -457,7 +457,7 @@ static void dib_surface_lock( struct window_surface *window_surface ) ...@@ -457,7 +457,7 @@ static void dib_surface_lock( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* dib_surface_unlock * dib_surface_unlock
*/ */
static void dib_surface_unlock( struct window_surface *window_surface ) static void CDECL dib_surface_unlock( struct window_surface *window_surface )
{ {
/* nothing to do */ /* nothing to do */
} }
...@@ -465,7 +465,7 @@ static void dib_surface_unlock( struct window_surface *window_surface ) ...@@ -465,7 +465,7 @@ static void dib_surface_unlock( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* dib_surface_get_bitmap_info * dib_surface_get_bitmap_info
*/ */
static void *dib_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) static void *CDECL dib_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info )
{ {
struct dib_window_surface *surface = get_dib_surface( window_surface ); struct dib_window_surface *surface = get_dib_surface( window_surface );
...@@ -476,7 +476,7 @@ static void *dib_surface_get_bitmap_info( struct window_surface *window_surface, ...@@ -476,7 +476,7 @@ static void *dib_surface_get_bitmap_info( struct window_surface *window_surface,
/*********************************************************************** /***********************************************************************
* dib_surface_get_bounds * dib_surface_get_bounds
*/ */
static RECT *dib_surface_get_bounds( struct window_surface *window_surface ) static RECT *CDECL dib_surface_get_bounds( struct window_surface *window_surface )
{ {
struct dib_window_surface *surface = get_dib_surface( window_surface ); struct dib_window_surface *surface = get_dib_surface( window_surface );
...@@ -486,7 +486,7 @@ static RECT *dib_surface_get_bounds( struct window_surface *window_surface ) ...@@ -486,7 +486,7 @@ static RECT *dib_surface_get_bounds( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* dib_surface_set_region * dib_surface_set_region
*/ */
static void dib_surface_set_region( struct window_surface *window_surface, HRGN region ) static void CDECL dib_surface_set_region( struct window_surface *window_surface, HRGN region )
{ {
/* nothing to do */ /* nothing to do */
} }
...@@ -494,7 +494,7 @@ static void dib_surface_set_region( struct window_surface *window_surface, HRGN ...@@ -494,7 +494,7 @@ static void dib_surface_set_region( struct window_surface *window_surface, HRGN
/*********************************************************************** /***********************************************************************
* dib_surface_flush * dib_surface_flush
*/ */
static void dib_surface_flush( struct window_surface *window_surface ) static void CDECL dib_surface_flush( struct window_surface *window_surface )
{ {
/* nothing to do */ /* nothing to do */
} }
...@@ -502,7 +502,7 @@ static void dib_surface_flush( struct window_surface *window_surface ) ...@@ -502,7 +502,7 @@ static void dib_surface_flush( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* dib_surface_destroy * dib_surface_destroy
*/ */
static void dib_surface_destroy( struct window_surface *window_surface ) static void CDECL dib_surface_destroy( struct window_surface *window_surface )
{ {
struct dib_window_surface *surface = get_dib_surface( window_surface ); struct dib_window_surface *surface = get_dib_surface( window_surface );
......
dlls/user32/win.c
View file @ b16f552e
...@@ -528,17 +528,17 @@ BOOL is_desktop_window( HWND hwnd ) ...@@ -528,17 +528,17 @@ BOOL is_desktop_window( HWND hwnd )
* Dummy window surface for windows that shouldn't get painted. * Dummy window surface for windows that shouldn't get painted.
*/ */
static void dummy_surface_lock( struct window_surface *window_surface ) static void CDECL dummy_surface_lock( struct window_surface *window_surface )
{ {
/* nothing to do */ /* nothing to do */
} }
static void dummy_surface_unlock( struct window_surface *window_surface ) static void CDECL dummy_surface_unlock( struct window_surface *window_surface )
{ {
/* nothing to do */ /* nothing to do */
} }
static void *dummy_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) static void *CDECL dummy_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info )
{ {
static DWORD dummy_data; static DWORD dummy_data;
...@@ -556,23 +556,23 @@ static void *dummy_surface_get_bitmap_info( struct window_surface *window_surfac ...@@ -556,23 +556,23 @@ static void *dummy_surface_get_bitmap_info( struct window_surface *window_surfac
return &dummy_data; return &dummy_data;
} }
static RECT *dummy_surface_get_bounds( struct window_surface *window_surface ) static RECT *CDECL dummy_surface_get_bounds( struct window_surface *window_surface )
{ {
static RECT dummy_bounds; static RECT dummy_bounds;
return &dummy_bounds; return &dummy_bounds;
} }
static void dummy_surface_set_region( struct window_surface *window_surface, HRGN region ) static void CDECL dummy_surface_set_region( struct window_surface *window_surface, HRGN region )
{ {
/* nothing to do */ /* nothing to do */
} }
static void dummy_surface_flush( struct window_surface *window_surface ) static void CDECL dummy_surface_flush( struct window_surface *window_surface )
{ {
/* nothing to do */ /* nothing to do */
} }
static void dummy_surface_destroy( struct window_surface *window_surface ) static void CDECL dummy_surface_destroy( struct window_surface *window_surface )
{ {
/* nothing to do */ /* nothing to do */
} }
......
dlls/wineandroid.drv/window.c
View file @ b16f552e
...@@ -656,7 +656,7 @@ static void apply_line_region( DWORD *dst, int width, int x, int y, const RECT * ...@@ -656,7 +656,7 @@ static void apply_line_region( DWORD *dst, int width, int x, int y, const RECT *
/*********************************************************************** /***********************************************************************
* android_surface_lock * android_surface_lock
*/ */
static void android_surface_lock( struct window_surface *window_surface ) static void CDECL android_surface_lock( struct window_surface *window_surface )
{ {
struct android_window_surface *surface = get_android_surface( window_surface ); struct android_window_surface *surface = get_android_surface( window_surface );
...@@ -666,7 +666,7 @@ static void android_surface_lock( struct window_surface *window_surface ) ...@@ -666,7 +666,7 @@ static void android_surface_lock( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* android_surface_unlock * android_surface_unlock
*/ */
static void android_surface_unlock( struct window_surface *window_surface ) static void CDECL android_surface_unlock( struct window_surface *window_surface )
{ {
struct android_window_surface *surface = get_android_surface( window_surface ); struct android_window_surface *surface = get_android_surface( window_surface );
...@@ -676,7 +676,7 @@ static void android_surface_unlock( struct window_surface *window_surface ) ...@@ -676,7 +676,7 @@ static void android_surface_unlock( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* android_surface_get_bitmap_info * android_surface_get_bitmap_info
*/ */
static void *android_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) static void *CDECL android_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info )
{ {
struct android_window_surface *surface = get_android_surface( window_surface ); struct android_window_surface *surface = get_android_surface( window_surface );
...@@ -687,7 +687,7 @@ static void *android_surface_get_bitmap_info( struct window_surface *window_surf ...@@ -687,7 +687,7 @@ static void *android_surface_get_bitmap_info( struct window_surface *window_surf
/*********************************************************************** /***********************************************************************
* android_surface_get_bounds * android_surface_get_bounds
*/ */
static RECT *android_surface_get_bounds( struct window_surface *window_surface ) static RECT *CDECL android_surface_get_bounds( struct window_surface *window_surface )
{ {
struct android_window_surface *surface = get_android_surface( window_surface ); struct android_window_surface *surface = get_android_surface( window_surface );
...@@ -697,7 +697,7 @@ static RECT *android_surface_get_bounds( struct window_surface *window_surface ) ...@@ -697,7 +697,7 @@ static RECT *android_surface_get_bounds( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* android_surface_set_region * android_surface_set_region
*/ */
static void android_surface_set_region( struct window_surface *window_surface, HRGN region ) static void CDECL android_surface_set_region( struct window_surface *window_surface, HRGN region )
{ {
struct android_window_surface *surface = get_android_surface( window_surface ); struct android_window_surface *surface = get_android_surface( window_surface );
...@@ -721,7 +721,7 @@ static void android_surface_set_region( struct window_surface *window_surface, H ...@@ -721,7 +721,7 @@ static void android_surface_set_region( struct window_surface *window_surface, H
/*********************************************************************** /***********************************************************************
* android_surface_flush * android_surface_flush
*/ */
static void android_surface_flush( struct window_surface *window_surface ) static void CDECL android_surface_flush( struct window_surface *window_surface )
{ {
struct android_window_surface *surface = get_android_surface( window_surface ); struct android_window_surface *surface = get_android_surface( window_surface );
ANativeWindow_Buffer buffer; ANativeWindow_Buffer buffer;
...@@ -804,7 +804,7 @@ static void android_surface_flush( struct window_surface *window_surface ) ...@@ -804,7 +804,7 @@ static void android_surface_flush( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* android_surface_destroy * android_surface_destroy
*/ */
static void android_surface_destroy( struct window_surface *window_surface ) static void CDECL android_surface_destroy( struct window_surface *window_surface )
{ {
struct android_window_surface *surface = get_android_surface( window_surface ); struct android_window_surface *surface = get_android_surface( window_surface );
......
dlls/winemac.drv/surface.c
View file @ b16f552e
...@@ -96,7 +96,7 @@ static void update_blit_data(struct macdrv_window_surface *surface) ...@@ -96,7 +96,7 @@ static void update_blit_data(struct macdrv_window_surface *surface)
/*********************************************************************** /***********************************************************************
* macdrv_surface_lock * macdrv_surface_lock
*/ */
static void macdrv_surface_lock(struct window_surface *window_surface) static void CDECL macdrv_surface_lock(struct window_surface *window_surface)
{ {
struct macdrv_window_surface *surface = get_mac_surface(window_surface); struct macdrv_window_surface *surface = get_mac_surface(window_surface);
...@@ -106,7 +106,7 @@ static void macdrv_surface_lock(struct window_surface *window_surface) ...@@ -106,7 +106,7 @@ static void macdrv_surface_lock(struct window_surface *window_surface)
/*********************************************************************** /***********************************************************************
* macdrv_surface_unlock * macdrv_surface_unlock
*/ */
static void macdrv_surface_unlock(struct window_surface *window_surface) static void CDECL macdrv_surface_unlock(struct window_surface *window_surface)
{ {
struct macdrv_window_surface *surface = get_mac_surface(window_surface); struct macdrv_window_surface *surface = get_mac_surface(window_surface);
...@@ -116,8 +116,8 @@ static void macdrv_surface_unlock(struct window_surface *window_surface) ...@@ -116,8 +116,8 @@ static void macdrv_surface_unlock(struct window_surface *window_surface)
/*********************************************************************** /***********************************************************************
* macdrv_surface_get_bitmap_info * macdrv_surface_get_bitmap_info
*/ */
static void *macdrv_surface_get_bitmap_info(struct window_surface *window_surface, static void *CDECL macdrv_surface_get_bitmap_info(struct window_surface *window_surface,
BITMAPINFO *info) BITMAPINFO *info)
{ {
struct macdrv_window_surface *surface = get_mac_surface(window_surface); struct macdrv_window_surface *surface = get_mac_surface(window_surface);
...@@ -128,7 +128,7 @@ static void *macdrv_surface_get_bitmap_info(struct window_surface *window_surfac ...@@ -128,7 +128,7 @@ static void *macdrv_surface_get_bitmap_info(struct window_surface *window_surfac
/*********************************************************************** /***********************************************************************
* macdrv_surface_get_bounds * macdrv_surface_get_bounds
*/ */
static RECT *macdrv_surface_get_bounds(struct window_surface *window_surface) static RECT *CDECL macdrv_surface_get_bounds(struct window_surface *window_surface)
{ {
struct macdrv_window_surface *surface = get_mac_surface(window_surface); struct macdrv_window_surface *surface = get_mac_surface(window_surface);
...@@ -138,7 +138,7 @@ static RECT *macdrv_surface_get_bounds(struct window_surface *window_surface) ...@@ -138,7 +138,7 @@ static RECT *macdrv_surface_get_bounds(struct window_surface *window_surface)
/*********************************************************************** /***********************************************************************
* macdrv_surface_set_region * macdrv_surface_set_region
*/ */
static void macdrv_surface_set_region(struct window_surface *window_surface, HRGN region) static void CDECL macdrv_surface_set_region(struct window_surface *window_surface, HRGN region)
{ {
struct macdrv_window_surface *surface = get_mac_surface(window_surface); struct macdrv_window_surface *surface = get_mac_surface(window_surface);
...@@ -164,7 +164,7 @@ static void macdrv_surface_set_region(struct window_surface *window_surface, HRG ...@@ -164,7 +164,7 @@ static void macdrv_surface_set_region(struct window_surface *window_surface, HRG
/*********************************************************************** /***********************************************************************
* macdrv_surface_flush * macdrv_surface_flush
*/ */
static void macdrv_surface_flush(struct window_surface *window_surface) static void CDECL macdrv_surface_flush(struct window_surface *window_surface)
{ {
struct macdrv_window_surface *surface = get_mac_surface(window_surface); struct macdrv_window_surface *surface = get_mac_surface(window_surface);
CGRect rect; CGRect rect;
...@@ -200,7 +200,7 @@ static void macdrv_surface_flush(struct window_surface *window_surface) ...@@ -200,7 +200,7 @@ static void macdrv_surface_flush(struct window_surface *window_surface)
/*********************************************************************** /***********************************************************************
* macdrv_surface_destroy * macdrv_surface_destroy
*/ */
static void macdrv_surface_destroy(struct window_surface *window_surface) static void CDECL macdrv_surface_destroy(struct window_surface *window_surface)
{ {
struct macdrv_window_surface *surface = get_mac_surface(window_surface); struct macdrv_window_surface *surface = get_mac_surface(window_surface);
......
dlls/winex11.drv/bitblt.c
View file @ b16f552e
...@@ -1817,7 +1817,7 @@ failed: ...@@ -1817,7 +1817,7 @@ failed:
/*********************************************************************** /***********************************************************************
* x11drv_surface_lock * x11drv_surface_lock
*/ */
static void x11drv_surface_lock( struct window_surface *window_surface ) static void CDECL x11drv_surface_lock( struct window_surface *window_surface )
{ {
struct x11drv_window_surface *surface = get_x11_surface( window_surface ); struct x11drv_window_surface *surface = get_x11_surface( window_surface );
...@@ -1827,7 +1827,7 @@ static void x11drv_surface_lock( struct window_surface *window_surface ) ...@@ -1827,7 +1827,7 @@ static void x11drv_surface_lock( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* x11drv_surface_unlock * x11drv_surface_unlock
*/ */
static void x11drv_surface_unlock( struct window_surface *window_surface ) static void CDECL x11drv_surface_unlock( struct window_surface *window_surface )
{ {
struct x11drv_window_surface *surface = get_x11_surface( window_surface ); struct x11drv_window_surface *surface = get_x11_surface( window_surface );
...@@ -1837,7 +1837,7 @@ static void x11drv_surface_unlock( struct window_surface *window_surface ) ...@@ -1837,7 +1837,7 @@ static void x11drv_surface_unlock( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* x11drv_surface_get_bitmap_info * x11drv_surface_get_bitmap_info
*/ */
static void *x11drv_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) static void *CDECL x11drv_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info )
{ {
struct x11drv_window_surface *surface = get_x11_surface( window_surface ); struct x11drv_window_surface *surface = get_x11_surface( window_surface );
...@@ -1848,7 +1848,7 @@ static void *x11drv_surface_get_bitmap_info( struct window_surface *window_surfa ...@@ -1848,7 +1848,7 @@ static void *x11drv_surface_get_bitmap_info( struct window_surface *window_surfa
/*********************************************************************** /***********************************************************************
* x11drv_surface_get_bounds * x11drv_surface_get_bounds
*/ */
static RECT *x11drv_surface_get_bounds( struct window_surface *window_surface ) static RECT *CDECL x11drv_surface_get_bounds( struct window_surface *window_surface )
{ {
struct x11drv_window_surface *surface = get_x11_surface( window_surface ); struct x11drv_window_surface *surface = get_x11_surface( window_surface );
...@@ -1858,7 +1858,7 @@ static RECT *x11drv_surface_get_bounds( struct window_surface *window_surface ) ...@@ -1858,7 +1858,7 @@ static RECT *x11drv_surface_get_bounds( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* x11drv_surface_set_region * x11drv_surface_set_region
*/ */
static void x11drv_surface_set_region( struct window_surface *window_surface, HRGN region ) static void CDECL x11drv_surface_set_region( struct window_surface *window_surface, HRGN region )
{ {
RGNDATA *data; RGNDATA *data;
struct x11drv_window_surface *surface = get_x11_surface( window_surface ); struct x11drv_window_surface *surface = get_x11_surface( window_surface );
...@@ -1889,7 +1889,7 @@ static void x11drv_surface_set_region( struct window_surface *window_surface, HR ...@@ -1889,7 +1889,7 @@ static void x11drv_surface_set_region( struct window_surface *window_surface, HR
/*********************************************************************** /***********************************************************************
* x11drv_surface_flush * x11drv_surface_flush
*/ */
static void x11drv_surface_flush( struct window_surface *window_surface ) static void CDECL x11drv_surface_flush( struct window_surface *window_surface )
{ {
struct x11drv_window_surface *surface = get_x11_surface( window_surface ); struct x11drv_window_surface *surface = get_x11_surface( window_surface );
unsigned char *src = surface->bits; unsigned char *src = surface->bits;
...@@ -1956,7 +1956,7 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) ...@@ -1956,7 +1956,7 @@ static void x11drv_surface_flush( struct window_surface *window_surface )
/*********************************************************************** /***********************************************************************
* x11drv_surface_destroy * x11drv_surface_destroy
*/ */
static void x11drv_surface_destroy( struct window_surface *window_surface ) static void CDECL x11drv_surface_destroy( struct window_surface *window_surface )
{ {
struct x11drv_window_surface *surface = get_x11_surface( window_surface ); struct x11drv_window_surface *surface = get_x11_surface( window_surface );
......
include/wine/gdi_driver.h
View file @ b16f552e
...@@ -236,13 +236,13 @@ struct window_surface; ...@@ -236,13 +236,13 @@ struct window_surface;
struct window_surface_funcs struct window_surface_funcs
{ {
void (*lock)( struct window_surface *surface ); void (CDECL *lock)( struct window_surface *surface );
void (*unlock)( struct window_surface *surface ); void (CDECL *unlock)( struct window_surface *surface );
void* (*get_info)( struct window_surface *surface, BITMAPINFO *info ); void* (CDECL *get_info)( struct window_surface *surface, BITMAPINFO *info );
RECT* (*get_bounds)( struct window_surface *surface ); RECT* (CDECL *get_bounds)( struct window_surface *surface );
void (*set_region)( struct window_surface *surface, HRGN region ); void (CDECL *set_region)( struct window_surface *surface, HRGN region );
void (*flush)( struct window_surface *surface ); void (CDECL *flush)( struct window_surface *surface );
void (*destroy)( struct window_surface *surface ); void (CDECL *destroy)( struct window_surface *surface );
}; };
struct window_surface struct window_surface
......
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