dsound: Adjust for partial block before prepare-header and add-buffer steps.

Otherwise, the wave-in driver(s) may copy incorrect data to internal structures.

dsound: Adjust for partial block before prepare-header and add-buffer steps.
2de65355 · Ken Thomases · Alexandre Julliard · 0bb1eb72 · 2de65355
Commit 2de65355 authored Mar 12, 2008 by Ken Thomases Committed by Alexandre Julliard Mar 12, 2008
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

capture.c dlls/dsound/capture.c +3 -2

No files found.
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -1146,6 +1146,9 @@ IDirectSoundCaptureBufferImpl_Start(

            for (c = 0; c < device->nrofpwaves; ++c) {
                device->pwave[c].lpData = (char *)device->buffer + c * blocksize;
+                if (c + 1 == device->nrofpwaves)
+                    device->pwave[c].dwBufferLength = device->buflen - c * blocksize;
+                else
                    device->pwave[c].dwBufferLength = blocksize;
                device->pwave[c].dwBytesRecorded = 0;
                device->pwave[c].dwUser = (DWORD)device;
@@ -1167,8 +1170,6 @@ IDirectSoundCaptureBufferImpl_Start(
                    break;
                }
            }
-            if (device->buflen % blocksize)
-                device->pwave[device->nrofpwaves - 1].dwBufferLength = device->buflen % blocksize;

            FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0);
        }