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
1d2bc65c
Commit
1d2bc65c
authored
Jun 30, 2015
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jun 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmstyle: COM cleanup for IDirectMusicTrack8 of DMMotifTrack.
parent
6c057b03
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
83 additions
and
55 deletions
+83
-55
motiftrack.c
dlls/dmstyle/motiftrack.c
+83
-55
No files found.
dlls/dmstyle/motiftrack.c
View file @
1d2bc65c
...
...
@@ -22,7 +22,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
dmstyle
);
static
ULONG
WINAPI
IDirectMusicMotifTrack_IUnknown_AddRef
(
LPUNKNOWN
iface
);
static
ULONG
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_AddRef
(
LPDIRECTMUSICTRACK8
iface
);
static
ULONG
WINAPI
IDirectMusicMotifTrack_IPersistStream_AddRef
(
LPPERSISTSTREAM
iface
);
/*****************************************************************************
...
...
@@ -30,7 +29,7 @@ static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_AddRef (LPPERSISTSTREA
*/
typedef
struct
IDirectMusicMotifTrack
{
const
IUnknownVtbl
*
UnknownVtbl
;
const
IDirectMusicTrack8Vtbl
*
TrackVtbl
;
IDirectMusicTrack8
IDirectMusicTrack8_iface
;
const
IPersistStreamVtbl
*
PersistStreamVtbl
;
LONG
ref
;
DMUS_OBJECTDESC
*
pDesc
;
...
...
@@ -47,8 +46,8 @@ static HRESULT WINAPI IDirectMusicMotifTrack_IUnknown_QueryInterface (LPUNKNOWN
return
S_OK
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IDirectMusicTrack
)
||
IsEqualIID
(
riid
,
&
IID_IDirectMusicTrack8
))
{
*
ppobj
=
(
LPDIRECTMUSICTRACK8
)
&
This
->
TrackVtbl
;
IDirectMusic
MotifTrack_IDirectMusicTrack_AddRef
((
LPDIRECTMUSICTRACK8
)
&
This
->
TrackVtbl
);
*
ppobj
=
&
This
->
IDirectMusicTrack8_iface
;
IDirectMusic
Track8_AddRef
(
&
This
->
IDirectMusicTrack8_iface
);
return
S_OK
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IPersistStream
))
{
*
ppobj
=
&
This
->
PersistStreamVtbl
;
...
...
@@ -95,66 +94,81 @@ static const IUnknownVtbl DirectMusicMotifTrack_Unknown_Vtbl = {
/* IDirectMusicMotifTrack IDirectMusicTrack8 part: */
static
inline
IDirectMusicMotifTrack
*
impl_from_IDirectMusicTrack8
(
IDirectMusicTrack8
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IDirectMusicMotifTrack
,
TrackVtbl
);
return
CONTAINING_RECORD
(
iface
,
IDirectMusicMotifTrack
,
IDirectMusicTrack8_iface
);
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_QueryInterface
(
LPDIRECTMUSICTRACK8
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_QueryInterface
(
IDirectMusicTrack8
*
iface
,
REFIID
riid
,
void
**
ppobj
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
return
IDirectMusicMotifTrack_IUnknown_QueryInterface
((
LPUNKNOWN
)
&
This
->
UnknownVtbl
,
riid
,
ppobj
);
}
static
ULONG
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_AddRef
(
LPDIRECTMUSICTRACK8
iface
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
ULONG
WINAPI
IDirectMusicTrack8Impl_AddRef
(
IDirectMusicTrack8
*
iface
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
return
IDirectMusicMotifTrack_IUnknown_AddRef
((
LPUNKNOWN
)
&
This
->
UnknownVtbl
);
}
static
ULONG
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_Release
(
LPDIRECTMUSICTRACK8
iface
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
ULONG
WINAPI
IDirectMusicTrack8Impl_Release
(
IDirectMusicTrack8
*
iface
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
return
IDirectMusicMotifTrack_IUnknown_Release
((
LPUNKNOWN
)
&
This
->
UnknownVtbl
);
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_Init
(
LPDIRECTMUSICTRACK8
iface
,
IDirectMusicSegment
*
pSegment
)
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_Init
(
IDirectMusicTrack8
*
iface
,
IDirectMusicSegment
*
pSegment
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %p): stub
\n
"
,
This
,
pSegment
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_InitPlay
(
LPDIRECTMUSICTRACK8
iface
,
IDirectMusicSegmentState
*
pSegmentState
,
IDirectMusicPerformance
*
pPerformance
,
void
**
ppStateData
,
DWORD
dwVirtualTrack8ID
,
DWORD
dwFlags
)
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_InitPlay
(
IDirectMusicTrack8
*
iface
,
IDirectMusicSegmentState
*
pSegmentState
,
IDirectMusicPerformance
*
pPerformance
,
void
**
ppStateData
,
DWORD
dwVirtualTrack8ID
,
DWORD
dwFlags
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %p, %p, %p, %d, %d): stub
\n
"
,
This
,
pSegmentState
,
pPerformance
,
ppStateData
,
dwVirtualTrack8ID
,
dwFlags
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusic
MotifTrack_IDirectMusicTrack_EndPlay
(
LPDIRECTMUSICTRACK8
iface
,
void
*
pStateData
)
static
HRESULT
WINAPI
IDirectMusic
Track8Impl_EndPlay
(
IDirectMusicTrack8
*
iface
,
void
*
pStateData
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %p): stub
\n
"
,
This
,
pStateData
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_Play
(
LPDIRECTMUSICTRACK8
iface
,
void
*
pStateData
,
MUSIC_TIME
mtStart
,
MUSIC_TIME
mtEnd
,
MUSIC_TIME
mtOffset
,
DWORD
dwFlags
,
IDirectMusicPerformance
*
pPerf
,
IDirectMusicSegmentState
*
pSegSt
,
DWORD
dwVirtualID
)
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_Play
(
IDirectMusicTrack8
*
iface
,
void
*
pStateData
,
MUSIC_TIME
mtStart
,
MUSIC_TIME
mtEnd
,
MUSIC_TIME
mtOffset
,
DWORD
dwFlags
,
IDirectMusicPerformance
*
pPerf
,
IDirectMusicSegmentState
*
pSegSt
,
DWORD
dwVirtualID
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub
\n
"
,
This
,
pStateData
,
mtStart
,
mtEnd
,
mtOffset
,
dwFlags
,
pPerf
,
pSegSt
,
dwVirtualID
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_GetParam
(
LPDIRECTMUSICTRACK8
iface
,
REFGUID
rguidType
,
MUSIC_TIME
mtTime
,
MUSIC_TIME
*
pmtNext
,
void
*
pParam
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_GetParam
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidType
,
MUSIC_TIME
mtTime
,
MUSIC_TIME
*
pmtNext
,
void
*
pParam
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %s, %d, %p, %p): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidType
),
mtTime
,
pmtNext
,
pParam
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_SetParam
(
LPDIRECTMUSICTRACK8
iface
,
REFGUID
rguidType
,
MUSIC_TIME
mtTime
,
void
*
pParam
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_SetParam
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidType
,
MUSIC_TIME
mtTime
,
void
*
pParam
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %s, %d, %p): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidType
),
mtTime
,
pParam
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_IsParamSupported
(
LPDIRECTMUSICTRACK8
iface
,
REFGUID
rguidType
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_IsParamSupported
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidType
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
TRACE
(
"(%p, %s)
\n
"
,
This
,
debugstr_dmguid
(
rguidType
));
...
...
@@ -172,40 +186,54 @@ static HRESULT WINAPI IDirectMusicMotifTrack_IDirectMusicTrack_IsParamSupported
return
DMUS_E_TYPE_UNSUPPORTED
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_AddNotificationType
(
LPDIRECTMUSICTRACK8
iface
,
REFGUID
rguidNotificationType
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_AddNotificationType
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidNotificationType
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %s): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidNotificationType
));
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_RemoveNotificationType
(
LPDIRECTMUSICTRACK8
iface
,
REFGUID
rguidNotificationType
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_RemoveNotificationType
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidNotificationType
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %s): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidNotificationType
));
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_Clone
(
LPDIRECTMUSICTRACK8
iface
,
MUSIC_TIME
mtStart
,
MUSIC_TIME
mtEnd
,
IDirectMusicTrack
**
ppTrack
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_Clone
(
IDirectMusicTrack8
*
iface
,
MUSIC_TIME
mtStart
,
MUSIC_TIME
mtEnd
,
IDirectMusicTrack
**
ppTrack
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %d, %d, %p): stub
\n
"
,
This
,
mtStart
,
mtEnd
,
ppTrack
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_PlayEx
(
LPDIRECTMUSICTRACK8
iface
,
void
*
pStateData
,
REFERENCE_TIME
rtStart
,
REFERENCE_TIME
rtEnd
,
REFERENCE_TIME
rtOffset
,
DWORD
dwFlags
,
IDirectMusicPerformance
*
pPerf
,
IDirectMusicSegmentState
*
pSegSt
,
DWORD
dwVirtualID
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_PlayEx
(
IDirectMusicTrack8
*
iface
,
void
*
pStateData
,
REFERENCE_TIME
rtStart
,
REFERENCE_TIME
rtEnd
,
REFERENCE_TIME
rtOffset
,
DWORD
dwFlags
,
IDirectMusicPerformance
*
pPerf
,
IDirectMusicSegmentState
*
pSegSt
,
DWORD
dwVirtualID
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub
\n
"
,
This
,
pStateData
,
wine_dbgstr_longlong
(
rtStart
),
wine_dbgstr_longlong
(
rtEnd
),
wine_dbgstr_longlong
(
rtOffset
),
dwFlags
,
pPerf
,
pSegSt
,
dwVirtualID
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_GetParamEx
(
LPDIRECTMUSICTRACK8
iface
,
REFGUID
rguidType
,
REFERENCE_TIME
rtTime
,
REFERENCE_TIME
*
prtNext
,
void
*
pParam
,
void
*
pStateData
,
DWORD
dwFlags
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_GetParamEx
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidType
,
REFERENCE_TIME
rtTime
,
REFERENCE_TIME
*
prtNext
,
void
*
pParam
,
void
*
pStateData
,
DWORD
dwFlags
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %s, 0x%s, %p, %p, %p, %d): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidType
),
wine_dbgstr_longlong
(
rtTime
),
prtNext
,
pParam
,
pStateData
,
dwFlags
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicMotifTrack_IDirectMusicTrack_SetParamEx
(
LPDIRECTMUSICTRACK8
iface
,
REFGUID
rguidType
,
REFERENCE_TIME
rtTime
,
void
*
pParam
,
void
*
pStateData
,
DWORD
dwFlags
)
{
ICOM_THIS_MULTI
(
IDirectMusicMotifTrack
,
TrackVtbl
,
iface
);
static
HRESULT
WINAPI
IDirectMusicTrack8Impl_SetParamEx
(
IDirectMusicTrack8
*
iface
,
REFGUID
rguidType
,
REFERENCE_TIME
rtTime
,
void
*
pParam
,
void
*
pStateData
,
DWORD
dwFlags
)
{
IDirectMusicMotifTrack
*
This
=
impl_from_IDirectMusicTrack8
(
iface
);
FIXME
(
"(%p, %s, 0x%s, %p, %p, %d): stub
\n
"
,
This
,
debugstr_dmguid
(
rguidType
),
wine_dbgstr_longlong
(
rtTime
),
pParam
,
pStateData
,
dwFlags
);
return
S_OK
;
...
...
@@ -230,23 +258,23 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
return
E_NOTIMPL
;
}
static
const
IDirectMusicTrack8Vtbl
DirectMusicMotifTrack_Track_V
tbl
=
{
IDirectMusicMotifTrack_IDirectMusicTrack
_QueryInterface
,
IDirectMusicMotifTrack_IDirectMusicTrack
_AddRef
,
IDirectMusicMotifTrack_IDirectMusicTrack
_Release
,
IDirectMusicMotifTrack_IDirectMusicTrack
_Init
,
IDirectMusicMotifTrack_IDirectMusicTrack
_InitPlay
,
IDirectMusicMotifTrack_IDirectMusicTrack
_EndPlay
,
IDirectMusicMotifTrack_IDirectMusicTrack
_Play
,
IDirectMusicMotifTrack_IDirectMusicTrack
_GetParam
,
IDirectMusicMotifTrack_IDirectMusicTrack
_SetParam
,
IDirectMusicMotifTrack_IDirectMusicTrack
_IsParamSupported
,
IDirectMusicMotifTrack_IDirectMusicTrack
_AddNotificationType
,
IDirectMusicMotifTrack_IDirectMusicTrack
_RemoveNotificationType
,
IDirectMusicMotifTrack_IDirectMusicTrack
_Clone
,
IDirectMusicMotifTrack_IDirectMusicTrack
_PlayEx
,
IDirectMusicMotifTrack_IDirectMusicTrack
_GetParamEx
,
IDirectMusicMotifTrack_IDirectMusicTrack
_SetParamEx
,
static
const
IDirectMusicTrack8Vtbl
dmtrack8_v
tbl
=
{
IDirectMusicTrack8Impl
_QueryInterface
,
IDirectMusicTrack8Impl
_AddRef
,
IDirectMusicTrack8Impl
_Release
,
IDirectMusicTrack8Impl
_Init
,
IDirectMusicTrack8Impl
_InitPlay
,
IDirectMusicTrack8Impl
_EndPlay
,
IDirectMusicTrack8Impl
_Play
,
IDirectMusicTrack8Impl
_GetParam
,
IDirectMusicTrack8Impl
_SetParam
,
IDirectMusicTrack8Impl
_IsParamSupported
,
IDirectMusicTrack8Impl
_AddNotificationType
,
IDirectMusicTrack8Impl
_RemoveNotificationType
,
IDirectMusicTrack8Impl
_Clone
,
IDirectMusicTrack8Impl
_PlayEx
,
IDirectMusicTrack8Impl
_GetParamEx
,
IDirectMusicTrack8Impl
_SetParamEx
,
IDirectMusicTrack8Impl_Compose
,
IDirectMusicTrack8Impl_Join
};
...
...
@@ -310,7 +338,7 @@ HRESULT WINAPI create_dmmotiftrack(REFIID lpcGUID, void **ppobj)
return
E_OUTOFMEMORY
;
}
track
->
UnknownVtbl
=
&
DirectMusicMotifTrack_Unknown_Vtbl
;
track
->
TrackVtbl
=
&
DirectMusicMotifTrack_Track_V
tbl
;
track
->
IDirectMusicTrack8_iface
.
lpVtbl
=
&
dmtrack8_v
tbl
;
track
->
PersistStreamVtbl
=
&
DirectMusicMotifTrack_PersistStream_Vtbl
;
track
->
pDesc
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
DMUS_OBJECTDESC
));
DM_STRUCT_INIT
(
track
->
pDesc
);
...
...
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