Jacek Caban : win32u: Don't use CDECL for OSMesa functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fd413f69c9c617d30c5e12d8eaaad79e12e9a00d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fd413f69c9c617d30c5e12d8e...

Author: Jacek Caban 
Date:   Fri Oct 15 16:53:50 2021 +0200

win32u: Don't use CDECL for OSMesa functions.

Signed-off-by: Jacek Caban 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/win32u/dibdrv/dibdrv.h | 12 ++++++------
 dlls/win32u/dibdrv/opengl.c | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/win32u/dibdrv/dibdrv.h b/dlls/win32u/dibdrv/dibdrv.h
index d5606388e30..b6f6bb41098 100644
--- a/dlls/win32u/dibdrv/dibdrv.h
+++ b/dlls/win32u/dibdrv/dibdrv.h
@@ -292,12 +292,12 @@ static inline const RGBQUAD *get_dib_color_table( const dib_info *dib )

struct osmesa_funcs
 {
-    void (CDECL *get_gl_funcs)( struct opengl_funcs *funcs );
-    struct wgl_context * (CDECL *create_context)( HDC hdc, const PIXELFORMATDESCRIPTOR *descr );
-    BOOL (CDECL *delete_context)( struct wgl_context *context );
-    PROC (CDECL *get_proc_address)( const char *proc );
-    BOOL (CDECL *make_current)( struct wgl_context *context, void *bits,
-                                int width, int height, int bpp, int stride );
+    void (*get_gl_funcs)( struct opengl_funcs *funcs );
+    struct wgl_context * (*create_context)( HDC hdc, const PIXELFORMATDESCRIPTOR *descr );
+    BOOL (*delete_context)( struct wgl_context *context );
+    PROC (*get_proc_address)( const char *proc );
+    BOOL (*make_current)( struct wgl_context *context, void *bits,
+                          int width, int height, int bpp, int stride );
 };

extern const struct osmesa_funcs *init_opengl_lib(void) DECLSPEC_HIDDEN;
diff --git a/dlls/win32u/dibdrv/opengl.c b/dlls/win32u/dibdrv/opengl.c
index 9261cc09299..9504e8efd25 100644
--- a/dlls/win32u/dibdrv/opengl.c
+++ b/dlls/win32u/dibdrv/opengl.c
@@ -119,7 +119,7 @@ failed:
 /***********************************************************************
  *		osmesa_get_gl_funcs
  */
-static void CDECL osmesa_get_gl_funcs( struct opengl_funcs *funcs )
+static void osmesa_get_gl_funcs( struct opengl_funcs *funcs )
 {
     funcs->gl = opengl_funcs.gl;
 }
@@ -127,7 +127,7 @@ static void CDECL osmesa_get_gl_funcs( struct opengl_funcs *funcs )
 /***********************************************************************
  *		osmesa_create_context
  */
-static struct wgl_context * CDECL osmesa_create_context( HDC hdc, const PIXELFORMATDESCRIPTOR *descr )
+static struct wgl_context * osmesa_create_context( HDC hdc, const PIXELFORMATDESCRIPTOR *descr )
 {
     struct wgl_context *context;
     UINT gl_format;
@@ -162,7 +162,7 @@ static struct wgl_context * CDECL osmesa_create_context( HDC hdc, const PIXELFOR
 /***********************************************************************
  *		osmesa_delete_context
  */
-static BOOL CDECL osmesa_delete_context( struct wgl_context *context )
+static BOOL osmesa_delete_context( struct wgl_context *context )
 {
     pOSMesaDestroyContext( context->context );
     free( context );
@@ -172,7 +172,7 @@ static BOOL CDECL osmesa_delete_context( struct wgl_context *context )
 /***********************************************************************
  *		osmesa_get_proc_address
  */
-static PROC CDECL osmesa_get_proc_address( const char *proc )
+static PROC osmesa_get_proc_address( const char *proc )
 {
     return (PROC)pOSMesaGetProcAddress( proc );
 }
@@ -180,8 +180,8 @@ static PROC CDECL osmesa_get_proc_address( const char *proc )
 /***********************************************************************
  *		osmesa_make_current
  */
-static BOOL CDECL osmesa_make_current( struct wgl_context *context, void *bits,
-                                       int width, int height, int bpp, int stride )
+static BOOL osmesa_make_current( struct wgl_context *context, void *bits,
+                                 int width, int height, int bpp, int stride )
 {
     BOOL ret;
     GLenum type;