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

Alexandre Julliard julliard at winehq.org
Fri Feb 26 14:39:28 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Feb 26 10:23:49 2021 +0100

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

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

---

 dlls/scrrun/Makefile.in | 2 +-
 dlls/scrrun/scrrun.c    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in
index 90fe286a760..63e35fc5acf 100644
--- a/dlls/scrrun/Makefile.in
+++ b/dlls/scrrun/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = scrrun.dll
 IMPORTS   = uuid oleaut32 version advapi32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	dictionary.c \
diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c
index c14fb130f60..9445c727ac7 100644
--- a/dlls/scrrun/scrrun.c
+++ b/dlls/scrrun/scrrun.c
@@ -242,8 +242,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 
     switch (reason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls( hinst );
             scrrun_instance = hinst;




More information about the wine-cvs mailing list