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

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

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

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

---

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

diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in
index 5cc2287c2d9..ab1a04ac241 100644
--- a/dlls/wlanapi/Makefile.in
+++ b/dlls/wlanapi/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = wlanapi.dll
 IMPORTLIB = wlanapi
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c
index cfffeedb110..d54cc1463ba 100644
--- a/dlls/wlanapi/main.c
+++ b/dlls/wlanapi/main.c
@@ -197,19 +197,3 @@ void *WINAPI WlanAllocateMemory(DWORD size)
 
     return ret;
 }
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *reserved)
-{
-    TRACE("(0x%p, %u, %p)\n", hinstDLL, reason, reserved);
-
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hinstDLL);
-            break;
-    }
-
-    return TRUE;
-}




More information about the wine-cvs mailing list