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

Alexandre Julliard julliard at winehq.org
Wed Feb 24 15:45:40 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Feb 24 10:28:33 2021 +0100

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

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

---

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

diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in
index b2be9b401bd..7a3754735d6 100644
--- a/dlls/rstrtmgr/Makefile.in
+++ b/dlls/rstrtmgr/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = rstrtmgr.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c
index d78c9f590fe..b9f29c7060c 100644
--- a/dlls/rstrtmgr/main.c
+++ b/dlls/rstrtmgr/main.c
@@ -26,25 +26,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(rstrtmgr);
 
-/*****************************************************
- *      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;
-}
-
 /***********************************************************************
  * RmGetList (rstrtmgr.@)
  *




More information about the wine-cvs mailing list