Module: wine Branch: master Commit: 36e02dc7bcafb72d04aa429c9c1e16c101ecb1eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=36e02dc7bcafb72d04aa429c9... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:56 2021 +0100 sxs: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/Makefile.in | 2 +- dlls/sxs/sxs.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 05794029f2c..4e87d764a30 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -2,7 +2,7 @@ MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ cache.c \ diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index cd1d0f7bb56..2fa4dc0262b 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -28,23 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sxs); -/*********************************************************************** - * DllMain (SXS.@) - * - */ -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; -} - typedef struct _SXS_GUID_INFORMATION_CLR { DWORD cbSize;