wasapi: improved parameter checks for blocking API

diff --git a/src/hostapi/wasapi/pa_win_wasapi.c b/src/hostapi/wasapi/pa_win_wasapi.c
index a6536750719247c2e2848c77cf0eb9482dda7e67..31e1675be52ff017c1f34db12252c1a59cc91d6e 100644 (file)
--- a/src/hostapi/wasapi/pa_win_wasapi.c
+++ b/src/hostapi/wasapi/pa_win_wasapi.c
@@ -2500,12 +2500,10 @@ static PaError ReadStream( PaStream* s, void *_buffer, unsigned long _frames )
        UINT32 buffer_size;\r
 \r
        // validate\r
-       if (s == NULL)\r
+       if (!stream->running)\r
+               return paStreamIsStopped;\r
+       if (stream->cclient == NULL)\r
                return paBadStreamPtr;\r
-       if (_buffer == NULL)\r
-               return paBadBufferPtr;\r
-       if (_frames == 0)\r
-               return paBufferTooSmall;\r
 \r
        // Notify blocking op has begun\r
        ResetEvent(stream->hBlockingOpStreamRD);\r
@@ -2570,16 +2568,8 @@ static PaError WriteStream( PaStream* s, const void *_buffer, unsigned long _fra
        UINT32 i;\r
 \r
        // validate\r
-       if (s == NULL)\r
-               return paBadStreamPtr;\r
-       if (_buffer == NULL)\r
-               return paBadBufferPtr;\r
-       if (_frames == 0)\r
-               return paBufferTooSmall;\r
-\r
        if (!stream->running)\r
                return paStreamIsStopped;\r
-\r
        if (stream->rclient == NULL)\r
                return paBadStreamPtr;\r
 \r
@@ -2701,12 +2691,8 @@ static signed long GetStreamReadAvailable( PaStream* s )
        UINT32 pending = 0;\r
 \r
        // validate\r
-       if (s == NULL)\r
-               return paBadStreamPtr;\r
-\r
        if (!stream->running)\r
                return paStreamIsStopped;\r
-\r
        if (stream->cclient == NULL)\r
                return paBadStreamPtr;\r
 \r
@@ -2730,12 +2716,8 @@ static signed long GetStreamWriteAvailable( PaStream* s )
        UINT32 padding = 0;\r
 \r
        // validate\r
-       if (s == NULL)\r
-               return paBadStreamPtr;\r
-\r
        if (!stream->running)\r
                return paStreamIsStopped;\r
-\r
        if (stream->rclient == NULL)\r
                return paBadStreamPtr;\r
 \r