system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

dmusic: Build with msvcrt.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-06-03 10:31:02 +02:00
parent 51994cb64d
commit 3a06100668
5 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/dmusic/Makefile.in
View file

@ -1,6 +1,8 @@
MODULE = dmusic.dll MODULE = dmusic.dll
IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
buffer.c \ buffer.c \
clock.c \ clock.c \

2
dlls/dmusic/collection.c
View file

@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicColl
IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument); IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument);
IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, patch); IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, patch);
if (name) { 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)); memcpy(name, instrument->wszName, length * sizeof(WCHAR));
name[length] = '\0'; name[length] = '\0';
} }

16
dlls/dmusic/dmusic.c
View file

@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW
clock_info->ctType = 0; clock_info->ctType = 0;
clock_info->guidClock = guid_system_clock; clock_info->guidClock = guid_system_clock;
strcpyW(clock_info->wszDescription, name_system_clock); lstrcpyW(clock_info->wszDescription, name_system_clock);
} }
else else
{ {
@ -233,7 +233,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW
clock_info->ctType = 0; clock_info->ctType = 0;
clock_info->guidClock = guid_dsound_clock; clock_info->guidClock = guid_dsound_clock;
strcpyW(clock_info->wszDescription, name_dsound_clock); lstrcpyW(clock_info->wszDescription, name_dsound_clock);
} }
return S_OK; return S_OK;
@ -418,8 +418,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object)
port->device = MIDI_MAPPER; port->device = MIDI_MAPPER;
port->create = midi_out_port_create; port->create = midi_out_port_create;
midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out)); midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out));
strcpyW(port->caps.wszDescription, caps_out.szPname); lstrcpyW(port->caps.wszDescription, caps_out.szPname);
strcatW(port->caps.wszDescription, emulated); lstrcatW(port->caps.wszDescription, emulated);
port->caps.dwFlags = DMUS_PC_SHAREABLE; port->caps.dwFlags = DMUS_PC_SHAREABLE;
port->caps.dwClass = DMUS_PC_OUTPUTCLASS; port->caps.dwClass = DMUS_PC_OUTPUTCLASS;
port++; port++;
@ -430,8 +430,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object)
port->device = i; port->device = i;
port->create = midi_out_port_create; port->create = midi_out_port_create;
midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out)); midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out));
strcpyW(port->caps.wszDescription, caps_out.szPname); lstrcpyW(port->caps.wszDescription, caps_out.szPname);
strcatW(port->caps.wszDescription, emulated); lstrcatW(port->caps.wszDescription, emulated);
port->caps.dwFlags = DMUS_PC_SHAREABLE | DMUS_PC_EXTERNAL; port->caps.dwFlags = DMUS_PC_SHAREABLE | DMUS_PC_EXTERNAL;
port->caps.dwClass = DMUS_PC_OUTPUTCLASS; port->caps.dwClass = DMUS_PC_OUTPUTCLASS;
port++; port++;
@ -443,8 +443,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object)
port->device = i; port->device = i;
port->create = midi_in_port_create; port->create = midi_in_port_create;
midiInGetDevCapsW(i, &caps_in, sizeof(caps_in)); midiInGetDevCapsW(i, &caps_in, sizeof(caps_in));
strcpyW(port->caps.wszDescription, caps_in.szPname); lstrcpyW(port->caps.wszDescription, caps_in.szPname);
strcatW(port->caps.wszDescription, emulated); lstrcatW(port->caps.wszDescription, emulated);
port->caps.dwFlags = DMUS_PC_EXTERNAL; port->caps.dwFlags = DMUS_PC_EXTERNAL;
port->caps.dwClass = DMUS_PC_INPUTCLASS; port->caps.dwClass = DMUS_PC_INPUTCLASS;
port++; port++;

2
dlls/dmusic/dmusic_main.c
View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include "wine/port.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>

1
dlls/dmusic/dmusic_private.h
View file

@ -36,7 +36,6 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/list.h" #include "wine/list.h"
#include "wine/unicode.h"
#include "winreg.h" #include "winreg.h"
#include "objbase.h" #include "objbase.h"