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

Alexandre Julliard julliard at winehq.org
Wed Feb 24 15:45:40 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Feb 24 10:28:01 2021 +0100

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

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

---

 dlls/ntdsapi/Makefile.in |  2 +-
 dlls/ntdsapi/ntdsapi.c   | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in
index afe29a38fa6..e2f1eca4865 100644
--- a/dlls/ntdsapi/Makefile.in
+++ b/dlls/ntdsapi/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = ntdsapi.dll
 IMPORTLIB = ntdsapi
 IMPORTS   = user32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	ntdsapi.c
diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c
index 929b9944846..2438197a7a3 100644
--- a/dlls/ntdsapi/ntdsapi.c
+++ b/dlls/ntdsapi/ntdsapi.c
@@ -27,25 +27,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi);
 
-/*****************************************************
- *      DllMain
- */
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
-{
-    TRACE("(%p, %d, %p)\n", hinst, reason, reserved);
-
-    switch(reason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( hinst );
-        break;
-    }
-    return TRUE;
-}
-
 /***********************************************************************
  *             DsBindA (NTDSAPI.@)
  */




More information about the wine-cvs mailing list