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

Alexandre Julliard julliard at winehq.org
Thu Feb 25 16:45:37 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 25 08:59:44 2021 +0100

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

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

---

 dlls/wmvcore/Makefile.in    |  2 +-
 dlls/wmvcore/wmvcore_main.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in
index c0b582775eb..e4efe0d3873 100644
--- a/dlls/wmvcore/Makefile.in
+++ b/dlls/wmvcore/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = wmvcore.dll
 IMPORTLIB = wmvcore
 IMPORTS   = kernel32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	reader.c \
diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c
index 4dafcf8055a..7d030a0e93a 100644
--- a/dlls/wmvcore/wmvcore_main.c
+++ b/dlls/wmvcore/wmvcore_main.c
@@ -25,22 +25,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-
-    switch (fdwReason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hinstDLL);
-            break;
-    }
-
-    return TRUE;
-}
-
 HRESULT WINAPI DllRegisterServer(void)
 {
     FIXME("(): stub\n");




More information about the wine-cvs mailing list