[PATCH 2/2] quartz: Return E_NOTIMPL from IBasicAudio methods if no filter supporting IBasicAudio is attached.

[Zebediah Figura]

Based on a patch by Alistair Leslie-Hughes.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45366
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/quartz/filtergraph.c       | 8 ++++++++
 dlls/quartz/tests/filtergraph.c | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index d1643c3..48aff98 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -3140,6 +3140,8 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume)
     EnterCriticalSection(&This->cs);
 
     hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio);
+    if (hr == E_NOINTERFACE)
+        hr = E_NOTIMPL;
 
     if (hr == S_OK)
         hr = IBasicAudio_put_Volume(pBasicAudio, lVolume);
@@ -3160,6 +3162,8 @@ static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, LONG *plVolume)
     EnterCriticalSection(&This->cs);
 
     hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio);
+    if (hr == E_NOINTERFACE)
+        hr = E_NOTIMPL;
 
     if (hr == S_OK)
         hr = IBasicAudio_get_Volume(pBasicAudio, plVolume);
@@ -3180,6 +3184,8 @@ static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, LONG lBalance)
     EnterCriticalSection(&This->cs);
 
     hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio);
+    if (hr == E_NOINTERFACE)
+        hr = E_NOTIMPL;
 
     if (hr == S_OK)
         hr = IBasicAudio_put_Balance(pBasicAudio, lBalance);
@@ -3200,6 +3206,8 @@ static HRESULT WINAPI BasicAudio_get_Balance(IBasicAudio *iface, LONG *plBalance
     EnterCriticalSection(&This->cs);
 
     hr = GetTargetInterface(This, &IID_IBasicAudio, (LPVOID*)&pBasicAudio);
+    if (hr == E_NOINTERFACE)
+        hr = E_NOTIMPL;
 
     if (hr == S_OK)
         hr = IBasicAudio_get_Balance(pBasicAudio, plBalance);
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 27906ce..5ca4bfc 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -1579,7 +1579,6 @@ static void test_control_delegation(void)
     hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio);
     ok(hr == S_OK, "got %#x\n", hr);
 
-todo_wine {
     hr = IBasicAudio_put_Volume(audio, -10);
     ok(hr == E_NOTIMPL, "got %#x\n", hr);
     hr = IBasicAudio_get_Volume(audio, &val);
@@ -1588,7 +1587,6 @@ todo_wine {
     ok(hr == E_NOTIMPL, "got %#x\n", hr);
     hr = IBasicAudio_get_Balance(audio, &val);
     ok(hr == E_NOTIMPL, "got %#x\n", hr);
-}
 
     hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer);
     if (hr != VFW_E_NO_AUDIO_HARDWARE)
@@ -1624,7 +1622,6 @@ todo_wine {
         IBasicAudio_Release(filter_audio);
     }
 
-todo_wine {
     hr = IBasicAudio_put_Volume(audio, -10);
     ok(hr == E_NOTIMPL, "got %#x\n", hr);
     hr = IBasicAudio_get_Volume(audio, &val);
@@ -1633,7 +1630,6 @@ todo_wine {
     ok(hr == E_NOTIMPL, "got %#x\n", hr);
     hr = IBasicAudio_get_Balance(audio, &val);
     ok(hr == E_NOTIMPL, "got %#x\n", hr);
-}
 
     IBasicAudio_Release(audio);
 
-- 
2.7.4