system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 09:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

dmcompos: Return a valid pointer from ComposeSegmentFromTemplate().

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941
This commit is contained in:
Michael Stefaniuc 2022-12-17 23:38:41 +01:00 committed by Alexandre Julliard
parent c92d01016b
commit 3f0afe8e5c
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
dlls/dmcompos/composer.c
View file

@ -77,12 +77,38 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface
/* IDirectMusicComposerImpl IDirectMusicComposer part: */
static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate(IDirectMusicComposer *iface,
IDirectMusicStyle *pStyle, IDirectMusicSegment *pTemplate, WORD wActivity,
IDirectMusicChordMap *pChordMap, IDirectMusicSegment **ppSegment)
IDirectMusicStyle *style, IDirectMusicSegment *template, WORD activity, IDirectMusicChordMap *chordmap,
IDirectMusicSegment **segment)
{
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
FIXME("(%p, %p, %p, %d, %p, %p): stub\n", This, pStyle, pTemplate, wActivity, pChordMap, ppSegment);
return S_OK;
IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface);
IDirectMusicTrack *track;
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,