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

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

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

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

---

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

diff --git a/dlls/dhcpcsvc/Makefile.in b/dlls/dhcpcsvc/Makefile.in
index 47ab04c690c..d2d46a24f8a 100644
--- a/dlls/dhcpcsvc/Makefile.in
+++ b/dlls/dhcpcsvc/Makefile.in
@@ -1,6 +1,6 @@
 MODULE = dhcpcsvc.dll
 IMPORTLIB = dhcpcsvc
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = dhcpcsvc.c
diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c
index d5df635012b..59883bbc72e 100644
--- a/dlls/dhcpcsvc/dhcpcsvc.c
+++ b/dlls/dhcpcsvc/dhcpcsvc.c
@@ -30,21 +30,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc);
 
-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;
-}
-
 void WINAPI DhcpCApiCleanup(void)
 {
     FIXME(": stub\n");




More information about the wine-cvs mailing list