[PATCH 0/1] MR2029: dmime: Store WAVE data when Loading.

[Alistair Leslie-Hughes (＠alesliehughes)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2029

[PATCH 1/1] dmime: Store WAVE data when Loading.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

---
 dlls/dmime/segment.c | 56 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index bf44c5e73b3..6bf9f3abf0c 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -33,6 +33,10 @@ typedef struct IDirectMusicSegment8Impl {
     DMUS_IO_SEGMENT_HEADER header;
     IDirectMusicGraph *pGraph;
     struct list Tracks;
+
+    PCMWAVEFORMAT wave_format;
+    void *wave_data;
+    int data_size;
 } IDirectMusicSegment8Impl;
 
 IDirectMusicSegment8Impl *create_segment(void);
@@ -86,6 +90,9 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface
     TRACE("(%p) ref=%ld\n", This, ref);
 
     if (!ref) {
+        if (This->wave_data)
+            free(This->wave_data);
+
         HeapFree(GetProcessHeap(), 0, This);
         DMIME_UnlockModule();
     }
@@ -818,6 +825,49 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream
     return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface);
 }
 
+static HRESULT parse_wave_form(IDirectMusicSegment8Impl *This, IStream *stream, const struct chunk_entry *riff)
+{
+    HRESULT hr;
+    struct chunk_entry chunk = {.parent = riff};
+
+    TRACE("Parsing segment wave in %p: %s\n", stream, debugstr_chunk(riff));
+
+     while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) {
+        switch (chunk.id) {
+            case mmioFOURCC('f','m','t',' '): {
+                if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &This->wave_format, chunk.size)))
+                    return hr;
+                TRACE("Wave Format tag %d\n", This->wave_format.wf.wFormatTag);
+                break;
+            }
+            case mmioFOURCC('d','a','t','a'): {
+                TRACE("Wave Data size %lu\n", chunk.size);
+                This->wave_data = malloc(chunk.size);
+                This->data_size = chunk.size;
+                if (!This->wave_data)
+                    return E_OUTOFMEMORY;
+                if (FAILED(hr = stream_chunk_get_data(stream, &chunk, This->wave_data, chunk.size)))
+                    return hr;
+                break;
+            }
+            case FOURCC_LIST: {
+                FIXME("Skipping LIST tag\n");
+                break;
+            }
+            case mmioFOURCC('I','S','F','T'): {
+                FIXME("Skipping ISFT tag\n");
+                break;
+            }
+            case mmioFOURCC('f','a','c','t'): {
+                FIXME("Skipping fact tag\n");
+                break;
+            }
+        }
+    }
+
+    return S_OK;
+}
+
 static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
     IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface);
@@ -847,10 +897,8 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st
 
     if (riff.type == DMUS_FOURCC_SEGMENT_FORM)
         hr = parse_segment_form(This, stream, &riff);
-    else {
-        FIXME("WAVE form loading not implemented\n");
-        hr = S_OK;
-    }
+    else
+        hr = parse_wave_form(This, stream, &riff);
 
     return hr;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2029

[PATCH 1/1] dmime: Store WAVE data when Loading.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=128784

Your paranoid android.


=== debian11 (32 bit report) ===

ntoskrnl.exe:
ntoskrnl.c:1715: Test succeeded inside todo block: got error 997