From 3e80b93f90f8e517d51764212545650668e5a8ca Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 3 Jun 2019 10:34:35 +0200
Subject: [PATCH] dsound: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/dsound/Makefile.in      | 2 ++
 dlls/dsound/dsound_convert.c | 2 --
 dlls/dsound/dsound_private.h | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index 6cb653fdfa0..909b38c0632 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = dsound.dll
 IMPORTLIB = dsound
 IMPORTS   = dxguid uuid winmm ole32 advapi32 user32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	buffer.c \
 	capture.c \
diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c
index 3519337c3c0..6181f04be73 100644
--- a/dlls/dsound/dsound_convert.c
+++ b/dlls/dsound/dsound_convert.c
@@ -34,8 +34,6 @@
  * Sound is LITTLE endian
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 #include <math.h>
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index b04ce06275b..69c4a2f3902 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -31,7 +31,6 @@
 #include "uuids.h"
 
 #include "wine/list.h"
-#include "wine/unicode.h"
 
 #define DS_MAX_CHANNELS 6
 
@@ -272,7 +271,7 @@ static inline WCHAR *strdupW( const WCHAR *str )
     WCHAR *ret;
 
     if (!str) return NULL;
-    size = (strlenW( str ) + 1) * sizeof(WCHAR);
+    size = (lstrlenW( str ) + 1) * sizeof(WCHAR);
     ret = HeapAlloc( GetProcessHeap(), 0, size );
     if (ret) memcpy( ret, str, size );
     return ret;