Jacek Caban : gdi32: Don't export Wine extensions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c166e9694eac3aa5124e1c2039248ac6d063dccc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c166e9694eac3aa5124e1c2039248ac6d063dccc

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Oct  8 13:34:42 2021 +0200

gdi32: Don't export Wine extensions.

Link directly to win32u instead.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d12/Makefile.in      |  2 +-
 dlls/dxgi/Makefile.in       |  2 +-
 dlls/gdi.exe16/Makefile.in  |  2 +-
 dlls/gdi32/gdi32.spec       | 20 --------------------
 dlls/opengl32/Makefile.in   |  2 +-
 dlls/user.exe16/Makefile.in |  2 +-
 dlls/wined3d/Makefile.in    |  2 +-
 dlls/winevulkan/Makefile.in |  2 +-
 8 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in
index 71c2c879f4b..64930ac442e 100644
--- a/dlls/d3d12/Makefile.in
+++ b/dlls/d3d12/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = d3d12.dll
 IMPORTLIB = d3d12
-IMPORTS   = dxgi dxguid gdi32 user32 uuid
+IMPORTS   = dxgi dxguid gdi32 user32 uuid win32u
 EXTRALIBS = $(VKD3D_LIBS)
 EXTRAINCL = $(VKD3D_CFLAGS)
 
diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in
index 7460d5098b6..3a28d0462de 100644
--- a/dlls/dxgi/Makefile.in
+++ b/dlls/dxgi/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = dxgi.dll
 IMPORTLIB = dxgi
-IMPORTS   = gdi32 dxguid uuid wined3d user32
+IMPORTS   = gdi32 dxguid uuid wined3d user32 win32u
 EXTRAINCL = $(VKD3D_CFLAGS)
 
 EXTRADLLFLAGS = -mcygwin
diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in
index 312641cd513..21850e2e660 100644
--- a/dlls/gdi.exe16/Makefile.in
+++ b/dlls/gdi.exe16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = gdi.exe16
-IMPORTS   = user32 advapi32 gdi32
+IMPORTS   = user32 advapi32 gdi32 win32u
 
 EXTRADLLFLAGS = -m16 -Wb,--main-module,gdi32.dll,--heap,65520
 
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec
index 74e452c9b67..c6fe436b7c9 100644
--- 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)
diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in
index 2e8fe657f40..fc27b481df3 100644
--- a/dlls/opengl32/Makefile.in
+++ b/dlls/opengl32/Makefile.in
@@ -1,7 +1,7 @@
 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
diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in
index 5a82b7590cd..7e2438d033f 100644
--- a/dlls/user.exe16/Makefile.in
+++ b/dlls/user.exe16/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = user.exe16
-IMPORTS   = mpr user32 gdi32
+IMPORTS   = mpr user32 gdi32 win32u
 EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
 
 C_SRCS = \
diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in
index 1d1782855de..41e129b24f6 100644
--- a/dlls/wined3d/Makefile.in
+++ b/dlls/wined3d/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = wined3d.dll
 IMPORTLIB = wined3d
-IMPORTS   = opengl32 user32 gdi32 advapi32
+IMPORTS   = opengl32 user32 gdi32 advapi32 win32u
 EXTRAINCL = $(VKD3D_SHADER_CFLAGS)
 
 EXTRADLLFLAGS = -mcygwin
diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in
index bb5248c8f73..52b397e4242 100644
--- a/dlls/winevulkan/Makefile.in
+++ b/dlls/winevulkan/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = winevulkan.dll
 IMPORTLIB = winevulkan
-IMPORTS   = user32 gdi32 advapi32 setupapi
+IMPORTS   = user32 gdi32 advapi32 setupapi win32u
 EXTRALIBS = $(PTHREAD_LIBS)
 
 C_SRCS = \