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

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

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

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

---

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

diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in
index e823eb380cb..a18224ac4e1 100644
--- a/dlls/traffic/Makefile.in
+++ b/dlls/traffic/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = traffic.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	traffic_main.c
diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c
index 6b8a9751e19..87646622346 100644
--- a/dlls/traffic/traffic_main.c
+++ b/dlls/traffic/traffic_main.c
@@ -26,24 +26,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(traffic);
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(0x%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;
-        default:
-            break;
-    }
-
-    return TRUE;
-}
-
 /*****************************************************************************
  * TcRegisterClient [TRAFFIC.@]
  */




More information about the wine-cvs mailing list