dsound: DirectSoundDevice_RemoveBuffer() cannot fail.

cea63294 · Michael Stefaniuc · Alexandre Julliard · 4e06eead · cea63294 · cea63294
Commit cea63294 authored Sep 25, 2012 by Michael Stefaniuc Committed by Alexandre Julliard Sep 26, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

dsound.c dlls/dsound/dsound.c +1 -6

dsound_private.h dlls/dsound/dsound_private.h +1 -3

No files found.
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -1080,12 +1080,9 @@ HRESULT DirectSoundDevice_AddBuffer(
 * Remove secondary buffer from buffer list.
 * Gets exclusive access to buffer for writing.
 */
-HRESULT DirectSoundDevice_RemoveBuffer(
-    DirectSoundDevice * device,
-    IDirectSoundBufferImpl * pDSB)
+void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB)
 {
    int i;
-    HRESULT hr = DS_OK;

    TRACE("(%p, %p)\n", device, pDSB);

@@ -1108,6 +1105,4 @@ HRESULT DirectSoundDevice_RemoveBuffer(
    TRACE("buffer count is now %d\n", device->nrofbuffers);

    RtlReleaseResource(&(device->buffer_list_lock));
-
-    return hr;
 }
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -118,9 +118,7 @@ HRESULT DirectSoundDevice_Initialize(
 HRESULT DirectSoundDevice_AddBuffer(
    DirectSoundDevice * device,
    IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN;
-HRESULT DirectSoundDevice_RemoveBuffer(
-    DirectSoundDevice * device,
-    IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN;
+void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN;
 HRESULT DirectSoundDevice_CreateSoundBuffer(
    DirectSoundDevice * device,
    LPCDSBUFFERDESC dsbd,