diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c
index 1c6d930230a..5242e646e58 100644
--- a/dlls/gdi32/dibdrv/opengl.c
+++ b/dlls/gdi32/dibdrv/opengl.c
@@ -143,7 +143,7 @@ failed:
 /**********************************************************************
  *	     dibdrv_wglDescribePixelFormat
  */
-static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr )
+static int WINAPI dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr )
 {
     int ret = ARRAY_SIZE( pixel_formats );
 
@@ -180,7 +180,7 @@ static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORM
 /***********************************************************************
  *		dibdrv_wglCopyContext
  */
-static BOOL dibdrv_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask )
+static BOOL WINAPI dibdrv_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask )
 {
     FIXME( "not supported yet\n" );
     return FALSE;
@@ -189,7 +189,7 @@ static BOOL dibdrv_wglCopyContext( struct wgl_context *src, struct wgl_context *
 /***********************************************************************
  *		dibdrv_wglCreateContext
  */
-static struct wgl_context *dibdrv_wglCreateContext( HDC hdc )
+static struct wgl_context * WINAPI dibdrv_wglCreateContext( HDC hdc )
 {
     struct wgl_context *context;
 
@@ -211,7 +211,7 @@ static struct wgl_context *dibdrv_wglCreateContext( HDC hdc )
 /***********************************************************************
  *		dibdrv_wglDeleteContext
  */
-static BOOL dibdrv_wglDeleteContext( struct wgl_context *context )
+static BOOL WINAPI dibdrv_wglDeleteContext( struct wgl_context *context )
 {
     pOSMesaDestroyContext( context->context );
     HeapFree( GetProcessHeap(), 0, context );
@@ -221,7 +221,7 @@ static BOOL dibdrv_wglDeleteContext( struct wgl_context *context )
 /***********************************************************************
  *		dibdrv_wglGetPixelFormat
  */
-static int dibdrv_wglGetPixelFormat( HDC hdc )
+static int WINAPI dibdrv_wglGetPixelFormat( HDC hdc )
 {
     DC *dc = get_dc_ptr( hdc );
     int ret = 0;
@@ -237,7 +237,7 @@ static int dibdrv_wglGetPixelFormat( HDC hdc )
 /***********************************************************************
  *		dibdrv_wglGetProcAddress
  */
-static PROC dibdrv_wglGetProcAddress( const char *proc )
+static PROC WINAPI dibdrv_wglGetProcAddress( const char *proc )
 {
     if (!strncmp( proc, "wgl", 3 )) return NULL;
     return (PROC)pOSMesaGetProcAddress( proc );
@@ -246,7 +246,7 @@ static PROC dibdrv_wglGetProcAddress( const char *proc )
 /***********************************************************************
  *		dibdrv_wglMakeCurrent
  */
-static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
+static BOOL WINAPI dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
 {
     HBITMAP bitmap;
     BITMAPOBJ *bmp;
@@ -301,7 +301,7 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
 /**********************************************************************
  *	     dibdrv_wglSetPixelFormat
  */
-static BOOL dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr )
+static BOOL WINAPI dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr )
 {
     if (fmt <= 0 || fmt > ARRAY_SIZE( pixel_formats )) return FALSE;
     return GdiSetPixelFormat( hdc, fmt, descr );
@@ -310,7 +310,7 @@ static BOOL dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIP
 /***********************************************************************
  *		dibdrv_wglShareLists
  */
-static BOOL dibdrv_wglShareLists( struct wgl_context *org, struct wgl_context *dest )
+static BOOL WINAPI dibdrv_wglShareLists( struct wgl_context *org, struct wgl_context *dest )
 {
     FIXME( "not supported yet\n" );
     return FALSE;
@@ -319,7 +319,7 @@ static BOOL dibdrv_wglShareLists( struct wgl_context *org, struct wgl_context *d
 /***********************************************************************
  *		dibdrv_wglSwapBuffers
  */
-static BOOL dibdrv_wglSwapBuffers( HDC hdc )
+static BOOL WINAPI dibdrv_wglSwapBuffers( HDC hdc )
 {
     return TRUE;
 }
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl
index 1cf55e1e87c..cd04b343887 100755
--- a/dlls/opengl32/make_opengl
+++ b/dlls/opengl32/make_opengl
@@ -222,14 +222,14 @@ sub GenerateThunk($$$)
     return $ret;
 }
 
-sub generate_null_func($$)
+sub generate_null_func($$$)
 {
-    my ($name, $func_ref) = @_;
+    my ($name, $func_ref, $callconv) = @_;
     my $ret;
 
     return "" if $name eq "glDebugEntry";
 
-    $ret = get_func_proto( "static %s null_%s(%s)", $name, $func_ref, 1 );
+    $ret = get_func_proto( "static %s$callconv null_%s(%s)", $name, $func_ref, 1 );
     $ret .= " {";
     if ($name eq "glGetError")
     {
@@ -611,7 +611,7 @@ print HEADER "    struct\n    {\n";
 foreach (sort keys %wgl_functions)
 {
     next unless defined $supported_wgl_functions{$_};
-    print HEADER get_func_proto("        %-10s (WINE_GLAPI *p_%s)(%s);\n", $_, $wgl_functions{$_}, 1);
+    print HEADER get_func_proto("        %-10s (WINAPI *p_%s)(%s);\n", $_, $wgl_functions{$_}, 1);
 }
 print HEADER "    } wgl;\n\n";
 
@@ -717,13 +717,13 @@ foreach (sort keys %norm_functions) {
 
 foreach (sort keys %wgl_functions) {
     next unless defined $supported_wgl_functions{$_};
-    print NORM generate_null_func($_, $wgl_functions{$_});
+    print NORM generate_null_func($_, $wgl_functions{$_}, " WINAPI");
 }
 foreach (sort keys %norm_functions) {
-    print NORM generate_null_func($_, $norm_functions{$_});
+    print NORM generate_null_func($_, $norm_functions{$_}, "");
 }
 foreach (sort keys %ext_functions) {
-    print NORM generate_null_func($_, $ext_functions{$_});
+    print NORM generate_null_func($_, $ext_functions{$_}, "");
 }
 
 print NORM "\nstruct opengl_funcs null_opengl_funcs =\n{\n    {\n";
diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c
index aa8f6f06fdf..8b1b9c77287 100644
--- a/dlls/opengl32/opengl_norm.c
+++ b/dlls/opengl32/opengl_norm.c
@@ -2346,16 +2346,16 @@ void WINAPI glViewport( GLint x, GLint y, GLsizei width, GLsizei height )
   funcs->gl.p_glViewport( x, y, width, height );
 }
 
-static BOOL null_wglCopyContext( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask ) { return 0; }
-static struct wgl_context * null_wglCreateContext( HDC hDc ) { return 0; }
-static BOOL null_wglDeleteContext( struct wgl_context * oldContext ) { return 0; }
-static int null_wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ) { return 0; }
-static int null_wglGetPixelFormat( HDC hdc ) { return 0; }
-static PROC null_wglGetProcAddress( LPCSTR lpszProc ) { return 0; }
-static BOOL null_wglMakeCurrent( HDC hDc, struct wgl_context * newContext ) { return 0; }
-static BOOL null_wglSetPixelFormat( HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd ) { return 0; }
-static BOOL null_wglShareLists( struct wgl_context * hrcSrvShare, struct wgl_context * hrcSrvSource ) { return 0; }
-static BOOL null_wglSwapBuffers( HDC hdc ) { return 0; }
+static BOOL WINAPI null_wglCopyContext( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask ) { return 0; }
+static struct wgl_context * WINAPI null_wglCreateContext( HDC hDc ) { return 0; }
+static BOOL WINAPI null_wglDeleteContext( struct wgl_context * oldContext ) { return 0; }
+static int WINAPI null_wglDescribePixelFormat( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd ) { return 0; }
+static int WINAPI null_wglGetPixelFormat( HDC hdc ) { return 0; }
+static PROC WINAPI null_wglGetProcAddress( LPCSTR lpszProc ) { return 0; }
+static BOOL WINAPI null_wglMakeCurrent( HDC hDc, struct wgl_context * newContext ) { return 0; }
+static BOOL WINAPI null_wglSetPixelFormat( HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd ) { return 0; }
+static BOOL WINAPI null_wglShareLists( struct wgl_context * hrcSrvShare, struct wgl_context * hrcSrvSource ) { return 0; }
+static BOOL WINAPI null_wglSwapBuffers( HDC hdc ) { return 0; }
 static void null_glAccum( GLenum op, GLfloat value ) { }
 static void null_glAlphaFunc( GLenum func, GLfloat ref ) { }
 static GLboolean null_glAreTexturesResident( GLsizei n, const GLuint *textures, GLboolean *residences ) { return 0; }
diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c
index 93e77c423b5..281f63219af 100644
--- a/dlls/wineandroid.drv/opengl.c
+++ b/dlls/wineandroid.drv/opengl.c
@@ -418,7 +418,7 @@ static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format )
 /***********************************************************************
  *		android_wglCopyContext
  */
-static BOOL android_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask )
+static BOOL WINAPI android_wglCopyContext( struct wgl_context *src, struct wgl_context *dst, UINT mask )
 {
     FIXME( "%p -> %p mask %#x unsupported\n", src, dst, mask );
     return FALSE;
@@ -427,7 +427,7 @@ static BOOL android_wglCopyContext( struct wgl_context *src, struct wgl_context
 /***********************************************************************
  *		android_wglCreateContext
  */
-static struct wgl_context *android_wglCreateContext( HDC hdc )
+static struct wgl_context * WINAPI android_wglCreateContext( HDC hdc )
 {
     int egl_attribs[3] = { EGL_CONTEXT_CLIENT_VERSION, egl_client_version, EGL_NONE };
 
@@ -437,7 +437,7 @@ static struct wgl_context *android_wglCreateContext( HDC hdc )
 /***********************************************************************
  *		android_wglDeleteContext
  */
-static BOOL android_wglDeleteContext( struct wgl_context *ctx )
+static BOOL WINAPI android_wglDeleteContext( struct wgl_context *ctx )
 {
     EnterCriticalSection( &drawable_section );
     list_remove( &ctx->entry );
@@ -449,7 +449,7 @@ static BOOL android_wglDeleteContext( struct wgl_context *ctx )
 /***********************************************************************
  *		android_wglDescribePixelFormat
  */
-static int android_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd )
+static int WINAPI android_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd )
 {
     EGLint val;
     EGLConfig config;
@@ -495,7 +495,7 @@ static int android_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFOR
 /***********************************************************************
  *		android_wglGetPixelFormat
  */
-static int android_wglGetPixelFormat( HDC hdc )
+static int WINAPI android_wglGetPixelFormat( HDC hdc )
 {
     struct gl_drawable *gl;
     int ret = 0;
@@ -513,7 +513,7 @@ static int android_wglGetPixelFormat( HDC hdc )
 /***********************************************************************
  *		android_wglGetProcAddress
  */
-static PROC android_wglGetProcAddress( LPCSTR name )
+static PROC WINAPI android_wglGetProcAddress( LPCSTR name )
 {
     PROC ret;
     if (!strncmp( name, "wgl", 3 )) return NULL;
@@ -525,7 +525,7 @@ static PROC android_wglGetProcAddress( LPCSTR name )
 /***********************************************************************
  *		android_wglMakeCurrent
  */
-static BOOL android_wglMakeCurrent( HDC hdc, struct wgl_context *ctx )
+static BOOL WINAPI android_wglMakeCurrent( HDC hdc, struct wgl_context *ctx )
 {
     BOOL ret = FALSE;
     struct gl_drawable *gl;
@@ -565,7 +565,7 @@ done:
 /***********************************************************************
  *		android_wglSetPixelFormat
  */
-static BOOL android_wglSetPixelFormat( HDC hdc, int format, const PIXELFORMATDESCRIPTOR *pfd )
+static BOOL WINAPI android_wglSetPixelFormat( HDC hdc, int format, const PIXELFORMATDESCRIPTOR *pfd )
 {
     return set_pixel_format( hdc, format, FALSE );
 }
@@ -573,7 +573,7 @@ static BOOL android_wglSetPixelFormat( HDC hdc, int format, const PIXELFORMATDES
 /***********************************************************************
  *		android_wglShareLists
  */
-static BOOL android_wglShareLists( struct wgl_context *org, struct wgl_context *dest )
+static BOOL WINAPI android_wglShareLists( struct wgl_context *org, struct wgl_context *dest )
 {
     FIXME( "%p %p\n", org, dest );
     return FALSE;
@@ -582,7 +582,7 @@ static BOOL android_wglShareLists( struct wgl_context *org, struct wgl_context *
 /***********************************************************************
  *		android_wglSwapBuffers
  */
-static BOOL android_wglSwapBuffers( HDC hdc )
+static BOOL WINAPI android_wglSwapBuffers( HDC hdc )
 {
     struct wgl_context *ctx = NtCurrentTeb()->glContext;
 
diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index 402dd8190c7..b80c8fffb0c 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -4340,7 +4340,7 @@ void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, cons
 /**********************************************************************
  *              macdrv_wglDescribePixelFormat
  */
-int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr)
+static int WINAPI macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr)
 {
     const pixel_format *pf;
     const struct color_mode *mode;
@@ -4406,7 +4406,7 @@ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRI
 /***********************************************************************
  *              macdrv_wglCopyContext
  */
-static BOOL macdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask)
+static BOOL WINAPI macdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask)
 {
     CGLError err;
 
@@ -4421,7 +4421,7 @@ static BOOL macdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *d
 /***********************************************************************
  *              macdrv_wglCreateContext
  */
-static struct wgl_context *macdrv_wglCreateContext(HDC hdc)
+static struct wgl_context * WINAPI macdrv_wglCreateContext(HDC hdc)
 {
     struct wgl_context *context;
 
@@ -4435,7 +4435,7 @@ static struct wgl_context *macdrv_wglCreateContext(HDC hdc)
 /***********************************************************************
  *              macdrv_wglDeleteContext
  */
-static BOOL macdrv_wglDeleteContext(struct wgl_context *context)
+static BOOL WINAPI macdrv_wglDeleteContext(struct wgl_context *context)
 {
     TRACE("deleting context %p/%p/%p\n", context, context->context, context->cglcontext);
 
@@ -4450,7 +4450,7 @@ static BOOL macdrv_wglDeleteContext(struct wgl_context *context)
 /***********************************************************************
  *              macdrv_wglGetPixelFormat
  */
-static int macdrv_wglGetPixelFormat(HDC hdc)
+static int WINAPI macdrv_wglGetPixelFormat(HDC hdc)
 {
     int format;
 
@@ -4472,7 +4472,7 @@ static int macdrv_wglGetPixelFormat(HDC hdc)
 /***********************************************************************
  *              macdrv_wglGetProcAddress
  */
-static PROC macdrv_wglGetProcAddress(const char *proc)
+static PROC WINAPI macdrv_wglGetProcAddress(const char *proc)
 {
     void *ret;
 
@@ -4497,7 +4497,7 @@ static PROC macdrv_wglGetProcAddress(const char *proc)
 /***********************************************************************
  *              macdrv_wglMakeCurrent
  */
-static BOOL macdrv_wglMakeCurrent(HDC hdc, struct wgl_context *context)
+static BOOL WINAPI macdrv_wglMakeCurrent(HDC hdc, struct wgl_context *context)
 {
     TRACE("hdc %p context %p/%p/%p\n", hdc, context, (context ? context->context : NULL),
           (context ? context->cglcontext : NULL));
@@ -4508,7 +4508,7 @@ static BOOL macdrv_wglMakeCurrent(HDC hdc, struct wgl_context *context)
 /**********************************************************************
  *              macdrv_wglSetPixelFormat
  */
-static BOOL macdrv_wglSetPixelFormat(HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr)
+static BOOL WINAPI macdrv_wglSetPixelFormat(HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr)
 {
     return set_pixel_format(hdc, fmt, FALSE);
 }
@@ -4516,7 +4516,7 @@ static BOOL macdrv_wglSetPixelFormat(HDC hdc, int fmt, const PIXELFORMATDESCRIPT
 /***********************************************************************
  *              macdrv_wglShareLists
  */
-static BOOL macdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest)
+static BOOL WINAPI macdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest)
 {
     macdrv_opengl_context saved_context;
     CGLContextObj saved_cglcontext;
@@ -4569,7 +4569,7 @@ static BOOL macdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de
 /**********************************************************************
  *              macdrv_wglSwapBuffers
  */
-static BOOL macdrv_wglSwapBuffers(HDC hdc)
+static BOOL WINAPI macdrv_wglSwapBuffers(HDC hdc)
 {
     struct wgl_context *context = NtCurrentTeb()->glContext;
     BOOL match = FALSE;
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 3197a179e02..4a3ab31273a 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1533,8 +1533,8 @@ void destroy_gl_drawable( HWND hwnd )
  *
  * Get the pixel-format descriptor associated to the given id
  */
-static int glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat,
-                                          UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd)
+static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat,
+                                                 UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd)
 {
   /*XVisualInfo *vis;*/
   int value;
@@ -1665,7 +1665,7 @@ static int glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat,
 /***********************************************************************
  *		glxdrv_wglGetPixelFormat
  */
-static int glxdrv_wglGetPixelFormat( HDC hdc )
+static int WINAPI glxdrv_wglGetPixelFormat( HDC hdc )
 {
     struct gl_drawable *gl;
     int ret = 0;
@@ -1685,7 +1685,7 @@ static int glxdrv_wglGetPixelFormat( HDC hdc )
 /***********************************************************************
  *		glxdrv_wglSetPixelFormat
  */
-static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd )
+static BOOL WINAPI glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd )
 {
     return set_pixel_format(hdc, iPixelFormat, FALSE);
 }
@@ -1693,7 +1693,7 @@ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORM
 /***********************************************************************
  *		glxdrv_wglCopyContext
  */
-static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask)
+static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask)
 {
     TRACE("%p -> %p mask %#x\n", src, dst, mask);
 
@@ -1706,7 +1706,7 @@ static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *d
 /***********************************************************************
  *		glxdrv_wglCreateContext
  */
-static struct wgl_context *glxdrv_wglCreateContext( HDC hdc )
+static struct wgl_context * WINAPI glxdrv_wglCreateContext( HDC hdc )
 {
     struct wgl_context *ret;
     struct gl_drawable *gl;
@@ -1734,7 +1734,7 @@ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc )
 /***********************************************************************
  *		glxdrv_wglDeleteContext
  */
-static BOOL glxdrv_wglDeleteContext(struct wgl_context *ctx)
+static BOOL WINAPI glxdrv_wglDeleteContext(struct wgl_context *ctx)
 {
     struct wgl_pbuffer *pb;
 
@@ -1762,7 +1762,7 @@ static BOOL glxdrv_wglDeleteContext(struct wgl_context *ctx)
 /***********************************************************************
  *		glxdrv_wglGetProcAddress
  */
-static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc)
+static PROC WINAPI glxdrv_wglGetProcAddress(LPCSTR lpszProc)
 {
     if (!strncmp(lpszProc, "wgl", 3)) return NULL;
     return pglXGetProcAddressARB((const GLubyte*)lpszProc);
@@ -1787,7 +1787,7 @@ static void set_context_drawables( struct wgl_context *ctx, struct gl_drawable *
 /***********************************************************************
  *		glxdrv_wglMakeCurrent
  */
-static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
+static BOOL WINAPI glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx)
 {
     BOOL ret = FALSE;
     struct gl_drawable *gl;
@@ -1884,7 +1884,7 @@ done:
 /***********************************************************************
  *		glxdrv_wglShareLists
  */
-static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest)
+static BOOL WINAPI glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest)
 {
     TRACE("(%p, %p)\n", org, dest);
 
@@ -3235,7 +3235,7 @@ static void X11DRV_WineGL_LoadExtensions(void)
  *
  * Swap the buffers of this DC
  */
-static BOOL glxdrv_wglSwapBuffers( HDC hdc )
+static BOOL WINAPI glxdrv_wglSwapBuffers( HDC hdc )
 {
     struct x11drv_escape_flush_gl_drawable escape;
     struct gl_drawable *gl;
diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h
index 9c0a3f438ff..f077a3d0f09 100644
--- a/include/wine/wgl_driver.h
+++ b/include/wine/wgl_driver.h
@@ -7,7 +7,7 @@
 #define WINE_GLAPI
 #endif
 
-#define WINE_WGL_DRIVER_VERSION 20
+#define WINE_WGL_DRIVER_VERSION 21
 
 struct wgl_context;
 struct wgl_pbuffer;
@@ -16,16 +16,16 @@ struct opengl_funcs
 {
     struct
     {
-        BOOL       (WINE_GLAPI *p_wglCopyContext)( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask );
-        struct wgl_context * (WINE_GLAPI *p_wglCreateContext)( HDC hDc );
-        BOOL       (WINE_GLAPI *p_wglDeleteContext)( struct wgl_context * oldContext );
-        int        (WINE_GLAPI *p_wglDescribePixelFormat)( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd );
-        int        (WINE_GLAPI *p_wglGetPixelFormat)( HDC hdc );
-        PROC       (WINE_GLAPI *p_wglGetProcAddress)( LPCSTR lpszProc );
-        BOOL       (WINE_GLAPI *p_wglMakeCurrent)( HDC hDc, struct wgl_context * newContext );
-        BOOL       (WINE_GLAPI *p_wglSetPixelFormat)( HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd );
-        BOOL       (WINE_GLAPI *p_wglShareLists)( struct wgl_context * hrcSrvShare, struct wgl_context * hrcSrvSource );
-        BOOL       (WINE_GLAPI *p_wglSwapBuffers)( HDC hdc );
+        BOOL       (WINAPI *p_wglCopyContext)( struct wgl_context * hglrcSrc, struct wgl_context * hglrcDst, UINT mask );
+        struct wgl_context * (WINAPI *p_wglCreateContext)( HDC hDc );
+        BOOL       (WINAPI *p_wglDeleteContext)( struct wgl_context * oldContext );
+        int        (WINAPI *p_wglDescribePixelFormat)( HDC hdc, int ipfd, UINT cjpfd, PIXELFORMATDESCRIPTOR *ppfd );
+        int        (WINAPI *p_wglGetPixelFormat)( HDC hdc );
+        PROC       (WINAPI *p_wglGetProcAddress)( LPCSTR lpszProc );
+        BOOL       (WINAPI *p_wglMakeCurrent)( HDC hDc, struct wgl_context * newContext );
+        BOOL       (WINAPI *p_wglSetPixelFormat)( HDC hdc, int ipfd, const PIXELFORMATDESCRIPTOR *ppfd );
+        BOOL       (WINAPI *p_wglShareLists)( struct wgl_context * hrcSrvShare, struct wgl_context * hrcSrvSource );
+        BOOL       (WINAPI *p_wglSwapBuffers)( HDC hdc );
     } wgl;
 
     struct