Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
3a061006
Commit
3a061006
authored
Jun 03, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmusic: Build with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
51994cb6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
12 deletions
+11
-12
Makefile.in
dlls/dmusic/Makefile.in
+2
-0
collection.c
dlls/dmusic/collection.c
+1
-1
dmusic.c
dlls/dmusic/dmusic.c
+8
-8
dmusic_main.c
dlls/dmusic/dmusic_main.c
+0
-2
dmusic_private.h
dlls/dmusic/dmusic_private.h
+0
-1
No files found.
dlls/dmusic/Makefile.in
View file @
3a061006
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
\
...
...
dlls/dmusic/collection.c
View file @
3a061006
...
@@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicColl
...
@@ -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
(
l
strlenW
(
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'
;
}
}
...
...
dlls/dmusic/dmusic.c
View file @
3a061006
...
@@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW
...
@@ -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
);
l
strcpyW
(
clock_info
->
wszDescription
,
name_system_clock
);
}
}
else
else
{
{
...
@@ -233,7 +233,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW
...
@@ -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
);
l
strcpyW
(
clock_info
->
wszDescription
,
name_dsound_clock
);
}
}
return
S_OK
;
return
S_OK
;
...
@@ -418,8 +418,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object)
...
@@ -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
);
l
strcpyW
(
port
->
caps
.
wszDescription
,
caps_out
.
szPname
);
strcatW
(
port
->
caps
.
wszDescription
,
emulated
);
l
strcatW
(
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)
...
@@ -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
);
l
strcpyW
(
port
->
caps
.
wszDescription
,
caps_out
.
szPname
);
strcatW
(
port
->
caps
.
wszDescription
,
emulated
);
l
strcatW
(
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)
...
@@ -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
);
l
strcpyW
(
port
->
caps
.
wszDescription
,
caps_in
.
szPname
);
strcatW
(
port
->
caps
.
wszDescription
,
emulated
);
l
strcatW
(
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
++
;
...
...
dlls/dmusic/dmusic_main.c
View file @
3a061006
...
@@ -17,8 +17,6 @@
...
@@ -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>
...
...
dlls/dmusic/dmusic_private.h
View file @
3a061006
...
@@ -36,7 +36,6 @@
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment