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

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

qmgr: Use --prefer_native instead of DLL_WINE_PREATTACH.

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

---

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

diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in
index fe051ad239b..d01f50e3b79 100644
--- a/dlls/qmgr/Makefile.in
+++ b/dlls/qmgr/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = qmgr.dll
 IMPORTS   = uuid winhttp ole32 advapi32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	enum_files.c \
diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c
index 7bea214ed2b..2c48b4cc09e 100644
--- a/dlls/qmgr/qmgr_main.c
+++ b/dlls/qmgr/qmgr_main.c
@@ -47,8 +47,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:
             DisableThreadLibraryCalls(hinstDLL);
             hInst = hinstDLL;




More information about the wine-cvs mailing list