Commit 3f0afe8e authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

dmcompos: Return a valid pointer from ComposeSegmentFromTemplate().

parent c92d0101
...@@ -77,12 +77,38 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface ...@@ -77,12 +77,38 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface
/* IDirectMusicComposerImpl IDirectMusicComposer part: */ /* IDirectMusicComposerImpl IDirectMusicComposer part: */
static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate(IDirectMusicComposer *iface, static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate(IDirectMusicComposer *iface,
IDirectMusicStyle *pStyle, IDirectMusicSegment *pTemplate, WORD wActivity, IDirectMusicStyle *style, IDirectMusicSegment *template, WORD activity, IDirectMusicChordMap *chordmap,
IDirectMusicChordMap *pChordMap, IDirectMusicSegment **ppSegment) IDirectMusicSegment **segment)
{ {
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
FIXME("(%p, %p, %p, %d, %p, %p): stub\n", This, pStyle, pTemplate, wActivity, pChordMap, ppSegment); IDirectMusicTrack *track;
return S_OK; HRESULT hr;
FIXME("(%p, %p, %p, %d, %p, %p): semi-stub\n", This, style, template, activity, chordmap, segment);
if (!segment)
return E_POINTER;
if (!template)
return E_INVALIDARG;
if (!style) {
hr = IDirectMusicSegment_GetTrack(template, &CLSID_DirectMusicStyleTrack, 0xFFFFFFFF,
DMUS_SEG_ANYTRACK, &track);
if (FAILED(hr))
return E_INVALIDARG;
else
IDirectMusicTrack_Release(track); /* Temp to not leak memory */
}
if (!chordmap) {
hr = IDirectMusicSegment_GetTrack(template, &CLSID_DirectMusicChordMapTrack, 0xFFFFFFFF,
DMUS_SEG_ANYTRACK, &track);
if (FAILED(hr))
return E_INVALIDARG;
else
IDirectMusicTrack_Release(track); /* Temp to not leak memory */
}
return IDirectMusicSegment_Clone(template, -1, 0, segment);
} }
static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromShape(IDirectMusicComposer *iface, static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromShape(IDirectMusicComposer *iface,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment