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

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

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

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

---

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

diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in
index 941eb0772df..cd026549e6e 100644
--- a/dlls/acledit/Makefile.in
+++ b/dlls/acledit/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = acledit.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c
index 50797c074cd..314fa4ab0c6 100644
--- a/dlls/acledit/main.c
+++ b/dlls/acledit/main.c
@@ -29,24 +29,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(acledit);
 
-/*****************************************************
- * DllMain
- */
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(%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;
-    }
-    return TRUE;
-}
-
 /***********************************************************************
  *  FMExtensionProcW (acledit.@)
  *




More information about the wine-cvs mailing list