gdi32: Don't export Wine extensions.

Link directly to win32u instead. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Don't export Wine extensions.
c166e969 · Jacek Caban · Alexandre Julliard · 80df54a4 · c166e969 · c166e969
Commit c166e969 authored Oct 08, 2021 by Jacek Caban Committed by Alexandre Julliard Oct 08, 2021
8 changed files
--- a/dlls/d3d12/Makefile.in
+++ b/dlls/d3d12/Makefile.in
 MODULE    = d3d12.dll
 IMPORTLIB = d3d12
-IMPORTS   = dxgi dxguid gdi32 user32 uuid
+IMPORTS   = dxgi dxguid gdi32 user32 uuid win32u
 EXTRALIBS = $(VKD3D_LIBS)
 EXTRAINCL = $(VKD3D_CFLAGS)


--- a/dlls/dxgi/Makefile.in
+++ b/dlls/dxgi/Makefile.in
 MODULE    = dxgi.dll
 IMPORTLIB = dxgi
-IMPORTS   = gdi32 dxguid uuid wined3d user32
+IMPORTS   = gdi32 dxguid uuid wined3d user32 win32u
 EXTRAINCL = $(VKD3D_CFLAGS)

 EXTRADLLFLAGS = -mcygwin

--- a/dlls/gdi.exe16/Makefile.in
+++ b/dlls/gdi.exe16/Makefile.in
 MODULE    = gdi.exe16
-IMPORTS   = user32 advapi32 gdi32
+IMPORTS   = user32 advapi32 gdi32 win32u

 EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520


--- a/dlls/gdi32/gdi32.spec
+++ b/dlls/gdi32/gdi32.spec
@@ -543,23 +543,3 @@
 @ extern pfnRealizePalette
 @ extern pfnSelectPalette
 @ stub pstackConnect
-
-################################################################
-# Wine extensions: Win16 functions that are needed by other dlls
-#
-@ stdcall SetHookFlags(long long)
-
-################################################################
-# Wine internal extensions
-#
-# All functions must be prefixed with '__wine_' (for internal functions)
-# or 'wine_' (for user-visible functions) to avoid namespace conflicts.
-
-# GDI objects
-@ cdecl __wine_set_visible_region(long long ptr ptr ptr)
-
-# OpenGL
-@ cdecl __wine_get_wgl_driver(long long)
-
-# Vulkan
-@ cdecl __wine_get_vulkan_driver(long long)
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
 MODULE    = opengl32.dll
 EXTRADEFS = -D_OPENGL32_
 IMPORTLIB = opengl32
-IMPORTS   = user32 gdi32 advapi32
+IMPORTS   = user32 gdi32 advapi32 win32u
 DELAYIMPORTS = glu32

 EXTRADLLFLAGS = -Wl,--image-base,0x7a800000 -mcygwin

--- a/dlls/user.exe16/Makefile.in
+++ b/dlls/user.exe16/Makefile.in
 MODULE    = user.exe16
-IMPORTS   = mpr user32 gdi32
+IMPORTS   = mpr user32 gdi32 win32u
 EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520

 C_SRCS = \

--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
 MODULE    = wined3d.dll
 IMPORTLIB = wined3d
-IMPORTS   = opengl32 user32 gdi32 advapi32
+IMPORTS   = opengl32 user32 gdi32 advapi32 win32u
 EXTRAINCL = $(VKD3D_SHADER_CFLAGS)

 EXTRADLLFLAGS = -mcygwin

--- a/dlls/winevulkan/Makefile.in
+++ b/dlls/winevulkan/Makefile.in
 MODULE    = winevulkan.dll
 IMPORTLIB = winevulkan
-IMPORTS   = user32 gdi32 advapi32 setupapi
+IMPORTS   = user32 gdi32 advapi32 setupapi win32u
 EXTRALIBS = $(PTHREAD_LIBS)

 C_SRCS = \