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
d827b652
Commit
d827b652
authored
Dec 03, 2019
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Dec 04, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmime: Partial implementation of the Marker track Get/SetParam.
Signed-off-by:
Michael Stefaniuc
<
mstefani@winehq.org
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d08bce15
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
11 deletions
+28
-11
markertrack.c
dlls/dmime/markertrack.c
+25
-10
dmime.c
dlls/dmime/tests/dmime.c
+3
-1
No files found.
dlls/dmime/markertrack.c
View file @
d827b652
...
@@ -117,20 +117,35 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void
...
@@ -117,20 +117,35 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
WINAPI
IDirectMusicTrackImpl_GetParam
(
IDirectMusicTrack
*
iface
,
REFGUID
rguidT
ype
,
static
HRESULT
WINAPI
IDirectMusicTrackImpl_GetParam
(
IDirectMusicTrack
*
iface
,
REFGUID
t
ype
,
MUSIC_TIME
mtTime
,
MUSIC_TIME
*
pmtNext
,
void
*
pP
aram
)
MUSIC_TIME
time
,
MUSIC_TIME
*
next
,
void
*
p
aram
)
{
{
IDirectMusicMarkerTrack
*
This
=
impl_from_IDirectMusicTrack
(
iface
);
IDirectMusicMarkerTrack
*
This
=
impl_from_IDirectMusicTrack
(
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
(
!
param
)
return
E_POINTER
;
if
(
IsEqualGUID
(
type
,
&
GUID_Play_Marker
))
{
FIXME
(
"GUID_Play_Marker not handled yet
\n
"
);
return
S_FALSE
;
}
if
(
IsEqualGUID
(
type
,
&
GUID_Valid_Start_Time
))
{
FIXME
(
"GUID_Valid_Start_Time not handled yet
\n
"
);
return
DMUS_E_NOT_FOUND
;
}
return
DMUS_E_GET_UNSUPPORTED
;
}
}
static
HRESULT
WINAPI
IDirectMusicTrackImpl_SetParam
(
IDirectMusicTrack
*
iface
,
REFGUID
rguidT
ype
,
static
HRESULT
WINAPI
IDirectMusicTrackImpl_SetParam
(
IDirectMusicTrack
*
iface
,
REFGUID
t
ype
,
MUSIC_TIME
mtTime
,
void
*
pP
aram
)
MUSIC_TIME
time
,
void
*
p
aram
)
{
{
IDirectMusicMarkerTrack
*
This
=
impl_from_IDirectMusicTrack
(
iface
);
IDirectMusicMarkerTrack
*
This
=
impl_from_IDirectMusicTrack
(
iface
);
FIXME
(
"(%p, %s, %d, %p): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidType
),
mtTime
,
pParam
);
return
S_OK
;
TRACE
(
"(%p, %s, %d, %p): not supported
\n
"
,
This
,
debugstr_dmguid
(
type
),
time
,
param
);
return
DMUS_E_SET_UNSUPPORTED
;
}
}
static
HRESULT
WINAPI
IDirectMusicTrackImpl_IsParamSupported
(
IDirectMusicTrack
*
iface
,
static
HRESULT
WINAPI
IDirectMusicTrackImpl_IsParamSupported
(
IDirectMusicTrack
*
iface
,
...
...
dlls/dmime/tests/dmime.c
View file @
d827b652
...
@@ -706,7 +706,9 @@ static void test_track(void)
...
@@ -706,7 +706,9 @@ static void test_track(void)
expect_getparam
(
dmt
,
param_types
[
j
].
type
,
param_types
[
j
].
name
,
expect_getparam
(
dmt
,
param_types
[
j
].
type
,
param_types
[
j
].
name
,
DMUS_E_GET_UNSUPPORTED
);
DMUS_E_GET_UNSUPPORTED
);
expect_setparam
(
dmt
,
param_types
[
j
].
type
,
param_types
[
j
].
name
,
S_OK
);
expect_setparam
(
dmt
,
param_types
[
j
].
type
,
param_types
[
j
].
name
,
S_OK
);
}
}
else
if
(
class
[
i
].
clsid
==
&
CLSID_DirectMusicMarkerTrack
)
expect_setparam
(
dmt
,
param_types
[
j
].
type
,
param_types
[
j
].
name
,
DMUS_E_SET_UNSUPPORTED
);
}
else
}
else
ok
(
hr
==
DMUS_E_TYPE_UNSUPPORTED
,
ok
(
hr
==
DMUS_E_TYPE_UNSUPPORTED
,
"IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED
\n
"
,
"IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED
\n
"
,
...
...
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