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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcm: Use --prefer-native instead of DLL_WINE_PREATTACH.
576c26c1 · Alexandre Julliard · 1c418212 · 576c26c1 · 576c26c1 · 576c26c1
Commit 576c26c1 authored Feb 23, 2021 by Alexandre Julliard
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 15 deletions

Makefile.in dlls/msvcm80/Makefile.in +1 -1

msvcm_main.c dlls/msvcm80/msvcm_main.c +0 -13

Makefile.in dlls/msvcm90/Makefile.in +1 -1

No files found.
--- a/dlls/msvcm80/Makefile.in
+++ b/dlls/msvcm80/Makefile.in
 MODULE    = msvcm80.dll

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

 C_SRCS = \
 	msvcm_main.c
--- 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)
 {

--- a/dlls/msvcm90/Makefile.in
+++ b/dlls/msvcm90/Makefile.in
 MODULE    = msvcm90.dll
 PARENTSRC = ../msvcm80

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

 C_SRCS = \
 	msvcm_main.c