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

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

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

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

---

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

diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in
index f296e4a8302..98e052c57b2 100644
--- a/dlls/shcore/Makefile.in
+++ b/dlls/shcore/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = shcore.dll
 IMPORTLIB = shcore
 IMPORTS   = user32 gdi32 ole32 advapi32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	main.c
diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c
index d5fce76eade..fd21db423ea 100644
--- a/dlls/shcore/main.c
+++ b/dlls/shcore/main.c
@@ -44,8 +44,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
 
     switch (reason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;  /* prefer native version */
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(instance);
             shcore_tls = TlsAlloc();




More information about the wine-cvs mailing list