From 7d60c2576067829b50ca954a8419925d9c66fa59 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 22 Feb 2021 09:23:54 +0100
Subject: [PATCH] apphelp: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/apphelp/Makefile.in |  2 +-
 dlls/apphelp/apphelp.c   | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/dlls/apphelp/Makefile.in b/dlls/apphelp/Makefile.in
index b3c4de763a4..ec247c845c7 100644
--- a/dlls/apphelp/Makefile.in
+++ b/dlls/apphelp/Makefile.in
@@ -1,5 +1,5 @@
 MODULE = apphelp.dll
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = apphelp.c
diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c
index 0ff74aa5847..a603a044b94 100644
--- a/dlls/apphelp/apphelp.c
+++ b/dlls/apphelp/apphelp.c
@@ -39,21 +39,6 @@ typedef DWORD TAGID;
 /* FIXME: don't know where to place that define */
 #define TAGID_NULL 0x0
 
-BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
-{
-    TRACE("%p, %u, %p\n", hinst, reason, reserved);
-
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls( hinst );
-            break;
-    }
-    return TRUE;
-}
-
 BOOL WINAPI ApphelpCheckInstallShieldPackage( void* ptr, LPCWSTR path )
 {
     FIXME("stub: %p %s\n", ptr, debugstr_w(path));