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

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

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

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

---

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

diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in
index 333717c502e..b9f8f5c2aed 100644
--- a/dlls/wmp/Makefile.in
+++ b/dlls/wmp/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = wmp.dll
 IMPORTS   = oleaut32 ole32 urlmon shlwapi user32 gdi32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	events.c \
diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c
index 2541fc54ffb..37ae9a1ac13 100644
--- a/dlls/wmp/wmp_main.c
+++ b/dlls/wmp/wmp_main.c
@@ -149,8 +149,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
     TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv);
 
     switch(fdwReason) {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
     case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hInstDLL);
         wmp_instance = hInstDLL;




More information about the wine-cvs mailing list