Alexandre Julliard : dpvoice: Use --prefer_native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Tue Mar 2 15:35:57 CST 2021
Module: wine
Branch: master
Commit: 15da5be4664bcfbed8d7fb07d6e5d653ed62b684
URL: https://source.winehq.org/git/wine.git/?a=commit;h=15da5be4664bcfbed8d7fb07d6e5d653ed62b684
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Mar 2 10:54:07 2021 +0100
dpvoice: Use --prefer_native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dpvoice/Makefile.in | 2 +-
dlls/dpvoice/main.c | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in
index 38e934dda16..872080fa310 100644
--- a/dlls/dpvoice/Makefile.in
+++ b/dlls/dpvoice/Makefile.in
@@ -1,7 +1,7 @@
MODULE = dpvoice.dll
IMPORTS = dxguid uuid
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
client.c \
diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c
index 73441a80e05..66d67586276 100644
--- a/dlls/dpvoice/main.c
+++ b/dlls/dpvoice/main.c
@@ -109,13 +109,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
- DPVOICE_hInstance = hinstDLL;
-
switch (fdwReason)
{
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
+ DPVOICE_hInstance = hinstDLL;
DisableThreadLibraryCalls(hinstDLL);
break;
default:
More information about the wine-cvs
mailing list