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

OCO/trunk/drv16/waveplay.cpp

@@ -61 +61 @@
     ULONG ret;
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::Open %lx",StreamId));
+//    dprintf(("WAVEPLAY::Open %lx",StreamId));
 #endif
     if (fAPMSuspend)
     {
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::Open. Suspend state"));
+//        dprintf(("WAVEPLAY::Open. Suspend state"));
 #endif
         apm_resume();
@@ -107 +107 @@
 {
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::Close stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
+//    dprintf(("WAVEPLAY::Close stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
 #endif
 #if 0 // fixme to be gone?
@@ -119 +119 @@
         force_closed = 0;
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
+//        dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx", StreamId, waveOpened,open_strategy));
 #endif
         return TRUE;
@@ -140 +140 @@
                 open_strategy = 0UL;
 #ifdef DEBUG
-                dprintf(("OSS16_WAVECLOSE: Success"));
+//                dprintf(("OSS16_WAVECLOSE: Success"));
 #endif /* DEBUG */
                 return TRUE;
@@ -171 +171 @@
     {
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::ConfigDev. Suspend state"));
+//        dprintf(("WAVEPLAY::ConfigDev. Suspend state"));
 #endif
         apm_resume();
@@ -189 +189 @@
     }
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev1 SampleRate %ld", pConfigInfo->ulHwSampleRate));
-    dprintf(("WAVEPLAY::ConfigDev1 ulFirstBufSize %ld", ulFirstBufSize));
-    dprintf(("WAVEPLAY::ConfigDev1 ulFragsize %ld", pConfigInfo->ulFragsize));
+    dprintf(("WAVEPLAY::ConfigDev1\nSampleRate %ld", pConfigInfo->ulHwSampleRate));
+    dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
+    dprintf(("ulFragsize %ld", pConfigInfo->ulFragsize));
 #endif
 
@@ -211 +211 @@
         ulFirstBufSize = ConvertLength(ulFirstBufSize, pConfigInfo);
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::ConfigDev2 ulFirstBufSize %ld", ulFirstBufSize));
+        dprintf(("ulFirstBufSize %ld", ulFirstBufSize));
 #endif /* DEBUG */
     }
@@ -223 +223 @@
     ulPCMConsumeRate = ConvertLength(pConfigInfo->ulPCMConsumeRate, pConfigInfo);
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev: cons rate %ld buf size %ld init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
+    dprintf(("cons rate %ld buf size %ld init rate %ld", ulPCMConsumeRate, ulFirstBufSize, pConfigInfo->ulHwSampleRate));
 #endif /* DEBUG */
 
@@ -252 +252 @@
 
 #ifdef DEBUG
-    dprintf(("WAVEPLAY::ConfigDev2 fragsize %ld", fragsize));
+    dprintf(("fragsize %ld", fragsize));
 #endif
     hwparam.ulSampleRate    = pConfigInfo->ulHwSampleRate;
@@ -261 +261 @@
 #ifdef DEBUG
         dprintf(("WAVEPLAY:ConfigDev:OSS16_WaveSetFormat . rc = %d",rc));
-        dprintf(("WAVEPLAY:ConfigDev:samp rate %ld",hwparam.ulSampleRate));
-        dprintf(("WAVEPLAY:ConfigDev:bits per sample %ld",hwparam.ulBitsPerSample));
-        dprintf(("WAVEPLAY:ConfigDev:channels %ld",hwparam.ulNumChannels));
-        dprintf(("WAVEPLAY:ConfigDev:data type %ld",hwparam.ulDataType));
+        dprintf(("samp rate %ld",hwparam.ulSampleRate));
+        dprintf(("bits per sample %ld",hwparam.ulBitsPerSample));
+        dprintf(("channels %ld",hwparam.ulNumChannels));
+        dprintf(("data type %ld",hwparam.ulDataType));
 
 #endif
@@ -294 +294 @@
     {
 #ifdef DEBUG
-        dprintf(("WAVEPLAY::Transfer. Suspend state"));
+//        dprintf(("WAVEPLAY::Transfer. Suspend state"));
 #endif
         apm_resume();
@@ -415 +415 @@
             dprintf(("WPLAY::AddBuffer need %ld space:%ld", ulCvtBufferSize, Space));
 #endif
-            while (!Space)
-               for (i=0; i < 0xffffff; i++)
-               {
-                    OSS16_WaveGetSpace(StreamId, &Space);
-                    if (Space & ~(pConfigInfo->ulHwSampleSize - 1)) break;
-               }
-#ifdef DEBUG
-            dprintf(("OUT %lx need %ld space:%ld ",i, ulCvtBufferSize, Space));
-#endif
+            if (Space < pConfigInfo->ulBytesPerIRQ)
+            {
+               return TRUE;
+            }
+
             if (ulCvtBufferSize > Space)
                 ulCvtBufferSize = Space & ~(pConfigInfo->ulHwSampleSize - 1);
@@ -433 +429 @@
             {
                  GetSpace(StreamId, pConfigInfo, &Space);
-                 dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld %x failed due to full buffer free space:%ld", ulCvtBufferSize, (USHORT)rc,Space));
+                 dprintf(("WPLAY::AddBuffer; %ld %x failed due to full buffer free space:%ld", ulCvtBufferSize, (USHORT)rc,Space));
             }
 #ifdef DEBUG
             else 
-                dprintf(("WPLAY::AddBuffer; OSS16_WaveAddBuffer %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
+                dprintf(("WPLAY::AddBuffer; %ld rc=%x failed", ulCvtBufferSize, (USHORT)rc));
 #endif
             *pulBytesTransferred = 0;
@@ -492 +488 @@
         *pulStreamPosition = 0;
 #ifdef DEBUG
-        dprintf(("OSS16_WAVEPLAY::GetPosition: Failed"));
+        dprintf(("WAVEPLAY::GetPosition: Failed"));
 #endif /* DEBUG */
         return FALSE;
@@ -515 +511 @@
         *pulStreamSpace = 0;
 #ifdef DEBUG
-        dprintf(("OSS16_WAVEPLAY::GetSpace: Failed"));
+        dprintf(("WAVEPLAY::GetSpace: Failed"));
 #endif /* DEBUG */
         return FALSE;
@@ -537 +533 @@
         *pulHwPtr = 0;
         #ifdef DEBUG
-        dprintf(("OSS16_WAVEPLAY::WaveGetHwPtr: Failed"));
+        dprintf(("WAVEPLAY::WaveGetHwPtr: Failed"));
         #endif /* DEBUG */
         return FALSE;