From ec9a3d99062504c5b249fbd1e62cb4359cc03836 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 26 Feb 2021 10:22:43 +0100 Subject: [PATCH] joy.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard --- dlls/joy.cpl/Makefile.in | 2 +- dlls/joy.cpl/main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in index d1b0e45552e..db6883bb121 100644 --- a/dlls/joy.cpl/Makefile.in +++ b/dlls/joy.cpl/Makefile.in @@ -1,7 +1,7 @@ MODULE = joy.cpl IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 66ac58f7038..3ea417843f4 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -47,9 +47,6 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); hcpl = hdll;