Michael Stefaniuc : dsound: Make capture behave like native in regards to COM aggregation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a3120ce80ecca76c2138bb86a5ed9238659917af
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a3120ce80ecca76c2138bb86a5ed9238659917af

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jan 12 00:28:21 2012 +0100

dsound: Make capture behave like native in regards to COM aggregation.

---

 dlls/dsound/capture.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 29d34dc..90cddb7 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -1065,6 +1065,11 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(IDirectSoundCa
 
     TRACE( "(%p,%p,%p,%p)\n",iface,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk);
 
+    if (pUnk) {
+        WARN("invalid parameter: pUnk != NULL\n");
+        return DSERR_NOAGGREGATION;
+    }
+
     if (lpcDSCBufferDesc == NULL) {
 	WARN("invalid parameter: lpcDSCBufferDesc == NULL)\n");
 	return DSERR_INVALIDPARAM;
@@ -1270,7 +1275,6 @@ HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID lpcGUID, IDirectSoundCapture **p
 
     if (pUnkOuter) {
 	WARN("invalid parameter: pUnkOuter != NULL\n");
-        *ppDSC = NULL;
         return DSERR_NOAGGREGATION;
     }