commit 26ba64b56313dc6503e1e71b84e32c03f56e4700
author Robert Reif <reif@earthlink.net> Fri Apr 11 23:59:19 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Apr 11 23:59:19 2003 +0000
tree 36a0edf6cdb3aa5ed012a27a21928c7b7950c4c0
parent aa89eccc7157c193cacc724edeacd98415235415

Fixed PCM format evaluation bug.
Properly clean up partially created sound buffers.

dlls/dsound/capture.c

diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index fe3996b..8901549 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -604,11 +604,11 @@
             wfex->nAvgBytesPerSec, wfex->nBlockAlign,
             wfex->wBitsPerSample, wfex->cbSize);
 
-        if (wfex->cbSize == 0)
-            memcpy(&(ipDSC->wfx), wfex, sizeof(*wfex) + wfex->cbSize);
+        if (wfex->wFormatTag == WAVE_FORMAT_PCM)
+            memcpy(&(ipDSC->wfx), wfex, sizeof(WAVEFORMATEX));
         else {
             WARN("non PCM formats not supported\n");
-            return DSERR_BADFORMAT; /* FIXME: DSERR_INVALIDPARAM ? */
+            return DSERR_BADFORMAT;
         }
     } else {
 	WARN("lpcDSCBufferDesc->lpwfxFormat == 0\n");
@@ -648,8 +648,10 @@
 		&(ipDSC->wfx),0,0,&(ipDSC->buflen),&(ipDSC->buffer),(LPVOID*)&(ipDSC->hwbuf));
 	    if (err != DS_OK) {
 		WARN("IDsCaptureDriver_CreateCaptureBuffer failed\n");
-		ipDSC->hwbuf = 0;
-		return DSERR_GENERIC;
+		This->dsound->capture_buffer = 0;
+		HeapFree( GetProcessHeap(), 0, This );
+		*ppobj = NULL;
+		return err;
 	    }
 	} else {
             LPBYTE newbuf;
@@ -662,8 +664,10 @@
                 (DWORD)DSOUND_capture_callback, (DWORD)ipDSC, flags));
             if (err != DS_OK) {
                 WARN("waveInOpen failed\n");
-	        ipDSC->hwi = 0;
-                return DSERR_BADFORMAT; /* FIXME: DSERR_INVALIDPARAM ? */
+		This->dsound->capture_buffer = 0;
+		HeapFree( GetProcessHeap(), 0, This );
+		*ppobj = NULL;
+		return err;
             }
 
 	    buflen = lpcDSCBufferDesc->dwBufferBytes;