Commit 4e06eead authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

dsound: Don't bother shrinking the secondary buffer list.

parent 04453937
......@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
......@@ -1090,22 +1091,21 @@ HRESULT DirectSoundDevice_RemoveBuffer(
RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE);
for (i = 0; i < device->nrofbuffers; i++)
if (device->buffers[i] == pDSB)
break;
if (i < device->nrofbuffers) {
/* Put the last buffer of the list in the (now empty) position */
device->buffers[i] = device->buffers[device->nrofbuffers - 1];
device->nrofbuffers--;
device->buffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(LPDIRECTSOUNDBUFFER8)*device->nrofbuffers);
TRACE("buffer count is now %d\n", device->nrofbuffers);
}
if (device->nrofbuffers == 0) {
HeapFree(GetProcessHeap(),0,device->buffers);
if (device->nrofbuffers == 1) {
assert(device->buffers[0] == pDSB);
HeapFree(GetProcessHeap(), 0, device->buffers);
device->buffers = NULL;
} else {
for (i = 0; i < device->nrofbuffers; i++) {
if (device->buffers[i] == pDSB) {
/* Put the last buffer of the list in the (now empty) position */
device->buffers[i] = device->buffers[device->nrofbuffers - 1];
break;
}
}
}
device->nrofbuffers--;
TRACE("buffer count is now %d\n", device->nrofbuffers);
RtlReleaseResource(&(device->buffer_list_lock));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment