Changeset 167 for sbliveos2/trunk/drv16

Timestamp:

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

Author:

sandervl

Message:

update

Location:

sbliveos2/trunk/drv16

Files:

• dwavestrm.cpp (modified) (8 diffs)
• dwavestrm.hpp (modified) (2 diffs)
• ioctl.cpp (modified) (6 diffs)
• stream.hpp (modified) (1 diff)
• strmbuff.hpp (modified) (1 diff)

sbliveos2/trunk/drv16/dwavestrm.cpp

@@ -31 +31 @@
 #include <dbgos2.h>
 #include "ioctl.h"
+#include "malloc.h"
 
 
@@ -55 +56 @@
         }
         DevHelp_VMFree((LIN)temp->pBuffptr);
-        DevHelp_VMUnLock(temp->hLock);
+        DevHelp_VMUnLock(temp->linLock);
+        free(temp->pLock);
         delete temp;
     }
@@ -65 +67 @@
 {
     PSTREAMBUFFEREX pStreamBuf;
-    ULONG pGlobalAddr;
-    LIN   linAddr = (LIN)&pGlobalAddr;
-    ULONG lock;
-    LIN   linLock = (LIN)&lock;
+    LIN   linAddr;
+    PULONG pLock;
+    ULONG PageListCount;
+    LIN   linLock;
     int   rc;
 
-    rc = DevHelp_VirtToLin(SELECTOROF(linAddr), OFFSETOF(linAddr), &linAddr);
+    pLock = (PULONG)malloc(12);
+    if(pLock == NULL) {
+        DebugInt3();
+        return 1;
+    }
+
+    rc = DevHelp_VirtToLin(SELECTOROF(pLock), OFFSETOF(pLock), &linLock);
     if(rc) {
         DebugInt3();
@@ -77 +85 @@
     }
 
-    rc = DevHelp_VirtToLin(SELECTOROF(linLock), OFFSETOF(linLock), &linLock);
+    rc = DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE, (LIN)pbuf, uLength, -1L, linLock, (PULONG)&PageListCount);
+    if(rc) {
+        DebugInt3();
+        DevHelp_VMFree(linAddr);
+        return rc;
+    }
+
+    rc = DevHelp_VMProcessToGlobal(VMDHGP_WRITE, (LIN)pbuf, uLength, (PLIN)&linAddr);
     if(rc) {
         DebugInt3();
@@ -83 +98 @@
     }
 
-    rc = DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE, (LIN)pbuf, uLength, -1L, linLock, (PULONG)-1L);
-    if(rc) {
-        DebugInt3();
-        return rc;
-    }
+    pStreamBuf = new STREAMBUFFEREX(uLength, (PSTREAMBUF)linAddr, linLock, pLock);
 
-    rc = DevHelp_VMProcessToGlobal(VMDHGP_WRITE, (LIN)pbuf, uLength, (PLIN)linAddr);
-    if(rc) {
-        return rc;
-    }
-
-    pStreamBuf = new STREAMBUFFEREX(uLength, (PSTREAMBUF)pGlobalAddr, lock);
-
-    return WAVESTREAM::Write((STREAMBUFFER *)pStreamBuf);
+    return WAVESTREAM::Write((PSTREAMBUFFER)pStreamBuf);
 }
 
@@ -111 +115 @@
         else {
             DevHelp_VMFree((LIN)temp->pBuffptr);
-            DevHelp_VMUnLock(temp->hLock);
+            DevHelp_VMUnLock(temp->linLock);
+            free(temp->pLock);
             delete temp;
         }
@@ -117 +122 @@
 }
 
+ULONG DWAVESTREAM::Register(PDDCMDREGISTER pReg)
+{
+    hSem = pReg->hStream;
+
+    if(DevHelp_OpenEventSem(hSem) != 0) {
+        dprintf(("DevHlp_OpenEventSem %lx failed!", hSem));
+        hSem = 0;
+        return 1;
+    }
+    return WAVESTREAM::Register(pReg);
+}
+
+void DWAVESTREAM::DeRegister(void)
+{
+    if(DevHelp_CloseEventSem(hSem) != 0) {
+        dprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
+        return;
+    }
+    hSem = 0;
+    WAVESTREAM::DeRegister();
+}
+
+
 DWAVESTREAM::DWAVESTREAM(ULONG streamtype, LPMCI_AUDIO_INIT pinit, USHORT filesysnum):
-   WAVESTREAM(streamtype, pinit, filesysnum), fError(FALSE), hCtxHook(0)
+   WAVESTREAM(streamtype, pinit, filesysnum), fError(FALSE), hCtxHook(0), hSem(0)
 {
     if(DevHelp_AllocateCtxHook((NPFN)HookHandlerAsm, &hCtxHook)) {
@@ -132 +160 @@
         StopStream(&cParm);
     }
+    else ReturnBuffers();
+
+    if(hSem) {
+        if(DevHelp_CloseEventSem(hSem) != 0) {
+            dprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
+        }
+    }
     if(hCtxHook) {
         DevHelp_FreeCtxHook(hCtxHook);

sbliveos2/trunk/drv16/dwavestrm.hpp

@@ -44 +44 @@
 public:
    virtual ULONG  Write(PSTREAMBUF, ULONG);
+   virtual ULONG Register(PDDCMDREGISTER);
+   virtual void  DeRegister(void);
+
    DWAVESTREAM(ULONG streamtype, LPMCI_AUDIO_INIT pinit, USHORT filesysnum);
    virtual ~DWAVESTREAM();
@@ -54 +57 @@
    QUEUEHEAD qhReturn;          //queue with buffers to be returned
    ULONG     hCtxHook;
+   ULONG     hSem;
 
    BOOL      fError;

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;
     }

sbliveos2/trunk/drv16/stream.hpp

@@ -81 +81 @@
    ULONG ResumeStreamTime(void);
    virtual ULONG Register(PDDCMDREGISTER);
-   void  DeRegister(void);
+   virtual void  DeRegister(void);
    virtual ULONG Write(PSTREAMBUF, ULONG);
    virtual ULONG Read(PSTREAMBUF, unsigned) = 0;

sbliveos2/trunk/drv16/strmbuff.hpp

@@ -48 +48 @@
 {
 public:
-    STREAMBUFFEREX(ULONG bufsize, PSTREAMBUF bufptr, ULONG lockHandle):
-    STREAMBUFFER(bufsize, bufptr), hLock(lockHandle), fDone(FALSE)
-    {};
+    STREAMBUFFEREX(ULONG bufsize, PSTREAMBUF bufptr, ULONG linLock, PULONG pLock):
+    STREAMBUFFER(bufsize, bufptr), fDone(FALSE)
+    {
+       this->linLock = linLock;
+       this->pLock = pLock;
+    };
 
-    ULONG hLock;
-    BOOL  fDone;
+    ULONG  linLock;
+    PULONG pLock;
+    BOOL   fDone;
 
 };