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@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Do not delay-load setupapi.
50aeb5e7 · Zebediah Figura · Alexandre Julliard · f4f4a423 · 50aeb5e7
Commit 50aeb5e7 authored Mar 09, 2020 by Zebediah Figura Committed by Alexandre Julliard Mar 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile.in dlls/user32/Makefile.in +2 -2

No files found.
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
 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 \