Alexandre Julliard : loadperf: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Tue Feb 23 15:54:47 CST 2021
Module: wine
Branch: master
Commit: 987ca1f1ffd3874028c8dbe07e923338d0875159
URL: https://source.winehq.org/git/wine.git/?a=commit;h=987ca1f1ffd3874028c8dbe07e923338d0875159
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 23 10:06:21 2021 +0100
loadperf: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/loadperf/Makefile.in | 2 +-
dlls/loadperf/loadperf_main.c | 16 ----------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in
index 9258ec06353..5ca8959ebd1 100644
--- a/dlls/loadperf/Makefile.in
+++ b/dlls/loadperf/Makefile.in
@@ -1,7 +1,7 @@
MODULE = loadperf.dll
IMPORTLIB = loadperf
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
loadperf_main.c
diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c
index 54901a739af..c58f46f4204 100644
--- a/dlls/loadperf/loadperf_main.c
+++ b/dlls/loadperf/loadperf_main.c
@@ -31,22 +31,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(loadperf);
-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;
- }
-
- return TRUE;
-}
-
static WCHAR *strdupAW(const char *str)
{
WCHAR *ret = NULL;
More information about the wine-cvs
mailing list