Module: wine Branch: master Commit: 3a061006688f9bd0d73d5989d882947c0bb6e601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a061006688f9bd0d73d5989d...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jun 3 10:31:02 2019 +0200
dmusic: Build with msvcrt.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dmusic/Makefile.in | 2 ++ dlls/dmusic/collection.c | 2 +- dlls/dmusic/dmusic.c | 16 ++++++++-------- dlls/dmusic/dmusic_main.c | 2 -- dlls/dmusic/dmusic_private.h | 1 - 5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index a8955a2..8870032 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmusic.dll IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ clock.c \ diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index b7eb375..1fddab5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicColl IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument); IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, patch); if (name) { - length = min(strlenW(instrument->wszName), name_length - 1); + length = min(lstrlenW(instrument->wszName), name_length - 1); memcpy(name, instrument->wszName, length * sizeof(WCHAR)); name[length] = '\0'; } diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index fd450b8..94c0ff4 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW
clock_info->ctType = 0; clock_info->guidClock = guid_system_clock; - strcpyW(clock_info->wszDescription, name_system_clock); + lstrcpyW(clock_info->wszDescription, name_system_clock); } else { @@ -233,7 +233,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW
clock_info->ctType = 0; clock_info->guidClock = guid_dsound_clock; - strcpyW(clock_info->wszDescription, name_dsound_clock); + lstrcpyW(clock_info->wszDescription, name_dsound_clock); }
return S_OK; @@ -418,8 +418,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = MIDI_MAPPER; port->create = midi_out_port_create; midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out)); - strcpyW(port->caps.wszDescription, caps_out.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_out.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_SHAREABLE; port->caps.dwClass = DMUS_PC_OUTPUTCLASS; port++; @@ -430,8 +430,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = i; port->create = midi_out_port_create; midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out)); - strcpyW(port->caps.wszDescription, caps_out.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_out.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_SHAREABLE | DMUS_PC_EXTERNAL; port->caps.dwClass = DMUS_PC_OUTPUTCLASS; port++; @@ -443,8 +443,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = i; port->create = midi_in_port_create; midiInGetDevCapsW(i, &caps_in, sizeof(caps_in)); - strcpyW(port->caps.wszDescription, caps_in.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_in.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_EXTERNAL; port->caps.dwClass = DMUS_PC_INPUTCLASS; port++; diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 3956dc2..295cd84 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "config.h" -#include "wine/port.h"
#include <stdio.h> #include <stdarg.h> diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index f9839ed..c59646d 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -36,7 +36,6 @@
#include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h"