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

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

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

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

---

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

diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in
index a09649f81cb..76cda37a84c 100644
--- a/dlls/browseui/Makefile.in
+++ b/dlls/browseui/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = browseui.dll
 IMPORTS   = uuid ole32 comctl32 user32 advapi32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	aclmulti.c \
diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c
index 71981d7b7f2..97f400d949e 100644
--- a/dlls/browseui/browseui_main.c
+++ b/dlls/browseui/browseui_main.c
@@ -165,8 +165,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
     TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad);
     switch (fdwReason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;   /* prefer native version */
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hinst);
             BROWSEUI_hinstance = hinst;




More information about the wine-cvs mailing list