Alexandre Julliard : d3dx11: Use --prefer-native instead of DLL_WINE_PREATTACH.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0fee3fc46fe684f451952d2d775aab117ba64f25
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0fee3fc46fe684f451952d2d7...

Author: Alexandre Julliard 
Date:   Mon Feb 22 09:24:37 2021 +0100

d3dx11: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard

---

dlls/d3dx11_42/Makefile.in |  2 +-
 dlls/d3dx11_43/Makefile.in |  2 +-
 dlls/d3dx11_43/main.c      | 13 -------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in
index 41792c9fd0a..dbc31e2407d 100644
--- a/dlls/d3dx11_42/Makefile.in
+++ b/dlls/d3dx11_42/Makefile.in
@@ -3,7 +3,7 @@ MODULE = d3dx11_42.dll
 IMPORTS = d3dcompiler
 PARENTSRC = ../d3dx11_43

-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native

C_SRCS = \
    async.c \
diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in
index bf5a263b284..b69f3f1ce02 100644
--- a/dlls/d3dx11_43/Makefile.in
+++ b/dlls/d3dx11_43/Makefile.in
@@ -3,7 +3,7 @@ MODULE = d3dx11_43.dll
 IMPORTLIB = d3dx11
 IMPORTS   = d3dcompiler

-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native

C_SRCS = \
    async.c \
diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c
index e8eac58cbbe..950f6d76f5c 100644
--- a/dlls/d3dx11_43/main.c
+++ b/dlls/d3dx11_43/main.c
@@ -33,19 +33,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(d3dx);

-BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
-{
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;       /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hdll);
-    }
-
-   return TRUE;
-}
-
 BOOL WINAPI D3DX11CheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver)
 {
     return d3d_sdk_ver == D3D11_SDK_VERSION && d3dx_sdk_ver == D3DX11_SDK_VERSION;