From 9d1f13438f523a7799631c0324b5ecbaf83eeea2 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 18 Feb 2021 11:45:17 +0100 Subject: [PATCH] mscorwks: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard --- dlls/mscorwks/Makefile.in | 5 +---- dlls/mscorwks/mscorwks_main.c | 36 ----------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 dlls/mscorwks/mscorwks_main.c diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in index 42a6238a9a9..91d8823d971 100644 --- a/dlls/mscorwks/Makefile.in +++ b/dlls/mscorwks/Makefile.in @@ -1,6 +1,3 @@ MODULE = mscorwks.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - mscorwks_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mscorwks/mscorwks_main.c b/dlls/mscorwks/mscorwks_main.c deleted file mode 100644 index ac7708087f6..00000000000 --- a/dlls/mscorwks/mscorwks_main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * .NET workstation runtime - * - * Copyright 2019 Zebediah Figura for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include -#include -#include - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - } - - return TRUE; -}