Changeset 167 for sbliveos2/trunk/drv16/ioctl.cpp

Timestamp:

Mar 23, 2001, 12:33:12 AM (24 years ago)

Author:

sandervl

Message:

update

File:

• sbliveos2/trunk/drv16/ioctl.cpp (modified) (6 diffs)

sbliveos2/trunk/drv16/ioctl.cpp

@@ -308 +308 @@
 void IoctlDirectAudio(PREQPACKET prp)
 {
- PSTREAM pStream;
-
     if(prp->s.ioctl.bCode == DAUDIO_OPEN)
     {
@@ -315 +313 @@
         PAUDIOHW pHWobj;
         MCI_AUDIO_CAPS audioCaps;
+        PDWAVESTREAM pStream;
 
         if(DevHelp_VerifyAccess(SELECTOROF(pInit), sizeof(MCI_AUDIO_INIT), OFFSETOF(pInit), VERIFY_READWRITE))
@@ -358 +357 @@
         }
 
+        if(!pStream->IsEverythingOk()) {
+            delete pStream;
+            DebugInt3();
+            pInit->sReturnCode = INVALID_REQUEST;
+            prp->usStatus |= RPERR;
+            return;
+        }
         pInit->ulFlags |= VOLUME;           /* volume control is supported   */
         pInit->ulFlags |= INPUT;            /* Input select is supported     */
@@ -413 +419 @@
     }
 
+    PSTREAM pStream;
+
     pStream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
     if(pStream == NULL) {
@@ -481 +489 @@
         DDCMDREGISTER reg;
 
-        if(DevHelp_OpenEventSem(pDAudioCmd->Thread.hSemaphore) != 0) {
-            dprintf(("DevHlp_OpenEventSem %lx failed!", pDAudioCmd->Thread.hSemaphore));
-            prp->usStatus |= RPERR | RPBADCMD;
-            return;
-        }
-
         reg.ulFunction     = DDCMD_REG_STREAM;
         reg.hStream        = pDAudioCmd->Thread.hSemaphore;
@@ -498 +500 @@
     {
         pStream->DeRegister();
-
-        if(DevHelp_CloseEventSem(pDAudioCmd->Thread.hSemaphore) != 0) {
-            dprintf(("DevHlp_CloseEventSemaphore %lx failed!", pDAudioCmd->Thread.hSemaphore));
-            prp->usStatus |= RPERR | RPBADCMD;
-            return;
-        }
         break;
     }