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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 93c551abd6c206b68119113b8adf0db66fd96179
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=93c551abd6c206b68119113b8...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Feb 22 09:23:49 2021 +0100

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

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/activeds/Makefile.in     |  2 +-
 dlls/activeds/activeds_main.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in
index e76db4f7bcd..6a64ec541b9 100644
--- a/dlls/activeds/Makefile.in
+++ b/dlls/activeds/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = activeds.dll
 IMPORTLIB = activeds
 IMPORTS   = advapi32 ole32 oleaut32 uuid
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	activeds_main.c \
diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c
index 1b22da67653..9a8bb3b0e73 100644
--- a/dlls/activeds/activeds_main.c
+++ b/dlls/activeds/activeds_main.c
@@ -40,24 +40,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(activeds);
 
-/*****************************************************
- * DllMain
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved);
-
-    switch(fdwReason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( hinstDLL );
-        break;
-    }
-    return TRUE;
-}
-
 /*****************************************************
  * ADsGetObject     [ACTIVEDS.3]
  */