Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
9bc84396
Commit
9bc84396
authored
Jan 26, 2020
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jan 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmcompos: Partially implement Chord Map track GetParam/SetParam methods.
Signed-off-by:
Michael Stefaniuc
<
mstefani@winehq.org
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e4e507a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
14 deletions
+30
-14
chordmaptrack.c
dlls/dmcompos/chordmaptrack.c
+28
-10
dmcompos.c
dlls/dmcompos/tests/dmcompos.c
+2
-4
No files found.
dlls/dmcompos/chordmaptrack.c
View file @
9bc84396
...
@@ -117,20 +117,38 @@ static HRESULT WINAPI chordmap_track_Play(IDirectMusicTrack8 *iface, void *pStat
...
@@ -117,20 +117,38 @@ static HRESULT WINAPI chordmap_track_Play(IDirectMusicTrack8 *iface, void *pStat
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
WINAPI
chordmap_track_GetParam
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidT
ype
,
static
HRESULT
WINAPI
chordmap_track_GetParam
(
IDirectMusicTrack8
*
iface
,
REFGUID
t
ype
,
MUSIC_TIME
mtTime
,
MUSIC_TIME
*
pmtNext
,
void
*
pP
aram
)
MUSIC_TIME
time
,
MUSIC_TIME
*
next
,
void
*
p
aram
)
{
{
IDirectMusicChordMapTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
IDirectMusicChordMapTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %s, %d, %p, %p): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidType
),
mtTime
,
pmtNext
,
pParam
);
return
S_OK
;
TRACE
(
"(%p, %s, %d, %p, %p)
\n
"
,
This
,
debugstr_dmguid
(
type
),
time
,
next
,
param
);
if
(
!
type
)
return
E_POINTER
;
if
(
!
IsEqualGUID
(
type
,
&
GUID_IDirectMusicChordMap
))
return
DMUS_E_GET_UNSUPPORTED
;
FIXME
(
"GUID_IDirectMusicChordMap not handled yet
\n
"
);
return
S_OK
;
}
}
static
HRESULT
WINAPI
chordmap_track_SetParam
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidT
ype
,
static
HRESULT
WINAPI
chordmap_track_SetParam
(
IDirectMusicTrack8
*
iface
,
REFGUID
t
ype
,
MUSIC_TIME
mtTime
,
void
*
pP
aram
)
MUSIC_TIME
time
,
void
*
p
aram
)
{
{
IDirectMusicChordMapTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
IDirectMusicChordMapTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %s, %d, %p): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidType
),
mtTime
,
pParam
);
return
S_OK
;
TRACE
(
"(%p, %s, %d, %p)
\n
"
,
This
,
debugstr_dmguid
(
type
),
time
,
param
);
if
(
!
type
)
return
E_POINTER
;
if
(
!
IsEqualGUID
(
type
,
&
GUID_IDirectMusicChordMap
))
return
DMUS_E_SET_UNSUPPORTED
;
FIXME
(
"GUID_IDirectMusicChordMap not handled yet
\n
"
);
return
S_OK
;
}
}
static
HRESULT
WINAPI
chordmap_track_IsParamSupported
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidType
)
static
HRESULT
WINAPI
chordmap_track_IsParamSupported
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidType
)
...
...
dlls/dmcompos/tests/dmcompos.c
View file @
9bc84396
...
@@ -321,12 +321,10 @@ static void test_chordmaptrack(void)
...
@@ -321,12 +321,10 @@ static void test_chordmaptrack(void)
ok
(
hr
==
S_OK
,
"IDirectMusicTrack8_EndPlay failed: %08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"IDirectMusicTrack8_EndPlay failed: %08x
\n
"
,
hr
);
hr
=
IDirectMusicTrack8_Play
(
dmt8
,
NULL
,
0
,
0
,
0
,
0
,
NULL
,
NULL
,
0
);
hr
=
IDirectMusicTrack8_Play
(
dmt8
,
NULL
,
0
,
0
,
0
,
0
,
NULL
,
NULL
,
0
);
ok
(
hr
==
S_OK
,
"IDirectMusicTrack8_Play failed: %08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"IDirectMusicTrack8_Play failed: %08x
\n
"
,
hr
);
todo_wine
{
hr
=
IDirectMusicTrack8_GetParam
(
dmt8
,
NULL
,
0
,
NULL
,
NULL
);
hr
=
IDirectMusicTrack8_GetParam
(
dmt8
,
NULL
,
0
,
NULL
,
NULL
);
ok
(
hr
==
E_POINTER
,
"IDirectMusicTrack8_GetParam failed: %08x
\n
"
,
hr
);
ok
(
hr
==
E_POINTER
,
"IDirectMusicTrack8_GetParam failed: %08x
\n
"
,
hr
);
hr
=
IDirectMusicTrack8_SetParam
(
dmt8
,
NULL
,
0
,
NULL
);
hr
=
IDirectMusicTrack8_SetParam
(
dmt8
,
NULL
,
0
,
NULL
);
ok
(
hr
==
E_POINTER
,
"IDirectMusicTrack8_SetParam failed: %08x
\n
"
,
hr
);
ok
(
hr
==
E_POINTER
,
"IDirectMusicTrack8_SetParam failed: %08x
\n
"
,
hr
);
}
hr
=
IDirectMusicTrack8_IsParamSupported
(
dmt8
,
NULL
);
hr
=
IDirectMusicTrack8_IsParamSupported
(
dmt8
,
NULL
);
ok
(
hr
==
E_POINTER
,
"IDirectMusicTrack8_IsParamSupported failed: %08x
\n
"
,
hr
);
ok
(
hr
==
E_POINTER
,
"IDirectMusicTrack8_IsParamSupported failed: %08x
\n
"
,
hr
);
...
@@ -348,11 +346,11 @@ static void test_chordmaptrack(void)
...
@@ -348,11 +346,11 @@ static void test_chordmaptrack(void)
"IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED
\n
"
,
"IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED
\n
"
,
unsupported
[
i
].
name
,
hr
);
unsupported
[
i
].
name
,
hr
);
hr
=
IDirectMusicTrack8_GetParam
(
dmt8
,
unsupported
[
i
].
type
,
0
,
NULL
,
&
chordmap
);
hr
=
IDirectMusicTrack8_GetParam
(
dmt8
,
unsupported
[
i
].
type
,
0
,
NULL
,
&
chordmap
);
todo_wine
ok
(
hr
==
DMUS_E_GET_UNSUPPORTED
,
ok
(
hr
==
DMUS_E_GET_UNSUPPORTED
,
"GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED
\n
"
,
"GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED
\n
"
,
unsupported
[
i
].
name
,
hr
);
unsupported
[
i
].
name
,
hr
);
hr
=
IDirectMusicTrack8_SetParam
(
dmt8
,
unsupported
[
i
].
type
,
0
,
chordmap
);
hr
=
IDirectMusicTrack8_SetParam
(
dmt8
,
unsupported
[
i
].
type
,
0
,
chordmap
);
todo_wine
ok
(
hr
==
DMUS_E_SET_UNSUPPORTED
,
ok
(
hr
==
DMUS_E_SET_UNSUPPORTED
,
"SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED
\n
"
,
"SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED
\n
"
,
unsupported
[
i
].
name
,
hr
);
unsupported
[
i
].
name
,
hr
);
}
}
...
...
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