Alexandre Julliard : evr: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Fri Feb 26 14:39:27 CST 2021
Module: wine
Branch: master
Commit: dc382414dfce1a8cca430f9e7d8df334f0810432
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc382414dfce1a8cca430f9e7d8df334f0810432
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Feb 26 10:22:16 2021 +0100
evr: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/evr/Makefile.in | 2 +-
dlls/evr/main.c | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in
index 02cdb9b820a..0fd5526e71c 100644
--- a/dlls/evr/Makefile.in
+++ b/dlls/evr/Makefile.in
@@ -3,7 +3,7 @@ IMPORTLIB = evr
IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2
DELAYIMPORTS = mfplat
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
evr.c \
diff --git a/dlls/evr/main.c b/dlls/evr/main.c
index 301330a51e2..e75fb0ad691 100644
--- a/dlls/evr/main.c
+++ b/dlls/evr/main.c
@@ -36,16 +36,15 @@ static HINSTANCE instance_evr;
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
{
- if (reason == DLL_WINE_PREATTACH)
- return FALSE; /* prefer native version */
- else if (reason == DLL_PROCESS_ATTACH)
+ switch (reason)
{
- instance_evr = instance;
+ case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(instance);
- }
- else if (reason == DLL_PROCESS_DETACH && !reserved)
- {
+ break;
+ case DLL_PROCESS_DETACH:
+ if (reserved) break;
strmbase_release_typelibs();
+ break;
}
return TRUE;
}
More information about the wine-cvs
mailing list