Alexandre Julliard : inetcpl.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH.

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


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

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

inetcpl.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH.

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

---

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

diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in
index 972c66697a8..f7f241b7b1f 100644
--- a/dlls/inetcpl.cpl/Makefile.in
+++ b/dlls/inetcpl.cpl/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = inetcpl.cpl
 IMPORTS   = comctl32 shlwapi user32 advapi32
 DELAYIMPORTS = cryptui wininet ole32 urlmon shell32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	connections.c \
diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c
index e2178e1fac6..b4dbe848677 100644
--- a/dlls/inetcpl.cpl/inetcpl.c
+++ b/dlls/inetcpl.cpl/inetcpl.c
@@ -50,9 +50,6 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
 
     switch (reason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;  /* prefer native version */
-
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hdll);
             hcpl = hdll;




More information about the wine-cvs mailing list