[ros-diffs] [janderwald] 44324: - Partly revert 44309 as it sometimes causes problems

[janderwald at svn.reactos.org]

Author: janderwald
Date: Sun Nov 29 20:29:52 2009
New Revision: 44324

URL: http://svn.reactos.org/svn/reactos?rev=44324&view=rev
Log:
- Partly revert 44309 as it sometimes causes problems

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

Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp?rev=44324&r1=44323&r2=44324&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Sun Nov 29 20:29:52 2009
@@ -415,10 +415,10 @@
     IN PKSIDENTIFIER Request,
     IN OUT PVOID Data)
 {
+    NTSTATUS Status = STATUS_UNSUCCESSFUL;
     CPortPinWaveCyclic *Pin;
     PSUBDEVICE_DESCRIPTOR Descriptor;
     PKSSTATE State = (PKSSTATE)Data;
-    PSETPIN_CONTEXT PinWorkContext;
 
     // get sub device descriptor 
     Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp);
@@ -436,20 +436,24 @@
 
     if (Request->Flags & KSPROPERTY_TYPE_SET)
     {
-        PinWorkContext = (PSETPIN_CONTEXT)AllocateItem(NonPagedPool, sizeof(PSETPIN_CONTEXT), TAG_PORTCLASS);
-        PC_ASSERT(PinWorkContext);
-
-        PinWorkContext->WorkItem = IoAllocateWorkItem(IoGetCurrentIrpStackLocation(Irp)->DeviceObject);
-        PC_ASSERT(PinWorkContext->WorkItem);
-        // initialize work item context
-        PinWorkContext->NewState = *State;
-        PinWorkContext->Pin = Pin;
-        PinWorkContext->Irp = Irp;
-
-        IoMarkIrpPending(Irp);
-
-        IoQueueWorkItem(PinWorkContext->WorkItem, PinSetStateWorkerRoutine, DelayedWorkQueue, (PVOID)PinWorkContext);
-        return STATUS_PENDING;
+        // try set stream
+        Status = Pin->m_Stream->SetState(*State);
+
+        DPRINT("Setting state %u %x\n", *State, Status);
+        if (NT_SUCCESS(Status))
+        {
+            // store new state
+            Pin->m_State = *State;
+
+            if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING && Pin->m_State == KSSTATE_STOP)
+            {
+                // FIXME
+                // complete with successful state
+                Pin->m_IrpQueue->CancelBuffers();
+            }
+            // store result
+            Irp->IoStatus.Information = sizeof(KSSTATE);
+        }
     }
     else if (Request->Flags & KSPROPERTY_TYPE_GET)
     {
@@ -457,7 +461,7 @@
         *State = Pin->m_State;
         // store result
         Irp->IoStatus.Information = sizeof(KSSTATE);
-        DPRINT1("Getting state %u %x\n", *State, STATUS_SUCCESS);
+
         return STATUS_SUCCESS;
     }
 
@@ -1243,8 +1247,8 @@
     m_Port = Port;
     m_Filter = Filter;
 
-    DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE));
-    DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE));
+    //DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE));
+    //DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE));
 
     return STATUS_SUCCESS;
 }