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

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

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

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

---

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

diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in
index 884fdbd57eb..411d8fe6728 100644
--- a/dlls/sti/Makefile.in
+++ b/dlls/sti/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = sti.dll
 IMPORTLIB = sti
 IMPORTS   = uuid ole32 oleaut32 rpcrt4 advapi32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	sti.c \
diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c
index c532ffbd6ac..b37f4d3fee2 100644
--- a/dlls/sti/sti_main.c
+++ b/dlls/sti/sti_main.c
@@ -137,8 +137,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved);
 
-    if (fdwReason == DLL_WINE_PREATTACH)
-        return FALSE;
     return STI_DllMain(hInstDLL, fdwReason, lpvReserved);
 }
 




More information about the wine-cvs mailing list