[PATCH v2 0/2] MR1504: win32u: Remove __wine_get_wgl_driver PE entry point.
-- v2: win32u: Don't use CDECL for __wine_get_wgl_driver. win32u: Remove __wine_get_wgl_driver PE entry point. https://gitlab.winehq.org/wine/wine/-/merge_requests/1504
From: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/win32u.spec | 3 --- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ 4 files changed, 11 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index f8a1bd96f8f..3cd6d86c317 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1149,7 +1149,6 @@ static struct unix_funcs unix_funcs = __wine_get_brush_bitmap_info, __wine_get_file_outline_text_metric, __wine_get_icm_profile, - __wine_get_wgl_driver, __wine_send_input, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 3771dafcf76..c9c126ec2f3 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1323,9 +1323,6 @@ # Graphics drivers @ cdecl __wine_send_input(long ptr ptr) -# OpenGL -@ cdecl __wine_get_wgl_driver(long long) - # gdi32 @ stdcall SetDIBits(long long long long ptr ptr long) @ cdecl __wine_get_brush_bitmap_info(long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e8ff02ffb75..31d832f321f 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -207,7 +207,6 @@ struct unix_funcs BOOL (CDECL *get_brush_bitmap_info)( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ); BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); - struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); }; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index c5078c8a7f7..e128705ef37 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -798,12 +798,6 @@ BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTME return unix_funcs->get_file_outline_text_metric( path, otm ); } -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) -{ - if (!unix_funcs) return NULL; - return unix_funcs->get_wgl_driver( hdc, version ); -} - BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ) { if (!unix_funcs) return FALSE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1504
From: Jacek Caban <jacek(a)codeweavers.com> --- 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 300ae2a1153..943ff401aef 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 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1504
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1504
participants (3)
-
Huw Davies (＠huw) -
Jacek Caban
-
Jacek Caban (＠jacek)