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

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

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

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

---

 dlls/dpwsockx/Makefile.in     |  2 +-
 dlls/dpwsockx/dpwsockx_main.c | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in
index 5a386a7ac88..1fecc3cbbc0 100644
--- a/dlls/dpwsockx/Makefile.in
+++ b/dlls/dpwsockx/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = dpwsockx.dll
 IMPORTS   = dxguid ws2_32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	dpwsockx_main.c
diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c
index dec3d9e0300..2c73c17be21 100644
--- a/dlls/dpwsockx/dpwsockx_main.c
+++ b/dlls/dpwsockx/dpwsockx_main.c
@@ -30,25 +30,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
-
-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:
-        /* TODO: Initialization */
-        DisableThreadLibraryCalls(hinstDLL);
-        break;
-    }
-
-    return TRUE;
-}
-
-
 static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data )
 {
     FIXME( "(%p,%d,%p,%u) stub\n",




More information about the wine-cvs mailing list