include: Use proper dllimports for win32u functions.

dlls/opengl32/make_opengl

@@ -919,8 +919,6 @@ foreach (sort keys %norm_functions)
     printf HEADER " \\\n    USE_GL_FUNC(\%s)", $_;
 }
 print HEADER "\n\n";
-
-print HEADER "extern const struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n";
 print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n";
 close HEADER;
 

dlls/opengl32/unix_private.h

@@ -28,6 +28,7 @@
 #include "winbase.h"
 #include "winternl.h"
 #include "wingdi.h"
+#include "ntgdi.h"
 
 #include "wine/wgl.h"
 #include "wine/wgl_driver.h"

dlls/win32u/Makefile.in

-EXTRADEFS = -DWINGDIAPI= -DWINUSERAPI=
+EXTRADEFS = -D_WIN32U_
 MODULE    = win32u.dll
 UNIXLIB   = win32u.so
 IMPORTLIB = win32u

dlls/win32u/font.c

@@ -7073,7 +7073,7 @@ BOOL WINAPI NtGdiGetCharWidthInfo( HDC hdc, struct char_width_info *info )
 /***********************************************************************
  *           DrawTextW    (win32u.so)
  */
-INT WINAPI DECLSPEC_HIDDEN DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT *rect, UINT flags )
+INT WINAPI DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT *rect, UINT flags )
 {
     struct draw_text_params *params;
     ULONG ret_len, size;

dlls/winevulkan/make_vulkan

@@ -3136,8 +3136,6 @@ class VkGenerator(object):
         f.write("    VkSurfaceKHR (*p_wine_get_native_surface)(VkSurfaceKHR);\n")
         f.write("};\n\n")
 
-        f.write("extern const struct vulkan_funcs * __wine_get_vulkan_driver(UINT version);\n\n")
-
         f.write("static inline void *get_vulkan_driver_device_proc_addr(\n")
         f.write("        const struct vulkan_funcs *vulkan_funcs, const char *name)\n{\n")
         f.write("    if (!name || name[0] != 'v' || name[1] != 'k') return NULL;\n\n")

dlls/winevulkan/vulkan.c

@@ -26,6 +26,7 @@
 
 #include "vulkan_private.h"
 #include "wine/vulkan_driver.h"
+#include "ntgdi.h"
 #include "ntuser.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(vulkan);

include/wine/gdi_driver.h

@@ -347,9 +347,9 @@ struct user_driver_funcs
     void    (*pThreadDetach)(void);
 };
 
-extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version );
+W32KAPI void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version );
 
-extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal );
-extern int win32u_get_window_pixel_format( HWND hwnd );
+W32KAPI BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal );
+W32KAPI int win32u_get_window_pixel_format( HWND hwnd );
 
 #endif /* __WINE_WINE_GDI_DRIVER_H */

include/wine/vulkan_driver.h

@@ -46,8 +46,6 @@ struct vulkan_funcs
     VkSurfaceKHR (*p_wine_get_native_surface)(VkSurfaceKHR);
 };
 
-extern const struct vulkan_funcs * __wine_get_vulkan_driver(UINT version);
-
 static inline void *get_vulkan_driver_device_proc_addr(
         const struct vulkan_funcs *vulkan_funcs, const char *name)
 {

include/wine/wgl_driver.h

@@ -3405,6 +3405,4 @@ struct opengl_funcs
     USE_GL_FUNC(glVertexPointer) \
     USE_GL_FUNC(glViewport)
 
-extern const struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );
-
 #endif /* __WINE_WGL_DRIVER_H */