From b5ab0b3e76a6f39feca497c8a7b358978d4ada0e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 18 Feb 2021 11:41:48 +0100 Subject: [PATCH] d3d8thk: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard --- dlls/d3d8thk/Makefile.in | 5 +---- dlls/d3d8thk/d3d8thk_main.c | 42 ------------------------------------- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 dlls/d3d8thk/d3d8thk_main.c diff --git a/dlls/d3d8thk/Makefile.in b/dlls/d3d8thk/Makefile.in index b84c8d171f1..3b406cb30d9 100644 --- a/dlls/d3d8thk/Makefile.in +++ b/dlls/d3d8thk/Makefile.in @@ -1,8 +1,5 @@ MODULE = d3d8thk.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - d3d8thk_main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/d3d8thk/d3d8thk_main.c b/dlls/d3d8thk/d3d8thk_main.c deleted file mode 100644 index 1d89cb48720..00000000000 --- a/dlls/d3d8thk/d3d8thk_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * 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(d3d8thk); - -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; -}