Module: wine Branch: master Commit: 63b2ee515d30829e0353545a4fa11c83d838dfbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b2ee515d30829e0353545a4...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Feb 18 11:53:37 2021 +0100
srvcli: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/srvcli/Makefile.in | 4 +--- dlls/srvcli/main.c | 41 ----------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/dlls/srvcli/Makefile.in b/dlls/srvcli/Makefile.in index 716cc1b3867..22c1230b769 100644 --- a/dlls/srvcli/Makefile.in +++ b/dlls/srvcli/Makefile.in @@ -1,5 +1,3 @@ MODULE = srvcli.dll
-EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/srvcli/main.c b/dlls/srvcli/main.c deleted file mode 100644 index 0df8e00d0fa..00000000000 --- a/dlls/srvcli/main.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * - * Copyright (C) 2020 Alistair Leslie-Hughes - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(srvcli); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}