Marcus Meissner : mciwave: Return on error (Coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1ae601772c9f9378a2f3b86c14d53cd9a43bc757
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1ae601772c9f9378a2f3b86c14...

Author: Marcus Meissner 
Date:   Sat Oct 17 17:44:21 2009 +0200

mciwave: Return on error (Coverity).

---

dlls/mciwave/mciwave.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c
index 8729bfb..8eb6bad 100644
--- a/dlls/mciwave/mciwave.c
+++ b/dlls/mciwave/mciwave.c
@@ -1579,9 +1579,10 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l

TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms);

-    if (lpParms == NULL || lpParms->lpstrReturn == NULL) {
-	ret = MCIERR_NULL_PARAMETER_BLOCK;
-    } else if (wmw == NULL) {
+    if (!lpParms || !lpParms->lpstrReturn)
+	return MCIERR_NULL_PARAMETER_BLOCK;
+
+    if (wmw == NULL) {
    ret = MCIERR_INVALID_DEVICE_ID;
     } else {
         static const WCHAR wszAudio  [] = {'W','i','n','e',''','s',' ','a','u','d','i','o',' ','p','l','a','y','e','r',0};