Skip to content

W
wine-winehq
Commit 50aeb5e7 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

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: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f4f4a423
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/user32/Makefile.in
View file @ 50aeb5e7
EXTRADEFS = -D_USER32_ -D_WINABLE_ EXTRADEFS = -D_USER32_ -D_WINABLE_
MODULE = user32.dll MODULE = user32.dll
IMPORTLIB = user32 IMPORTLIB = user32
IMPORTS = gdi32 version advapi32 kernelbase IMPORTS = setupapi gdi32 version advapi32 kernelbase
EXTRAINCL = $(PNG_CFLAGS) EXTRAINCL = $(PNG_CFLAGS)
DELAYIMPORTS = hid imm32 setupapi usp10 DELAYIMPORTS = hid imm32 usp10
C_SRCS = \ C_SRCS = \
button.c \ button.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment