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

Alexandre Julliard julliard at winehq.org
Mon Feb 22 15:43:21 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Feb 22 09:25:06 2021 +0100

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

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

---

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

diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
index d331512f019..efa37464a9b 100644
--- a/dlls/dxva2/Makefile.in
+++ b/dlls/dxva2/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = dxva2.dll
 IMPORTS   = uuid ole32
 IMPORTLIB = dxva2
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
index d784e1b46ab..069f03d8077 100644
--- a/dlls/dxva2/main.c
+++ b/dlls/dxva2/main.c
@@ -1212,18 +1212,3 @@ BOOL WINAPI SetVCPFeature( HMONITOR monitor, BYTE vcpCode, DWORD value )
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return FALSE;
 }
-
-BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("%p,%x,%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;
-}




More information about the wine-cvs mailing list