Alexandre Julliard : d3dx11: Build with msvcrt.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Thu May 30 09:17:00 2019 +0200

d3dx11: Build with msvcrt.

Signed-off-by: Alexandre Julliard

---

dlls/d3dx11_42/Makefile.in | 2 ++
 dlls/d3dx11_43/Makefile.in | 2 ++
 dlls/d3dx11_43/async.c     | 7 ++-----
 dlls/d3dx11_43/main.c      | 2 --
 dlls/d3dx11_43/texture.c   | 2 --
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in
index 4a8fd0b..41792c9 100644
--- a/dlls/d3dx11_42/Makefile.in
+++ b/dlls/d3dx11_42/Makefile.in
@@ -3,6 +3,8 @@ MODULE = d3dx11_42.dll
 IMPORTS = d3dcompiler
 PARENTSRC = ../d3dx11_43

+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
    async.c \
    main.c \
diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in
index c64d037..bf5a263 100644
--- a/dlls/d3dx11_43/Makefile.in
+++ b/dlls/d3dx11_43/Makefile.in
@@ -3,6 +3,8 @@ MODULE = d3dx11_43.dll
 IMPORTLIB = d3dx11
 IMPORTS   = d3dcompiler

+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
    async.c \
    main.c \
diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c
index f640b6c..cde87ce 100644
--- a/dlls/d3dx11_43/async.c
+++ b/dlls/d3dx11_43/async.c
@@ -16,13 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
-#include "wine/port.h"
 #include "d3dx11.h"
 #include "d3dcompiler.h"

#include "wine/debug.h"
-#include "wine/unicode.h"

WINE_DEFAULT_DEBUG_CHANNEL(d3dx);

@@ -317,13 +314,13 @@ HRESULT WINAPI D3DX11CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX11DataLo
         return E_OUTOFMEMORY;

object->ID3DX11DataLoader_iface.lpVtbl = &filedataloadervtbl;
-    object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (strlenW(filename) + 1) * sizeof(WCHAR));
+    object->u.file.path = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR));
     if (!object->u.file.path)
     {
         HeapFree(GetProcessHeap(), 0, object);
         return E_OUTOFMEMORY;
     }
-    strcpyW(object->u.file.path, filename);
+    lstrcpyW(object->u.file.path, filename);
     object->data = NULL;
     object->size = 0;

diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c
index b1bf969..215a51b 100644
--- a/dlls/d3dx11_43/main.c
+++ b/dlls/d3dx11_43/main.c
@@ -17,8 +17,6 @@
  *
  */

-#include "config.h"
-#include "wine/port.h"
 #include <stdarg.h>

#define COBJMACROS
diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
index 6aaf8a7..bc30015 100644
--- a/dlls/d3dx11_43/texture.c
+++ b/dlls/d3dx11_43/texture.c
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
-#include "wine/port.h"
 #include "d3dx11.h"
 #include "d3dcompiler.h"