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

Timestamp:

Nov 9, 2009, 2:36:35 AM (16 years ago)

Author:

pasha

Message:

Fix buffers overflow problem, check Flash10, fix some strange code

File:

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

OCO/trunk/drv16/dwavestrm.cpp

@@ -166 +166 @@
 ULONG DWAVESTREAM::StartStream(void)
 {
+    dprintf(("DWAVESTREAM::StartStream"));
    return WAVESTREAM::StartStream();
 }
@@ -175 +176 @@
    ULONG space, Buff_left, byteswritten;
 
-   if(!pTemp) pTemp = (PSTREAMBUFFER)qhInProcess.Tail();
-
-   if(ulStreamType & STREAM_WRITE && pTemp && pTemp->looping) 
+    dprintf(("DW::AddBuffers"));
+    if (!pTemp) pTemp = (PSTREAMBUFFER)qhInProcess.Tail();
+
+    if (ulStreamType & STREAM_WRITE && pTemp && pTemp->looping) 
+    {
+        Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
+        if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS) 
+        {
+            dprintf(("DWAVESTREAM::AddBuffers GetPositions"));
+            DebugInt3();
+            return;
+        }
+        if(fFirst) 
+        {
+             space = min(space, 4*_configinfo.ulFragsize);
+        }
+        else
+        { 
+            space = min(space, _configinfo.ulFragsize);
+        }
+        if (space) 
+        {
+           if (space >= Buff_left) 
+           {
+              byteswritten = AddBuffer(Buff_left);
+              if (byteswritten == Buff_left) 
+              {
+                  pTemp->ulBuffpos = 0; //reset fill position
+                  AddBuffer(space - Buff_left);
+              }
+           }
+           else 
+           {
+              AddBuffer(space);
+           }
+        }       
+        pTemp->ulDonepos = 0; //make sure it ::Process never thinks it's done
+   }
+   else 
    {
-        Buff_left = pTemp->ulBuffsz - pTemp->ulBuffpos;
-
-            if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS) 
-           {
-               dprintf(("DWAVESTREAM::AddBuffers GetPositions"));
-               DebugInt3();
-               return;
-           }
-        if(fFirst) {
-             space = min(space, 4*_configinfo.ulFragsize);
-        }
-        else space = min(space, _configinfo.ulFragsize);
-
-            if(space) {
-            if(space >= Buff_left) {
-                 byteswritten = AddBuffer(Buff_left);
-                 if(byteswritten == Buff_left) {
-                     pTemp->ulBuffpos = 0; //reset fill position
-                     AddBuffer(space - Buff_left);
-                 }
-            }
-            else AddBuffer(space);
-            }   
-        pTemp->ulDonepos = 0; //make sure it ::Process never thinks it's done
-   }
-   else WAVESTREAM::AddBuffers(fFirst);
+     WAVESTREAM::AddBuffers(fFirst);
+   }
+    dprintf(("DW::AddBuffers End"));
 }
 //*****************************************************************************