Alexandre Julliard : pdh: 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: 918a41e4835c4b2d5351c370b16395d0c2f002fa
URL: https://source.winehq.org/git/wine.git/?a=commit;h=918a41e4835c4b2d5351c370b16395d0c2f002fa
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 24 20:54:50 2021 +0100
pdh: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/pdh/Makefile.in | 2 +-
dlls/pdh/pdh_main.c | 19 -------------------
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in
index d3ce7a4e13e..59e0442a4d0 100644
--- a/dlls/pdh/Makefile.in
+++ b/dlls/pdh/Makefile.in
@@ -1,7 +1,7 @@
MODULE = pdh.dll
IMPORTLIB = pdh
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
pdh_main.c
diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c
index d3bf6ab8706..73d4fef2a14 100644
--- a/dlls/pdh/pdh_main.c
+++ b/dlls/pdh/pdh_main.c
@@ -67,25 +67,6 @@ static inline WCHAR *pdh_strdup_aw( const char *src )
return dst;
}
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
- TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved);
- switch (fdwReason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(hinstDLL);
- break;
- case DLL_PROCESS_DETACH:
- if (lpvReserved) break;
- DeleteCriticalSection(&pdh_handle_cs);
- break;
- }
-
- return TRUE;
-}
-
union value
{
LONG longvalue;
More information about the wine-cvs
mailing list