Module: wine Branch: master Commit: 55ae768fdcdb9286adde36198d519c04ebab1273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55ae768fdcdb9286adde36198...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Mar 2 10:53:33 2021 +0100
adsldp: Use --prefer_native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/adsldp/Makefile.in | 2 +- dlls/adsldp/adsldp.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index a99917a16ad..9420a8a92c9 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -2,7 +2,7 @@ MODULE = adsldp.dll IMPORTS = ole32 oleaut32 secur32 activeds uuid DELAYIMPORTS = netapi32 wldap32
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ adsldp.c \ diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 13bd73c1296..63f800b5061 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -2135,9 +2135,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: adsldp_hinst = hinst; DisableThreadLibraryCalls(hinst);