Michael Stefaniuc : dsound: Primary buffers don' t support IDirectSoundNotify.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b21b6ad717d2cf98ee23591a09442e5ff12813a6
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b21b6ad717d2cf98ee23591a0...

Author: Michael Stefaniuc 
Date:   Wed Nov 14 22:49:50 2018 +0100

dsound: Primary buffers don't support IDirectSoundNotify.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Andrew Eikum 
Signed-off-by: Alexandre Julliard

---

dlls/dsound/primary.c      | 1 -
 dlls/dsound/tests/dsound.c | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index c64a6e7..f74db2f 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -1101,7 +1101,6 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer8 *ifac

if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) {
    	ERR("app requested IDirectSoundNotify on primary buffer\n");
-		/* FIXME: should we support this? */
    	return E_NOINTERFACE;
    }

diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index 0807d43..89f0aa0 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -465,6 +465,7 @@ static HRESULT test_primary(LPGUID lpGuid)
         trace("  No Primary\n");
     else if (rc==DS_OK && primary!=NULL) {
         LONG vol;
+        IDirectSoundNotify *notify;

/* Try to create a second primary buffer */
         /* DSOUND: Error: The primary buffer already exists.
@@ -509,8 +510,10 @@ static HRESULT test_primary(LPGUID lpGuid)
         ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref);

ref=IDirectSoundBuffer_Release(primary);
-        ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, "
-           "should have 0\n",ref);
+        ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref);
+
+        rc=IDirectSoundBuffer_QueryInterface(primary,&IID_IDirectSoundNotify,(void **)&notify);
+        ok(rc==E_NOINTERFACE,"IDirectSoundBuffer_QueryInterface() failed %08x\n",rc);
     }

/* Set the CooperativeLevel back to normal */