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

Alexandre Julliard julliard at winehq.org
Thu Feb 25 16:45:37 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 25 08:59:32 2021 +0100

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

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

---

 dlls/winnls32/Makefile.in |  2 +-
 dlls/winnls32/winnls.c    | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/dlls/winnls32/Makefile.in b/dlls/winnls32/Makefile.in
index c94375a2516..d7787abf08c 100644
--- a/dlls/winnls32/Makefile.in
+++ b/dlls/winnls32/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = winnls32.dll
 IMPORTLIB = winnls32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	winnls.c
diff --git a/dlls/winnls32/winnls.c b/dlls/winnls32/winnls.c
index 517a53cf7cd..b89a6a8cc6b 100644
--- a/dlls/winnls32/winnls.c
+++ b/dlls/winnls32/winnls.c
@@ -22,22 +22,6 @@
 #include "winbase.h"
 #include "winnls32.h"
 
-/***********************************************************************
- *		DllMain  (WINNLS.@)
- */
-BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
-{
-    switch(reason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( inst );
-        break;
-    }
-    return TRUE;
-}
-
 /***********************************************************************
  *		WINNLS32GetEnableStatus (WINNLS32.2)
  */




More information about the wine-cvs mailing list