[PATCH 0/5] MR4381: DMusic: Remove superfluous checks / casts

[PATCH 1/5] dmime: Remove redundant NULL check before free().

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dmime/segment.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index 126bc44335d..e806a845d37 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -112,10 +112,7 @@ static ULONG WINAPI segment_Release(IDirectMusicSegment8 *iface)
             list_remove(&entry->entry);
             track_entry_destroy(entry);
         }
-
-        if (This->wave_data)
-            free(This->wave_data);
-
+        free(This->wave_data);
         free(This);
     }

[PATCH 2/5] dmime/tests: Remove superfluous casts to self.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dmime/tests/dmime.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index 7613b82c893..0999d8b914e 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -2571,7 +2571,7 @@ static void test_performance_graph(void)
     /* performance exposes a graph interface but it's not an actual toolgraph */
     hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph);
     ok(hr == S_OK, "got %#lx\n", hr);
-    hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1);
+    hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1);
     ok(hr == E_NOTIMPL, "got %#lx\n", hr);
     hr = IDirectMusicGraph_GetTool(graph, 0, &tmp_tool);
     ok(hr == E_NOTIMPL, "got %#lx\n", hr);
@@ -2628,7 +2628,7 @@ static void test_performance_graph(void)
     ok(tmp_graph == graph, "got %p\n", graph);
     IDirectMusicGraph_Release(tmp_graph);

-    hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1);
+    hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1);
     ok(hr == S_OK, "got %#lx\n", hr);

IDirectMusicGraph_Release(graph);
@@ -2830,7 +2830,7 @@ static void test_performance_pmsg(void)
     ok(hr == S_OK, "got %#lx\n", hr);
     hr = IDirectMusicPerformance_SetGraph(performance, graph);
     ok(hr == S_OK, "got %#lx\n", hr);
-    hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1);
+    hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1);
     ok(hr == S_OK, "got %#lx\n", hr);
     IDirectMusicGraph_Release(graph);

@@ -3111,7 +3111,7 @@ static void test_notification_pmsg(void)
     ok(hr == S_OK, "got %#lx\n", hr);
     hr = IDirectMusicPerformance_SetGraph(performance, graph);
     ok(hr == S_OK, "got %#lx\n", hr);
-    hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1);
+    hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1);
     ok(hr == S_OK, "got %#lx\n", hr);
     IDirectMusicGraph_Release(graph);

@@ -3361,7 +3361,7 @@ static void test_wave_pmsg(void)
     ok(hr == S_OK, "got %#lx\n", hr);
     hr = IDirectMusicPerformance_SetGraph(performance, graph);
     ok(hr == S_OK, "got %#lx\n", hr);
-    hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1);
+    hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1);
     ok(hr == S_OK, "got %#lx\n", hr);
     IDirectMusicGraph_Release(graph);

@@ -4236,7 +4236,7 @@ static void test_segment_state(void)
     ok(hr == S_OK, "got %#lx\n", hr);
     hr = IDirectMusicPerformance_SetGraph(performance, graph);
     ok(hr == S_OK, "got %#lx\n", hr);
-    hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1);
+    hr = IDirectMusicGraph_InsertTool(graph, tool, NULL, 0, -1);
     ok(hr == S_OK, "got %#lx\n", hr);
     IDirectMusicGraph_Release(graph);

[PATCH 3/5] dmime: Remove superfluous casts to self.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dmime/performance.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index 0e817d232e3..35a7ab413e5 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -1404,7 +1404,7 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi
         IDirectSound_AddRef(*dsound);
     }
     if (dmusic && !*dmusic) {
-        *dmusic = (IDirectMusic *)This->dmusic;
+        *dmusic = This->dmusic;
         IDirectMusic_AddRef(*dmusic);
     }

@@ -2005,7 +2005,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface,
             msg->dwFlags &= ~DMUS_PMSGF_TOOL_IMMEDIATE;
             msg->dwFlags |= DMUS_PMSGF_TOOL_ATTIME;

-            if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, (DMUS_PMSG *)msg)))
+            if (FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, msg)))
             {
                 ERR("Failed to send notification message, hr %#lx\n", hr);
                 return DMUS_S_FREE;

[PATCH 4/5] dmsynth: Remove superfluous casts to self.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dmsynth/synthsink.c     | 2 +-
 dlls/dmsynth/tests/dmsynth.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index d0a89358652..9263ff56349 100644
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -320,7 +320,7 @@ static HRESULT synth_sink_activate(struct synth_sink *This)
     else
     {
         synth_sink_get_format(This, &format);
-        desc.lpwfxFormat = (WAVEFORMATEX *)&format;
+        desc.lpwfxFormat = &format;
         desc.dwBufferBytes = format.nAvgBytesPerSec;
         if (FAILED(hr = IDirectMusicSynthSink_GetDesiredBufferSize(iface, &desc.dwBufferBytes)))
             ERR("Failed to get desired buffer size, hr %#lx\n", hr);
diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c
index ad09a651094..ad9f706aada 100644
--- a/dlls/dmsynth/tests/dmsynth.c
+++ b/dlls/dmsynth/tests/dmsynth.c
@@ -1134,11 +1134,11 @@ static void test_IDirectMusicSynth(void)
     ok(hr == S_OK, "got %#lx\n", hr);
     hr = IReferenceClock_GetTime(latency_clock, &time);
     ok(hr == S_OK, "got %#lx\n", hr);
-    hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, (BYTE **)&raw);
+    hr = IDirectMusicBuffer_GetRawBufferPtr(buffer, &raw);
     ok(hr == S_OK, "got %#lx\n", hr);
     hr = IDirectMusicBuffer_GetUsedBytes(buffer, &len);
     ok(hr == S_OK, "got %#lx\n", hr);
-    hr = IDirectMusicSynth_PlayBuffer(synth, time, (BYTE *)raw, len);
+    hr = IDirectMusicSynth_PlayBuffer(synth, time, raw, len);
     ok(hr == S_OK, "got %#lx\n", hr);
     IDirectMusicBuffer_Release(buffer);
     IReferenceClock_Release(latency_clock);

[PATCH 5/5] dmusic: Remove superfluous casts to self.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dmusic/dmobject.c     | 2 +-
 dlls/dmusic/tests/dmusic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c
index 8cb4719c4e6..9ba1f239167 100644
--- a/dlls/dmusic/dmobject.c
+++ b/dlls/dmusic/dmobject.c
@@ -466,7 +466,7 @@ HRESULT stream_get_object(IStream *stream, DMUS_OBJECTDESC *desc, REFIID iid, vo

if (SUCCEEDED(hr = stream_get_loader(stream, &loader)))
     {
-        hr = IDirectMusicLoader_GetObject(loader, desc, iid, (void **)ret_iface);
+        hr = IDirectMusicLoader_GetObject(loader, desc, iid, ret_iface);
         IDirectMusicLoader_Release(loader);
     }

diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c
index f71c0600366..3b2f7d9160e 100644
--- a/dlls/dmusic/tests/dmusic.c
+++ b/dlls/dmusic/tests/dmusic.c
@@ -1078,7 +1078,7 @@ static void test_port_download(void)
     ok(hr == S_OK, "got %#lx\n", hr);
     size = 0xdeadbeef;
     buffer = invalid_ptr;
-    hr = IDirectMusicDownload_GetBuffer(download, (void **)&buffer, &size);
+    hr = IDirectMusicDownload_GetBuffer(download, &buffer, &size);
     ok(hr == S_OK, "got %#lx\n", hr);
     ok(size == 1, "got %#lx\n", size);
     ok(buffer != invalid_ptr, "got %p\n", buffer);

[PATCH 5/5] dmusic: Remove superfluous casts to self.

[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=139818

Your paranoid android.

=== w7u_2qxl (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got punkUser 009307E0

=== w7u_adm (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got mtTime 1839
dmime.c:3243: Test failed: got punkUser 00925D48
dmime.c:3250: Test failed: got mtTime 1839

=== w7u_el (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got mtTime 1841
dmime.c:3243: Test failed: got punkUser 016DB778
dmime.c:3250: Test failed: got mtTime 1841

=== w864 (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got mtTime 463
dmime.c:3243: Test failed: got punkUser 03856740
dmime.c:3250: Test failed: got mtTime 1845
dmime.c:3257: Test failed: got mtTime 1845

=== w1064v1507 (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got mtTime 461
dmime.c:3243: Test failed: got punkUser 03FDE4B0
dmime.c:3250: Test failed: got mtTime 1845
dmime.c:3257: Test failed: got mtTime 1845

=== w1064v1809 (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got mtTime 465
dmime.c:3243: Test failed: got punkUser 047B9278

=== w10pro64 (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got mtTime 464
dmime.c:3243: Test failed: got punkUser 041A9340
dmime.c:3250: Test failed: got mtTime 1847
dmime.c:3257: Test failed: got mtTime 1847
dmime.c:3257: Test failed: got punkUser 00000000

=== w10pro64_en_AE_u8 (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got mtTime 466
dmime.c:3243: Test failed: got punkUser 045F3A18
dmime.c:3250: Test failed: got mtTime 1850
dmime.c:3257: Test failed: got mtTime 1850

=== w11pro64 (32 bit report) ===

dmime:
dmime.c:3243: Test failed: got mtTime 463
dmime.c:3243: Test failed: got punkUser 03C51248