Alexandre Julliard : msvcm: Use --prefer-native instead of DLL_WINE_PREATTACH.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 576c26c1f230b5a2675078277578175633121c3a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=576c26c1f230b5a2675078277...

Author: Alexandre Julliard 
Date:   Tue Feb 23 10:07:07 2021 +0100

msvcm: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard

---

dlls/msvcm80/Makefile.in  |  2 +-
 dlls/msvcm80/msvcm_main.c | 13 -------------
 dlls/msvcm90/Makefile.in  |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/dlls/msvcm80/Makefile.in b/dlls/msvcm80/Makefile.in
index 9527713e538..5249a128a2c 100644
--- a/dlls/msvcm80/Makefile.in
+++ b/dlls/msvcm80/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = msvcm80.dll

-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native

C_SRCS = \
    msvcm_main.c
diff --git a/dlls/msvcm80/msvcm_main.c b/dlls/msvcm80/msvcm_main.c
index 0dd94ca04b5..9ebf809ab54 100644
--- a/dlls/msvcm80/msvcm_main.c
+++ b/dlls/msvcm80/msvcm_main.c
@@ -25,19 +25,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(msvcm);

-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);
-    }
-    return TRUE;
-}
-
 /* void __cdecl <CrtImplementationDetails>::DoDllLanguageSupportValidation(void) */
 void __cdecl CrtImplementationDetails_DoDllLanguageSupportValidation(void)
 {
diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in
index 86f56160088..25398876214 100644
--- a/dlls/msvcm90/Makefile.in
+++ b/dlls/msvcm90/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = msvcm90.dll
 PARENTSRC = ../msvcm80

-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native

C_SRCS = \
    msvcm_main.c