[PATCH 0/1] MR8124: dmusic: Only extract name in EnumInstrument when the valid flag is set.

[Bernhard Übelacker]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56186

A regular build did not show this failure, but was quite nicely reproducible in my ASan tree. Probably it fills new allocations with some fill bytes.

[The pattern page](https://test.winehq.org/data/patterns.html#dmusic:dmusic) shows currently just two of this test failures.

[Testbot run](https://testbot.winehq.org/JobDetails.pl?Key=158383) with this patch.

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

[PATCH 1/1] dmusic: Only extract name in EnumInstrument when the valid flag is set.

[Bernhard Übelacker]

From: Bernhard Übelacker <bernhardu(a)mailbox.org>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56186
---
 dlls/dmusic/collection.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 5cf129cfdd1..dae27fb4133 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -208,7 +208,14 @@ static HRESULT WINAPI collection_EnumInstrument(IDirectMusicCollection *iface,
     {
         if (index--) continue;
         *patch = entry->patch;
-        if (name) lstrcpynW(name, entry->desc.wszName, name_length);
+        if (name)
+        {
+            if (entry->desc.dwValidData & DMUS_OBJ_NAME)
+                lstrcpynW(name, entry->desc.wszName, name_length);
+            else
+                name[0] = L'\0';
+        }
+
         return S_OK;
     }
 
-- 
GitLab

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

[Michael Stefaniuc (＠mstefani)]

None of the failed tests are dmusic related.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8124#note_104424

[PATCH 0/1] MR8124: dmusic: Only extract name in EnumInstrument when the valid flag is set. - approved

[Michael Stefaniuc (＠mstefani)]

This merge request was approved by Michael Stefaniuc.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8124

[Bernhard Übelacker]

On Sat May 24 10:52:48 2025 +0000, Michael Stefaniuc wrote:
> None of the failed tests are dmusic related.
> I was not clear about the test pattern page, those which I meant were at [2025-04-01 at linux_esme-worklinux-64](https://test.winehq.org/data/8e2aea6290e823d2f5023e2bff5c2fec0880a65d/linux_...), and at [2025-04-15 at linux_fg-deb64-t32](https://test.winehq.org/data/661cc2a1dec5e44e074702707272228178f21487/linux_...).

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8124#note_104426

[Michael Stefaniuc (＠mstefani)]

On Sat May 24 11:24:07 2025 +0000, Bernhard Übelacker wrote:
> I was not clear about the test pattern page, those which I meant were at
> [2025-04-01 at
> linux_esme-worklinux-64](https://test.winehq.org/data/8e2aea6290e823d2f5023e2bff5c2fec0880a65d/linux_...),
> and at [2025-04-15 at linux_fg-deb64-t32](https://test.winehq.org/data/661cc2a1dec5e44e074702707272228178f21487/linux_...).
> Heh, my comment was only part of my normal review aka that I looked at the test failures in the pipeline.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8124#note_104427