[PATCH 1/7] win32u: Remove no longer used __wine_set_user_driver PE entry point.

[Jacek Caban]

From: Jacek Caban <jacek at codeweavers.com>

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
---
 dlls/win32u/driver.c         |  4 ++--
 dlls/win32u/gdiobj.c         |  1 -
 dlls/win32u/win32u.spec      |  1 -
 dlls/win32u/win32u_private.h |  1 -
 dlls/win32u/wrappers.c       |  9 ---------
 include/wine/gdi_driver.h    | 12 ++++++------
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 1f538d100ed..4a853b516f4 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -1223,9 +1223,9 @@ static const struct user_driver_funcs lazy_load_driver =
 const struct user_driver_funcs *user_driver = &lazy_load_driver;
 
 /******************************************************************************
- *	     __wine_set_user_driver   (win32u.@)
+ *	     __wine_set_user_driver   (win32u.so)
  */
-void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version )
+void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version )
 {
     struct user_driver_funcs *driver, *prev;
 
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c
index edb21456d8d..c29e7773e6c 100644
--- a/dlls/win32u/gdiobj.c
+++ b/dlls/win32u/gdiobj.c
@@ -1249,7 +1249,6 @@ static struct unix_funcs unix_funcs =
     __wine_get_vulkan_driver,
     __wine_get_wgl_driver,
     __wine_send_input,
-    __wine_set_user_driver,
 };
 
 NTSTATUS gdi_init(void)
diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec
index 17be6894508..8584fc4e5c3 100644
--- a/dlls/win32u/win32u.spec
+++ b/dlls/win32u/win32u.spec
@@ -1322,7 +1322,6 @@
 
 # Graphics drivers
 @ cdecl __wine_send_input(long ptr ptr)
-@ cdecl __wine_set_user_driver(ptr long)
 
 # OpenGL
 @ cdecl __wine_get_wgl_driver(long long)
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index fd6dba82da2..c5303010ef3 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -328,7 +328,6 @@ struct unix_funcs
     const struct vulkan_funcs * (CDECL *get_vulkan_driver)( UINT version );
     struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version );
     BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput );
-    void (CDECL *set_user_driver)( const struct user_driver_funcs *funcs, UINT version );
 };
 
 /* clipboard.c */
diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c
index 13b4b7164ab..b336059fe96 100644
--- a/dlls/win32u/wrappers.c
+++ b/dlls/win32u/wrappers.c
@@ -1408,15 +1408,6 @@ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *raw
     return unix_funcs->wine_send_input( hwnd, input, rawinput );
 }
 
-/***********************************************************************
- *           __wine_set_user_driver    (win32u.@)
- */
-void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version )
-{
-    if (!unix_funcs) return;
-    return unix_funcs->set_user_driver( funcs, version );
-}
-
 extern void wrappers_init( unixlib_handle_t handle )
 {
     const void *args;
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 52fd6fe49d3..998aa3ed3e9 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -168,7 +168,7 @@ struct gdi_dc_funcs
 };
 
 /* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 79
+#define WINE_GDI_DRIVER_VERSION 80
 
 #define GDI_PRIORITY_NULL_DRV        0  /* null driver */
 #define GDI_PRIORITY_FONT_DRV      100  /* any font driver */
@@ -196,9 +196,9 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g
 
 /* support for window surfaces */
 
-struct window_surface;
+#ifdef WINE_UNIX_LIB
 
-#ifndef __WINE_USE_MSVCRT
+struct window_surface;
 
 struct window_surface_funcs
 {
@@ -333,10 +333,10 @@ struct user_driver_funcs
     void    (*pThreadDetach)(void);
 };
 
-#endif /* __WINE_USE_MSVCRT */
+extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version );
+
+#endif /* WINE_UNIX_LIB */
 
-struct user_driver_funcs;
-extern void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version );
 extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );
 extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version );
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/211