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

Alexandre Julliard julliard at winehq.org
Mon Feb 22 15:43:21 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Feb 22 09:24:20 2021 +0100

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

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

---

 dlls/connect/Makefile.in |  2 +-
 dlls/connect/main.c      | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/connect/Makefile.in b/dlls/connect/Makefile.in
index f2396138b68..97c6e8ea0a4 100644
--- a/dlls/connect/Makefile.in
+++ b/dlls/connect/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = connect.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/connect/main.c b/dlls/connect/main.c
index 95dca3db324..fb84e8cc876 100644
--- a/dlls/connect/main.c
+++ b/dlls/connect/main.c
@@ -25,20 +25,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(connect);
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
-{
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
-
 HRESULT WINAPI IsInternetConnected(void)
 {
     FIXME("stub, faking success!\n");




More information about the wine-cvs mailing list