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

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

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

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

---

 dlls/tdh/Makefile.in |  2 +-
 dlls/tdh/tdh_main.c  | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in
index 66bc18c88ee..eab8b56e264 100644
--- a/dlls/tdh/Makefile.in
+++ b/dlls/tdh/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = tdh.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	tdh_main.c
diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c
index 29e7d50c241..2e6a9e69a38 100644
--- a/dlls/tdh/tdh_main.c
+++ b/dlls/tdh/tdh_main.c
@@ -27,22 +27,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(tdh);
 
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-{
-    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
-
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
-
 ULONG WINAPI TdhLoadManifest(LPWSTR manifest)
 {
     FIXME("(%s): stub\n", debugstr_w(manifest));




More information about the wine-cvs mailing list