Alexandre Julliard : propsys: Use --prefer_native instead of DLL_WINE_PREATTACH.

Alexandre Julliard julliard at winehq.org
Tue Mar 2 15:35:58 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Mar  2 10:55:15 2021 +0100

propsys: Use --prefer_native instead of DLL_WINE_PREATTACH.

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

---

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

diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in
index ec0b223cc92..d8a7a7888bb 100644
--- a/dlls/propsys/Makefile.in
+++ b/dlls/propsys/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = propsys.dll
 IMPORTLIB = propsys
 IMPORTS   = ole32 oleaut32 uuid
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	propstore.c \
diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c
index 91ebc62127a..ee67ab35f17 100644
--- a/dlls/propsys/propsys_main.c
+++ b/dlls/propsys/propsys_main.c
@@ -42,8 +42,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
     switch (fdwReason)
     {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
         case DLL_PROCESS_ATTACH:
             propsys_hInstance = hinstDLL;
             DisableThreadLibraryCalls(hinstDLL);




More information about the wine-cvs mailing list