Alexandre Julliard : mf: Use --prefer_native instead of DLL_WINE_PREATTACH.

Alexandre Julliard julliard at winehq.org
Tue Mar 2 15:35:57 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Mar  2 10:54:42 2021 +0100

mf: Use --prefer_native instead of DLL_WINE_PREATTACH.

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

---

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

diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in
index cd50a849b7c..f60e337b386 100644
--- a/dlls/mf/Makefile.in
+++ b/dlls/mf/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = mf
 IMPORTS   = advapi32 mfplat ole32 uuid mfuuid strmiids
 DELAYIMPORTS = evr
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	copier.c \
diff --git a/dlls/mf/main.c b/dlls/mf/main.c
index 2caf50c54e0..bf7066ad032 100644
--- a/dlls/mf/main.c
+++ b/dlls/mf/main.c
@@ -1076,8 +1076,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
 {
     switch (reason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
         case DLL_PROCESS_ATTACH:
             mf_instance = instance;
             DisableThreadLibraryCalls(instance);




More information about the wine-cvs mailing list