Zebediah Figura : user32: Do not delay-load setupapi.

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Mar  9 18:04:25 2020 -0500

user32: Do not delay-load setupapi.

This fixes a deadlock in the Steel Series Engine installer, between the
"user_section" lock and the loader lock.

Currently user32 takes the "user_section" lock during THREAD_DETACH, i.e. while
the loader lock is held. However, it is also possible for a thread to take the
locks in the reverse order. The observed path is:
 - register_builtin()
 - LoadCursorA()
 - get_display_bpp()
 - get_display_dc()
 - CreateDCW()
 - GetDeviceCaps(DESKTOPHORZRES)
 - GetSystemMetrics(SM_CXVIRTUALSCREEN)
 - EnumDisplayMonitors()
 - update_monitor_cache()

Since we now rely on setupapi for fundamental tasks such as determining screen
size, it doesn't make much sense to delay-load it.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in
index 2bb60140d3..a91dd89c94 100644
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@@ -1,9 +1,9 @@
 EXTRADEFS = -D_USER32_ -D_WINABLE_
 MODULE    = user32.dll
 IMPORTLIB = user32
-IMPORTS   = gdi32 version advapi32 kernelbase
+IMPORTS   = setupapi gdi32 version advapi32 kernelbase
 EXTRAINCL = $(PNG_CFLAGS)
-DELAYIMPORTS = hid imm32 setupapi usp10
+DELAYIMPORTS = hid imm32 usp10
 
 C_SRCS = \
 	button.c \