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

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Fri Feb 26 10:22:56 2021 +0100

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

Signed-off-by: Alexandre Julliard

---

dlls/msctf/Makefile.in | 2 +-
 dlls/msctf/msctf.c     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in
index a3c7e0c6fad..fd4314b77ac 100644
--- a/dlls/msctf/Makefile.in
+++ b/dlls/msctf/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = msctf.dll
 IMPORTS   = uuid ole32 oleaut32 user32 advapi32

-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native

C_SRCS = \
    categorymgr.c \
diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c
index c6e3a2ca597..56a36cb23c8 100644
--- a/dlls/msctf/msctf.c
+++ b/dlls/msctf/msctf.c
@@ -556,8 +556,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
     TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad);
     switch (fdwReason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;   /* prefer native version */
         case DLL_PROCESS_ATTACH:
             MSCTF_hinstance = hinst;
             tlsIndex = TlsAlloc();