Changeset 2103 for trunk/src/msacm32/stream.cpp

Timestamp:

Dec 18, 1999, 11:15:16 AM (26 years ago)

Author:

sandervl

Message:

JW's update (wine 991212)

File:

• trunk/src/msacm32/stream.cpp (modified) (4 diffs)

trunk/src/msacm32/stream.cpp

@@ -48 +48 @@
     ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_CLOSE, (DWORD)&was->drvInst, 0);
     if (ret == MMSYSERR_NOERROR) {
-        /* FIXME: shall the was->pDrv->hDrvr be also closed ? */
+        if (was->hAcmDriver)
+            acmDriverClose(was->hAcmDriver, 0L);        
         HeapFree(MSACM_hHeap, 0, was);
     }
@@ -169 +170 @@
         was->obj.pACMDriverID = wad->obj.pACMDriverID;
         was->pDrv = wad;
-        
+        was->hAcmDriver = 0; /* not to close it in acmStreamClose */
+
         ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L);
         if (ret != MMSYSERR_NOERROR)
@@ -183 +185 @@
                     was->obj.pACMDriverID = wad->obj.pACMDriverID;
                     was->pDrv = wad;
+                    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 */
@@ -198 +204 @@
         }
     }
+    ret = MMSYSERR_NOERROR;
+    if (!(fdwOpen & ACM_STREAMOPENF_QUERY)) {
+        if (phas)
+            *phas = (HACMSTREAM)was;
+        dprintf(("=> (%d)\n", ret));
+        return ret;
+    }
+errCleanUp:             
     if (phas)
-        *phas = (HACMSTREAM)was;
-    dprintf(("=> (%d)\n", ret));
-    ret = MMSYSERR_NOERROR;
-    if (!(fdwOpen & ACM_STREAMOPENF_QUERY))
-        return ret;
-errCleanUp:             
+        *phas = (HACMSTREAM)0;
     HeapFree(MSACM_hHeap, 0, was);
     dprintf(("=> (%d)\n", ret));