commit 94d6bc927f9aa8b773e0fdcccc08234f7848e64b
author Eric Pouech <Eric.Pouech@wanadoo.fr> Sun Dec 05 23:08:42 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Dec 05 23:08:42 1999 +0000
tree b30d267865a2ef60e2dfdcc4446636b1a0e748a1
parent 92e492e29600c1b8d0f020785ae7f972c1138715

Correctly implement ACM_STREAMOPENF_QUERY flag in acmOpenStream.

dlls/msacm32/stream.c

diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c
index c8f3436..4918f87 100644
--- a/dlls/msacm32/stream.c
+++ b/dlls/msacm32/stream.c
@@ -185,9 +185,12 @@
 		    was->hAcmDriver = had;
 		    
 		    ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L);
-		    /* FIXME: when shall the acmDriver be Close():d ? */
-		    if (ret == MMSYSERR_NOERROR)
+		    if (ret == MMSYSERR_NOERROR) {
+			if (fdwOpen & ACM_STREAMOPENF_QUERY) {
+			    acmDriverClose(had, 0L);
+			}
 			break;
+		    }
 		}
 		/* no match, close this acm driver and try next one */
 		acmDriverClose(had, 0L);
@@ -198,13 +201,16 @@
 	    goto errCleanUp;
 	}
     }
-    if (phas)
-	*phas = (HACMSTREAM)was;
-    TRACE("=> (%d)\n", ret);
     ret = MMSYSERR_NOERROR;
-    if (!(fdwOpen & ACM_STREAMOPENF_QUERY))
+    if (!(fdwOpen & ACM_STREAMOPENF_QUERY)) {
+	if (phas)
+	    *phas = (HACMSTREAM)was;
+	TRACE("=> (%d)\n", ret);
 	return ret;
+    }
 errCleanUp:		
+    if (phas)
+	*phas = (HACMSTREAM)0;
     HeapFree(MSACM_hHeap, 0, was);
     TRACE("=> (%d)\n", ret);
     return ret;