Module: wine Branch: master Commit: c2a43defec3efca05d38cd83ffa53412766fdc80 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a43defec3efca05d38cd83ffa5341...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Nov 22 16:46:14 2022 +0100
win32u: Don't use CDECL for __wine_get_wgl_driver.
---
dlls/opengl32/make_opengl | 2 +- dlls/win32u/dc.c | 2 +- include/wine/gdi_driver.h | 2 -- include/wine/wgl_driver.h | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5654ddfa824..5d995495abd 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -925,7 +925,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n";
-print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER;
diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 2e59dc8dc9c..8379cd353ef 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -1491,7 +1491,7 @@ BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCH /*********************************************************************** * __wine_get_wgl_driver (win32u.@) */ -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) +struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ) { BOOL is_display, is_memdc; DC *dc; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index edde473b4d1..d074c09cceb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -340,6 +340,4 @@ extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT
#endif /* WINE_UNIX_LIB */
-extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); - #endif /* __WINE_WINE_GDI_DRIVER_H */ diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index 36b1f384ddf..c35847ff2e4 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 21 +#define WINE_WGL_DRIVER_VERSION 22
struct wgl_context; struct wgl_pbuffer; @@ -3405,6 +3405,6 @@ struct opengl_funcs USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport)
-extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); +extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );
#endif /* __WINE_WGL_DRIVER_H */