[ros-diffs] [janderwald] 47909: [PORTCLS] - Check if there is a silence buffer available when there is no audio mapping available - ignore failure for allocation requirements

[janderwald at svn.reactos.org]

Author: janderwald
Date: Tue Jun 29 21:14:09 2010
New Revision: 47909

URL: http://svn.reactos.org/svn/reactos?rev=47909&view=rev
Log:
[PORTCLS]
- Check if there is a silence buffer available when there is no audio mapping available
- ignore failure for allocation requirements

Modified:
    trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp
    trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp?rev=47909&r1=47908&r2=47909&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Tue Jun 29 21:14:09 2010
@@ -259,7 +259,7 @@
         m_CurrentOffset = Offset = 0;
     }
 
-    if (!Irp)
+    if (!Irp && m_SilenceBuffer && m_MaxFrameSize)
     {
         DPRINT("NoIrp\n");
         // no irp available, use silence buffer
@@ -267,6 +267,13 @@
         *BufferSize = m_MaxFrameSize;
         return STATUS_SUCCESS;
     }
+
+    if (!Irp)
+    {
+        // no irp buffer available
+        return STATUS_UNSUCCESSFUL;
+    }
+
 
     // get stream header
     StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2];

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp?rev=47909&r1=47908&r2=47909&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Tue Jun 29 21:14:09 2010
@@ -824,7 +824,6 @@
     if (!NT_SUCCESS(Status))
     {
         DPRINT("GetAllocatorFraming failed with %x\n", Status);
-        return Status;
     }
 
     DPRINT("OptionFlags %x RequirementsFlag %x PoolType %x Frames %lu FrameSize %lu FileAlignment %lu\n",