Alexandre Julliard : wsnmp32: 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: 96d1c58e7087dada6d5d9d45aff0dc07063b0625
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=96d1c58e7087dada6d5d9d45aff0dc07063b0625

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

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

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

---

 dlls/wsnmp32/Makefile.in |  2 +-
 dlls/wsnmp32/wsnmp32.c   | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/dlls/wsnmp32/Makefile.in b/dlls/wsnmp32/Makefile.in
index db01f47b298..c7b263bd964 100644
--- a/dlls/wsnmp32/Makefile.in
+++ b/dlls/wsnmp32/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = wsnmp32.dll
 IMPORTLIB = wsnmp32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = wsnmp32.c
diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c
index 3dc54cb5fac..f0df30b3b4c 100644
--- a/dlls/wsnmp32/wsnmp32.c
+++ b/dlls/wsnmp32/wsnmp32.c
@@ -24,21 +24,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wsnmp32);
 
-BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
-{
-    TRACE("%p, %u, %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;
-}
-
 SNMPAPI_STATUS WINAPI SnmpCleanup( void )
 {
     FIXME( "\n" );




More information about the wine-cvs mailing list