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

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

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

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

---

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

diff --git a/dlls/atmlib/Makefile.in b/dlls/atmlib/Makefile.in
index f8bd6758568..3290523113e 100644
--- a/dlls/atmlib/Makefile.in
+++ b/dlls/atmlib/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = atmlib.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c
index 4baeb9d31d8..e416195c408 100644
--- a/dlls/atmlib/main.c
+++ b/dlls/atmlib/main.c
@@ -24,21 +24,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(atmlib);
 
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv)
-{
-    TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv);
-
-    switch (reason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;    /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls(hInstDLL);
-        break;
-    }
-    return TRUE;
-}
-
 BOOL WINAPI ATMProperlyLoaded(void)
 {
     FIXME("stub\n");




More information about the wine-cvs mailing list