Module: wine Branch: master Commit: b0c277f68d3c7e3ed659fae112f72db1a4e3aec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0c277f68d3c7e3ed659fae11...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Feb 18 11:49:18 2021 +0100
olethk32: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/olethk32/Makefile.in | 4 +--- dlls/olethk32/main.c | 37 ------------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/dlls/olethk32/Makefile.in b/dlls/olethk32/Makefile.in index 6888b46c3df..124ae2cd60c 100644 --- a/dlls/olethk32/Makefile.in +++ b/dlls/olethk32/Makefile.in @@ -1,7 +1,5 @@ MODULE = olethk32.dll
-EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = main.c +EXTRADLLFLAGS = -Wb,--prefer-native
RC_SRCS = version.rc diff --git a/dlls/olethk32/main.c b/dlls/olethk32/main.c deleted file mode 100644 index 13de72eb197..00000000000 --- a/dlls/olethk32/main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2007 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(olethk32); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_WINE_PREATTACH) - return FALSE; /* prefer native version */ - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -}