Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[janderwald] 39893: - Implement a fast read / fast write path with KsStreamIo - Fix 2 bugs in KsRegister*Worker code - Implement fast write support for the general purpose dispatcher in portcls - Implement a IIrpQueue object will queue pending irp requests - Refactor IPinWaveCyclic interrupt handling code to work with IIrpQueue - Handle wave out request in IRP_MJ_WRITE and submit them using KsStreamIo -
by janderwald＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: janderwald Date: Fri Mar 6 22:06:21 2009 New Revision: 39893 URL: http://svn.reactos.org/svn/reactos?rev=39893&view=rev Log: - Implement a fast read / fast write path with KsStreamIo - Fix 2 bugs in KsRegister*Worker code - Implement fast write support for the general purpose dispatcher in portcls - Implement a IIrpQueue object will queue pending irp requests - Refactor IPinWaveCyclic interrupt handling code to work with IIrpQueue - Handle wave out request in IRP_MJ_WRITE and submit them using KsStreamIo - Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/worker.c trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -1077,6 +1077,8 @@ ULONG Code; NTSTATUS Status; LARGE_INTEGER Offset; + PKSIOBJECT_HEADER ObjectHeader; + if (Flags == KSSTREAM_READ) Code = IRP_MJ_READ; @@ -1092,6 +1094,30 @@ if (Event) { KeResetEvent(Event); + } + + //ASSERT(DeviceObject->DeviceType == FILE_DEVICE_KS); + ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; + ASSERT(ObjectHeader); + if (Code == IRP_MJ_READ) + { + if (ObjectHeader->DispatchTable.FastRead) + { + if (ObjectHeader->DispatchTable.FastRead(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject)) + { + return STATUS_SUCCESS; + } + } + } + else + { + if (ObjectHeader->DispatchTable.FastWrite) + { + if (ObjectHeader->DispatchTable.FastWrite(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject)) + { + return STATUS_SUCCESS; + } + } } Offset.QuadPart = 0LL; Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -43,7 +43,7 @@ KsWorker->Counter = 0; KsWorker->WorkItemActive = 0; KsWorker->WorkItem = NULL; - KsWorker->DeleteInProgress = TRUE; + KsWorker->DeleteInProgress = FALSE; KeInitializeSpinLock(&KsWorker->Lock); KeInitializeEvent(&KsWorker->Event, NotificationEvent, FALSE); @@ -181,6 +181,9 @@ if (!KsWorker->DeleteInProgress) { ExQueueWorkItem(WorkItem, KsWorker->Type); + } + else + { Status = STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -200,7 +200,8 @@ return status; } -NTSTATUS NTAPI +NTSTATUS +NTAPI PcRegisterSubdevice( IN PDEVICE_OBJECT DeviceObject, IN PWCHAR Name, @@ -215,16 +216,24 @@ DPRINT1("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); + /* check if all parameters are valid */ if (!DeviceObject || !Name || !Unknown) { DPRINT("PcRegisterSubdevice invalid parameter\n"); return STATUS_INVALID_PARAMETER; } + /* get device extension */ DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + if (!DeviceExt) + { + /* should not happen */ + KeBugCheck(0); return STATUS_UNSUCCESSFUL; - + } + + /* look up our undocumented interface */ Status = Unknown->lpVtbl->QueryInterface(Unknown, &IID_ISubdevice, (LPVOID)&SubDevice); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -215,9 +215,12 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { + IIrpTarget * IrpTarget; DPRINT1("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); - return FALSE; + IrpTarget = (IIrpTarget *)FileObject->FsContext2; + + return IrpTarget->lpVtbl->FastWrite(IrpTarget, FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); } static KSDISPATCH_TABLE DispatchTable = @@ -244,6 +247,7 @@ NTSTATUS Status; KSOBJECT_HEADER ObjectHeader; PKSOBJECT_CREATE_ITEM CreateItem; + PIO_STACK_LOCATION IoStack; CreateItem = AllocateItem(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM), TAG_PORTCLASS); if (!CreateItem) @@ -251,6 +255,11 @@ CreateItem->Context = (PVOID)Target; + IoStack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(IoStack->FileObject); + + IoStack->FileObject->FsContext2 = (PVOID)Target; + Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); DPRINT1("KsAllocateObjectHeader result %x\n", Status); return Status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -180,6 +180,44 @@ }; /***************************************************************************** + * IIrpQueue + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IIrpQueue + +DECLARE_INTERFACE_(IIrpQueue, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(NTSTATUS, Init)(THIS_ + IN KSPIN_CONNECT *ConnectDetails, + IN PDEVICE_OBJECT DeviceObject); + + STDMETHOD_(NTSTATUS, AddMapping)(THIS_ + IN PUCHAR Buffer, + IN ULONG BufferSize, + IN PIRP Irp); + + STDMETHOD_(NTSTATUS, GetMapping)(THIS_ + OUT PUCHAR * Buffer, + OUT PULONG BufferSize); + + STDMETHOD_(VOID, UpdateMapping)(THIS_ + IN ULONG BytesWritten); + + STDMETHOD_(ULONG, NumMappings)(THIS); + + STDMETHOD_(ULONG, MinMappings)(THIS); + + STDMETHOD_(ULONG, MaxMappings)(THIS); + +}; + + + +/***************************************************************************** * IKsWorkSink ***************************************************************************** */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -1,4 +1,244 @@ - +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/multimedia/portcls/irpstream.c + * PURPOSE: IRP Stream handling + * PROGRAMMER: Johannes Anderwald + * + * HISTORY: + * 27 Jan 07 Created + */ + +#include "private.h" + +typedef struct _IRP_MAPPING_ +{ + KSSTREAM_HEADER *Header; + PIRP Irp; + LIST_ENTRY Entry; + struct _IRP_MAPPING_ * Next; +}IRP_MAPPING, *PIRP_MAPPING; + +#define MAX_MAPPING (100) + +typedef struct +{ + IIrpQueueVtbl *lpVtbl; + + LONG ref; + + ULONG CurrentOffset; + ULONG NextMapping; + LONG NumMappings; + IN KSPIN_CONNECT *ConnectDetails; + + PIRP_MAPPING FirstMap; + PIRP_MAPPING LastMap; +}IIrpQueueImpl; + +VOID +NTAPI +DpcRoutine( + IN struct _KDPC *Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2); + + +NTSTATUS +NTAPI +IIrpQueue_fnQueryInterface( + IIrpQueue* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IIrpQueue_fnAddRef( + IIrpQueue* iface) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + return _InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IIrpQueue_fnRelease( + IIrpQueue* iface) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + _InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + + +NTSTATUS +NTAPI +IIrpQueue_fnInit( + IN IIrpQueue *iface, + IN KSPIN_CONNECT *ConnectDetails, + IN PDEVICE_OBJECT DeviceObject) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + This->ConnectDetails = ConnectDetails; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IIrpQueue_fnAddMapping( + IN IIrpQueue *iface, + IN PUCHAR Buffer, + IN ULONG BufferSize, + IN PIRP Irp) +{ + PIRP_MAPPING Mapping; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + Mapping = ExAllocatePool(NonPagedPool, sizeof(IRP_MAPPING)); + if (!Mapping) + return STATUS_UNSUCCESSFUL; + + Mapping->Header = (KSSTREAM_HEADER*)Buffer; + Mapping->Irp = Irp; + + if (!This->FirstMap) + This->FirstMap = Mapping; + else + This->LastMap->Next = Mapping; + + This->LastMap = Mapping; + + InterlockedIncrement(&This->NumMappings); + + DPRINT1("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu\n", This->NumMappings, Mapping->Header->DataUsed); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IIrpQueue_fnGetMapping( + IN IIrpQueue *iface, + OUT PUCHAR * Buffer, + OUT PULONG BufferSize) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + if (!This->FirstMap) + return STATUS_UNSUCCESSFUL; + + *Buffer = (PUCHAR)This->FirstMap->Header->Data + This->CurrentOffset; + *BufferSize = This->FirstMap->Header->DataUsed - This->CurrentOffset; + + return STATUS_SUCCESS; +} + + + +VOID +NTAPI +IIrpQueue_fnUpdateMapping( + IN IIrpQueue *iface, + IN ULONG BytesWritten) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + PIRP_MAPPING Mapping; + + This->CurrentOffset += BytesWritten; + + if (This->FirstMap->Header->DataUsed <=This->CurrentOffset) + { + This->CurrentOffset = 0; + Mapping = This->FirstMap; + This->FirstMap = This->FirstMap->Next; + + //ExFreePool(Mapping->Header->Data); + //ExFreePool(Mapping->Header); + //IoCompleteRequest(Mapping->Irp, IO_NO_INCREMENT); + //ExFreePool(Mapping); + } +} + +ULONG +NTAPI +IIrpQueue_fnNumMappings( + IN IIrpQueue *iface) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + return This->NumMappings; +} + +ULONG +NTAPI +IIrpQueue_fnMaxMappings( + IN IIrpQueue *iface) +{ + return MAX_MAPPING; +} + +ULONG +NTAPI +IIrpQueue_fnMinMappings( + IN IIrpQueue *iface) +{ + return MAX_MAPPING / 4; +} + +static IIrpQueueVtbl vt_IIrpQueue = +{ + IIrpQueue_fnQueryInterface, + IIrpQueue_fnAddRef, + IIrpQueue_fnRelease, + IIrpQueue_fnInit, + IIrpQueue_fnAddMapping, + IIrpQueue_fnGetMapping, + IIrpQueue_fnUpdateMapping, + IIrpQueue_fnNumMappings, + IIrpQueue_fnMinMappings, + IIrpQueue_fnMaxMappings +}; + + +NTSTATUS +NTAPI +NewIrpQueue( + IN IIrpQueue **Queue) +{ + IIrpQueueImpl *This = AllocateItem(NonPagedPool, sizeof(IIrpQueueImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->ref = 1; + This->lpVtbl = &vt_IIrpQueue; + + *Queue = (IIrpQueue*)This; + return STATUS_SUCCESS; + +} NTSTATUS NewIrpStreamPhysical( Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -16,19 +16,17 @@ KSSTATE State; PKSDATAFORMAT Format; - LIST_ENTRY QueueHead; - KSPIN_LOCK QueueLock; - PVOID CommonBuffer; ULONG CommonBufferSize; ULONG CommonBufferOffset; - PIRP ActiveIrp; + IIrpQueue * IrpQueue; + PUCHAR ActiveIrpBuffer; ULONG ActiveIrpBufferSize; ULONG ActiveIrpOffset; ULONG DelayedRequestInProgress; - + ULONG RetryCount; }IPortPinWaveCyclicImpl; @@ -101,88 +99,72 @@ IServiceSink* iface) { ULONG Position; - ULONG BufferLength, IrpLength, BytesToCopy; + ULONG BufferLength, BytesToCopy; NTSTATUS Status; + PUCHAR Buffer; + ULONG BufferSize; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)CONTAINING_RECORD(iface, IPortPinWaveCyclicImpl, lpVtblServiceSink); - if (This->ActiveIrp && This->ActiveIrpOffset >= This->ActiveIrpBufferSize) - { - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); - if (KeGetCurrentIrql() > DISPATCH_LEVEL) + + Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); + if (!NT_SUCCESS(Status)) + { + This->RetryCount++; + if (This->RetryCount > 30) { - This->DelayedRequestInProgress = TRUE; - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + DPRINT1("Stopping\n"); + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); + This->RetryCount = 0; return; } - else + DPRINT("IServiceSink_fnRequestService> Waiting for mapping\n"); + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + return; + } + This->RetryCount = 0; + + if (KeGetCurrentIrql() == DISPATCH_LEVEL) + return; + + + Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); + DPRINT("Position %u BufferSize %u ActiveIrpOffset %u\n", Position, This->CommonBufferSize, BufferSize); + + + if (Position < This->CommonBufferOffset) + { + BufferLength = This->CommonBufferSize - This->CommonBufferOffset; + + BytesToCopy = min(BufferLength, BufferSize); + + DPRINT("Copying %u\n", BytesToCopy); + + if (BytesToCopy) { - if (This->ActiveIrp) - { - This->ActiveIrp->IoStatus.Status = STATUS_SUCCESS; - This->ActiveIrp->IoStatus.Information = This->ActiveIrpBufferSize; - IoCompleteRequest(This->ActiveIrp, IO_SOUND_INCREMENT); - This->ActiveIrp = NULL; - } - - Status = IPortWaveCyclic_fnProcessNewIrp(This); - if (Status == STATUS_SUCCESS) - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); - else - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, Buffer, BytesToCopy); + This->IrpQueue->lpVtbl->UpdateMapping(This->IrpQueue, BytesToCopy); + This->CommonBufferOffset = 0; + } + + + Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); + if (!NT_SUCCESS(Status)) + { + DPRINT("IServiceSink_fnRequestService> Waiting for mapping\n"); + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); + This->RetryCount++; return; } - } - - if (!This->ActiveIrp) - { - if (KeGetCurrentIrql() > DISPATCH_LEVEL) - { - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); - return; - } - - Status = IPortWaveCyclic_fnProcessNewIrp(This); - if (Status == STATUS_SUCCESS) - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); - else - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); - return; - } - - Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); - DPRINT("Position %u BufferSize %u ActiveIrpOffset %u\n", Position, This->CommonBufferSize, This->ActiveIrpOffset); - - if (Position < This->CommonBufferOffset) - { - BufferLength = This->CommonBufferSize - This->CommonBufferOffset; - IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; - - BytesToCopy = min(BufferLength, IrpLength); - - DPRINT("Copying %u Remaining %u\n", BytesToCopy, IrpLength); + + BytesToCopy = min(Position, BufferSize); + + DPRINT("Copying %u\n", BytesToCopy); if (BytesToCopy) { - This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, (PUCHAR)This->ActiveIrpBuffer + This->ActiveIrpOffset, BytesToCopy); - This->ActiveIrpOffset += BytesToCopy; - This->CommonBufferOffset = 0; - } - else - { - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); - return; - } - BufferLength = Position; - IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; - BytesToCopy = min(BufferLength, IrpLength); - - DPRINT("Copying %u Remaining %u\n", BytesToCopy, IrpLength); - - if (BytesToCopy) - { - This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)(PUCHAR)This->CommonBuffer, (PUCHAR)This->ActiveIrpBuffer + This->ActiveIrpOffset, BytesToCopy); - This->ActiveIrpOffset += Position; + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)(PUCHAR)This->CommonBuffer, Buffer, BytesToCopy); + This->IrpQueue->lpVtbl->UpdateMapping(This->IrpQueue, BytesToCopy); This->CommonBufferOffset = Position; } @@ -190,23 +172,16 @@ else if (Position >= This->CommonBufferOffset) { BufferLength = Position - This->CommonBufferOffset; - IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; - - BytesToCopy = min(BufferLength, IrpLength); - DPRINT("Copying %u Remaining %u\n", BytesToCopy, IrpLength); - - if (!BytesToCopy) - { - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); - return; - } - - This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, + + BytesToCopy = min(BufferLength, BufferSize); + DPRINT("Copying %u\n", BytesToCopy); + + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, - (PUCHAR)This->ActiveIrpBuffer + This->ActiveIrpOffset, + Buffer, BytesToCopy); - This->ActiveIrpOffset += BytesToCopy; + This->IrpQueue->lpVtbl->UpdateMapping(This->IrpQueue, BytesToCopy); This->CommonBufferOffset = Position; } @@ -299,44 +274,6 @@ NTSTATUS NTAPI -IPortWaveCyclic_fnProcessNewIrp( - IPortPinWaveCyclicImpl * This) -{ - PIO_STACK_LOCATION IoStack; - PKSSTREAM_HEADER Header; - - This->ActiveIrp = KsRemoveIrpFromCancelableQueue(&This->QueueHead, &This->QueueLock, KsListEntryTail, KsAcquireAndRemove); - if (!This->ActiveIrp) - { - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, -10000000L); - return STATUS_PENDING; - } - - DPRINT("ActiveIrp %p\n", This->ActiveIrp); - - IoStack = IoGetCurrentIrpStackLocation(This->ActiveIrp); - - if (IoStack->Parameters.DeviceIoControl.InputBufferLength != sizeof(KSSTREAM_HEADER)) - { - DPRINT1("Irp has unexpected header\n"); - IoCompleteRequest(This->ActiveIrp, IO_NO_INCREMENT); - This->ActiveIrp = NULL; - return STATUS_INVALID_PARAMETER; - } - - Header = (PKSSTREAM_HEADER)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; - DPRINT("Header %p Size %u\n", Header, Header->Size); - - - This->ActiveIrpOffset = 0; - This->ActiveIrpBuffer = Header->Data; - This->ActiveIrpBufferSize = Header->DataUsed; - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI IPortPinWaveCyclic_HandleKsProperty( IN IPortPinWaveCyclic * iface, IN PIRP Irp) @@ -381,28 +318,9 @@ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; if (This->Stream) { - This->CommonBufferOffset = 0; - This->CommonBufferSize = This->DmaChannel->lpVtbl->AllocatedBufferSize(This->DmaChannel); - This->CommonBuffer = This->DmaChannel->lpVtbl->SystemAddress(This->DmaChannel); - - This->ActiveIrp = KsRemoveIrpFromCancelableQueue(&This->QueueHead, &This->QueueLock, KsListEntryHead, KsAcquireAndRemove); - if (This->ActiveIrp) - { - Status = IPortWaveCyclic_fnProcessNewIrp(This); - DPRINT1("IPortWaveCyclic_fnProcessNewIrp result %x\n", Status); - if (NT_SUCCESS(Status)) - { - //FIXME - // verify offset - resume stream - This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, This->CommonBuffer, This->ActiveIrpBuffer, This->CommonBufferSize); - This->ActiveIrpOffset += This->CommonBufferSize; - } - } - - Status = This->Stream->lpVtbl->SetState(This->Stream, *State); - DPRINT1("Setting state %x\n", Status); + DPRINT1("Setting state %u %x\n", *State, Status); if (NT_SUCCESS(Status)) { This->State = *State; @@ -502,25 +420,10 @@ IN IPortPinWaveCyclic * iface, IN PIRP Irp) { - PIO_STACK_LOCATION IoStack; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; - IoStack = IoGetCurrentIrpStackLocation(Irp); - - DPRINT1("IPortPinWaveCyclic_HandleKsStream entered\n"); - - if (!This->Stream) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - - KsAddIrpToCancelableQueue(&This->QueueHead, &This->QueueLock, Irp, KsListEntryTail, NULL); - IoMarkIrpPending(Irp); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_PENDING; + DPRINT1("IPortPinWaveCyclic_HandleKsStream entered State %u Stream %p\n", This->State, This->Stream); + DbgBreakPoint(); return STATUS_PENDING; } @@ -720,7 +623,30 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - return STATUS_SUCCESS; + NTSTATUS Status; + PCONTEXT_WRITE Packet; + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + DPRINT1("IPortPinWaveCyclic_fnFastWrite entered\n"); + + Packet = (PCONTEXT_WRITE)Buffer; + + + Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Packet->Irp); + + if (!NT_SUCCESS(Status)) + return FALSE; + + if ((This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue) > This->IrpQueue->lpVtbl->MinMappings(This->IrpQueue)) && + This->State != KSSTATE_RUN) + { + /* some should initiate a state request but didnt do it */ + DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); + This->State = KSSTATE_RUN; + } + + return TRUE; } /* @@ -737,6 +663,7 @@ { NTSTATUS Status; PKSDATAFORMAT DataFormat; + PDEVICE_OBJECT DeviceObject; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; Port->lpVtbl->AddRef(Port); @@ -746,8 +673,15 @@ This->Filter = Filter; This->KsPinDescriptor = KsPinDescriptor; This->Miniport = GetWaveCyclicMiniport(Port); - KeInitializeSpinLock(&This->QueueLock); - InitializeListHead(&This->QueueHead); + + DeviceObject = GetDeviceObject(Port); + + + Status = NewIrpQueue(&This->IrpQueue); + if (!NT_SUCCESS(Status)) + return Status; + + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DeviceObject); DataFormat = (PKSDATAFORMAT)(ConnectDetails + 1); @@ -784,6 +718,10 @@ This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); This->State = KSSTATE_STOP; + This->CommonBufferOffset = 0; + This->CommonBufferSize = This->DmaChannel->lpVtbl->AllocatedBufferSize(This->DmaChannel); + This->CommonBuffer = This->DmaChannel->lpVtbl->SystemAddress(This->DmaChannel); + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -718,6 +718,14 @@ return This->pMiniport; } +PDEVICE_OBJECT +GetDeviceObject( + PPORTWAVECYCLIC iface) +{ + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl *)iface; + return This->pDeviceObject; +} + //--------------------------------------------------------------- // IPortWaveCyclic constructor // Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -20,6 +20,7 @@ <file>filter_wavecyclic.c</file> <file>guids.c</file> <file>irp.c</file> + <file>irpstream.c</file> <file>interrupt.c</file> <file>drm.c</file> <file>stubs.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -112,6 +112,11 @@ NTSTATUS StringFromCLSID( const CLSID *id, LPWSTR idstr); + +NTSTATUS +NTAPI +NewIrpQueue( + IN IIrpQueue **Queue); typedef struct @@ -162,6 +167,12 @@ } PCLASS_DEVICE_EXTENSION, *PPCLASS_DEVICE_EXTENSION; + +typedef struct +{ + KSSTREAM_HEADER Header; + PIRP Irp; +}CONTEXT_WRITE, *PCONTEXT_WRITE; NTSTATUS NTAPI @@ -226,5 +237,8 @@ IN PIRP Irp, IN PSUBDEVICE_DESCRIPTOR Descriptor); +PDEVICE_OBJECT +GetDeviceObject( + IPortWaveCyclic* iface); #endif Modified: trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/directory.rbuild [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -4,6 +4,10 @@ <directory name="mpu401"> <xi:include href="mpu401/mpu401.rbuild" /> </directory> + <directory name="CMIDriver"> + <xi:include href="CMIDriver/cmidriver.rbuild" /> + </directory> +  Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -330,8 +330,8 @@ } } } - else - DPRINT1("KSPROPERTY_PIN_CTYPES index %u failed with %x\n", Index, Status); + else + DPRINT1("KSPROPERTY_PIN_CTYPES index %u failed with %x\n", Index, Status); } @@ -357,6 +357,8 @@ ULONG BytesReturned; PFILE_OBJECT FileObject; + DPRINT1("WdmAudControlDeviceState\n"); + Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) { @@ -393,90 +395,6 @@ ExFreePool(Context); return STATUS_SUCCESS; -} - -NTSTATUS -WdmAudControlWriteData( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PWDMAUD_DEVICE_INFO DeviceInfo, - IN PWDMAUD_CLIENT ClientInfo) -{ - PKSSTREAM_HEADER Packet; - NTSTATUS Status = STATUS_SUCCESS; - PFILE_OBJECT FileObject; - PWRITE_CONTEXT Context; - ULONG BytesReturned; - PUCHAR Buffer; - - Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Invalid buffer handle %x\n", DeviceInfo->hDevice); - return SetIrpIoStatus(Irp, Status, 0); - } - - if (DeviceInfo->DeviceType != WAVE_OUT_DEVICE_TYPE) - { - DPRINT1("FIXME: only waveout devices are supported\n"); - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } - - _SEH2_TRY - { - ProbeForRead(DeviceInfo->Buffer, DeviceInfo->BufferSize, TYPE_ALIGNMENT(char)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Exception, get the error code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Invalid buffer supplied\n"); - return SetIrpIoStatus(Irp, Status, 0); - } - - Buffer = ExAllocatePool(NonPagedPool, DeviceInfo->BufferSize); - if (!Buffer) - { - /* no memory */ - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - - RtlMoveMemory(Buffer, DeviceInfo->Buffer, DeviceInfo->BufferSize); - - - Context = ExAllocatePool(NonPagedPool, sizeof(WRITE_CONTEXT)); - if (!Context) - { - /* no memory */ - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - - /* setup completion context */ - Context->Irp = Irp; - Context->Length = DeviceInfo->BufferSize; - - /* setup stream context */ - Packet = (PKSSTREAM_HEADER)ExAllocatePool(NonPagedPool, sizeof(KSSTREAM_HEADER)); - Packet->Data = Buffer; - Packet->FrameExtent = DeviceInfo->BufferSize; - Packet->DataUsed = DeviceInfo->BufferSize; - Packet->Size = sizeof(KSSTREAM_HEADER); - Packet->PresentationTime.Numerator = 1; - Packet->PresentationTime.Denominator = 1; - ASSERT(FileObject->FsContext != NULL); - - - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, (PVOID)Packet, sizeof(KSSTREAM_HEADER), NULL, 0, &BytesReturned); - - DPRINT1("KsSynchronousIoControlDevice result %x\n", Status); - ExFreePool(Buffer); - - return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } ULONG @@ -700,8 +618,6 @@ return WdmAudControlDeviceType(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_SETDEVICE_STATE: return WdmAudControlDeviceState(DeviceObject, Irp, DeviceInfo, ClientInfo); - case IOCTL_WRITEDATA: - return WdmAudControlWriteData(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_GETCAPABILITIES: return WdmAudCapabilities(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_CLOSE_WDMAUD: @@ -716,3 +632,112 @@ return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); } + +NTSTATUS +NTAPI +WdmAudWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PWDMAUD_DEVICE_INFO DeviceInfo; + PWDMAUD_CLIENT ClientInfo; + NTSTATUS Status = STATUS_SUCCESS; + PUCHAR Buffer; + PCONTEXT_WRITE Packet; + PFILE_OBJECT FileObject; + IO_STATUS_BLOCK IoStatusBlock; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT1("WdmAudWrite entered\n"); + + if (IoStack->Parameters.Write.Length < sizeof(WDMAUD_DEVICE_INFO)) + { + /* invalid parameter */ + DPRINT1("Input buffer too small size %u expected %u\n", IoStack->Parameters.Write.Length, sizeof(WDMAUD_DEVICE_INFO)); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + DeviceInfo = (PWDMAUD_DEVICE_INFO)MmGetMdlVirtualAddress(Irp->MdlAddress); + + + Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid buffer handle %x\n", DeviceInfo->hDevice); + return SetIrpIoStatus(Irp, Status, 0); + } + + + DPRINT1("DeviceInfo %p %p %p\n", DeviceInfo, Irp->MdlAddress->StartVa, Irp->MdlAddress->MappedSystemVa); + if (DeviceInfo->DeviceType < MIN_SOUND_DEVICE_TYPE || DeviceInfo->DeviceType > MAX_SOUND_DEVICE_TYPE) + { + /* invalid parameter */ + DPRINT1("Error: device type not set\n"); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + if (!IoStack->FileObject) + { + /* file object parameter */ + DPRINT1("Error: file object is not attached\n"); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + ClientInfo = (PWDMAUD_CLIENT)IoStack->FileObject->FsContext; + + + /* setup stream context */ + Packet = (PCONTEXT_WRITE)ExAllocatePool(NonPagedPool, sizeof(CONTEXT_WRITE)); + if (!Packet) + { + /* no memory */ + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + + Packet->Header.FrameExtent = DeviceInfo->BufferSize; + Packet->Header.DataUsed = DeviceInfo->BufferSize; + Packet->Header.Size = sizeof(KSSTREAM_HEADER); + Packet->Header.PresentationTime.Numerator = 1; + Packet->Header.PresentationTime.Denominator = 1; + Packet->Irp = Irp; + + Buffer = ExAllocatePool(NonPagedPool, DeviceInfo->BufferSize); + if (!Buffer) + { + /* no memory */ + ExFreePool(Packet); + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + Packet->Header.Data = Buffer; + + _SEH2_TRY + { + ProbeForRead(DeviceInfo->Buffer, DeviceInfo->BufferSize, TYPE_ALIGNMENT(char)); + RtlMoveMemory(Buffer, DeviceInfo->Buffer, DeviceInfo->BufferSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid buffer supplied\n"); + ExFreePool(Buffer); + ExFreePool(Packet); + return SetIrpIoStatus(Irp, Status, 0); + } + + KsStreamIo(FileObject, NULL, NULL, NULL, NULL, 0, &IoStatusBlock, Packet, sizeof(CONTEXT_WRITE), KSSTREAM_WRITE, KernelMode); + + Irp->IoStatus.Status = STATUS_PENDING; + Irp->IoStatus.Information = 0; + IoMarkIrpPending(Irp); + return STATUS_PENDING; + + //return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0); +} + Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -247,6 +247,7 @@ Driver->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; Driver->MajorFunction[IRP_MJ_CLEANUP] = WdmAudCleanup; Driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = WdmAudDeviceControl; + Driver->MajorFunction[IRP_MJ_WRITE] = WdmAudWrite; Driver->MajorFunction[IRP_MJ_POWER] = KsDefaultDispatchPower; return WdmAudInstallDevice(Driver); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -43,6 +43,13 @@ typedef struct { + KSSTREAM_HEADER Header; + PIRP Irp; +}CONTEXT_WRITE, *PCONTEXT_WRITE; + + +typedef struct +{ PIRP Irp; IO_STATUS_BLOCK StatusBlock; ULONG Length; @@ -70,4 +77,11 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS +NTAPI +WdmAudWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + #endif Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Fri Mar 6 22:06:21 2009 @@ -97,10 +97,10 @@ ASSERT(Context); Status = KsSynchronousIoControlDevice(Context->FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, - IoStack->Parameters.DeviceIoControl.Type3InputBuffer, - IoStack->Parameters.DeviceIoControl.InputBufferLength, - Irp->UserBuffer, - IoStack->Parameters.DeviceIoControl.OutputBufferLength, + MmGetMdlVirtualAddress(Irp->MdlAddress), + IoStack->Parameters.Write.Length, + NULL, + 0, &BytesReturned); Irp->IoStatus.Information = BytesReturned; @@ -216,9 +216,16 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { + PDISPATCH_CONTEXT Context; + NTSTATUS Status; DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); - return FALSE; + Context = (PDISPATCH_CONTEXT)FileObject->FsContext2; + Status = KsStreamIo(Context->FileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + if (Status == STATUS_SUCCESS) + return TRUE; + else + return FALSE; } static KSDISPATCH_TABLE PinTable =

1 0

[jmorlan] 39892: Implement SETLOCAL and ENDLOCAL commands. Make delayed expansion optional (disabled by default, enabled by CMD /V switch or with SETLOCAL)
by jmorlan＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: jmorlan Date: Fri Mar 6 21:05:45 2009 New Revision: 39892 URL: http://svn.reactos.org/svn/reactos?rev=39892&view=rev Log: Implement SETLOCAL and ENDLOCAL commands. Make delayed expansion optional (disabled by default, enabled by CMD /V switch or with SETLOCAL) Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/setlocal.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Fri Mar 6 21:05:45 2009 @@ -189,6 +189,9 @@ /* Preserve echo state across batch calls */ bEcho = bc->bEcho; + while (bc->setlocal) + cmd_endlocal(_T("")); + bc = bc->prev; } @@ -239,16 +242,23 @@ } else { + struct _SETLOCAL *setlocal = NULL; /* If a batch file runs another batch file as part of a compound command * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ - if (Cmd != NULL) + if (bc && Cmd != NULL) + { + /* Get its SETLOCAL stack so it can be migrated to the new context */ + setlocal = bc->setlocal; + bc->setlocal = NULL; ExitBatch(NULL); + } /* Create a new context. This function will not * return until this context has been exited */ new.prev = bc; bc = &new; bc->RedirList = NULL; + bc->setlocal = setlocal; } GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Fri Mar 6 21:05:45 2009 @@ -18,6 +18,7 @@ BOOL bEcho; /* Preserve echo flag across batch calls */ REDIRECTION *RedirList; PARSED_COMMAND *current; + struct _SETLOCAL *setlocal; } BATCH_CONTEXT, *LPBATCH_CONTEXT; typedef struct tagFORCONTEXT Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Fri Mar 6 21:05:45 2009 @@ -157,6 +157,7 @@ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */ BOOL bChildProcessRunning = FALSE; +BOOL bDelayedExpansion = FALSE; DWORD dwChildProcessId = 0; OSVERSIONINFO osvi; HANDLE hIn; @@ -1295,7 +1296,7 @@ if (!SubstituteForVars(Line, Buf1)) return NULL; - if (!_tcschr(Buf1, _T('!'))) + if (!bDelayedExpansion || !_tcschr(Buf1, _T('!'))) return cmd_dup(Buf1); /* FIXME: Delayed substitutions actually aren't quite the same as @@ -1663,6 +1664,10 @@ SetScreenColor (wColor, TRUE); } #endif + else if (_totlower(ptr[1]) == _T('v')) + { + bDelayedExpansion = _tcsnicmp(&ptr[2], _T(":off"), 4); + } } } Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Fri Mar 6 21:05:45 2009 @@ -59,6 +59,7 @@ extern BOOL bCtrlBreak; extern BOOL bIgnoreEcho; extern BOOL bExit; +extern BOOL bDelayedExpansion; extern INT nErrorLevel; extern SHORT maxx; extern SHORT maxy; Modified: trunk/reactos/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/setlocal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] Fri Mar 6 21:05:45 2009 @@ -1,5 +1,5 @@ /* - * GOTO.C - goto internal batch command. + * SETLOCAL.C - setlocal and endlocal internal batch commands. * * History: * @@ -9,19 +9,109 @@ #include <precomp.h> +typedef struct _SETLOCAL { + struct _SETLOCAL *Prev; + BOOL DelayedExpansion; + LPTSTR Environment; +} SETLOCAL; -/* unimplemented */ +/* Create a copy of the current environment */ +static LPTSTR DuplicateEnvironment() +{ + LPTSTR Environ = GetEnvironmentStrings(); + LPTSTR End, EnvironCopy; + if (!Environ) + return NULL; + for (End = Environ; *End; End += _tcslen(End) + 1) + ; + EnvironCopy = cmd_alloc((End + 1 - Environ) * sizeof(TCHAR)); + if (EnvironCopy) + memcpy(EnvironCopy, Environ, (End + 1 - Environ) * sizeof(TCHAR)); + FreeEnvironmentStrings(Environ); + return EnvironCopy; +} -/* our current default is delayedexpansion */ +INT cmd_setlocal(LPTSTR param) +{ + SETLOCAL *Saved; -INT cmd_setlocal (LPTSTR param) + /* SETLOCAL only works inside a batch file */ + if (!bc) + return 0; + + Saved = cmd_alloc(sizeof(SETLOCAL)); + if (!Saved) + { + error_out_of_memory(); + return 1; + } + Saved->Prev = bc->setlocal; + Saved->DelayedExpansion = bDelayedExpansion; + Saved->Environment = DuplicateEnvironment(); + if (!Saved->Environment) + { + error_out_of_memory(); + cmd_free(Saved); + return 1; + } + bc->setlocal = Saved; + + nErrorLevel = 0; + + if (*param == _T('\0')) + /* nothing */; + else if (!_tcsicmp(param, _T("enabledelayedexpansion"))) + bDelayedExpansion = TRUE; + else if (!_tcsicmp(param, _T("disabledelayedexpansion"))) + bDelayedExpansion = FALSE; + else + error_invalid_parameter_format(param); + + return nErrorLevel; +} + +/* endlocal doesn't take any params */ +INT cmd_endlocal(LPTSTR param) { + LPTSTR Environ, Name, Value; + SETLOCAL *Saved; + + /* Pop a SETLOCAL struct off of this batch file's stack */ + if (!bc || !(Saved = bc->setlocal)) + return 0; + bc->setlocal = Saved->Prev; + + bDelayedExpansion = Saved->DelayedExpansion; + + /* First, clear out the environment. Since making any changes to the + * environment invalidates pointers obtained from GetEnvironmentStrings(), + * we must make a copy of it and get the variable names from that */ + Environ = DuplicateEnvironment(); + if (Environ) + { + for (Name = Environ; *Name; Name += _tcslen(Name) + 1) + { + if (!(Value = _tcschr(Name + 1, _T('=')))) + continue; + *Value++ = _T('\0'); + SetEnvironmentVariable(Name, NULL); + Name = Value; + } + cmd_free(Environ); + } + + /* Now, restore variables from the copy saved by cmd_setlocal */ + for (Name = Saved->Environment; *Name; Name += _tcslen(Name) + 1) + { + if (!(Value = _tcschr(Name + 1, _T('=')))) + continue; + *Value++ = _T('\0'); + SetEnvironmentVariable(Name, Value); + Name = Value; + } + + cmd_free(Saved->Environment); + cmd_free(Saved); return 0; } -/* endlocal doesn't take any params */ -INT cmd_endlocal (LPTSTR param) -{ - return 0; -} -

1 0

[dchapyshev] 39891: - Fix exceptions in some cases (if CriticalSection->DebugInfo = NULL)
by dchapyshev＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: dchapyshev Date: Fri Mar 6 21:03:04 2009 New Revision: 39891 URL: http://svn.reactos.org/svn/reactos?rev=39891&view=rev Log: - Fix exceptions in some cases (if CriticalSection->DebugInfo = NULL) Modified: trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=398… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Fri Mar 6 21:03:04 2009 @@ -358,14 +358,21 @@ /* Protect List */ RtlEnterCriticalSection(&RtlCriticalSectionLock); - /* Remove it from the list */ - RemoveEntryList(&CriticalSection->DebugInfo->ProcessLocksList); + if (CriticalSection->DebugInfo) + { + /* Remove it from the list */ + RemoveEntryList(&CriticalSection->DebugInfo->ProcessLocksList); + RtlZeroMemory(CriticalSection->DebugInfo, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + } /* Unprotect */ RtlLeaveCriticalSection(&RtlCriticalSectionLock); - /* Free it */ - RtlpFreeDebugInfo(CriticalSection->DebugInfo); + if (CriticalSection->DebugInfo) + { + /* Free it */ + RtlpFreeDebugInfo(CriticalSection->DebugInfo); + } /* Wipe it out */ RtlZeroMemory(CriticalSection, sizeof(RTL_CRITICAL_SECTION));

1 0

[jmorlan] 39890: - Ignore special characters in a REM line. - Make the \n-printing in batch files with ECHO on more consistant with how Windows does it.
by jmorlan＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: jmorlan Date: Fri Mar 6 20:27:42 2009 New Revision: 39890 URL: http://svn.reactos.org/svn/reactos?rev=39890&view=rev Log: - Ignore special characters in a REM line. - Make the \n-printing in batch files with ECHO on more consistant with how Windows does it. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/parser.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Fri Mar 6 20:27:42 2009 @@ -285,6 +285,7 @@ /* Echo batch file line */ if (bEcho && Cmd->Type != C_QUIET) { + ConOutChar(_T('\n')); PrintPrompt(); EchoCommand(Cmd); ConOutChar(_T('\n')); @@ -292,14 +293,8 @@ bc->current = Cmd; ExecuteCommand(Cmd); - if (bEcho && !bIgnoreEcho && Cmd->Type != C_QUIET) - ConOutChar(_T('\n')); FreeCommand(Cmd); - bIgnoreEcho = FALSE; - } - - /* Don't print a newline for this command */ - bIgnoreEcho = TRUE; + } TRACE ("Batch: returns TRUE\n"); Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Fri Mar 6 20:27:42 2009 @@ -522,12 +522,22 @@ return NULL; } +/* Parse a REM command */ +static PARSED_COMMAND *ParseRem(void) +{ + /* Just ignore the rest of the line */ + while (CurChar && CurChar != _T('\n')) + ParseChar(); + return NULL; +} + static PARSED_COMMAND *ParseCommandPart(void) { TCHAR ParsedLine[CMDLINE_LENGTH]; TCHAR *Pos; DWORD TailOffset; PARSED_COMMAND *Cmd; + PARSED_COMMAND *(*Func)(void); REDIRECTION *RedirList = NULL; int Type; @@ -595,8 +605,9 @@ TailOffset = Pos - ParsedLine; /* Check for special forms */ - if (_tcsicmp(ParsedLine, _T("for")) == 0 || - _tcsicmp(ParsedLine, _T("if")) == 0) + if ((Func = ParseFor, _tcsicmp(ParsedLine, _T("for")) == 0) || + (Func = ParseIf, _tcsicmp(ParsedLine, _T("if")) == 0) || + (Func = ParseRem, _tcsicmp(ParsedLine, _T("rem")) == 0)) { ParseToken(0, STANDARD_SEPS); /* Do special parsing only if it's not followed by /? */ @@ -608,7 +619,7 @@ FreeRedirection(RedirList); return NULL; } - return _totlower(*ParsedLine) == _T('f') ? ParseFor() : ParseIf(); + return Func(); } Pos = _stpcpy(Pos, _T(" /?")); }

1 0

[jmorlan] 39889: FAT(X)IsDirectoryEmpty: When done with one page, go to the next one instead of reading the same page over again. Fixes inability to remove directories that previously had many files in them.
by jmorlan＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: jmorlan Date: Fri Mar 6 20:23:29 2009 New Revision: 39889 URL: http://svn.reactos.org/svn/reactos?rev=39889&view=rev Log: FAT(X)IsDirectoryEmpty: When done with one page, go to the next one instead of reading the same page over again. Fixes inability to remove directories that previously had many files in them. Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] Fri Mar 6 20:23:29 2009 @@ -72,6 +72,7 @@ } FatDirEntry += Index % FAT_ENTRIES_PER_PAGE; + FileOffset.QuadPart += PAGE_SIZE; } if (FAT_ENTRY_END(FatDirEntry)) @@ -125,6 +126,7 @@ } FatXDirEntry += Index % FATX_ENTRIES_PER_PAGE; + FileOffset.QuadPart += PAGE_SIZE; } if (FATX_ENTRY_END(FatXDirEntry))

1 0

[mkupfer] 39888: - more improved version, reduced calls, allocate ressources if needed only
by mkupfer＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: mkupfer Date: Fri Mar 6 19:47:44 2009 New Revision: 39888 URL: http://svn.reactos.org/svn/reactos?rev=39888&view=rev Log: - more improved version, reduced calls, allocate ressources if needed only Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Fri Mar 6 19:47:44 2009 @@ -1234,64 +1234,58 @@ return TRUE; } -/* Ported from WINE20020904 */ -/* Draw a menu control coming from DrawFrameControl() */ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { - RECT myr; - int SmallDiam = UITOOLS_MakeSquareRect(r, &myr); - BOOL retval = TRUE; - /* Start using Marlett-font instead of basic drawing */ LOGFONT lf; HFONT hFont, hOldFont; COLORREF clrsave; - + INT bkmode; + TCHAR Symbol; + switch(uFlags & 0xff) + { + case DFCS_MENUARROW: + Symbol = '8'; + break; + + case DFCS_MENUBULLET: + Symbol = 'h'; + break; + + case DFCS_MENUCHECK: + Symbol = 'a'; + break; + + default: +/* + DbgPrint("Invalid menu; flags=0x%04x\n", uFlags); +*/ + return FALSE; + } + /* acquire ressources only if valid menu */ ZeroMemory(&lf, sizeof(LOGFONT)); - lf.lfHeight = SmallDiam; + lf.lfHeight = r->bottom - r->top; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; lstrcpy(lf.lfFaceName, TEXT("Marlett")); hFont = CreateFontIndirect(&lf); + /* save font and text color */ hOldFont = SelectObject(dc, hFont); + clrsave = GetTextColor(dc); + bkmode = GetBkMode(dc); + /* set color and drawing mode */ SetBkMode(dc, TRANSPARENT); - clrsave = GetTextColor(dc); SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH)); - - switch(uFlags & 0xff) - { - case DFCS_MENUARROW: - // FIXME: is "8" the correct symbol? - TextOut(dc, myr.left, myr.top, TEXT("8"), 1); - break; - - case DFCS_MENUBULLET: - // FIXME: is "h" the correct symbol? - TextOut(dc, myr.left, myr.top, TEXT("h"), 1); - break; - - case DFCS_MENUCHECK: - // FIXME: is "a" the correct symbol? - TextOut(dc, myr.left, myr.top, TEXT("a"), 1); - break; - - default: -/* - DbgPrint("Invalid menu; flags=0x%04x\n", uFlags); -*/ - retval = FALSE; - break; - } - + /* draw selected symbol */ + TextOut(dc, r->left, r->top, &Symbol, 1); + /* restore previous settings */ SetTextColor(dc, clrsave); SelectObject(dc, hOldFont); + SetBkMode(dc, bkmode); DeleteObject(hFont); - - return retval; -} - + return TRUE; +} BOOL WINAPI

1 0

[gedmurphy] 39887: Don't leak font objects
by gedmurphy＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: gedmurphy Date: Fri Mar 6 01:31:11 2009 New Revision: 39887 URL: http://svn.reactos.org/svn/reactos?rev=39887&view=rev Log: Don't leak font objects Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Fri Mar 6 01:31:11 2009 @@ -814,6 +814,7 @@ SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); SelectObject(dc, hOldFont); + DeleteObject(hFont); return TRUE; } @@ -1286,6 +1287,7 @@ SetTextColor(dc, clrsave); SelectObject(dc, hOldFont); + DeleteObject(hFont); return retval; }

1 0

[janderwald] 39886: - Setup winmm entries for wdmaud.drv if they dont exist yet
by janderwald＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: janderwald Date: Thu Mar 5 17:40:14 2009 New Revision: 39886 URL: http://svn.reactos.org/svn/reactos?rev=39886&view=rev Log: - Setup winmm entries for wdmaud.drv if they dont exist yet Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Thu Mar 5 17:40:14 2009 @@ -166,6 +166,10 @@ PVOID Context; BOOL Result; SC_HANDLE hSCManager, hService; + WCHAR WaveName[20]; + HKEY hKey; + DWORD BufferSize; + ULONG Index; if (!IsEqualIID(&pspDevInfoData->ClassGuid, &GUID_DEVCLASS_SOUND) && !IsEqualIID(&pspDevInfoData->ClassGuid, &GUID_DEVCLASS_MEDIA)) @@ -242,6 +246,23 @@ CloseServiceHandle(hService); } CloseServiceHandle(hSCManager); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32", 0, GENERIC_READ | GENERIC_WRITE, &hKey) == ERROR_SUCCESS) + { + szBuffer[Length] = '\0'; + pBuffer = PathAddBackslashW(szBuffer); + wcscpy(pBuffer, L"system32\\wdmaud.drv"); + + for(Index = 1; Index <= 4; Index++) + { + swprintf(WaveName, L"wave%u", Index); + if (RegQueryValueExW(hKey, WaveName, 0, NULL, NULL, &BufferSize) != ERROR_MORE_DATA) + { + RegSetValueExW(hKey, WaveName, 0, REG_SZ, (LPBYTE)szBuffer, (wcslen(szBuffer)+1) * sizeof(WCHAR)); + } + } + RegCloseKey(hKey); + } return ERROR_DI_DO_DEFAULT;

1 0

[janderwald] 39885: - Add wdmaud.drv to bootcd
by janderwald＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: janderwald Date: Thu Mar 5 17:35:10 2009 New Revision: 39885 URL: http://svn.reactos.org/svn/reactos?rev=39885&view=rev Log: - Add wdmaud.drv to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Mar 5 17:35:10 2009 @@ -422,6 +422,7 @@ dll\win32\wuapi\wuapi.dll 1 dll\win32\winmm\midimap\midimap.dll 1 dll\win32\winmm\wavemap\msacm32.drv 1 optional +dll\win32\wdmaud.drv\wdmaud.drv 1 ; Shell Extensions dll\shellext\deskadp\deskadp.dll 1

1 0

[janderwald] 39884: - Implement Pin object functions - Remove test sample function, as silverblade will implement those
by janderwald＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: janderwald Date: Thu Mar 5 16:50:54 2009 New Revision: 39884 URL: http://svn.reactos.org/svn/reactos?rev=39884&view=rev Log: - Implement Pin object functions - Remove test sample function, as silverblade will implement those Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Thu Mar 5 16:50:54 2009 @@ -207,8 +207,7 @@ /* is the request for a new pin */ if (!wcsncmp(KS_NAME_PIN, Buffer, wcslen(KS_NAME_PIN))) { - UNIMPLEMENTED - Status = STATUS_UNSUCCESSFUL; + Status = CreatePin(Irp); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] Thu Mar 5 16:50:54 2009 @@ -23,5 +23,9 @@ KMixAllocateDeviceHeader( IN PKMIXER_DEVICE_EXT DeviceExtension); +NTSTATUS +CreatePin( + IN PIRP Irp); + #endif Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Thu Mar 5 16:50:54 2009 @@ -8,137 +8,207 @@ #include "kmixer.h" - - -NTSTATUS -PerformSampleRateConversion( - PUCHAR Buffer, - ULONG BufferLength, - ULONG OldRate, - ULONG NewRate, - ULONG BytesPerSample, - ULONG NumChannels, - PVOID * Result, - PULONG ResultLength) -{ - KFLOATING_SAVE FloatSave; +NTSTATUS +NTAPI +Pin_fnDeviceIoControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + + //TODO + // silverblade + // Perform Sample Rate Conversion + // Stream Mixing + // Up/down sampling + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Pin_fnRead( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnRead called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +PinWriteCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PIRP CIrp = (PIRP)Context; + + CIrp->IoStatus.Status = STATUS_SUCCESS; + CIrp->IoStatus.Information = 0; + IoCompleteRequest(CIrp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnWrite( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnWrite called DeviceObject %p Irp %p\n", DeviceObject); + + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnFlush( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnFlush called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Pin_fnClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnQuerySecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Pin_fnSetSecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + + DPRINT1("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN +NTAPI +Pin_fnFastDeviceIoControl( + PFILE_OBJECT FileObject, + BOOLEAN Wait, + PVOID InputBuffer, + ULONG InputBufferLength, + PVOID OutputBuffer, + ULONG OutputBufferLength, + ULONG IoControlCode, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + + + return FALSE; +} + + +BOOLEAN +NTAPI +Pin_fnFastRead( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); + + return FALSE; + +} + +BOOLEAN +NTAPI +Pin_fnFastWrite( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + + return FALSE; +} + +static KSDISPATCH_TABLE PinTable = +{ + Pin_fnDeviceIoControl, + Pin_fnRead, + Pin_fnWrite, + Pin_fnFlush, + Pin_fnClose, + Pin_fnQuerySecurity, + Pin_fnSetSecurity, + Pin_fnFastDeviceIoControl, + Pin_fnFastRead, + Pin_fnFastWrite, +}; + +NTSTATUS +CreatePin( + IN PIRP Irp) +{ NTSTATUS Status; - ULONG Index; - SRC_STATE * State; - SRC_DATA Data; - PUCHAR ResultOut; - int error; - PFLOAT FloatIn, FloatOut; - ULONG NumSamples; - ULONG NewSamples; - - /* first acquire float save context */ - Status = KeSaveFloatingPointState(&FloatSave); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("KeSaveFloatingPointState failed with %x\n", Status); - return Status; - } - - NumSamples = BufferLength / BytesPerSample; - - FloatIn = ExAllocatePool(NonPagedPool, NumSamples * sizeof(FLOAT)); - if (!FloatIn) - { - KeRestoreFloatingPointState(&FloatSave); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)OldRate / (FLOAT)NewRate))) + 1; - - FloatOut = ExAllocatePool(NonPagedPool, NewSamples * sizeof(FLOAT)); - if (!FloatOut) - { - ExFreePool(FloatIn); - KeRestoreFloatingPointState(&FloatSave); - return STATUS_INSUFFICIENT_RESOURCES; - } - - ResultOut = ExAllocatePool(NonPagedPool, NewRate * BytesPerSample * NumChannels); - if (!FloatOut) - { - ExFreePool(FloatIn); - ExFreePool(FloatOut); - KeRestoreFloatingPointState(&FloatSave); - return STATUS_INSUFFICIENT_RESOURCES; - } - - State = src_new(SRC_LINEAR, NumChannels, &error); - if (!State) - { - DPRINT1("KeSaveFloatingPointState failed with %x\n", Status); - KeRestoreFloatingPointState(&FloatSave); - ExFreePool(FloatIn); - ExFreePool(FloatOut); - ExFreePool(ResultOut); - return STATUS_UNSUCCESSFUL; - } - - /* fixme use asm */ - if (BytesPerSample == 1) - { - for(Index = 0; Index < NumSamples; Index++) - FloatIn[Index] = (float)Buffer[Index]; - } - else if (BytesPerSample == 2) - { - PUSHORT Res = (PUSHORT)ResultOut; - for(Index = 0; Index < NumSamples; Index++) - FloatIn[Index] = (float)Res[Index]; - } - else - { - UNIMPLEMENTED - KeRestoreFloatingPointState(&FloatSave); - ExFreePool(FloatIn); - ExFreePool(FloatOut); - ExFreePool(ResultOut); - return STATUS_UNSUCCESSFUL; - } - - Data.data_in = FloatIn; - Data.data_out = FloatOut; - Data.input_frames = NumSamples; - Data.output_frames = NewSamples; - Data.src_ratio = (double)NewRate / (double)OldRate; - - error = src_process(State, &Data); - if (error) - { - DPRINT1("src_process failed with %x\n", error); - KeRestoreFloatingPointState(&FloatSave); - ExFreePool(FloatIn); - ExFreePool(FloatOut); - ExFreePool(ResultOut); - return STATUS_UNSUCCESSFUL; - } - - if (BytesPerSample == 1) - { - for(Index = 0; Index < Data.output_frames_gen; Index++) - ResultOut[Index] = lrintf(FloatOut[Index]); - } - else if (BytesPerSample == 2) - { - PUSHORT Res = (PUSHORT)ResultOut; - for(Index = 0; Index < Data.output_frames_gen; Index++) - Res[Index] = lrintf(FloatOut[Index]); - } - - *Result = ResultOut; - *ResultLength = NewRate * BytesPerSample * NumChannels; - ExFreePool(FloatIn); - ExFreePool(FloatOut); - KeRestoreFloatingPointState(&FloatSave); - return STATUS_SUCCESS; -} - + KSOBJECT_HEADER ObjectHeader; + + /* allocate object header */ + Status = KsAllocateObjectHeader(&ObjectHeader, 0, NULL, Irp, &PinTable); + return Status; +} void * calloc(size_t Elements, size_t ElementSize) {

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009