From 146ff01f5465ba4d6c769ac452a00e8a6a4b112d Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 18 Feb 2021 11:43:26 +0100 Subject: [PATCH] dcomp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard --- dlls/dcomp/Makefile.in | 5 ++--- dlls/dcomp/main.c | 44 ------------------------------------------ 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 dlls/dcomp/main.c diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in index 436b88993ab..c02907f3373 100644 --- a/dlls/dcomp/Makefile.in +++ b/dlls/dcomp/Makefile.in @@ -1,9 +1,8 @@ MODULE = dcomp.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ - device.c \ - main.c + device.c RC_SRCS = version.rc diff --git a/dlls/dcomp/main.c b/dlls/dcomp/main.c deleted file mode 100644 index b0b911a9bf5..00000000000 --- a/dlls/dcomp/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * DirectComposition Library - * - * Copyright 2020 Austin English - * - * 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 "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dcomp); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%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; - default: - break; - } - - return TRUE; -}