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
f5ad835e
Commit
f5ad835e
authored
Nov 19, 2019
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Nov 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmstyle: The Chord track doesn't support the BandParam type.
Signed-off-by:
Michael Stefaniuc
<
mstefani@winehq.org
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
cec8d5c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
19 deletions
+15
-19
chordtrack.c
dlls/dmstyle/chordtrack.c
+11
-14
dmstyle.c
dlls/dmstyle/tests/dmstyle.c
+4
-5
No files found.
dlls/dmstyle/chordtrack.c
View file @
f5ad835e
...
...
@@ -140,23 +140,20 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rg
return
S_OK
;
}
static
HRESULT
WINAPI
chord_track_IsParamSupported
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidT
ype
)
static
HRESULT
WINAPI
chord_track_IsParamSupported
(
IDirectMusicTrack8
*
iface
,
REFGUID
t
ype
)
{
IDirectMusicChordTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
TRACE
(
"(%p, %s)
\n
"
,
This
,
debugstr_dmguid
(
rguidType
));
IDirectMusicChordTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
if
(
!
rguidType
)
return
E_POINTER
;
TRACE
(
"(%p, %s)
\n
"
,
This
,
debugstr_dmguid
(
type
));
if
(
IsEqualGUID
(
rguidType
,
&
GUID_BandParam
)
||
IsEqualGUID
(
rguidType
,
&
GUID_ChordParam
)
||
IsEqualGUID
(
rguidType
,
&
GUID_RhythmParam
))
{
TRACE
(
"param supported
\n
"
);
return
S_OK
;
}
TRACE
(
"param unsupported
\n
"
);
return
DMUS_E_TYPE_UNSUPPORTED
;
if
(
!
type
)
return
E_POINTER
;
if
(
IsEqualGUID
(
type
,
&
GUID_ChordParam
)
||
IsEqualGUID
(
type
,
&
GUID_RhythmParam
))
return
S_OK
;
TRACE
(
"param unsupported
\n
"
);
return
DMUS_E_TYPE_UNSUPPORTED
;
}
static
HRESULT
WINAPI
chord_track_AddNotificationType
(
IDirectMusicTrack8
*
iface
,
...
...
dlls/dmstyle/tests/dmstyle.c
View file @
f5ad835e
...
...
@@ -291,7 +291,7 @@ static void test_track(void)
unsigned
int
todo_params
;
}
class
[]
=
{
{
X
(
DirectMusicAuditionTrack
),
TRUE
,
FALSE
,
0x18204200
,
0x18204200
},
{
X
(
DirectMusicChordTrack
),
TRUE
,
TRUE
,
0x100002
,
1
},
{
X
(
DirectMusicChordTrack
),
TRUE
,
TRUE
,
0x100002
,
0
},
{
X
(
DirectMusicCommandTrack
),
TRUE
,
TRUE
,
0x38
,
0
},
{
X
(
DirectMusicMotifTrack
),
FALSE
,
FALSE
,
0x8204200
,
0
},
{
X
(
DirectMusicMuteTrack
),
TRUE
,
FALSE
,
0x40000
,
0
},
...
...
@@ -333,10 +333,9 @@ static void test_track(void)
ok
(
hr
==
S_OK
,
"IsParamSupported(%s) failed: %08x, expected S_OK
\n
"
,
param_types
[
j
].
name
,
hr
);
else
todo_wine_if
(
class
[
i
].
todo_params
&
(
1
<<
j
))
ok
(
hr
==
DMUS_E_TYPE_UNSUPPORTED
,
"IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED
\n
"
,
param_types
[
j
].
name
,
hr
);
ok
(
hr
==
DMUS_E_TYPE_UNSUPPORTED
,
"IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED
\n
"
,
param_types
[
j
].
name
,
hr
);
}
if
(
class
[
i
].
clsid
==
&
CLSID_DirectMusicMuteTrack
)
{
...
...
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