Changeset 473 for OCO/trunk/drv16/wavestrm.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/wavestrm.cpp (modified) (12 diffs)

OCO/trunk/drv16/wavestrm.cpp

@@ -181 +181 @@
         }
         space &= (~(_configinfo.ulSampleSize - 1));
-        curspace = space;
+        curspace = min(space, _configinfo.ulBytesPerIRQ/_configinfo.ulSampleSize * 2);
         while (space && qhInProcess.IsElements()) 
         {
@@ -188 +188 @@
             if (fFirst == TRUE)  //PS+++
             {
-                 DevHelp_ProcBlock (space, 20, 0);
+                cli();
+//                 DevHelp_ProcBlock (space, 20, 0);
             }
 //            dgprintf(("AddBuffers write %ld SSize:%ld %d",space, _configinfo.ulSampleSize, fFirst == TRUE?1:2));
@@ -195 +196 @@
             {
 //                dgprintf(("WAVESTREAM::AddBuffers Error 2"));
-                return;
+                break;
             }
             if(byteswritten == (ULONG)-1)
@@ -233 +234 @@
     if(pahw->GetHwPtr(StreamId, &_configinfo, &start_pos) == FALSE)
     {
-        dgprintf(("WAVESTREAM::AddBuffer Error in WaveGetHwPtr"));
+        dgprintf(("WAVESTREAM::AddBuffer Err in GetHwPtr"));
         DebugInt3();
         return (ULONG)-1;
@@ -240 +241 @@
     if (!pTemp->ulBuffsz || !space)
     {
-        dgprintf(("WAVESTREAM::AddBuffer NULL, Bufsz:%ld Space:%ld",pTemp->ulBuffsz, space));
+        dgprintf(("WAVESTREAM::AddBuffer 0, Bufsz:%ld Space:%ld",pTemp->ulBuffsz, space));
         //PS+++ if is ZERO do nothing and ask for give new buffer, See REMARK in mmpm2.inf
         qhDone.PushOnTail(qhInProcess.PopHead());
 //        DebugInt3();
-        return 0;
+        return -1;
     }
     // get the buffer pointer and amount of data remaining
@@ -261 +262 @@
         dgprintf(("AddBuffer: No more room!!"));
 //        DebugInt3();
-        return (ULONG)-1; //no more room
+//PS+++        return (ULONG)-1; //no more room
+        return 0;   //PS+++ may be in next time?
     }
     // update the buffer pos counter
@@ -304 +306 @@
     }
 
-    dprintf4(("_vReadAudioBuf %lx size %ld, bytes read %ld", pdataBuf, Buff_left, bytesread));
+//    dprintf4(("_vReadAudioBuf %lx size %ld, bytes read %ld", pdataBuf, Buff_left, bytesread));
 
     // update the buffer pos counter
@@ -325 +327 @@
 // can be returned and finally process any events pending.
 //******************************************************************************
-//USHORT ProcNumber = 0;
+USHORT ProcNumber = 0;
 void DBGCALLCONV WAVESTREAM::Process(void)
 {
  PSTREAMBUFFER ptemp;
  ULONG         ulCurBytesProcessed = 0;
-// USHORT        CurProcNumber = ProcNumber++;
+ USHORT        CurProcNumber = ProcNumber++;
  ULONG         space;
 
@@ -351 +353 @@
     _ulBytesProcessed = ulCurBytesProcessed;
 
-//    if ((pahw->GetSpace(StreamId, &_configinfo, &space) != FALSE) && (space > _configinfo.ulBytesPerIRQ))
-    switch (ulStreamType & STREAM_WRITE) {
+    if ((pahw->GetSpace(StreamId, &_configinfo, &space) != FALSE) && (space > _configinfo.ulBytesPerIRQ/_configinfo.ulSampleSize ))
+    switch (ulStreamType & STREAM_WRITE) 
+    {
 
         // if there are buffers that have been completly written to the audio buffer
@@ -522 +525 @@
 
 #ifdef DEBUG
-    ddprintf(("WAVESTREAM::StartStream"));
+//    ddprintf(("WAVESTREAM::StartStream"));
 #endif
 
@@ -572 +575 @@
         }
     }
-    ddprintf(("WAVESTREAM::StartStream %lx End", StreamId));
+//    ddprintf(("WAVESTREAM::StartStream %lx End", StreamId));
     return NO_ERROR;
 
@@ -598 +601 @@
 
     ulStreamState = STREAM_STOPPED;
-    ddprintf(("WAVESTREAM::StopStream %lx", StreamId));
+//    ddprintf(("WAVESTREAM::StopStream %lx", StreamId));
     ReturnBuffers();
     pControl->ulTime = GetCurrentTime();