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
604e3951
Commit
604e3951
authored
Jan 17, 2014
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jan 17, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmcompos: COM cleanup for IDirectMusicComposer.
Also lock/unlock the module only on creation/destruction of the object.
parent
29fe7089
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
95 additions
and
71 deletions
+95
-71
composer.c
dlls/dmcompos/composer.c
+95
-59
dmcompos_private.h
dlls/dmcompos/dmcompos_private.h
+0
-12
No files found.
dlls/dmcompos/composer.c
View file @
604e3951
...
...
@@ -21,85 +21,116 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
dmcompos
);
/* IDirectMusicComposerImpl IUnknown part: */
static
HRESULT
WINAPI
IDirectMusicComposerImpl_QueryInterface
(
LPDIRECTMUSICCOMPOSER
iface
,
REFIID
riid
,
LPVOID
*
ppobj
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
TRACE
(
"(%p, %s, %p)
\n
"
,
This
,
debugstr_dmguid
(
riid
),
ppobj
);
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
IsEqualIID
(
riid
,
&
IID_IDirectMusicComposer
))
{
IUnknown_AddRef
(
iface
);
*
ppobj
=
This
;
return
S_OK
;
}
WARN
(
"(%p, %s, %p): not found
\n
"
,
This
,
debugstr_dmguid
(
riid
),
ppobj
);
return
E_NOINTERFACE
;
typedef
struct
IDirectMusicComposerImpl
{
IDirectMusicComposer
IDirectMusicComposer_iface
;
LONG
ref
;
}
IDirectMusicComposerImpl
;
static
inline
IDirectMusicComposerImpl
*
impl_from_IDirectMusicComposer
(
IDirectMusicComposer
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IDirectMusicComposerImpl
,
IDirectMusicComposer_iface
);
}
static
ULONG
WINAPI
IDirectMusicComposerImpl_AddRef
(
LPDIRECTMUSICCOMPOSER
iface
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
static
HRESULT
WINAPI
IDirectMusicComposerImpl_QueryInterface
(
IDirectMusicComposer
*
iface
,
REFIID
riid
,
void
**
ret_iface
)
{
TRACE
(
"(%p, %s, %p)
\n
"
,
iface
,
debugstr_dmguid
(
riid
),
ret_iface
);
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
IsEqualIID
(
riid
,
&
IID_IDirectMusicComposer
))
{
*
ret_iface
=
iface
;
IDirectMusicComposer_AddRef
(
iface
);
return
S_OK
;
}
WARN
(
"(%p, %s, %p): not found
\n
"
,
iface
,
debugstr_dmguid
(
riid
),
ret_iface
);
*
ret_iface
=
NULL
;
TRACE
(
"(%p): AddRef from %d
\n
"
,
This
,
ref
-
1
);
DMCOMPOS_LockModule
();
return
ref
;
return
E_NOINTERFACE
;
}
static
ULONG
WINAPI
IDirectMusicComposerImpl_Release
(
LPDIRECTMUSICCOMPOSER
iface
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p): ReleaseRef to %d
\n
"
,
This
,
ref
);
if
(
ref
==
0
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
);
}
DMCOMPOS_UnlockModule
();
return
ref
;
static
ULONG
WINAPI
IDirectMusicComposerImpl_AddRef
(
IDirectMusicComposer
*
iface
)
{
IDirectMusicComposerImpl
*
This
=
impl_from_IDirectMusicComposer
(
iface
);
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref=%d
\n
"
,
This
,
ref
);
return
ref
;
}
static
ULONG
WINAPI
IDirectMusicComposerImpl_Release
(
IDirectMusicComposer
*
iface
)
{
IDirectMusicComposerImpl
*
This
=
impl_from_IDirectMusicComposer
(
iface
);
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p) ref=%d
\n
"
,
This
,
ref
);
if
(
ref
==
0
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
);
DMCOMPOS_UnlockModule
();
}
return
ref
;
}
/* IDirectMusicComposerImpl IDirectMusicComposer part: */
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ComposeSegmentFromTemplate
(
LPDIRECTMUSICCOMPOSER
iface
,
IDirectMusicStyle
*
pStyle
,
IDirectMusicSegment
*
pTemplate
,
WORD
wActivity
,
IDirectMusicChordMap
*
pChordMap
,
IDirectMusicSegment
**
ppSegment
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ComposeSegmentFromTemplate
(
IDirectMusicComposer
*
iface
,
IDirectMusicStyle
*
pStyle
,
IDirectMusicSegment
*
pTemplate
,
WORD
wActivity
,
IDirectMusicChordMap
*
pChordMap
,
IDirectMusicSegment
**
ppSegment
)
{
IDirectMusicComposerImpl
*
This
=
impl_from_IDirectMusicComposer
(
iface
);
FIXME
(
"(%p, %p, %p, %d, %p, %p): stub
\n
"
,
This
,
pStyle
,
pTemplate
,
wActivity
,
pChordMap
,
ppSegment
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ComposeSegmentFromShape
(
LPDIRECTMUSICCOMPOSER
iface
,
IDirectMusicStyle
*
pStyle
,
WORD
wNumMeasures
,
WORD
wShape
,
WORD
wActivity
,
BOOL
fIntro
,
BOOL
fEnd
,
IDirectMusicChordMap
*
pChordMap
,
IDirectMusicSegment
**
ppSegment
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ComposeSegmentFromShape
(
IDirectMusicComposer
*
iface
,
IDirectMusicStyle
*
pStyle
,
WORD
wNumMeasures
,
WORD
wShape
,
WORD
wActivity
,
BOOL
fIntro
,
BOOL
fEnd
,
IDirectMusicChordMap
*
pChordMap
,
IDirectMusicSegment
**
ppSegment
)
{
IDirectMusicComposerImpl
*
This
=
impl_from_IDirectMusicComposer
(
iface
);
FIXME
(
"(%p, %p, %d, %d, %d, %d, %d, %p, %p): stub
\n
"
,
This
,
pStyle
,
wNumMeasures
,
wShape
,
wActivity
,
fIntro
,
fEnd
,
pChordMap
,
ppSegment
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ComposeTransition
(
LPDIRECTMUSICCOMPOSER
iface
,
IDirectMusicSegment
*
pFromSeg
,
IDirectMusicSegment
*
pToSeg
,
MUSIC_TIME
mtTime
,
WORD
wCommand
,
DWORD
dwFlags
,
IDirectMusicChordMap
*
pChordMap
,
IDirectMusicSegment
**
ppTransSeg
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ComposeTransition
(
IDirectMusicComposer
*
iface
,
IDirectMusicSegment
*
pFromSeg
,
IDirectMusicSegment
*
pToSeg
,
MUSIC_TIME
mtTime
,
WORD
wCommand
,
DWORD
dwFlags
,
IDirectMusicChordMap
*
pChordMap
,
IDirectMusicSegment
**
ppTransSeg
)
{
IDirectMusicComposerImpl
*
This
=
impl_from_IDirectMusicComposer
(
iface
);
FIXME
(
"(%p, %p, %p, %d, %d, %d, %p, %p): stub
\n
"
,
This
,
pFromSeg
,
pToSeg
,
mtTime
,
wCommand
,
dwFlags
,
pChordMap
,
ppTransSeg
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicComposerImpl_AutoTransition
(
LPDIRECTMUSICCOMPOSER
iface
,
IDirectMusicPerformance
*
pPerformance
,
IDirectMusicSegment
*
pToSeg
,
WORD
wCommand
,
DWORD
dwFlags
,
IDirectMusicChordMap
*
pChordMap
,
IDirectMusicSegment
**
ppTransSeg
,
IDirectMusicSegmentState
**
ppToSegState
,
IDirectMusicSegmentState
**
ppTransSegState
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
static
HRESULT
WINAPI
IDirectMusicComposerImpl_AutoTransition
(
IDirectMusicComposer
*
iface
,
IDirectMusicPerformance
*
pPerformance
,
IDirectMusicSegment
*
pToSeg
,
WORD
wCommand
,
DWORD
dwFlags
,
IDirectMusicChordMap
*
pChordMap
,
IDirectMusicSegment
**
ppTransSeg
,
IDirectMusicSegmentState
**
ppToSegState
,
IDirectMusicSegmentState
**
ppTransSegState
)
{
IDirectMusicComposerImpl
*
This
=
impl_from_IDirectMusicComposer
(
iface
);
FIXME
(
"(%p, %p, %d, %d, %p, %p, %p, %p): stub
\n
"
,
This
,
pPerformance
,
wCommand
,
dwFlags
,
pChordMap
,
ppTransSeg
,
ppToSegState
,
ppTransSegState
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ComposeTemplateFromShape
(
LPDIRECTMUSICCOMPOSER
iface
,
WORD
wNumMeasures
,
WORD
wShape
,
BOOL
fIntro
,
BOOL
fEnd
,
WORD
wEndLength
,
IDirectMusicSegment
**
ppTemplate
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ComposeTemplateFromShape
(
IDirectMusicComposer
*
iface
,
WORD
wNumMeasures
,
WORD
wShape
,
BOOL
fIntro
,
BOOL
fEnd
,
WORD
wEndLength
,
IDirectMusicSegment
**
ppTemplate
)
{
IDirectMusicComposerImpl
*
This
=
impl_from_IDirectMusicComposer
(
iface
);
FIXME
(
"(%p, %d, %d, %d, %d, %d, %p): stub
\n
"
,
This
,
wNumMeasures
,
wShape
,
fIntro
,
fEnd
,
wEndLength
,
ppTemplate
);
return
S_OK
;
}
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ChangeChordMap
(
LPDIRECTMUSICCOMPOSER
iface
,
IDirectMusicSegment
*
pSegment
,
BOOL
fTrackScale
,
IDirectMusicChordMap
*
pChordMap
)
{
IDirectMusicComposerImpl
*
This
=
(
IDirectMusicComposerImpl
*
)
iface
;
static
HRESULT
WINAPI
IDirectMusicComposerImpl_ChangeChordMap
(
IDirectMusicComposer
*
iface
,
IDirectMusicSegment
*
pSegment
,
BOOL
fTrackScale
,
IDirectMusicChordMap
*
pChordMap
)
{
IDirectMusicComposerImpl
*
This
=
impl_from_IDirectMusicComposer
(
iface
);
FIXME
(
"(%p, %p, %d, %p): stub
\n
"
,
This
,
pSegment
,
fTrackScale
,
pChordMap
);
return
S_OK
;
}
static
const
IDirectMusicComposerVtbl
DirectMusicComposer_V
tbl
=
{
static
const
IDirectMusicComposerVtbl
dmcomposer_v
tbl
=
{
IDirectMusicComposerImpl_QueryInterface
,
IDirectMusicComposerImpl_AddRef
,
IDirectMusicComposerImpl_Release
,
...
...
@@ -112,17 +143,22 @@ static const IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = {
};
/* for ClassFactory */
HRESULT
WINAPI
create_dmcomposer
(
REFIID
lpcGUID
,
void
**
ppobj
)
HRESULT
WINAPI
create_dmcomposer
(
REFIID
riid
,
void
**
ret_iface
)
{
IDirectMusicComposerImpl
*
obj
;
obj
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IDirectMusicComposerImpl
));
if
(
NULL
==
obj
)
{
*
ppobj
=
NULL
;
return
E_OUTOFMEMORY
;
}
obj
->
lpVtbl
=
&
DirectMusicComposer_Vtbl
;
obj
->
ref
=
0
;
/* will be inited by QueryInterface */
return
IDirectMusicComposerImpl_QueryInterface
((
LPDIRECTMUSICCOMPOSER
)
obj
,
lpcGUID
,
ppobj
);
IDirectMusicComposerImpl
*
obj
;
HRESULT
hr
;
obj
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
*
obj
));
if
(
!
obj
)
{
*
ret_iface
=
NULL
;
return
E_OUTOFMEMORY
;
}
obj
->
IDirectMusicComposer_iface
.
lpVtbl
=
&
dmcomposer_vtbl
;
obj
->
ref
=
1
;
DMCOMPOS_LockModule
();
hr
=
IDirectMusicComposer_QueryInterface
(
&
obj
->
IDirectMusicComposer_iface
,
riid
,
ret_iface
);
IDirectMusicComposer_Release
(
&
obj
->
IDirectMusicComposer_iface
);
return
hr
;
}
dlls/dmcompos/dmcompos_private.h
View file @
604e3951
...
...
@@ -46,7 +46,6 @@
* Interfaces
*/
typedef
struct
IDirectMusicChordMapImpl
IDirectMusicChordMapImpl
;
typedef
struct
IDirectMusicComposerImpl
IDirectMusicComposerImpl
;
typedef
struct
IDirectMusicChordMapTrack
IDirectMusicChordMapTrack
;
typedef
struct
IDirectMusicSignPostTrack
IDirectMusicSignPostTrack
;
...
...
@@ -75,17 +74,6 @@ struct IDirectMusicChordMapImpl {
};
/*****************************************************************************
* IDirectMusicComposerImpl implementation structure
*/
struct
IDirectMusicComposerImpl
{
/* IUnknown fields */
const
IDirectMusicComposerVtbl
*
lpVtbl
;
LONG
ref
;
/* IDirectMusicComposerImpl fields */
};
/*****************************************************************************
* IDirectMusicChordMapTrack implementation structure
*/
struct
IDirectMusicChordMapTrack
{
...
...
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