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
8729840f
Commit
8729840f
authored
Feb 04, 2022
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Feb 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmusic: Build without -DWINE_NO_LONG_TYPES.
Signed-off-by:
Michael Stefaniuc
<
mstefani@winehq.org
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
26a9ce80
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
103 additions
and
104 deletions
+103
-104
Makefile.in
dlls/dmusic/Makefile.in
+0
-1
buffer.c
dlls/dmusic/buffer.c
+5
-5
clock.c
dlls/dmusic/clock.c
+3
-3
collection.c
dlls/dmusic/collection.c
+18
-18
dmobject.c
dlls/dmusic/dmobject.c
+10
-10
dmusic.c
dlls/dmusic/dmusic.c
+7
-7
dmusic_main.c
dlls/dmusic/dmusic_main.c
+6
-6
download.c
dlls/dmusic/download.c
+2
-2
instrument.c
dlls/dmusic/instrument.c
+25
-25
port.c
dlls/dmusic/port.c
+27
-27
No files found.
dlls/dmusic/Makefile.in
View file @
8729840f
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
dmusic.dll
IMPORTS
=
dxguid uuid ole32 advapi32 dsound user32 winmm
...
...
dlls/dmusic/buffer.c
View file @
8729840f
...
...
@@ -56,7 +56,7 @@ static ULONG WINAPI IDirectMusicBufferImpl_AddRef(LPDIRECTMUSICBUFFER iface)
IDirectMusicBufferImpl
*
This
=
impl_from_IDirectMusicBuffer
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -66,7 +66,7 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface)
IDirectMusicBufferImpl
*
This
=
impl_from_IDirectMusicBuffer
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
iface
,
ref
);
if
(
!
ref
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
->
data
);
...
...
@@ -104,7 +104,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER
DWORD
new_write_pos
=
This
->
write_pos
+
DMUS_EVENT_SIZE
(
sizeof
(
channel_message
));
DMUS_EVENTHEADER
*
header
;
TRACE
(
"(%p
)->(0x%s, %u, 0x%
x)
\n
"
,
iface
,
wine_dbgstr_longlong
(
ref_time
),
channel_group
,
channel_message
);
TRACE
(
"(%p
, 0x%s, %lu, %#l
x)
\n
"
,
iface
,
wine_dbgstr_longlong
(
ref_time
),
channel_group
,
channel_message
);
if
(
new_write_pos
>
This
->
size
)
return
DMUS_E_BUFFER_FULL
;
...
...
@@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(IDirectMusicBuffer
DWORD
new_write_pos
=
This
->
write_pos
+
DMUS_EVENT_SIZE
(
len
);
DMUS_EVENTHEADER
*
header
;
TRACE
(
"(%p, 0x%s, %
d, %
d, %p)
\n
"
,
This
,
wine_dbgstr_longlong
(
ref_time
),
channel_group
,
len
,
data
);
TRACE
(
"(%p, 0x%s, %
ld, %l
d, %p)
\n
"
,
This
,
wine_dbgstr_longlong
(
ref_time
),
channel_group
,
len
,
data
);
if
(
new_write_pos
>
This
->
size
)
return
DMUS_E_BUFFER_FULL
;
...
...
@@ -263,7 +263,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes(LPDIRECTMUSICBUFFER if
{
IDirectMusicBufferImpl
*
This
=
impl_from_IDirectMusicBuffer
(
iface
);
TRACE
(
"(%p
)->(%
u)
\n
"
,
iface
,
used_bytes
);
TRACE
(
"(%p
, %l
u)
\n
"
,
iface
,
used_bytes
);
if
(
used_bytes
>
This
->
size
)
return
DMUS_E_BUFFER_FULL
;
...
...
dlls/dmusic/clock.c
View file @
8729840f
...
...
@@ -49,7 +49,7 @@ static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface)
IReferenceClockImpl
*
This
=
impl_from_IReferenceClock
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
This
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
This
,
ref
);
return
ref
;
}
...
...
@@ -59,7 +59,7 @@ static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface)
IReferenceClockImpl
*
This
=
impl_from_IReferenceClock
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
This
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
This
,
ref
);
if
(
!
ref
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
);
...
...
@@ -103,7 +103,7 @@ static HRESULT WINAPI IReferenceClockImpl_Unadvise(IReferenceClock *iface, DWORD
{
IReferenceClockImpl
*
This
=
impl_from_IReferenceClock
(
iface
);
FIXME
(
"(%p
)->(%
d): stub
\n
"
,
This
,
dwAdviseCookie
);
FIXME
(
"(%p
, %l
d): stub
\n
"
,
This
,
dwAdviseCookie
);
return
S_OK
;
}
...
...
dlls/dmusic/collection.c
View file @
8729840f
...
...
@@ -85,7 +85,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_AddRef(IDirectMusicCollection *if
IDirectMusicCollectionImpl
*
This
=
impl_from_IDirectMusicCollection
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p
/%p)->(): new ref = %u
\n
"
,
iface
,
This
,
ref
);
TRACE
(
"(%p
): new ref = %lu
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -95,7 +95,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_Release(IDirectMusicCollection *i
IDirectMusicCollectionImpl
*
This
=
impl_from_IDirectMusicCollection
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p
/%p)->(): new ref = %u
\n
"
,
iface
,
This
,
ref
);
TRACE
(
"(%p
): new ref = %lu
\n
"
,
iface
,
ref
);
if
(
!
ref
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
);
...
...
@@ -114,7 +114,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_GetInstrument(IDirectMusicColle
struct
list
*
list_entry
;
DWORD
inst_patch
;
TRACE
(
"(%p
/%p)->(%u, %p)
\n
"
,
iface
,
This
,
patch
,
instrument
);
TRACE
(
"(%p
, %lu, %p)
\n
"
,
iface
,
patch
,
instrument
);
LIST_FOR_EACH
(
list_entry
,
&
This
->
Instruments
)
{
inst_entry
=
LIST_ENTRY
(
list_entry
,
DMUS_PRIVATE_INSTRUMENTENTRY
,
entry
);
...
...
@@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicColl
struct
list
*
list_entry
;
DWORD
length
;
TRACE
(
"(%p
/%p)->(%d, %p, %p, %d)
\n
"
,
iface
,
This
,
index
,
patch
,
name
,
name_length
);
TRACE
(
"(%p
, %ld, %p, %p, %ld)
\n
"
,
iface
,
index
,
patch
,
name
,
name_length
);
LIST_FOR_EACH
(
list_entry
,
&
This
->
Instruments
)
{
inst_entry
=
LIST_ENTRY
(
list_entry
,
DMUS_PRIVATE_INSTRUMENTENTRY
,
entry
);
...
...
@@ -228,7 +228,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
This
->
pStm
=
stream
;
IStream_Read
(
stream
,
&
chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
TRACE_
(
dmfile
)(
": %s chunk (size =
0x%04
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE_
(
dmfile
)(
": %s chunk (size =
%#04l
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
if
(
chunk
.
fccID
!=
FOURCC_RIFF
)
{
TRACE_
(
dmfile
)(
": unexpected chunk; loading failed)
\n
"
);
...
...
@@ -253,7 +253,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
do
{
IStream_Read
(
stream
,
&
chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
StreamCount
+=
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
)
+
chunk
.
dwSize
;
TRACE_
(
dmfile
)(
": %s chunk (size =
0x%04
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE_
(
dmfile
)(
": %s chunk (size =
%#04l
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
switch
(
chunk
.
fccID
)
{
case
FOURCC_COLH
:
{
TRACE_
(
dmfile
)(
": collection header chunk
\n
"
);
...
...
@@ -293,7 +293,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
do
{
IStream_Read
(
stream
,
&
chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
ListCount
[
0
]
+=
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
)
+
chunk
.
dwSize
;
TRACE_
(
dmfile
)(
": %s chunk (size =
0x%04
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE_
(
dmfile
)(
": %s chunk (size =
%#04l
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
switch
(
chunk
.
fccID
)
{
case
mmioFOURCC
(
'I'
,
'N'
,
'A'
,
'M'
):
{
CHAR
szName
[
DMUS_MAX_NAME
];
...
...
@@ -360,7 +360,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
break
;
}
}
TRACE_
(
dmfile
)(
": ListCount[0] = %
d < ListSize[0] = %
d
\n
"
,
ListCount
[
0
],
ListSize
[
0
]);
TRACE_
(
dmfile
)(
": ListCount[0] = %
ld < ListSize[0] = %l
d
\n
"
,
ListCount
[
0
],
ListSize
[
0
]);
}
while
(
ListCount
[
0
]
<
ListSize
[
0
]);
break
;
}
...
...
@@ -378,7 +378,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
do
{
IStream_Read
(
stream
,
&
chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
ListCount
[
0
]
+=
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
)
+
chunk
.
dwSize
;
TRACE_
(
dmfile
)(
": %s chunk (size =
0x%04
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE_
(
dmfile
)(
": %s chunk (size =
%#04l
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
switch
(
chunk
.
fccID
)
{
case
FOURCC_LIST
:
{
IStream_Read
(
stream
,
&
chunk
.
fccID
,
sizeof
(
FOURCC
),
NULL
);
...
...
@@ -401,7 +401,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
do
{
IStream_Read
(
stream
,
&
chunk
,
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
),
NULL
);
ListCount
[
1
]
+=
sizeof
(
FOURCC
)
+
sizeof
(
DWORD
)
+
chunk
.
dwSize
;
TRACE_
(
dmfile
)(
": %s chunk (size =
0x%04
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE_
(
dmfile
)(
": %s chunk (size =
%#04l
x)"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
switch
(
chunk
.
fccID
)
{
case
FOURCC_INSH
:
{
TRACE_
(
dmfile
)(
": instrument header chunk
\n
"
);
...
...
@@ -433,7 +433,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
break
;
}
}
TRACE_
(
dmfile
)(
": ListCount[1] = %
d < ListSize[1] = %
d
\n
"
,
ListCount
[
1
],
ListSize
[
1
]);
TRACE_
(
dmfile
)(
": ListCount[1] = %
ld < ListSize[1] = %l
d
\n
"
,
ListCount
[
1
],
ListSize
[
1
]);
}
while
(
ListCount
[
1
]
<
ListSize
[
1
]);
/* DEBUG: dumps whole instrument object tree: */
if
(
TRACE_ON
(
dmusic
))
{
...
...
@@ -441,11 +441,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
if
(
!
IsEqualGUID
(
&
instrument
->
id
,
&
GUID_NULL
))
TRACE
(
" - GUID = %s
\n
"
,
debugstr_dmguid
(
&
instrument
->
id
));
TRACE
(
" - Instrument header:
\n
"
);
TRACE
(
" - cRegions: %d
\n
"
,
instrument
->
header
.
cRegions
);
TRACE
(
" - cRegions: %
l
d
\n
"
,
instrument
->
header
.
cRegions
);
TRACE
(
" - Locale:
\n
"
);
TRACE
(
" - ulBank: %d
\n
"
,
instrument
->
header
.
Locale
.
ulBank
);
TRACE
(
" - ulInstrument: %d
\n
"
,
instrument
->
header
.
Locale
.
ulInstrument
);
TRACE
(
" => dwPatch: %d
\n
"
,
MIDILOCALE2Patch
(
&
instrument
->
header
.
Locale
));
TRACE
(
" - ulBank: %
l
d
\n
"
,
instrument
->
header
.
Locale
.
ulBank
);
TRACE
(
" - ulInstrument: %
l
d
\n
"
,
instrument
->
header
.
Locale
.
ulInstrument
);
TRACE
(
" => dwPatch: %
l
d
\n
"
,
MIDILOCALE2Patch
(
&
instrument
->
header
.
Locale
));
}
list_add_tail
(
&
This
->
Instruments
,
&
new_instrument
->
entry
);
}
...
...
@@ -461,7 +461,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
break
;
}
}
TRACE_
(
dmfile
)(
": ListCount[0] = %
d < ListSize[0] = %
d
\n
"
,
ListCount
[
0
],
ListSize
[
0
]);
TRACE_
(
dmfile
)(
": ListCount[0] = %
ld < ListSize[0] = %l
d
\n
"
,
ListCount
[
0
],
ListSize
[
0
]);
}
while
(
ListCount
[
0
]
<
ListSize
[
0
]);
break
;
}
...
...
@@ -481,7 +481,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
break
;
}
}
TRACE_
(
dmfile
)(
": StreamCount = %
d < StreamSize = %
d
\n
"
,
StreamCount
,
StreamSize
);
TRACE_
(
dmfile
)(
": StreamCount = %
ld < StreamSize = %l
d
\n
"
,
StreamCount
,
StreamSize
);
}
while
(
StreamCount
<
StreamSize
);
TRACE_
(
dmfile
)(
": reading finished
\n
"
);
...
...
@@ -497,7 +497,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface,
dump_DMUS_OBJECTDESC
(
&
This
->
dmobj
.
desc
);
TRACE
(
" - Collection header:
\n
"
);
TRACE
(
" - cInstruments: %d
\n
"
,
This
->
pHeader
->
cInstruments
);
TRACE
(
" - cInstruments: %
l
d
\n
"
,
This
->
pHeader
->
cInstruments
);
TRACE
(
" - Instruments:
\n
"
);
LIST_FOR_EACH
(
listEntry
,
&
This
->
Instruments
)
{
...
...
dlls/dmusic/dmobject.c
View file @
8729840f
...
...
@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
return
;
TRACE_
(
dmfile
)(
"DMUS_OBJECTDESC (%p):"
,
desc
);
TRACE_
(
dmfile
)(
" - dwSize = %u
\n
"
,
desc
->
dwSize
);
TRACE_
(
dmfile
)(
" - dwSize = %
l
u
\n
"
,
desc
->
dwSize
);
#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
TRACE_
(
dmfile
)(
" - dwValidData = %#08x ( "
,
desc
->
dwValidData
);
TRACE_
(
dmfile
)(
" - dwValidData = %#08
l
x ( "
,
desc
->
dwValidData
);
X
(
DMUS_OBJ_OBJECT
);
X
(
DMUS_OBJ_CLASS
);
X
(
DMUS_OBJ_NAME
);
...
...
@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
return
"(null)"
;
if
(
chunk
->
id
==
FOURCC_RIFF
||
chunk
->
id
==
FOURCC_LIST
)
type
=
wine_dbg_sprintf
(
"type %s, "
,
debugstr_fourcc
(
chunk
->
type
));
return
wine_dbg_sprintf
(
"%s chunk, %ssize %u"
,
debugstr_fourcc
(
chunk
->
id
),
type
,
chunk
->
size
);
return
wine_dbg_sprintf
(
"%s chunk, %ssize %
l
u"
,
debugstr_fourcc
(
chunk
->
id
),
type
,
chunk
->
size
);
}
static
HRESULT
stream_read
(
IStream
*
stream
,
void
*
data
,
ULONG
size
)
...
...
@@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
hr
=
IStream_Read
(
stream
,
data
,
size
,
&
read
);
if
(
FAILED
(
hr
))
TRACE_
(
dmfile
)(
"IStream_Read failed: %08x
\n
"
,
hr
);
TRACE_
(
dmfile
)(
"IStream_Read failed: %08
l
x
\n
"
,
hr
);
else
if
(
!
read
&&
read
<
size
)
{
/* All or nothing: Handle a partial read due to end of stream as an error */
TRACE_
(
dmfile
)(
"Short read: %
u < %
u
\n
"
,
read
,
size
);
TRACE_
(
dmfile
)(
"Short read: %
lu < %l
u
\n
"
,
read
,
size
);
return
E_FAIL
;
}
...
...
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
if
(
FAILED
(
hr
=
stream_read
(
stream
,
&
size
,
sizeof
(
DWORD
))))
return
hr
;
if
(
size
!=
elem_size
)
{
WARN_
(
dmfile
)(
"%s: Array element size mismatch: got %
u, expected %
u
\n
"
,
WARN_
(
dmfile
)(
"%s: Array element size mismatch: got %
lu, expected %l
u
\n
"
,
debugstr_chunk
(
chunk
),
size
,
elem_size
);
return
DMUS_E_UNSUPPORTED_STREAM
;
}
...
...
@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
ULONG
size
)
{
if
(
chunk
->
size
!=
size
)
{
WARN_
(
dmfile
)(
"Chunk %s (size %
u, offset %s) doesn't contains the expected data size %
u
\n
"
,
WARN_
(
dmfile
)(
"Chunk %s (size %
lu, offset %s) doesn't contains the expected data size %l
u
\n
"
,
debugstr_fourcc
(
chunk
->
id
),
chunk
->
size
,
wine_dbgstr_longlong
(
chunk
->
offset
.
QuadPart
),
size
);
return
E_FAIL
;
...
...
@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
struct
chunk_entry
chunk
=
{.
parent
=
riff
};
HRESULT
hr
;
TRACE
(
"Looking for %#x in %p: %s
\n
"
,
supported
,
stream
,
debugstr_chunk
(
riff
));
TRACE
(
"Looking for %#
l
x in %p: %s
\n
"
,
supported
,
stream
,
debugstr_chunk
(
riff
));
desc
->
dwValidData
=
0
;
desc
->
dwSize
=
sizeof
(
*
desc
);
...
...
@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
break
;
}
}
TRACE
(
"Found %#x
\n
"
,
desc
->
dwValidData
);
TRACE
(
"Found %#
l
x
\n
"
,
desc
->
dwValidData
);
return
hr
;
}
...
...
@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
WARN
(
"Failed to read data of %s
\n
"
,
debugstr_chunk
(
&
chunk
));
return
hr
;
}
TRACE
(
"REFERENCE guidClassID %s, dwValidData %#x
\n
"
,
debugstr_dmguid
(
&
reference
.
guidClassID
),
TRACE
(
"REFERENCE guidClassID %s, dwValidData %#
l
x
\n
"
,
debugstr_dmguid
(
&
reference
.
guidClassID
),
reference
.
dwValidData
);
if
(
FAILED
(
hr
=
dmobj_parsedescriptor
(
stream
,
list
,
&
desc
,
reference
.
dwValidData
)))
...
...
dlls/dmusic/dmusic.c
View file @
8729840f
...
...
@@ -62,7 +62,7 @@ static ULONG WINAPI master_IReferenceClock_AddRef(IReferenceClock *iface)
struct
master_clock
*
This
=
impl_from_IReferenceClock
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref = %u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p) ref = %
l
u
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -72,7 +72,7 @@ static ULONG WINAPI master_IReferenceClock_Release(IReferenceClock *iface)
struct
master_clock
*
This
=
impl_from_IReferenceClock
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref = %u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p) ref = %
l
u
\n
"
,
iface
,
ref
);
if
(
!
ref
)
heap_free
(
This
);
...
...
@@ -115,7 +115,7 @@ static HRESULT WINAPI master_IReferenceClock_AdvisePeriodic(IReferenceClock *ifa
static
HRESULT
WINAPI
master_IReferenceClock_Unadvise
(
IReferenceClock
*
iface
,
DWORD
cookie
)
{
TRACE
(
"(%p, %#x): method not implemented
\n
"
,
iface
,
cookie
);
TRACE
(
"(%p, %#
l
x): method not implemented
\n
"
,
iface
,
cookie
);
return
E_NOTIMPL
;
}
...
...
@@ -183,7 +183,7 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface)
IDirectMusic8Impl
*
This
=
impl_from_IDirectMusic8
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
This
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
This
,
ref
);
return
ref
;
}
...
...
@@ -193,7 +193,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface)
IDirectMusic8Impl
*
This
=
impl_from_IDirectMusic8
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
This
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
This
,
ref
);
if
(
!
ref
)
{
IReferenceClock_Release
(
This
->
master_clock
);
...
...
@@ -213,7 +213,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind
{
IDirectMusic8Impl
*
This
=
impl_from_IDirectMusic8
(
iface
);
TRACE
(
"(%p, %d, %p)
\n
"
,
This
,
index
,
port_caps
);
TRACE
(
"(%p, %
l
d, %p)
\n
"
,
This
,
index
,
port_caps
);
if
(
!
port_caps
)
return
E_POINTER
;
...
...
@@ -333,7 +333,7 @@ void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port)
static
HRESULT
WINAPI
IDirectMusic8Impl_EnumMasterClock
(
LPDIRECTMUSIC8
iface
,
DWORD
index
,
LPDMUS_CLOCKINFO
clock_info
)
{
TRACE
(
"(%p
)->(%
d, %p)
\n
"
,
iface
,
index
,
clock_info
);
TRACE
(
"(%p
, %l
d, %p)
\n
"
,
iface
,
index
,
clock_info
);
if
(
!
clock_info
)
return
E_POINTER
;
...
...
dlls/dmusic/dmusic_main.c
View file @
8729840f
...
...
@@ -222,12 +222,12 @@ static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask)
void
dump_DMUS_PORTPARAMS
(
LPDMUS_PORTPARAMS
params
)
{
TRACE
(
"DMUS_PORTPARAMS (%p):
\n
"
,
params
);
TRACE
(
" - dwSize = %d
\n
"
,
params
->
dwSize
);
TRACE
(
" - dwSize = %
l
d
\n
"
,
params
->
dwSize
);
TRACE
(
" - dwValidParams = %s
\n
"
,
debugstr_DMUS_PORTPARAMS_FLAGS
(
params
->
dwValidParams
));
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_VOICES
)
TRACE
(
" - dwVoices = %u
\n
"
,
params
->
dwVoices
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_CHANNELGROUPS
)
TRACE
(
" - dwChannelGroup = %u
\n
"
,
params
->
dwChannelGroups
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_AUDIOCHANNELS
)
TRACE
(
" - dwAudioChannels = %u
\n
"
,
params
->
dwAudioChannels
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_SAMPLERATE
)
TRACE
(
" - dwSampleRate = %u
\n
"
,
params
->
dwSampleRate
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_EFFECTS
)
TRACE
(
" - dwEffectFlags = %x
\n
"
,
params
->
dwEffectFlags
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_VOICES
)
TRACE
(
" - dwVoices = %
l
u
\n
"
,
params
->
dwVoices
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_CHANNELGROUPS
)
TRACE
(
" - dwChannelGroup = %
l
u
\n
"
,
params
->
dwChannelGroups
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_AUDIOCHANNELS
)
TRACE
(
" - dwAudioChannels = %
l
u
\n
"
,
params
->
dwAudioChannels
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_SAMPLERATE
)
TRACE
(
" - dwSampleRate = %
l
u
\n
"
,
params
->
dwSampleRate
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_EFFECTS
)
TRACE
(
" - dwEffectFlags = %
l
x
\n
"
,
params
->
dwEffectFlags
);
if
(
params
->
dwValidParams
&
DMUS_PORTPARAMS_SHARE
)
TRACE
(
" - fShare = %u
\n
"
,
params
->
fShare
);
}
dlls/dmusic/download.c
View file @
8729840f
...
...
@@ -51,7 +51,7 @@ static ULONG WINAPI IDirectMusicDownloadImpl_AddRef(IDirectMusicDownload *iface)
IDirectMusicDownloadImpl
*
This
=
impl_from_IDirectMusicDownload
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -61,7 +61,7 @@ static ULONG WINAPI IDirectMusicDownloadImpl_Release(IDirectMusicDownload *iface
IDirectMusicDownloadImpl
*
This
=
impl_from_IDirectMusicDownload
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
iface
,
ref
);
if
(
!
ref
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
);
...
...
dlls/dmusic/instrument.c
View file @
8729840f
...
...
@@ -61,7 +61,7 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT if
IDirectMusicInstrumentImpl
*
This
=
impl_from_IDirectMusicInstrument
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i
IDirectMusicInstrumentImpl
*
This
=
impl_from_IDirectMusicInstrument
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
iface
,
ref
);
if
(
!
ref
)
{
...
...
@@ -104,7 +104,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_SetPatch(LPDIRECTMUSICINSTRUMEN
{
IDirectMusicInstrumentImpl
*
This
=
impl_from_IDirectMusicInstrument
(
iface
);
TRACE
(
"(%p
)->(%
d): stub
\n
"
,
This
,
dwPatch
);
TRACE
(
"(%p
, %l
d): stub
\n
"
,
This
,
dwPatch
);
Patch2MIDILOCALE
(
dwPatch
,
&
This
->
header
.
Locale
);
...
...
@@ -148,11 +148,11 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)
hr
=
IStream_Read
(
stream
,
data
,
size
,
&
bytes_read
);
if
(
FAILED
(
hr
)){
TRACE
(
"IStream_Read failed: %08x
\n
"
,
hr
);
TRACE
(
"IStream_Read failed: %08
l
x
\n
"
,
hr
);
return
hr
;
}
if
(
bytes_read
<
size
)
{
TRACE
(
"Didn't read full chunk: %
u < %
u
\n
"
,
bytes_read
,
size
);
TRACE
(
"Didn't read full chunk: %
lu < %l
u
\n
"
,
bytes_read
,
size
);
return
E_FAIL
;
}
...
...
@@ -162,7 +162,7 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)
static
inline
DWORD
subtract_bytes
(
DWORD
len
,
DWORD
bytes
)
{
if
(
bytes
>
len
){
TRACE
(
"Apparent mismatch in chunk lengths? %
u bytes remaining, %
u bytes read
\n
"
,
len
,
bytes
);
TRACE
(
"Apparent mismatch in chunk lengths? %
lu bytes remaining, %l
u bytes read
\n
"
,
len
,
bytes
);
return
0
;
}
return
len
-
bytes
;
...
...
@@ -177,7 +177,7 @@ static inline HRESULT advance_stream(IStream *stream, ULONG bytes)
ret
=
IStream_Seek
(
stream
,
move
,
STREAM_SEEK_CUR
,
NULL
);
if
(
FAILED
(
ret
))
WARN
(
"IStream_Seek failed: %08x
\n
"
,
ret
);
WARN
(
"IStream_Seek failed: %08
l
x
\n
"
,
ret
);
return
ret
;
}
...
...
@@ -187,7 +187,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
HRESULT
ret
;
DMUS_PRIVATE_CHUNK
chunk
;
TRACE
(
"(%p, %p, %p, %u)
\n
"
,
This
,
stream
,
region
,
length
);
TRACE
(
"(%p, %p, %p, %
l
u)
\n
"
,
This
,
stream
,
region
,
length
);
while
(
length
)
{
...
...
@@ -200,7 +200,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
switch
(
chunk
.
fccID
)
{
case
FOURCC_RGNH
:
TRACE
(
"RGNH chunk (region header): %u bytes
\n
"
,
chunk
.
dwSize
);
TRACE
(
"RGNH chunk (region header): %
l
u bytes
\n
"
,
chunk
.
dwSize
);
ret
=
read_from_stream
(
stream
,
&
region
->
header
,
sizeof
(
region
->
header
));
if
(
FAILED
(
ret
))
...
...
@@ -210,7 +210,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
break
;
case
FOURCC_WSMP
:
TRACE
(
"WSMP chunk (wave sample): %u bytes
\n
"
,
chunk
.
dwSize
);
TRACE
(
"WSMP chunk (wave sample): %
l
u bytes
\n
"
,
chunk
.
dwSize
);
ret
=
read_from_stream
(
stream
,
&
region
->
wave_sample
,
sizeof
(
region
->
wave_sample
));
if
(
FAILED
(
ret
))
...
...
@@ -228,7 +228,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
break
;
case
FOURCC_WLNK
:
TRACE
(
"WLNK chunk (wave link): %u bytes
\n
"
,
chunk
.
dwSize
);
TRACE
(
"WLNK chunk (wave link): %
l
u bytes
\n
"
,
chunk
.
dwSize
);
ret
=
read_from_stream
(
stream
,
&
region
->
wave_link
,
sizeof
(
region
->
wave_link
));
if
(
FAILED
(
ret
))
...
...
@@ -238,7 +238,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in
break
;
default:
TRACE
(
"Unknown chunk %s (skipping): %u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE
(
"Unknown chunk %s (skipping): %
l
u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
ret
=
advance_stream
(
stream
,
chunk
.
dwSize
);
if
(
FAILED
(
ret
))
...
...
@@ -297,7 +297,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
ULONG
i
=
0
;
ULONG
length
=
This
->
length
;
TRACE
(
"(%p, %p): offset = 0x%s, length = %u)
\n
"
,
This
,
stream
,
wine_dbgstr_longlong
(
This
->
liInstrumentPosition
.
QuadPart
),
This
->
length
);
TRACE
(
"(%p, %p): offset = 0x%s, length = %
l
u)
\n
"
,
This
,
stream
,
wine_dbgstr_longlong
(
This
->
liInstrumentPosition
.
QuadPart
),
This
->
length
);
if
(
This
->
loaded
)
return
S_OK
;
...
...
@@ -305,7 +305,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
hr
=
IStream_Seek
(
stream
,
This
->
liInstrumentPosition
,
STREAM_SEEK_SET
,
NULL
);
if
(
FAILED
(
hr
))
{
WARN
(
"IStream_Seek failed: %08x
\n
"
,
hr
);
WARN
(
"IStream_Seek failed: %08
l
x
\n
"
,
hr
);
return
DMUS_E_UNSUPPORTED_STREAM
;
}
...
...
@@ -325,7 +325,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
{
case
FOURCC_INSH
:
case
FOURCC_DLID
:
TRACE
(
"Chunk %s: %u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE
(
"Chunk %s: %
l
u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
/* Instrument header and id are already set so just skip */
hr
=
advance_stream
(
stream
,
chunk
.
dwSize
);
...
...
@@ -337,7 +337,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
case
FOURCC_LIST
:
{
DWORD
size
=
chunk
.
dwSize
;
TRACE
(
"LIST chunk: %u bytes
\n
"
,
chunk
.
dwSize
);
TRACE
(
"LIST chunk: %
l
u bytes
\n
"
,
chunk
.
dwSize
);
hr
=
read_from_stream
(
stream
,
&
chunk
.
fccID
,
sizeof
(
chunk
.
fccID
));
if
(
FAILED
(
hr
))
...
...
@@ -348,7 +348,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
switch
(
chunk
.
fccID
)
{
case
FOURCC_LRGN
:
TRACE
(
"LRGN chunk (regions list): %u bytes
\n
"
,
size
);
TRACE
(
"LRGN chunk (regions list): %
l
u bytes
\n
"
,
size
);
while
(
size
)
{
...
...
@@ -358,7 +358,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
if
(
chunk
.
fccID
!=
FOURCC_LIST
)
{
TRACE
(
"Unknown chunk %s: %u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE
(
"Unknown chunk %s: %
l
u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
goto
error
;
}
...
...
@@ -368,12 +368,12 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
if
(
chunk
.
fccID
==
FOURCC_RGN
)
{
TRACE
(
"RGN chunk (region): %u bytes
\n
"
,
chunk
.
dwSize
);
TRACE
(
"RGN chunk (region): %
l
u bytes
\n
"
,
chunk
.
dwSize
);
hr
=
load_region
(
This
,
stream
,
&
This
->
regions
[
i
++
],
chunk
.
dwSize
-
sizeof
(
chunk
.
fccID
));
}
else
{
TRACE
(
"Unknown chunk %s: %u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE
(
"Unknown chunk %s: %
l
u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
hr
=
advance_stream
(
stream
,
chunk
.
dwSize
-
sizeof
(
chunk
.
fccID
));
}
if
(
FAILED
(
hr
))
...
...
@@ -384,7 +384,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
break
;
case
FOURCC_LART
:
TRACE
(
"LART chunk (articulations list): %u bytes
\n
"
,
size
);
TRACE
(
"LART chunk (articulations list): %
l
u bytes
\n
"
,
size
);
while
(
size
)
{
...
...
@@ -394,12 +394,12 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
if
(
chunk
.
fccID
==
FOURCC_ART1
)
{
TRACE
(
"ART1 chunk (level 1 articulation): %u bytes
\n
"
,
chunk
.
dwSize
);
TRACE
(
"ART1 chunk (level 1 articulation): %
l
u bytes
\n
"
,
chunk
.
dwSize
);
hr
=
load_articulation
(
This
,
stream
,
chunk
.
dwSize
);
}
else
{
TRACE
(
"Unknown chunk %s: %u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE
(
"Unknown chunk %s: %
l
u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
hr
=
advance_stream
(
stream
,
chunk
.
dwSize
);
}
if
(
FAILED
(
hr
))
...
...
@@ -410,7 +410,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
break
;
default:
TRACE
(
"Unknown chunk %s: %u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE
(
"Unknown chunk %s: %
l
u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
hr
=
advance_stream
(
stream
,
chunk
.
dwSize
-
sizeof
(
chunk
.
fccID
));
if
(
FAILED
(
hr
))
...
...
@@ -423,7 +423,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt
}
default:
TRACE
(
"Unknown chunk %s: %u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
TRACE
(
"Unknown chunk %s: %
l
u bytes
\n
"
,
debugstr_fourcc
(
chunk
.
fccID
),
chunk
.
dwSize
);
hr
=
advance_stream
(
stream
,
chunk
.
dwSize
);
if
(
FAILED
(
hr
))
...
...
dlls/dmusic/port.c
View file @
8729840f
...
...
@@ -90,7 +90,7 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef(LPDIRECTMUSICDOW
IDirectMusicDownloadedInstrumentImpl
*
This
=
impl_from_IDirectMusicDownloadedInstrument
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -100,7 +100,7 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDO
IDirectMusicDownloadedInstrumentImpl
*
This
=
impl_from_IDirectMusicDownloadedInstrument
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
iface
,
ref
);
if
(
!
ref
)
{
...
...
@@ -177,7 +177,7 @@ static ULONG WINAPI synth_port_AddRef(IDirectMusicPort *iface)
struct
synth_port
*
This
=
synth_from_IDirectMusicPort
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
This
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
This
,
ref
);
DMUSIC_LockModule
();
...
...
@@ -189,7 +189,7 @@ static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface)
struct
synth_port
*
This
=
synth_from_IDirectMusicPort
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p)
->(): new ref = %
u
\n
"
,
This
,
ref
);
TRACE
(
"(%p)
: new ref = %l
u
\n
"
,
This
,
ref
);
if
(
!
ref
)
{
...
...
@@ -266,7 +266,7 @@ static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDi
ULONG
size
;
ULONG
i
;
TRACE
(
"(%p
/%p)->(%p, %p, %p, %d)
\n
"
,
iface
,
This
,
instrument
,
downloaded_instrument
,
note_ranges
,
num_note_ranges
);
TRACE
(
"(%p
, %p, %p, %p, %ld)
\n
"
,
iface
,
instrument
,
downloaded_instrument
,
note_ranges
,
num_note_ranges
);
if
(
!
instrument
||
!
downloaded_instrument
||
(
num_note_ranges
&&
!
note_ranges
))
return
E_POINTER
;
...
...
@@ -396,7 +396,7 @@ static HRESULT WINAPI synth_port_DeviceIoControl(IDirectMusicPort *iface, DWORD
{
struct
synth_port
*
This
=
synth_from_IDirectMusicPort
(
iface
);
FIXME
(
"(%p/%p
)->(%d, %p, %d, %p, %
d, %p, %p): stub
\n
"
,
iface
,
This
,
io_control_code
,
in_buffer
,
in_buffer_size
,
out_buffer
,
out_buffer_size
,
bytes_returned
,
overlapped
);
FIXME
(
"(%p/%p
, %ld, %p, %ld, %p, %l
d, %p, %p): stub
\n
"
,
iface
,
This
,
io_control_code
,
in_buffer
,
in_buffer_size
,
out_buffer
,
out_buffer_size
,
bytes_returned
,
overlapped
);
return
S_OK
;
}
...
...
@@ -405,7 +405,7 @@ static HRESULT WINAPI synth_port_SetNumChannelGroups(IDirectMusicPort *iface, DW
{
struct
synth_port
*
This
=
synth_from_IDirectMusicPort
(
iface
);
FIXME
(
"(%p
/%p)->(%d): semi-stub
\n
"
,
iface
,
This
,
channel_groups
);
FIXME
(
"(%p
, %ld): semi-stub
\n
"
,
iface
,
channel_groups
);
This
->
nrofgroups
=
channel_groups
;
...
...
@@ -457,11 +457,11 @@ static HRESULT WINAPI synth_port_SetChannelPriority(IDirectMusicPort *iface, DWO
{
struct
synth_port
*
This
=
synth_from_IDirectMusicPort
(
iface
);
FIXME
(
"(%p/%p
)->(%d, %d, %
d): semi-stub
\n
"
,
iface
,
This
,
channel_group
,
channel
,
priority
);
FIXME
(
"(%p/%p
, %ld, %ld, %l
d): semi-stub
\n
"
,
iface
,
This
,
channel_group
,
channel
,
priority
);
if
(
channel
>
16
)
{
WARN
(
"isn't there supposed to be 16 channels (no. %d requested)?! (faking as it is ok)
\n
"
,
channel
);
WARN
(
"isn't there supposed to be 16 channels (no. %
l
d requested)?! (faking as it is ok)
\n
"
,
channel
);
/*return E_INVALIDARG;*/
}
...
...
@@ -473,7 +473,7 @@ static HRESULT WINAPI synth_port_GetChannelPriority(IDirectMusicPort *iface, DWO
{
struct
synth_port
*
This
=
synth_from_IDirectMusicPort
(
iface
);
TRACE
(
"(%p
/%p)->(%u, %u, %p)
\n
"
,
iface
,
This
,
channel_group
,
channel
,
priority
);
TRACE
(
"(%p
, %lu, %lu, %p)
\n
"
,
iface
,
channel_group
,
channel
,
priority
);
*
priority
=
This
->
group
[
channel_group
-
1
].
channel
[
channel
].
priority
;
...
...
@@ -614,7 +614,7 @@ static HRESULT WINAPI synth_port_download_GetBuffer(IDirectMusicPortDownload *if
{
struct
synth_port
*
This
=
synth_from_IDirectMusicPortDownload
(
iface
);
FIXME
(
"(%p/%p
)->(%
u, %p): stub
\n
"
,
iface
,
This
,
DLId
,
IDMDownload
);
FIXME
(
"(%p/%p
, %l
u, %p): stub
\n
"
,
iface
,
This
,
DLId
,
IDMDownload
);
if
(
!
IDMDownload
)
return
E_POINTER
;
...
...
@@ -627,7 +627,7 @@ static HRESULT WINAPI synth_port_download_AllocateBuffer(IDirectMusicPortDownloa
{
struct
synth_port
*
This
=
synth_from_IDirectMusicPortDownload
(
iface
);
FIXME
(
"(%p/%p
)->(%
u, %p): stub
\n
"
,
iface
,
This
,
size
,
IDMDownload
);
FIXME
(
"(%p/%p
, %l
u, %p): stub
\n
"
,
iface
,
This
,
size
,
IDMDownload
);
return
S_OK
;
}
...
...
@@ -636,7 +636,7 @@ static HRESULT WINAPI synth_port_download_GetDLId(IDirectMusicPortDownload *ifac
{
struct
synth_port
*
This
=
synth_from_IDirectMusicPortDownload
(
iface
);
FIXME
(
"(%p/%p
)->(%p, %
u): stub
\n
"
,
iface
,
This
,
start_DLId
,
count
);
FIXME
(
"(%p/%p
, %p, %l
u): stub
\n
"
,
iface
,
This
,
start_DLId
,
count
);
return
S_OK
;
}
...
...
@@ -715,7 +715,7 @@ static HRESULT WINAPI synth_port_thru_ThruChannel(IDirectMusicThru *iface, DWORD
{
struct
synth_port
*
This
=
synth_from_IDirectMusicThru
(
iface
);
FIXME
(
"(%p/%p
)->(%d, %d, %d, %
d, %p): stub
\n
"
,
iface
,
This
,
source_channel_group
,
source_channel
,
destination_channel_group
,
destination_channel
,
destination_port
);
FIXME
(
"(%p/%p
, %ld, %ld, %ld, %l
d, %p): stub
\n
"
,
iface
,
This
,
source_channel_group
,
source_channel
,
destination_channel_group
,
destination_channel
,
destination_port
);
return
S_OK
;
}
...
...
@@ -754,12 +754,12 @@ static ULONG WINAPI IKsControlImpl_Release(IKsControl *iface)
static
HRESULT
WINAPI
IKsControlImpl_KsProperty
(
IKsControl
*
iface
,
KSPROPERTY
*
prop
,
ULONG
prop_len
,
void
*
data
,
ULONG
data_len
,
ULONG
*
ret_len
)
{
TRACE
(
"(%p
)->(%p, %u, %p, %
u, %p)
\n
"
,
iface
,
prop
,
prop_len
,
data
,
data_len
,
ret_len
);
TRACE
(
"prop = %s - %
u - %
u
\n
"
,
debugstr_guid
(
&
prop
->
u
.
s
.
Set
),
prop
->
u
.
s
.
Id
,
prop
->
u
.
s
.
Flags
);
TRACE
(
"(%p
, %p, %lu, %p, %l
u, %p)
\n
"
,
iface
,
prop
,
prop_len
,
data
,
data_len
,
ret_len
);
TRACE
(
"prop = %s - %
lu - %l
u
\n
"
,
debugstr_guid
(
&
prop
->
u
.
s
.
Set
),
prop
->
u
.
s
.
Id
,
prop
->
u
.
s
.
Flags
);
if
(
prop
->
u
.
s
.
Flags
!=
KSPROPERTY_TYPE_GET
)
{
FIXME
(
"prop flags %u not yet supported
\n
"
,
prop
->
u
.
s
.
Flags
);
FIXME
(
"prop flags %
l
u not yet supported
\n
"
,
prop
->
u
.
s
.
Flags
);
return
S_FALSE
;
}
...
...
@@ -776,7 +776,7 @@ static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *p
static
HRESULT
WINAPI
IKsControlImpl_KsMethod
(
IKsControl
*
iface
,
KSMETHOD
*
method
,
ULONG
method_len
,
void
*
data
,
ULONG
data_len
,
ULONG
*
ret_len
)
{
FIXME
(
"(%p
)->(%p, %u, %p, %
u, %p): stub
\n
"
,
iface
,
method
,
method_len
,
data
,
data_len
,
ret_len
);
FIXME
(
"(%p
, %p, %lu, %p, %l
u, %p): stub
\n
"
,
iface
,
method
,
method_len
,
data
,
data_len
,
ret_len
);
return
E_NOTIMPL
;
}
...
...
@@ -784,7 +784,7 @@ static HRESULT WINAPI IKsControlImpl_KsMethod(IKsControl *iface, KSMETHOD *metho
static
HRESULT
WINAPI
IKsControlImpl_KsEvent
(
IKsControl
*
iface
,
KSEVENT
*
event
,
ULONG
event_len
,
void
*
data
,
ULONG
data_len
,
ULONG
*
ret_len
)
{
FIXME
(
"(%p
)->(%p, %u, %p, %
u, %p): stub
\n
"
,
iface
,
event
,
event_len
,
data
,
data_len
,
ret_len
);
FIXME
(
"(%p
, %p, %lu, %p, %l
u, %p): stub
\n
"
,
iface
,
event
,
event_len
,
data
,
data_len
,
ret_len
);
return
E_NOTIMPL
;
}
...
...
@@ -917,7 +917,7 @@ static ULONG WINAPI midi_IDirectMusicPort_AddRef(IDirectMusicPort *iface)
struct
midi_port
*
This
=
impl_from_IDirectMusicPort
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref = %u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p) ref = %
l
u
\n
"
,
iface
,
ref
);
return
ref
;
}
...
...
@@ -927,7 +927,7 @@ static ULONG WINAPI midi_IDirectMusicPort_Release(IDirectMusicPort *iface)
struct
midi_port
*
This
=
impl_from_IDirectMusicPort
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref = %u
\n
"
,
iface
,
ref
);
TRACE
(
"(%p) ref = %
l
u
\n
"
,
iface
,
ref
);
if
(
!
ref
)
{
if
(
This
->
clock
)
...
...
@@ -966,7 +966,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DownloadInstrument(IDirectMusicPort
IDirectMusicInstrument
*
instrument
,
IDirectMusicDownloadedInstrument
**
downloaded
,
DMUS_NOTERANGE
*
ranges
,
DWORD
num_ranges
)
{
FIXME
(
"(%p, %p, %p, %p, %u) stub!
\n
"
,
iface
,
instrument
,
downloaded
,
ranges
,
num_ranges
);
FIXME
(
"(%p, %p, %p, %p, %
l
u) stub!
\n
"
,
iface
,
instrument
,
downloaded
,
ranges
,
num_ranges
);
return
E_NOTIMPL
;
}
...
...
@@ -1021,7 +1021,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DeviceIoControl(IDirectMusicPort *if
DWORD
io_control_code
,
void
*
in
,
DWORD
size_in
,
void
*
out
,
DWORD
size_out
,
DWORD
*
ret_len
,
OVERLAPPED
*
overlapped
)
{
FIXME
(
"(%p, %
u, %p, %u, %p, %
u, %p, %p) stub!
\n
"
,
iface
,
io_control_code
,
in
,
size_in
,
out
FIXME
(
"(%p, %
lu, %p, %lu, %p, %l
u, %p, %p) stub!
\n
"
,
iface
,
io_control_code
,
in
,
size_in
,
out
,
size_out
,
ret_len
,
overlapped
);
return
E_NOTIMPL
;
...
...
@@ -1030,7 +1030,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DeviceIoControl(IDirectMusicPort *if
static
HRESULT
WINAPI
midi_IDirectMusicPort_SetNumChannelGroups
(
IDirectMusicPort
*
iface
,
DWORD
cgroups
)
{
FIXME
(
"(%p, %u) stub!
\n
"
,
iface
,
cgroups
);
FIXME
(
"(%p, %
l
u) stub!
\n
"
,
iface
,
cgroups
);
return
E_NOTIMPL
;
}
...
...
@@ -1053,7 +1053,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_Activate(IDirectMusicPort *iface, BO
static
HRESULT
WINAPI
midi_IDirectMusicPort_SetChannelPriority
(
IDirectMusicPort
*
iface
,
DWORD
channel_group
,
DWORD
channel
,
DWORD
priority
)
{
FIXME
(
"(%p, %
u, %u, %
u) stub!
\n
"
,
iface
,
channel_group
,
channel
,
priority
);
FIXME
(
"(%p, %
lu, %lu, %l
u) stub!
\n
"
,
iface
,
channel_group
,
channel
,
priority
);
return
E_NOTIMPL
;
}
...
...
@@ -1061,7 +1061,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_SetChannelPriority(IDirectMusicPort
static
HRESULT
WINAPI
midi_IDirectMusicPort_GetChannelPriority
(
IDirectMusicPort
*
iface
,
DWORD
channel_group
,
DWORD
channel
,
DWORD
*
priority
)
{
FIXME
(
"(%p, %
u, %
u, %p) stub!
\n
"
,
iface
,
channel_group
,
channel
,
priority
);
FIXME
(
"(%p, %
lu, %l
u, %p) stub!
\n
"
,
iface
,
channel_group
,
channel
,
priority
);
return
E_NOTIMPL
;
}
...
...
@@ -1135,7 +1135,7 @@ static ULONG WINAPI midi_IDirectMusicThru_Release(IDirectMusicThru *iface)
static
HRESULT
WINAPI
midi_IDirectMusicThru_ThruChannel
(
IDirectMusicThru
*
iface
,
DWORD
src_group
,
DWORD
src_channel
,
DWORD
dest_group
,
DWORD
dest_channel
,
IDirectMusicPort
*
dest_port
)
{
FIXME
(
"(%p, %
u, %u, %u, %
u, %p) stub!
\n
"
,
iface
,
src_group
,
src_channel
,
dest_group
,
FIXME
(
"(%p, %
lu, %lu, %lu, %l
u, %p) stub!
\n
"
,
iface
,
src_group
,
src_channel
,
dest_group
,
dest_channel
,
dest_port
);
return
S_OK
;
...
...
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