Module: wine Branch: master Commit: b40a032e943d4f0bee4feeafcdb810652cf961ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=b40a032e943d4f0bee4feeafc...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Feb 22 09:24:12 2021 +0100
clusapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/clusapi/Makefile.in | 2 +- dlls/clusapi/clusapi.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in index 2084e289aae..3d09512e630 100644 --- a/dlls/clusapi/Makefile.in +++ b/dlls/clusapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = clusapi.dll IMPORTLIB = clusapi
-EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ clusapi.c diff --git a/dlls/clusapi/clusapi.c b/dlls/clusapi/clusapi.c index 88c6fbfc12b..b1dde6f0290 100644 --- a/dlls/clusapi/clusapi.c +++ b/dlls/clusapi/clusapi.c @@ -115,20 +115,3 @@ DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWST
return ERROR_NO_MORE_ITEMS; } - -/*********************************************************************** - * DllMain (CLUSAPI.@) - * - */ -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 ); - break; - } - return TRUE; -}