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

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

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

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

---

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

diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in
index 401c0c7d64d..539240ceadc 100644
--- a/dlls/mfplay/Makefile.in
+++ b/dlls/mfplay/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = mfplay.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	player.c
diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c
index d75ccfb1069..1e4f1f561f4 100644
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -26,20 +26,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-{
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
-
 HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options,
         IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player)
 {




More information about the wine-cvs mailing list