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

Alexandre Julliard julliard at winehq.org
Tue Feb 23 15:54:47 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Feb 23 10:06:25 2021 +0100

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

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

---

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

diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in
index ed06dd40f26..0a498a00bcd 100644
--- a/dlls/mfmediaengine/Makefile.in
+++ b/dlls/mfmediaengine/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = mfmediaengine.dll
 IMPORTLIB = mfmediaengine
 IMPORTS = oleaut32 ole32 mfplat mf mfuuid uuid
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index 8ae86d3a68b..4464b525a4d 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -61,20 +61,6 @@ static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, si
     return TRUE;
 }
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
-{
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
-
 enum media_engine_mode
 {
     MEDIA_ENGINE_INVALID,




More information about the wine-cvs mailing list