Alexandre Julliard : query: Use --prefer-native instead of DLL_WINE_PREATTACH.

Alexandre Julliard julliard at winehq.org
Wed Feb 24 15:45:40 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Feb 24 10:28:23 2021 +0100

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

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

---

 dlls/query/Makefile.in  |  2 +-
 dlls/query/query_main.c | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in
index 075a645d508..d2c06c4a262 100644
--- a/dlls/query/Makefile.in
+++ b/dlls/query/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = query.dll
 IMPORTS   = uuid
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	query_main.c
diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c
index b93973addea..4312d483fc2 100644
--- a/dlls/query/query_main.c
+++ b/dlls/query/query_main.c
@@ -36,19 +36,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(query);
 
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
-{
-    switch(fdwReason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls(hInstDLL);
-        break;
-    }
-    return TRUE;
-}
-
 /***********************************************************************
  *             DllGetClassObject (QUERY.@)
  */




More information about the wine-cvs mailing list