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

Alexandre Julliard julliard at winehq.org
Fri Feb 26 14:39:28 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Feb 26 10:23:01 2021 +0100

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

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

---

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

diff --git a/dlls/msftedit/Makefile.in b/dlls/msftedit/Makefile.in
index 3e76523118f..56687570054 100644
--- a/dlls/msftedit/Makefile.in
+++ b/dlls/msftedit/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = msftedit.dll
 IMPORTS   = uuid riched20
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	msftedit_main.c
diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c
index fbad7182a5b..5c7d9268e8c 100644
--- a/dlls/msftedit/msftedit_main.c
+++ b/dlls/msftedit/msftedit_main.c
@@ -46,8 +46,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
 
     switch(reason)
     {
-    case DLL_WINE_PREATTACH:
-        return FALSE; /* prefer native version */
     case DLL_PROCESS_ATTACH:
         /* explicitly load riched20 since it creates the window classes at dll attach time */
         richedit = LoadLibraryW( L"riched20.dll" );




More information about the wine-cvs mailing list