[PATCH] user32: Do not delay-load setupapi.
Zebediah Figura
z.figura12 at gmail.com
Mon Mar 9 18:04:25 CDT 2020
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>
---
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..a570c34b53 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 = gdi32 version advapi32 kernelbase setupapi
EXTRAINCL = $(PNG_CFLAGS)
-DELAYIMPORTS = hid imm32 setupapi usp10
+DELAYIMPORTS = hid imm32 usp10
C_SRCS = \
button.c \
--
2.25.1
More information about the wine-devel
mailing list