From 2f206a4388ec8141be4a3a1c22ca40501d808bf0 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 18 Feb 2021 11:52:03 +0100 Subject: [PATCH] scarddlg: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard --- dlls/scarddlg/Makefile.in | 5 +--- dlls/scarddlg/main.c | 48 --------------------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 dlls/scarddlg/main.c diff --git a/dlls/scarddlg/Makefile.in b/dlls/scarddlg/Makefile.in index 5b69e5d4074..0a5f1dd9b16 100644 --- a/dlls/scarddlg/Makefile.in +++ b/dlls/scarddlg/Makefile.in @@ -1,6 +1,3 @@ MODULE = scarddlg.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/scarddlg/main.c b/dlls/scarddlg/main.c deleted file mode 100644 index c39782e0fed..00000000000 --- a/dlls/scarddlg/main.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Implementation of the SCardDlg Interface - * - * Copyright 2011 Stefan Leichter - * - * 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 "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wfext.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scarddlg); - -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%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; -}