From 5a99feea38ddc08bf2d31518ab4d4b0777372a88 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 18 Feb 2021 11:42:47 +0100
Subject: [PATCH] d3dim: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/d3dim/Makefile.in        |  4 +---
 dlls/d3dim/d3dim_main.c       | 37 ------------------------------
 dlls/d3dim700/Makefile.in     |  5 +----
 dlls/d3dim700/d3dim700_main.c | 42 -----------------------------------
 4 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 dlls/d3dim/d3dim_main.c
 delete mode 100644 dlls/d3dim700/d3dim700_main.c

diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in
index 1acc05440cc..f62573b513d 100644
--- a/dlls/d3dim/Makefile.in
+++ b/dlls/d3dim/Makefile.in
@@ -1,7 +1,5 @@
 MODULE    = d3dim.dll
 
-EXTRADLLFLAGS = -mno-cygwin
-
-C_SRCS = d3dim_main.c
+EXTRADLLFLAGS = -Wb,--prefer-native
 
 RC_SRCS = version.rc
diff --git a/dlls/d3dim/d3dim_main.c b/dlls/d3dim/d3dim_main.c
deleted file mode 100644
index 4651d5dc11f..00000000000
--- a/dlls/d3dim/d3dim_main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2006 Alexandre Julliard
- *
- * 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"
-
-/***********************************************************************
- *		DllMain  (D3DIM.@)
- */
-BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
-{
-    switch(reason)
-    {
-    case DLL_WINE_PREATTACH:
-        return FALSE;  /* prefer native version */
-    case DLL_PROCESS_ATTACH:
-        DisableThreadLibraryCalls( inst );
-        break;
-    }
-    return TRUE;
-}
diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in
index 12a28ae475a..f2106dd977e 100644
--- a/dlls/d3dim700/Makefile.in
+++ b/dlls/d3dim700/Makefile.in
@@ -1,8 +1,5 @@
 MODULE    = d3dim700.dll
 
-EXTRADLLFLAGS = -mno-cygwin
-
-C_SRCS = \
-	d3dim700_main.c
+EXTRADLLFLAGS = -Wb,--prefer-native
 
 RC_SRCS = version.rc
diff --git a/dlls/d3dim700/d3dim700_main.c b/dlls/d3dim700/d3dim700_main.c
deleted file mode 100644
index 18a211ccc74..00000000000
--- a/dlls/d3dim700/d3dim700_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 <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3dim700);
-
-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;
-}