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

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Feb 26 10:23:44 2021 +0100

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

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in
index 15a40324012..d8e344bd2d4 100644
--- a/dlls/scrobj/Makefile.in
+++ b/dlls/scrobj/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = scrobj.dll
 IMPORTS   = uuid urlmon ole32 oleaut32 xmllite advapi32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	scrobj.c
diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c
index 427e4e54399..48943d235ec 100644
--- a/dlls/scrobj/scrobj.c
+++ b/dlls/scrobj/scrobj.c
@@ -2360,8 +2360,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
 
     switch (reason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hinst);
             scrobj_instance = hinst;