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

Alexandre Julliard julliard at winehq.org
Tue Feb 23 15:54:47 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Feb 23 10:06:40 2021 +0100

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

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

---

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

diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in
index e33e57ea40a..9ad3e0f891a 100644
--- a/dlls/mprapi/Makefile.in
+++ b/dlls/mprapi/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = mprapi.dll
 IMPORTLIB = mprapi
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	mprapi.c
diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c
index 715f1b8cada..cfb4259b339 100644
--- a/dlls/mprapi/mprapi.c
+++ b/dlls/mprapi/mprapi.c
@@ -25,25 +25,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(mprapi);
 
-/*****************************************************
- *      DllMain
- */
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
-{
-    TRACE("(%p, %d, %p)\n", hinst, reason, reserved);
-
-    switch(reason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( hinst );
-        break;
-    }
-    return TRUE;
-}
-
 /***********************************************************************
  * MprAdminGetErrorString (MPRAPI.@)
  *




More information about the wine-cvs mailing list