Alexandre Julliard : mscoree: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Fri Feb 26 14:39:28 CST 2021
Module: wine
Branch: master
Commit: ce90e69eeb330656c066e232bf6b5ac93ea30245
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce90e69eeb330656c066e232bf6b5ac93ea30245
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Feb 26 10:22:51 2021 +0100
mscoree: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mscoree/Makefile.in | 2 +-
dlls/mscoree/mscoree_main.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in
index 5302e45e1a1..a36e11ee3ac 100644
--- a/dlls/mscoree/Makefile.in
+++ b/dlls/mscoree/Makefile.in
@@ -1,7 +1,7 @@
MODULE = mscoree.dll
IMPORTS = dbghelp uuid shell32 advapi32 ole32 oleaut32 shlwapi
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
assembly.c \
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
index 4679d79e662..59cb17a0357 100644
--- a/dlls/mscoree/mscoree_main.c
+++ b/dlls/mscoree/mscoree_main.c
@@ -224,8 +224,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
switch (fdwReason)
{
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
runtimehost_init();
DisableThreadLibraryCalls(hinstDLL);
More information about the wine-cvs
mailing list