Jacek Caban : user32: Link directly to win32u.

[Alexandre Julliard]

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

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

user32: Link directly to win32u.

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/gdi32/gdi32.spec   | 6 ------
 dlls/user32/Makefile.in | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec
index 94a5cefdfa4..74e452c9b67 100644
--- a/dlls/gdi32/gdi32.spec
+++ b/dlls/gdi32/gdi32.spec
@@ -547,8 +547,6 @@
 ################################################################
 # Wine extensions: Win16 functions that are needed by other dlls
 #
-@ stdcall GetDCHook(long ptr)
-@ stdcall SetDCHook(long ptr long)
 @ stdcall SetHookFlags(long long)
 
 ################################################################
@@ -558,12 +556,8 @@
 # or 'wine_' (for user-visible functions) to avoid namespace conflicts.
 
 # GDI objects
-@ cdecl __wine_make_gdi_object_system(long long)
 @ cdecl __wine_set_visible_region(long long ptr ptr ptr)
 
-# Graphics drivers
-@ cdecl __wine_set_display_driver(long)
-
 # OpenGL
 @ cdecl __wine_get_wgl_driver(long long)
 
diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in
index 50bba8c1786..38ce2aad997 100644
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@@ -1,7 +1,7 @@
 EXTRADEFS = -D_USER32_ -D_WINABLE_
 MODULE    = user32.dll
 IMPORTLIB = user32
-IMPORTS   = setupapi gdi32 version sechost advapi32 kernelbase
+IMPORTS   = setupapi gdi32 version sechost advapi32 kernelbase win32u
 EXTRAINCL = $(PNG_CFLAGS)
 DELAYIMPORTS = hid imm32