Changeset 468 for OCO/trunk/drv16/dwavestrm.cpp

Timestamp:

Nov 4, 2009, 4:21:24 PM (16 years ago)

Author:

pasha

Message:

Rebuild buffers supply, fix DDCMD_WRITE with len=0 in WAVE chain, remove/add debug output, change DebugInt3 for debug/nondebug version, move unused code to unused directore

File:

• OCO/trunk/drv16/dwavestrm.cpp (modified) (9 diffs)

OCO/trunk/drv16/dwavestrm.cpp

@@ -44 +44 @@
 
     pStream = (PDWAVESTREAM)FindStream_fromFile(ulSysFileNum);
-    if(pStream == NULL) {
+    if (pStream == NULL) 
+    {
         dprintf(("HookHandler stream %lx not found!", (ULONG) ulSysFileNum));
         DebugInt3();
@@ -79 +80 @@
     pStreamBuf = new STREAMBUFFER(uLength, (PSTREAMBUF)0, fLooping);
     if(pStreamBuf == NULL) {
+        dprintf(("DWAVESTREAM::Write StreamBuf"));
         DebugInt3();
         return 1;
@@ -87 +89 @@
     rc = DevHelp_VirtToLin(SELECTOROF(pLock), OFFSETOF(pLock), &linLock);
     if(rc) {
+        dprintf(("DWAVESTREAM::Write VirtToLin"));
         DebugInt3();
         delete pStreamBuf;
@@ -94 +97 @@
     rc = DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE, (LIN)pbuf, uLength, -1L, linLock, (PULONG)&PageListCount);
     if(rc) {
+        dprintf(("DWAVESTREAM::Write VMLock"));
         DebugInt3();
         delete pStreamBuf;
@@ -101 +105 @@
     rc = DevHelp_VMProcessToGlobal(VMDHGP_WRITE, (LIN)pbuf, uLength, (PLIN)&linAddr);
     if(rc) {
+        dprintf(("DWAVESTREAM::Write ProcToGlob"));
         DebugInt3();
         DevHelp_VMUnLock(linLock);
@@ -119 +124 @@
    if(temp)
    {
-        if(ulStreamState == STREAM_STREAMING) {//means we're called during an interrupt
+        if(ulStreamState == STREAM_STREAMING) 
+        {//means we're called during an interrupt
             qhReturn.PushOnTail((PQUEUEELEMENT)temp);
             DevHelp_ArmCtxHook(ulSysFileNum, hCtxHook);
         }
-        else {
+        else 
+        {
             DevHelp_VMFree((LIN)temp->pBuffptr);
             DevHelp_VMUnLock(temp->linLock);
@@ -136 +143 @@
     hSem = pReg->hStream;
 
+    dprintf(("DWAVESTREAM::Register"));
     if(DevHelp_OpenEventSem(hSem) != 0) {
         dprintf(("DevHlp_OpenEventSem %lx failed!", hSem));
@@ -173 +181 @@
         Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
 
-            if(pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS) {
-            DebugInt3();
-            return;
-        }
+            if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS) 
+           {
+               dprintf(("DWAVESTREAM::AddBuffers GetPositions"));
+               DebugInt3();
+               return;
+           }
         if(fFirst) {
              space = min(space, 4*_configinfo.ulFragsize);
@@ -255 +265 @@
    WAVESTREAM(streamtype, pinit, filesysnum, mixerStreamId), fError(FALSE), hCtxHook(0), hSem(0)
 {
-    if(DevHelp_AllocateCtxHook((NPFN)HookHandlerAsm, &hCtxHook)) {
+    if (DevHelp_AllocateCtxHook((NPFN)HookHandlerAsm, &hCtxHook)) 
+    {
+        dprintf(("DWAVESTREAM::DWAVESTREAM AllocCtx"));
         DebugInt3();
         fError = TRUE;