September 2023 - Wine-Commits

Alexandre Julliard : Wine release 8.17
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: website Branch: master Commit: 423d9b3412a1bc8dabff378cdcf32294e5084520 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/423d9b3412a1bc8dabff378cdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 22:35:11 2023 +0200 Wine release 8.17 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023092901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023092901.xml b/news/en/2023092901.xml new file mode 100644 index 00000000..56e06bc2 --- /dev/null +++ b/news/en/2023092901.xml @@ -0,0 +1,16 @@ +<news> +<date>September 29, 2023</date> +<title>Wine 8.17 Released</title> +<body> + The Wine development release 8.17 is now available. + <a href="{$root}/announce/8.17">What's new</a> in this release: +<ul> + <li>Bundled vkd3d upgraded to version 1.9.</li> + <li>Initial window management in the Wayland driver.</li> + <li>SoundFont support in DirectMusic.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.17.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.17 : Alexandre Julliard : Release 8.17
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: refs/tags/wine-8.17 Tag: 049a5fcb51948eda499da71860840e44eafb439d URL: https://gitlab.winehq.org/wine/wine/-/tags/049a5fcb51948eda499da71860840e44… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 22:29:20 2023 +0200 Release 8.17

1 0

Rémi Bernon : dmband: Implement band track GUID_DownloadToAudioPath parameter.
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: master Commit: 96b0bdd7b59b2c5c52b2b9a05d629cc2596cef5a URL: https://gitlab.winehq.org/wine/wine/-/commit/96b0bdd7b59b2c5c52b2b9a05d629c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 21 12:08:42 2023 +0200 dmband: Implement band track GUID_DownloadToAudioPath parameter. --- dlls/dmband/bandtrack.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index b808faaf567..845345a9fa2 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -193,7 +193,32 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ else if (IsEqualGUID(type, &GUID_Download)) FIXME("GUID_Download not handled yet\n"); else if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) - FIXME("GUID_DownloadToAudioPath not handled yet\n"); + { + IDirectMusicPerformance *performance; + IDirectMusicAudioPath *audio_path; + IUnknown *object = param; + struct band_entry *entry; + HRESULT hr; + + if (FAILED(hr = IDirectMusicAudioPath_QueryInterface(object, &IID_IDirectMusicPerformance8, (void **)&performance)) + && SUCCEEDED(hr = IDirectMusicAudioPath_QueryInterface(object, &IID_IDirectMusicAudioPath, (void **)&audio_path))) + { + hr = IDirectMusicAudioPath_GetObjectInPath(audio_path, DMUS_PCHANNEL_ALL, DMUS_PATH_PERFORMANCE, 0, + &GUID_All_Objects, 0, &IID_IDirectMusicPerformance8, (void **)&performance); + IDirectMusicAudioPath_Release(audio_path); + } + + if (FAILED(hr)) + { + WARN("Failed to get IDirectMusicPerformance from param %p\n", param); + return hr; + } + + LIST_FOR_EACH_ENTRY(entry, &This->bands, struct band_entry, entry) + if (FAILED(hr = IDirectMusicBand_Download(entry->band, performance))) break; + + IDirectMusicPerformance_Release(performance); + } else if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) FIXME("GUID_Enable_Auto_Download not handled yet\n"); else if (IsEqualGUID(type, &GUID_IDirectMusicBand))

1 0

Rémi Bernon : dmime: Implement IDirectMusicPerformance_DownloadInstrument.
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: master Commit: 3c4d83609e16ad326685f01e7245684d7f526225 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c4d83609e16ad326685f01e724568… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 6 09:54:22 2023 +0200 dmime: Implement IDirectMusicPerformance_DownloadInstrument. --- dlls/dmime/performance.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index bdb7475370a..111d7c60568 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -828,14 +828,24 @@ static HRESULT WINAPI performance_PChannelInfo(IDirectMusicPerformance8 *iface, } static HRESULT WINAPI performance_DownloadInstrument(IDirectMusicPerformance8 *iface, - IDirectMusicInstrument *pInst, DWORD dwPChannel, - IDirectMusicDownloadedInstrument **ppDownInst, DMUS_NOTERANGE *pNoteRanges, - DWORD dwNumNoteRanges, IDirectMusicPort **ppPort, DWORD *pdwGroup, DWORD *pdwMChannel) + IDirectMusicInstrument *instrument, DWORD port_channel, + IDirectMusicDownloadedInstrument **downloaded, DMUS_NOTERANGE *note_ranges, + DWORD note_range_count, IDirectMusicPort **port, DWORD *group, DWORD *music_channel) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPort *tmp_port = NULL; + HRESULT hr; - FIXME("(%p, %p, %ld, %p, %p, %ld, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); - return S_OK; + TRACE("(%p, %p, %ld, %p, %p, %ld, %p, %p, %p)\n", This, instrument, port_channel, downloaded, + note_ranges, note_range_count, port, group, music_channel); + + if (!port) port = &tmp_port; + if (FAILED(hr = IDirectMusicPerformance_PChannelInfo(iface, port_channel, port, group, music_channel))) + return hr; + + hr = IDirectMusicPort_DownloadInstrument(*port, instrument, downloaded, note_ranges, note_range_count); + if (tmp_port) IDirectMusicPort_Release(tmp_port); + return hr; } static HRESULT WINAPI performance_Invalidate(IDirectMusicPerformance8 *iface, MUSIC_TIME mtTime, DWORD dwFlags)

1 0

Alexandre Julliard : Release 8.17.
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: master Commit: 3db7506221e44e8091887d7eb42fe1666d422166 URL: https://gitlab.winehq.org/wine/wine/-/commit/3db7506221e44e8091887d7eb42fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 29 22:29:20 2023 +0200 Release 8.17. --- ANNOUNCE | 917 +++++++++++++++++++++++++------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 383 insertions(+), 555 deletions(-)

1 0

Rémi Bernon : dmime: Implement IDirectMusicSegment_(Download|Unload).
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: master Commit: 17f68bfabf5ca35e8483d69bd4b5a88f5e636723 URL: https://gitlab.winehq.org/wine/wine/-/commit/17f68bfabf5ca35e8483d69bd4b5a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 26 09:35:50 2023 +0200 dmime: Implement IDirectMusicSegment_(Download|Unload). --- dlls/dmime/segment.c | 12 ++++++------ dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index bc52931f667..af7729f34b9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -530,18 +530,18 @@ static HRESULT WINAPI segment_Compose(IDirectMusicSegment8 *iface, MUSIC_TIME mt return S_OK; } -static HRESULT WINAPI segment_Download(IDirectMusicSegment8 *iface, IUnknown *pAudioPath) +static HRESULT WINAPI segment_Download(IDirectMusicSegment8 *iface, IUnknown *audio_path) { struct segment *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %p): stub\n", This, pAudioPath); - return S_OK; + TRACE("(%p, %p)\n", This, audio_path); + return IDirectMusicSegment8_SetParam(iface, &GUID_DownloadToAudioPath, -1, DMUS_SEG_ALLTRACKS, 0, audio_path); } -static HRESULT WINAPI segment_Unload(IDirectMusicSegment8 *iface, IUnknown *pAudioPath) +static HRESULT WINAPI segment_Unload(IDirectMusicSegment8 *iface, IUnknown *audio_path) { struct segment *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %p): stub\n", This, pAudioPath); - return S_OK; + TRACE("(%p, %p)\n", This, audio_path); + return IDirectMusicSegment8_SetParam(iface, &GUID_UnloadFromAudioPath, -1, DMUS_SEG_ALLTRACKS, 0, audio_path); } static const IDirectMusicSegment8Vtbl segment_vtbl = diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index cfd58b8b229..ea5a972dc80 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3943,7 +3943,7 @@ static void test_segment_state(void) check_track_state(track, downloaded, FALSE); hr = IDirectMusicSegment8_Download((IDirectMusicSegment8 *)segment, (IUnknown *)performance); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine check_track_state(track, downloaded, TRUE); + check_track_state(track, downloaded, TRUE); hr = IDirectMusicSegment8_Unload((IDirectMusicSegment8 *)segment, (IUnknown *)performance); ok(hr == S_OK, "got %#lx\n", hr); check_track_state(track, downloaded, FALSE);

1 0

Rémi Bernon : dmband: Implement band track GUID_UnloadFromAudioPath parameter.
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: master Commit: 52a38dc41fde3d3636c10c49f1896807b244313f URL: https://gitlab.winehq.org/wine/wine/-/commit/52a38dc41fde3d3636c10c49f18968… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 21 12:08:42 2023 +0200 dmband: Implement band track GUID_UnloadFromAudioPath parameter. --- dlls/dmband/bandtrack.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 45dc7ace86a..b808faaf567 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -201,7 +201,13 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ else if (IsEqualGUID(type, &GUID_StandardMIDIFile)) FIXME("GUID_StandardMIDIFile not handled yet\n"); else if (IsEqualGUID(type, &GUID_UnloadFromAudioPath)) - FIXME("GUID_UnloadFromAudioPath not handled yet\n"); + { + struct band_entry *entry; + HRESULT hr; + + LIST_FOR_EACH_ENTRY(entry, &This->bands, struct band_entry, entry) + if (FAILED(hr = IDirectMusicBand_Unload(entry->band, NULL))) break; + } return S_OK; }

1 0

Rémi Bernon : dmband: Implement IDirectMusicBand_(Download|Unload).
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: master Commit: 0ad7b553490a5e04a9494ddc07335c857cd0d4ef URL: https://gitlab.winehq.org/wine/wine/-/commit/0ad7b553490a5e04a9494ddc07335c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 21 11:41:36 2023 +0200 dmband: Implement IDirectMusicBand_(Download|Unload). --- dlls/dmband/band.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 361df5f8986..4b3c053c586 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -45,10 +45,30 @@ struct instrument_entry struct list entry; DMUS_IO_INSTRUMENT instrument; IDirectMusicCollection *collection; + + IDirectMusicDownloadedInstrument *download; + IDirectMusicPort *download_port; }; +static HRESULT instrument_entry_unload(struct instrument_entry *entry) +{ + HRESULT hr; + + if (!entry->download) return S_OK; + + if (FAILED(hr = IDirectMusicPort_UnloadInstrument(entry->download_port, entry->download))) + WARN("Failed to unload entry instrument, hr %#lx\n", hr); + IDirectMusicDownloadedInstrument_Release(entry->download); + entry->download = NULL; + IDirectMusicPort_Release(entry->download_port); + entry->download_port = NULL; + + return hr; +} + static void instrument_entry_destroy(struct instrument_entry *entry) { + instrument_entry_unload(entry); if (entry->collection) IDirectMusicCollection_Release(entry->collection); free(entry); } @@ -150,19 +170,51 @@ static HRESULT WINAPI band_CreateSegment(IDirectMusicBand *iface, } static HRESULT WINAPI band_Download(IDirectMusicBand *iface, - IDirectMusicPerformance *pPerformance) + IDirectMusicPerformance *performance) { - struct band *This = impl_from_IDirectMusicBand(iface); - FIXME("(%p, %p): stub\n", This, pPerformance); - return S_OK; + struct band *This = impl_from_IDirectMusicBand(iface); + struct instrument_entry *entry; + HRESULT hr = S_OK; + + TRACE("(%p, %p)\n", This, performance); + + LIST_FOR_EACH_ENTRY(entry, &This->instruments, struct instrument_entry, entry) + { + IDirectMusicCollection *collection; + IDirectMusicInstrument *instrument; + + if (FAILED(hr = instrument_entry_unload(entry))) break; + if (!(collection = entry->collection) && !(collection = This->collection)) continue; + + if (SUCCEEDED(hr = IDirectMusicCollection_GetInstrument(collection, entry->instrument.dwPatch, &instrument))) + { + hr = IDirectMusicPerformance_DownloadInstrument(performance, instrument, entry->instrument.dwPChannel, + &entry->download, NULL, 0, &entry->download_port, NULL, NULL); + IDirectMusicInstrument_Release(instrument); + } + + if (FAILED(hr)) break; + } + + if (FAILED(hr)) WARN("Failed to download instruments, hr %#lx\n", hr); + return hr; } -static HRESULT WINAPI band_Unload(IDirectMusicBand *iface, - IDirectMusicPerformance *pPerformance) +static HRESULT WINAPI band_Unload(IDirectMusicBand *iface, IDirectMusicPerformance *performance) { - struct band *This = impl_from_IDirectMusicBand(iface); - FIXME("(%p, %p): stub\n", This, pPerformance); - return S_OK; + struct band *This = impl_from_IDirectMusicBand(iface); + struct instrument_entry *entry; + HRESULT hr = S_OK; + + TRACE("(%p, %p)\n", This, performance); + + if (performance) FIXME("performance parameter not implemented\n"); + + LIST_FOR_EACH_ENTRY(entry, &This->instruments, struct instrument_entry, entry) + if (FAILED(hr = instrument_entry_unload(entry))) break; + + if (FAILED(hr)) WARN("Failed to unload instruments, hr %#lx\n", hr); + return hr; } static const IDirectMusicBandVtbl band_vtbl =

1 0

Rémi Bernon : dmime/tests: Test segment state and playing a custom track.
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: master Commit: 406f1783a926b0ff404e897650739a9fcaecb2df URL: https://gitlab.winehq.org/wine/wine/-/commit/406f1783a926b0ff404e897650739a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 29 09:02:56 2023 +0200 dmime/tests: Test segment state and playing a custom track. --- dlls/dmime/tests/dmime.c | 443 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 443 insertions(+)

1 0

Rémi Bernon : dmband: Implement band track GUID_ConnectToDLSCollection parameter.
by Alexandre Julliard Sept. 29, 2023

Sept. 29, 2023

Module: wine Branch: master Commit: 92985253e757202cc24b2ed933e099f44e936c93 URL: https://gitlab.winehq.org/wine/wine/-/commit/92985253e757202cc24b2ed933e099… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 21 12:08:42 2023 +0200 dmband: Implement band track GUID_ConnectToDLSCollection parameter. --- dlls/dmband/band.c | 26 ++++++++++++++++++++++++++ dlls/dmband/bandtrack.c | 7 ++++++- dlls/dmband/dmband_private.h | 2 ++ dlls/dmusic/dmobject.c | 43 ++++++++++++++++++++++++++++++------------- dlls/dmusic/dmobject.h | 3 +++ 5 files changed, 67 insertions(+), 14 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index d91775681bb..361df5f8986 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -59,6 +59,7 @@ struct band struct dmobject dmobj; LONG ref; struct list instruments; + IDirectMusicCollection *collection; }; static inline struct band *impl_from_IDirectMusicBand(IDirectMusicBand *iface) @@ -117,6 +118,7 @@ static ULONG WINAPI band_Release(IDirectMusicBand *iface) instrument_entry_destroy(entry); } + if (This->collection) IDirectMusicCollection_Release(This->collection); free(This); } @@ -336,11 +338,23 @@ static inline struct band *impl_from_IPersistStream(IPersistStream *iface) static HRESULT WINAPI band_persist_stream_Load(IPersistStream *iface, IStream *stream) { struct band *This = impl_from_IPersistStream(iface); + DMUS_OBJECTDESC default_desc = + { + .dwSize = sizeof(DMUS_OBJECTDESC), + .dwValidData = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS, + .guidClass = CLSID_DirectMusicCollection, + .guidObject = GUID_DefaultGMCollection, + }; struct chunk_entry chunk = {0}; HRESULT hr; TRACE("%p, %p\n", iface, stream); + if (This->collection) IDirectMusicCollection_Release(This->collection); + if (FAILED(hr = stream_get_object(stream, &default_desc, &IID_IDirectMusicCollection, + (void **)&This->collection))) + WARN("Failed to load default collection from loader, hr %#lx\n", hr); + if ((hr = stream_get_chunk(stream, &chunk)) == S_OK) { switch (MAKE_IDTYPE(chunk.id, chunk.type)) @@ -408,3 +422,15 @@ HRESULT create_dmband(REFIID lpcGUID, void **ppobj) return hr; } + +HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection) +{ + struct band *This = impl_from_IDirectMusicBand(iface); + + TRACE("%p, %p\n", iface, collection); + + if (This->collection) IDirectMusicCollection_Release(This->collection); + if ((This->collection = collection)) IDirectMusicCollection_AddRef(This->collection); + + return S_OK; +} diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index ab12e1f1355..45dc7ace86a 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -182,7 +182,12 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ else if (IsEqualGUID(type, &GUID_Clear_All_Bands)) FIXME("GUID_Clear_All_Bands not handled yet\n"); else if (IsEqualGUID(type, &GUID_ConnectToDLSCollection)) - FIXME("GUID_ConnectToDLSCollection not handled yet\n"); + { + struct band_entry *entry; + + LIST_FOR_EACH_ENTRY(entry, &This->bands, struct band_entry, entry) + band_connect_to_collection(entry->band, param); + } else if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) FIXME("GUID_Disable_Auto_Download not handled yet\n"); else if (IsEqualGUID(type, &GUID_Download)) diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 444fe5ccf55..a12b9f8cc82 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -47,4 +47,6 @@ extern HRESULT create_dmband(REFIID riid, void **ret_iface); extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface); +extern HRESULT band_connect_to_collection(IDirectMusicBand *iface, IDirectMusicCollection *collection); + #endif /* __WINE_DMBAND_PRIVATE_H */ diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 3007aceef3e..8cb4719c4e6 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -444,6 +444,35 @@ HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, return S_OK; } +HRESULT stream_get_loader(IStream *stream, IDirectMusicLoader **ret_loader) +{ + IDirectMusicGetLoader *getter; + HRESULT hr; + + if (SUCCEEDED(hr = IStream_QueryInterface(stream, &IID_IDirectMusicGetLoader, (void**)&getter))) + { + hr = IDirectMusicGetLoader_GetLoader(getter, ret_loader); + IDirectMusicGetLoader_Release(getter); + } + + if (FAILED(hr)) *ret_loader = NULL; + return hr; +} + +HRESULT stream_get_object(IStream *stream, DMUS_OBJECTDESC *desc, REFIID iid, void **ret_iface) +{ + IDirectMusicLoader *loader; + HRESULT hr; + + if (SUCCEEDED(hr = stream_get_loader(stream, &loader))) + { + hr = IDirectMusicLoader_GetObject(loader, desc, iid, (void **)ret_iface); + IDirectMusicLoader_Release(loader); + } + + if (FAILED(hr)) *ret_iface = NULL; + return hr; +} /* Generic IDirectMusicObject methods */ @@ -626,8 +655,6 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, IDirectMusicObject **dmobj) { struct chunk_entry chunk = {.parent = list}; - IDirectMusicGetLoader *getloader; - IDirectMusicLoader *loader; DMUS_OBJECTDESC desc; DMUS_IO_REFERENCE reference; HRESULT hr; @@ -650,17 +677,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, desc.dwValidData |= DMUS_OBJ_CLASS; dump_DMUS_OBJECTDESC(&desc); - if (FAILED(hr = IStream_QueryInterface(stream, &IID_IDirectMusicGetLoader, (void**)&getloader))) - return hr; - hr = IDirectMusicGetLoader_GetLoader(getloader, &loader); - IDirectMusicGetLoader_Release(getloader); - if (FAILED(hr)) - return hr; - - hr = IDirectMusicLoader_GetObject(loader, &desc, &IID_IDirectMusicObject, (void**)dmobj); - IDirectMusicLoader_Release(loader); - - return hr; + return stream_get_object(stream, &desc, &IID_IDirectMusicObject, (void **)dmobj); } /* Generic IPersistStream methods */ diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h index ae06935dfea..82ac05f31b9 100644 --- a/dlls/dmusic/dmobject.h +++ b/dlls/dmusic/dmobject.h @@ -44,6 +44,9 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, ULONG size); +HRESULT stream_get_loader(IStream *stream, IDirectMusicLoader **ret_loader); +HRESULT stream_get_object(IStream *stream, DMUS_OBJECTDESC *desc, REFIID riid, void **ret_iface); + static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) { LARGE_INTEGER offset;

1 0