Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43321: [WDMAUD] - Use KsProbeStreamIrp in wdmaud to probe user buffers - Remove a few hacks which were required to pass down irps to portcls [PORTCLS] - Check if there is an automation table [SYSAUDIO] - Release file object of pin to prevent reference leak -- - Audio stack now reacts faster as it now longer copies audio buffers in kernel mode and instead locks down the user buffers. In addition it uses less memory to do the same work.
by janderwald＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: janderwald Date: Wed Oct 7 12:41:34 2009 New Revision: 43321 URL: http://svn.reactos.org/svn/reactos?rev=43321&view=rev Log: [WDMAUD] - Use KsProbeStreamIrp in wdmaud to probe user buffers - Remove a few hacks which were required to pass down irps to portcls [PORTCLS] - Check if there is an automation table [SYSAUDIO] - Release file object of pin to prevent reference leak -- - Audio stack now reacts faster as it now longer copies audio buffers in kernel mode and instead locks down the user buffers. In addition it uses less memory to do the same work. Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp 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/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- 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] Wed Oct 7 12:41:34 2009 @@ -113,25 +113,32 @@ if (!Buffer) { - // probe the stream irp - Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_ALLOWFORMATCHANGE | KSPROBE_SYSTEMADDRESS, 0); - - // check for success - if (!NT_SUCCESS(Status)) + if (!Irp->MdlAddress) { - DPRINT1("KsProbeStreamIrp failed with %x\n", Status); - return Status; + // ioctl from KsStudio + // Wdmaud already probes buffers, therefore no need to probe it again + // probe the stream irp + Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_ALLOWFORMATCHANGE | KSPROBE_SYSTEMADDRESS, 0); + + // check for success + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsProbeStreamIrp failed with %x\n", Status); + return Status; + } } - // get the stream header Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; PC_ASSERT(Header); PC_ASSERT(Irp->MdlAddress); + DPRINT("Size %u DataUsed %u FrameExtent %u SizeHeader %u\n", Header->Size, Header->DataUsed, Header->FrameExtent, sizeof(KSSTREAM_HEADER)); + if (Irp->RequestorMode != KernelMode) { // use allocated mdl Header->Data = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + PC_ASSERT(Header->Data); } } else @@ -227,7 +234,12 @@ PC_ASSERT(StreamHeader); // store buffersize - *BufferSize = StreamHeader->DataUsed - Offset; + if (StreamHeader->DataUsed) + *BufferSize = StreamHeader->DataUsed - Offset; + else + *BufferSize = StreamHeader->FrameExtent - Offset; + + PC_ASSERT(*BufferSize); // store buffer *Buffer = &((PUCHAR)StreamHeader->Data)[Offset]; @@ -243,8 +255,8 @@ CIrpQueue::UpdateMapping( IN ULONG BytesWritten) { - //PIO_STACK_LOCATION IoStack; PKSSTREAM_HEADER StreamHeader; + ULONG Size; if (!m_Irp) { @@ -252,16 +264,8 @@ return; } -#if 0 - // get current irp stack location - IoStack = IoGetCurrentIrpStackLocation(m_Irp); - // get stream header - StreamHeader = (PKSSTREAM_HEADER)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; -#else - // HACK get stream header StreamHeader = (PKSSTREAM_HEADER)m_Irp->Tail.Overlay.DriverContext[2]; -#endif // sanity check // ASSERT(StreamHeader); @@ -272,7 +276,14 @@ // decrement available data counter m_NumDataAvailable -= BytesWritten; - if (m_CurrentOffset >= StreamHeader->DataUsed) + if (StreamHeader->DataUsed) + Size = StreamHeader->DataUsed; + else + Size = StreamHeader->FrameExtent; + + PC_ASSERT(Size); + + if (m_CurrentOffset >= Size) { // irp has been processed completly m_Irp->IoStatus.Status = STATUS_SUCCESS; @@ -280,14 +291,14 @@ // frame extend contains the original request size, DataUsed contains the real buffer size //is different when kmixer performs channel conversion, upsampling etc - m_Irp->IoStatus.Information = StreamHeader->FrameExtent; - - if (m_Irp->RequestorMode == KernelMode) - { - // HACK - WDMAUD should pass PKSSTREAM_HEADERs - ExFreePool(StreamHeader->Data); - ExFreePool(StreamHeader); - } + m_Irp->IoStatus.Information = Size; + + PC_ASSERT_IRQL(DISPATCH_LEVEL); + MmUnlockPages(m_Irp->MdlAddress); + IoFreeMdl(m_Irp->MdlAddress); + m_Irp->MdlAddress = NULL; + ExFreePool(m_Irp->AssociatedIrp.SystemBuffer); + m_Irp->AssociatedIrp.SystemBuffer = NULL; // complete the request IoCompleteRequest(m_Irp, IO_SOUND_INCREMENT); @@ -439,9 +450,6 @@ Irp->IoStatus.Information = StreamHeader->FrameExtent; - // free stream data, no tag as wdmaud.drv does it atm - ExFreePool(StreamHeader->Data); - // free stream header, no tag as wdmaud.drv allocates it atm ExFreePool(StreamHeader); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- 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] Wed Oct 7 12:41:34 2009 @@ -578,7 +578,7 @@ { InterlockedIncrement((PLONG)&m_TotalPackets); - DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u Pre %u Post %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); + DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); m_IrpQueue->AddMapping(NULL, 0, Irp); @@ -729,6 +729,8 @@ IN PIRP Irp) { PCLOSESTREAM_CONTEXT Ctx; + + DPRINT1("CPortPinWaveCyclic::Close entered\n"); if (m_Stream) { @@ -828,27 +830,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - NTSTATUS Status; - PCONTEXT_WRITE Packet; - PIRP Irp; - - // HACK to be removed - - DPRINT("CPortPinWaveCyclic::FastRead entered\n"); - - Packet = (PCONTEXT_WRITE)Buffer; - - Irp = Packet->Irp; - StatusBlock->Status = STATUS_PENDING; - - Status = m_IrpQueue->AddMapping((PUCHAR)Buffer, Length, Irp); - - if (!NT_SUCCESS(Status)) - return FALSE; - - StatusBlock->Status = STATUS_PENDING; - - return TRUE; + return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); } @@ -864,27 +846,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - NTSTATUS Status; - PCONTEXT_WRITE Packet; - PIRP Irp; - - // HACK to be removed - - InterlockedIncrement((PLONG)&m_TotalPackets); - - DPRINT("CPortPinWaveCyclic::FastWrite entered Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); - - Packet = (PCONTEXT_WRITE)Buffer; - Irp = Packet->Irp; - - Status = m_IrpQueue->AddMapping((PUCHAR)Buffer, Length, Irp); - - if (!NT_SUCCESS(Status)) - return FALSE; - - StatusBlock->Status = STATUS_PENDING; - - return TRUE; + return KsDispatchFastReadFailure(FileObject, FileOffset, Length, Wait, LockKey, Buffer, StatusBlock, DeviceObject); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] Wed Oct 7 12:41:34 2009 @@ -722,7 +722,6 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED return FALSE; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Wed Oct 7 12:41:34 2009 @@ -355,12 +355,6 @@ typedef struct { - KSSTREAM_HEADER Header; - PIRP Irp; -}CONTEXT_WRITE, *PCONTEXT_WRITE; - -typedef struct -{ PVOID Pin; PIO_WORKITEM WorkItem; PIRP Irp; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Wed Oct 7 12:41:34 2009 @@ -90,6 +90,13 @@ Node = (PPCNODE_DESCRIPTOR)((ULONG_PTR)SubDeviceDescriptor->DeviceDescriptor->Nodes + (Property->NodeId * SubDeviceDescriptor->DeviceDescriptor->NodeSize)); + if (!Node->AutomationTable) + { + // request is out of bounds + Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } + PC_ASSERT(Node->AutomationTable); PC_ASSERT(Node->AutomationTable->PropertyCount); PC_ASSERT(Node->AutomationTable->PropertyItemSize); @@ -125,6 +132,13 @@ } Node = (PPCNODE_DESCRIPTOR)((ULONG_PTR)SubDeviceDescriptor->DeviceDescriptor->Nodes + (Property->NodeId * SubDeviceDescriptor->DeviceDescriptor->NodeSize)); + + if (!Node->AutomationTable) + { + // request is out of bounds + Irp->IoStatus.Information = 0; + return STATUS_INVALID_PARAMETER; + } PC_ASSERT(Node->AutomationTable); PC_ASSERT(Node->AutomationTable->PropertyCount); 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] Wed Oct 7 12:41:34 2009 @@ -266,7 +266,6 @@ return WdmAudSetControlDetails(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_GETCONTROLDETAILS: return WdmAudGetControlDetails(DeviceObject, Irp, DeviceInfo, ClientInfo); - case IOCTL_GETPOS: case IOCTL_GETDEVID: case IOCTL_GETVOLUME: @@ -279,206 +278,93 @@ return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); } + NTSTATUS NTAPI -WdmAudWriteCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP LowerIrp, - IN PVOID Context) -{ - //PIRP Irp; - ASSERT(LowerIrp->PendingReturned == FALSE); - /* get original irp */ - //Irp = (PIRP)Context; - - /* save status */ - //Irp->IoStatus.Status = LowerIrp->IoStatus.Status; - //Irp->IoStatus.Information = LowerIrp->IoStatus.Information; - /* complete request */ - //IoCompleteRequest(Irp, IO_SOUND_INCREMENT); - /* return success to free irp */ - return STATUS_SUCCESS; -} - - -NTSTATUS -NTAPI -WdmAudWrite( +WdmAudReadWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + NTSTATUS Status; + PWDMAUD_DEVICE_INFO DeviceInfo; + PFILE_OBJECT FileObject; PIO_STACK_LOCATION IoStack; - PWDMAUD_DEVICE_INFO DeviceInfo; - PWDMAUD_CLIENT ClientInfo; - NTSTATUS Status = STATUS_SUCCESS; - PUCHAR Buffer; - PFILE_OBJECT FileObject; + ULONG Length; PMDL Mdl; - //PIRP LowerIrp; - PCONTEXT_WRITE Packet; - PVOID SystemBuffer; - //LARGE_INTEGER Offset; - IO_STATUS_BLOCK IoStatusBlock; - + + /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - //DPRINT("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); - - + /* store the input buffer in UserBuffer - as KsProbeStreamIrp operates on IRP_MJ_DEVICE_CONTROL */ + Irp->UserBuffer = MmGetMdlVirtualAddress(Irp->MdlAddress); + + /* sanity check */ + ASSERT(Irp->UserBuffer); + + /* get the length of the request length */ + Length = IoStack->Parameters.Write.Length; + + /* store outputbuffer length */ + IoStack->Parameters.DeviceIoControl.OutputBufferLength = Length; + + /* store mdl address */ + Mdl = Irp->MdlAddress; + + /* remove mdladdress as KsProbeStreamIrp will interprete it as an already probed audio buffer */ + Irp->MdlAddress = NULL; + + /* check for success */ + + if (IoStack->MajorFunction == IRP_MJ_WRITE) + { + /* probe the write stream irp */ + Status = KsProbeStreamIrp(Irp, KSPROBE_STREAMWRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK, Length); + } + else + { + /* probe the read stream irp */ + Status = KsProbeStreamIrp(Irp, KSPROBE_STREAMREAD | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK, Length); + } + + /* now free the mdl */ + IoFreeMdl(Mdl); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsProbeStreamIrp failed with Status %x\n", Status); + return SetIrpIoStatus(Irp, Status, 0); + } + + /* get device info */ + DeviceInfo = (PWDMAUD_DEVICE_INFO)Irp->AssociatedIrp.SystemBuffer; + ASSERT(DeviceInfo); + + /* now get sysaudio file object */ Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Invalid buffer handle %x\n", DeviceInfo->hDevice); + DPRINT1("Invalid pin handle %x\n", DeviceInfo->hDevice); return SetIrpIoStatus(Irp, Status, 0); } - - //DPRINT("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"); - ObDereferenceObject(FileObject); - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - if (!IoStack->FileObject) - { - /* file object parameter */ - DPRINT1("Error: file object is not attached\n"); - ObDereferenceObject(FileObject); - 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->Header.FrameExtent; - Packet->Header.DataUsed = DeviceInfo->Header.DataUsed; - Packet->Header.Size = sizeof(KSSTREAM_HEADER); - Packet->Header.PresentationTime.Numerator = 1; - Packet->Header.PresentationTime.Denominator = 1; - Packet->Irp = Irp; - - Buffer = ExAllocatePool(NonPagedPool, DeviceInfo->Header.DataUsed); - if (!Buffer) - { - /* no memory */ - ExFreePool(Packet); - ObDereferenceObject(FileObject); - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - Packet->Header.Data = Buffer; - - Mdl = IoAllocateMdl(DeviceInfo->Header.Data, DeviceInfo->Header.DataUsed, FALSE, FALSE, FALSE); - if (!Mdl) - { - /* no memory */ - ExFreePool(Packet); - ObDereferenceObject(FileObject); - ExFreePool(Buffer); - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - - _SEH2_TRY - { - MmProbeAndLockPages(Mdl, UserMode, IoReadAccess); - } - _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); - IoFreeMdl(Mdl); - ObDereferenceObject(FileObject); - return SetIrpIoStatus(Irp, Status, 0); - } - - SystemBuffer = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority ); - if (!SystemBuffer) - { - DPRINT1("Invalid buffer supplied\n"); - ExFreePool(Buffer); - ExFreePool(Packet); - IoFreeMdl(Mdl); - ObDereferenceObject(FileObject); - return SetIrpIoStatus(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); - } - - RtlMoveMemory(Buffer, SystemBuffer, DeviceInfo->Header.DataUsed); - MmUnlockPages(Mdl); - IoFreeMdl(Mdl); - -#if 1 - KsStreamIo(FileObject, NULL, NULL, NULL, NULL, 0, &IoStatusBlock, Packet, sizeof(CONTEXT_WRITE), KSSTREAM_WRITE, UserMode); + /* skip current irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* attach file object */ + IoStack->FileObject = FileObject; + IoStack->Parameters.Write.Length = sizeof(KSSTREAM_HEADER); + IoStack->MajorFunction = IRP_MJ_WRITE; + + /* mark irp as pending */ + IoMarkIrpPending(Irp); + /* call the driver */ + Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); + /* dereference file object */ ObDereferenceObject(FileObject); - return IoStatusBlock.Status; -#else - Offset.QuadPart = 0L; - - /* now build the irp */ - LowerIrp = IoBuildAsynchronousFsdRequest (IRP_MJ_WRITE, - IoGetRelatedDeviceObject(FileObject), - Packet, - sizeof(KSSTREAM_HEADER), - &Offset, - NULL); - - if (!LowerIrp) - { - /* failed to create an associated irp */ - ExFreePool(Buffer); - ExFreePool(Packet); - ObDereferenceObject(FileObject); - - return SetIrpIoStatus(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); - } - - /* get next stack location */ - IoStack = IoGetNextIrpStackLocation(LowerIrp); - - /* attach file object */ - IoStack->FileObject = FileObject; - - /* set a completion routine */ - IoSetCompletionRoutine(LowerIrp, WdmAudWriteCompletion, (PVOID)Irp, TRUE, TRUE, TRUE); - - /* mark irp as pending */ - //IoMarkIrpPending(Irp); - Irp->IoStatus.Information = DeviceInfo->BufferSize; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - DPRINT1("Wrote %u\n", DeviceInfo->BufferSize); - /* call the driver */ - Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), LowerIrp); - - /* dereference file object */ - ObDereferenceObject(FileObject); - - return STATUS_SUCCESS; -#endif -} + + return Status; +} 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] Wed Oct 7 12:41:34 2009 @@ -244,14 +244,14 @@ Driver->DriverUnload = WdmAudUnload; - Driver->MajorFunction[IRP_MJ_CREATE] = WdmAudCreate; Driver->MajorFunction[IRP_MJ_CLOSE] = WdmAudClose; Driver->MajorFunction[IRP_MJ_PNP] = WdmAudPnp; 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_WRITE] = WdmAudReadWrite; + Driver->MajorFunction[IRP_MJ_READ] = WdmAudReadWrite; 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] Wed Oct 7 12:41:34 2009 @@ -118,12 +118,6 @@ }WDMAUD_DEVICE_EXTENSION, *PWDMAUD_DEVICE_EXTENSION; -typedef struct -{ - KSSTREAM_HEADER Header; - PIRP Irp; -}CONTEXT_WRITE, *PCONTEXT_WRITE; - NTSTATUS NTAPI OpenWavePin( @@ -157,6 +151,12 @@ NTSTATUS NTAPI +WdmAudReadWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI WdmAudWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); 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] Wed Oct 7 12:41:34 2009 @@ -115,9 +115,16 @@ IoStack->MajorFunction = IRP_MJ_DEVICE_CONTROL; IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_KS_WRITE_STREAM; //FIXME IoStack->Parameters.DeviceIoControl.OutputBufferLength = Length; + ASSERT(Irp->AssociatedIrp.SystemBuffer); /* now call the driver */ - return IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); + Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); + + /* dereference file object */ + ObDereferenceObject(FileObject); + + return Status; + } NTSTATUS @@ -149,57 +156,6 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; -} - -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) -{ - PDISPATCH_CONTEXT Context; - PFILE_OBJECT RealFileObject; - NTSTATUS Status; - - DPRINT("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); - - Context = (PDISPATCH_CONTEXT)FileObject->FsContext; - - if (Context->hMixerPin) - { - Status = ObReferenceObjectByHandle(Context->hMixerPin, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&RealFileObject, NULL); - if (NT_SUCCESS(Status)) - { - Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, UserMode); - ObDereferenceObject(RealFileObject); - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Mixing stream failed with %lx\n", Status); - DbgBreakPoint(); - return FALSE; - } - } - - Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&RealFileObject, NULL); - if (!NT_SUCCESS(Status)) - return FALSE; - - Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, UserMode); - - ObDereferenceObject(RealFileObject); - - if (NT_SUCCESS(Status)) - return TRUE; - else - return FALSE; } static KSDISPATCH_TABLE PinTable = @@ -213,7 +169,7 @@ KsDispatchInvalidDeviceRequest, KsDispatchFastIoDeviceControlFailure, KsDispatchFastReadFailure, - Pin_fnFastWrite, + KsDispatchFastWriteFailure, }; NTSTATUS

1 0

[janderwald] 43320: - Fix building of ReactOS
by janderwald＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: janderwald Date: Wed Oct 7 11:43:30 2009 New Revision: 43320 URL: http://svn.reactos.org/svn/reactos?rev=43320&view=rev Log: - Fix building of ReactOS Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Wed Oct 7 11:43:30 2009 @@ -440,7 +440,6 @@ PSOUND_DEVICE SoundDevice; MMDEVICE_TYPE DeviceType; BOOL Ret; - DWORD BytesTransferred; VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); VALIDATE_MMSYS_PARAMETER( OffsetPtr );

1 0

[fireball] 43319: [fastfat_new] - Properly complete non-implemented volume open requests.
by fireball＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: fireball Date: Wed Oct 7 11:27:03 2009 New Revision: 43319 URL: http://svn.reactos.org/svn/reactos?rev=43319&view=rev Log: [fastfat_new] - Properly complete non-implemented volume open requests. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Wed Oct 7 11:27:03 2009 @@ -300,6 +300,14 @@ /* It is indeed a volume open request */ DPRINT1("Volume open request, not implemented now!\n"); UNIMPLEMENTED; + + /* Unlock VCB */ + FatReleaseVcb(IrpContext, Vcb); + + /* Complete the request */ + FatCompleteRequest(IrpContext, Irp, STATUS_NOT_IMPLEMENTED); + + return STATUS_NOT_IMPLEMENTED; } }

1 0

[janderwald] 43318: - Implement support for reading from waveIn devices
by janderwald＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: janderwald Date: Wed Oct 7 11:10:00 2009 New Revision: 43318 URL: http://svn.reactos.org/svn/reactos?rev=43318&view=rev Log: - Implement support for reading from waveIn devices Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Wed Oct 7 11:10:00 2009 @@ -435,8 +435,12 @@ IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine) { HANDLE Handle; + MMRESULT Result; WDMAUD_DEVICE_INFO DeviceInfo; - + PSOUND_DEVICE SoundDevice; + MMDEVICE_TYPE DeviceType; + BOOL Ret; + DWORD BytesTransferred; VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); VALIDATE_MMSYS_PARAMETER( OffsetPtr ); @@ -445,28 +449,46 @@ GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + { + return TranslateInternalMmResult(Result); + } + + Result = GetSoundDeviceType(SoundDevice, &DeviceType); + SND_ASSERT( Result == MMSYSERR_NOERROR ); + SND_ASSERT(Handle); ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); + DeviceInfo.Header.FrameExtent = Length; - DeviceInfo.Header.DataUsed = Length; + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + DeviceInfo.Header.DataUsed = Length; + } DeviceInfo.Header.Data = OffsetPtr; - DeviceInfo.Header.Size = sizeof(KSSTREAM_HEADER); + DeviceInfo.Header.Size = sizeof(WDMAUD_DEVICE_INFO); DeviceInfo.Header.PresentationTime.Numerator = 1; DeviceInfo.Header.PresentationTime.Denominator = 1; DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = WAVE_OUT_DEVICE_TYPE; //FIXME + DeviceInfo.DeviceType = DeviceType; Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if ( ! WriteFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine)) - { - SND_TRACE(L"WriteFileEx failed with %x\n", GetLastError()); - } - else - { - WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); - + if (DeviceType == WAVE_OUT_DEVICE_TYPE) + { + Ret = WriteFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); + if (Ret) + WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); + } + else if (DeviceType == WAVE_IN_DEVICE_TYPE) + { + Ret = ReadFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); + if (Ret) + WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); } return MMSYSERR_NOERROR;

1 0

[dgorbachev] 43317: Fix my stupid mistake, made in r43169. Bug #4863. Thanks to Gabriel & Victor.
by dgorbachev＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: dgorbachev Date: Wed Oct 7 03:41:53 2009 New Revision: 43317 URL: http://svn.reactos.org/svn/reactos?rev=43317&view=rev Log: Fix my stupid mistake, made in r43169. Bug #4863. Thanks to Gabriel & Victor. Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Wed Oct 7 03:41:53 2009 @@ -5,6 +5,7 @@ #include <reactos/version.rc> #include "windows.h" +#include "errcodes.rc" #include "locale_rc.rc"

1 0

[mkupfer] 43316: - fix typo in registry key name - fix wrong argument order in SystemParametersInfo call - use static variables instead of multiple strings - fix wrong pointer access in sysparams
by mkupfer＠svn.reactos.org 07 Oct '09

07 Oct '09

Author: mkupfer Date: Wed Oct 7 02:07:30 2009 New Revision: 43316 URL: http://svn.reactos.org/svn/reactos?rev=43316&view=rev Log: - fix typo in registry key name - fix wrong argument order in SystemParametersInfo call - use static variables instead of multiple strings - fix wrong pointer access in sysparams Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Wed Oct 7 02:07:30 2009 @@ -30,7 +30,7 @@ HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 -HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80 +HKCU,"Control Panel\Desktop","UserPreferencesMask",3,10,00,00,80 HKCU,"Control Panel\Desktop","LowPowerActive",,"0" HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400" HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3" Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Wed Oct 7 02:07:30 2009 @@ -30,7 +30,7 @@ HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 -HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80 +HKCU,"Control Panel\Desktop","UserPreferencesMask",3,10,00,00,80 HKCU,"Control Panel\Desktop","LowPowerActive",,"0" HKCU,"Control Panel\Desktop","MenuShowDelay",2,"400" HKCU,"Control Panel\Desktop","WheelScrollLines",2,"3" Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Wed Oct 7 02:07:30 2009 @@ -384,9 +384,9 @@ //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); #if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETMOUSECLICKLOCK, pButtonData->g_ClickLockEnabled, NULL, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSECLICKLOCK, 0, &pButtonData->g_ClickLockEnabled, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); if (pButtonData->g_ClickLockEnabled) - SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSECLICKLOCKTIME, pButtonData->g_ClickLockTime, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); #endif } else if (lppsn->hdr.code == PSN_RESET) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Wed Oct 7 02:07:30 2009 @@ -70,6 +70,7 @@ #if (_WIN32_WINNT >= 0x0600) static const WCHAR* VAL_SCRLLCHARS = L"WheelScrollChars"; #endif +static const WCHAR* VAL_USERPREFMASK = L"UserPreferencesMask"; static const WCHAR* KEY_MDALIGN = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"; static const WCHAR* VAL_MDALIGN = L"MenuDropAlignment"; @@ -515,7 +516,7 @@ SpiSetUserPref(DWORD dwMask, PVOID pvValue, FLONG fl) { DWORD dwRegMask; - BOOL bValue = pvValue ? 1 : 0; + BOOL bValue = *(BOOL *)pvValue; REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); @@ -527,7 +528,7 @@ { /* Read current value */ RegReadUserSetting(KEY_DESKTOP, - L"UserPreferencesMask", + VAL_USERPREFMASK, REG_BINARY, &dwRegMask, sizeof(DWORD)); @@ -537,7 +538,7 @@ /* write back value */ RegWriteUserSetting(KEY_DESKTOP, - L"UserPreferencesMask", + VAL_USERPREFMASK, REG_BINARY, &dwRegMask, sizeof(DWORD));

1 0

[janderwald] 43315: - Implement MIXER_GETLINEINFOF_COMPONENTTYPE for WdmAudGetLineInfo - Implement MIXER_GETLINECONTROLSF_ONEBYID for WdmAudGetLineControls - Clear MIXER_OBJECTF_HMIXER from Flags - Fix a bug SetGetVolumeControlDetails which fixes retrieving current volume level (verified by sndvol32.exe from XP / mmsys.cpl ReactOS)
by janderwald＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: janderwald Date: Tue Oct 6 20:16:21 2009 New Revision: 43315 URL: http://svn.reactos.org/svn/reactos?rev=43315&view=rev Log: - Implement MIXER_GETLINEINFOF_COMPONENTTYPE for WdmAudGetLineInfo - Implement MIXER_GETLINECONTROLSF_ONEBYID for WdmAudGetLineControls - Clear MIXER_OBJECTF_HMIXER from Flags - Fix a bug SetGetVolumeControlDetails which fixes retrieving current volume level (verified by sndvol32.exe from XP / mmsys.cpl ReactOS) Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Tue Oct 6 20:16:21 2009 @@ -96,9 +96,12 @@ { if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) { - *MixerLine = MixerLineSrc; - *MixerControl = &MixerLineSrc->LineControls[Index]; - *NodeId = MixerLineSrc->NodeIds[Index]; + if (MixerLine) + *MixerLine = MixerLineSrc; + if (MixerControl) + *MixerControl = &MixerLineSrc->LineControls[Index]; + if (NodeId) + *NodeId = MixerLineSrc->NodeIds[Index]; return STATUS_SUCCESS; } } @@ -108,7 +111,28 @@ return STATUS_NOT_FOUND; } - +LPMIXERLINE_EXT +GetSourceMixerLineByComponentType( + LPMIXER_INFO MixerInfo, + DWORD dwComponentType) +{ + PLIST_ENTRY Entry; + LPMIXERLINE_EXT MixerLineSrc; + + /* get first entry */ + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); + if (MixerLineSrc->Line.dwComponentType == dwComponentType) + return MixerLineSrc; + + Entry = Entry->Flink; + } + + return NULL; +} LPMIXERLINE_EXT GetSourceMixerLineByLineId( @@ -1761,6 +1785,8 @@ /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceInfo->Flags &= ~MIXER_OBJECTF_HMIXER; + if (DeviceInfo->Flags == MIXER_GETLINEINFOF_DESTINATION) { if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) @@ -1822,7 +1848,21 @@ RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); } - + else if (DeviceInfo->Flags == MIXER_GETLINEINFOF_COMPONENTTYPE) + { + if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + { + /* invalid parameter */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + MixerLineSrc = GetSourceMixerLineByComponentType(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwComponentType); + ASSERT(MixerLineSrc); + + /* copy cached data */ + RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); + return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(WDMAUD_DEVICE_INFO)); + } DPRINT1("Flags %x\n", DeviceInfo->Flags); UNIMPLEMENTED; @@ -1841,11 +1881,15 @@ IN PWDMAUD_CLIENT ClientInfo) { LPMIXERLINE_EXT MixerLineSrc; + LPMIXERCONTROLW MixerControl; PWDMAUD_DEVICE_EXTENSION DeviceExtension; ULONG Index; + NTSTATUS Status; /* get device extension */ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + DeviceInfo->Flags &= ~MIXER_OBJECTF_HMIXER; if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ALL) { @@ -1887,6 +1931,22 @@ DPRINT1("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", DeviceInfo->u.MixControls.dwControlType, DeviceInfo->u.MixControls.dwLineID, MixerLineSrc->Line.cControls); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, sizeof(WDMAUD_DEVICE_INFO)); } + else if (DeviceInfo->Flags == MIXER_GETLINECONTROLSF_ONEBYID) + { + if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) + { + /* invalid parameter */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); + if (NT_SUCCESS(Status)) + { + RtlMoveMemory(DeviceInfo->u.MixControls.pamxctrl, MixerControl, sizeof(MIXERCONTROLW)); + } + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + } + UNIMPLEMENTED; //DbgBreakPoint(); @@ -2042,7 +2102,7 @@ { for(Index = 0; Index < VolumeData->ValuesCount; Index++) { - if (VolumeData->Values[Index] < Value) + if (VolumeData->Values[Index] > Value) { /* FIXME SEH */ Input->dwValue = VolumeData->InputSteppingDelta * Index; @@ -2069,6 +2129,8 @@ PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; + DeviceInfo->Flags &= ~MIXER_OBJECTF_HMIXER; + DPRINT("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", DeviceInfo->u.MixDetails.cbStruct, sizeof(MIXERCONTROLDETAILS), DeviceInfo->u.MixDetails.dwControlID, DeviceInfo->u.MixDetails.cChannels, DeviceInfo->u.MixDetails.cMultipleItems, DeviceInfo->u.MixDetails.cbDetails, DeviceInfo->u.MixDetails.paDetails, DeviceInfo->Flags); @@ -2119,6 +2181,8 @@ PWDMAUD_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; + DeviceInfo->Flags &= ~MIXER_OBJECTF_HMIXER; + DPRINT("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", DeviceInfo->u.MixDetails.cbStruct, sizeof(MIXERCONTROLDETAILS), DeviceInfo->u.MixDetails.dwControlID, DeviceInfo->u.MixDetails.cChannels, DeviceInfo->u.MixDetails.cMultipleItems, DeviceInfo->u.MixDetails.cbDetails, DeviceInfo->u.MixDetails.paDetails, DeviceInfo->Flags);

1 0

[janderwald] 43314: - Fix creation of mixer pin
by janderwald＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: janderwald Date: Tue Oct 6 11:55:19 2009 New Revision: 43314 URL: http://svn.reactos.org/svn/reactos?rev=43314&view=rev Log: - Fix creation of mixer pin Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Tue Oct 6 11:55:19 2009 @@ -227,7 +227,7 @@ /* Query pin data ranges */ Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)PinRequest, sizeof(KSP_PIN), NULL, 0, &BytesReturned); - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status != STATUS_MORE_ENTRIES) { /* Failed to data ranges */ return Status;

1 0

[janderwald] 43313: - Partly implement WIDM_ADDBUFFER
by janderwald＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: janderwald Date: Tue Oct 6 11:54:10 2009 New Revision: 43313 URL: http://svn.reactos.org/svn/reactos?rev=43313&view=rev Log: - Partly implement WIDM_ADDBUFFER Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Tue Oct 6 11:54:10 2009 @@ -47,6 +47,7 @@ case WIDM_GETDEVCAPS : { + Result = MmeGetSoundDeviceCapabilities(WAVE_IN_DEVICE_TYPE, DeviceId, (PVOID) Parameter1, @@ -89,6 +90,13 @@ Result = MmeResetWavePlayback(PrivateHandle); break; } + + case WIDM_ADDBUFFER : + { + Result = MmeWriteWaveHeader(PrivateHandle, Parameter1); + break; + } + } SND_TRACE(L"widMessage returning MMRESULT %d\n", Result);

1 0

[mkupfer] 43312: - bind (almost all) mouse settings to system and registry and fixup sysparams
by mkupfer＠svn.reactos.org 06 Oct '09

06 Oct '09

Author: mkupfer Date: Tue Oct 6 11:02:31 2009 New Revision: 43312 URL: http://svn.reactos.org/svn/reactos?rev=43312&view=rev Log: - bind (almost all) mouse settings to system and registry and fixup sysparams Modified: trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/subsystems/win32/win32k/include/sysparams.h trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Tue Oct 6 11:02:31 2009 @@ -333,6 +333,7 @@ SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); SendDlgItemMessage(hwndDlg, IDC_IMAGE_SWAP_MOUSE, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pButtonData->hButtonRight); } + //SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_SwapMouseButtons, NULL, 0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -379,6 +380,8 @@ SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); } + SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); #if (WINVER >= 0x0500) SystemParametersInfo(SPI_SETMOUSECLICKLOCK, pButtonData->g_ClickLockEnabled, NULL, SPIF_SENDCHANGE); @@ -392,8 +395,8 @@ SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, 0); /* Reset double click speed setting */ -// SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, 0); - SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed); + SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, 0); + //SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed); } return TRUE; @@ -411,14 +414,14 @@ case TB_ENDTRACK: lResult = SendDlgItemMessage(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED, TBM_GETPOS, 0, 0); pButtonData->g_DoubleClickSpeed = (14 - (INT)lResult) * 50 + 200; -// SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, 0); + //SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case TB_THUMBTRACK: pButtonData->g_DoubleClickSpeed = (14 - (INT)HIWORD(wParam)) * 50 + 200; -// SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, 0); + //SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, 0); SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -1412,23 +1415,19 @@ pOptionData->OrigMouseAccel.nThreshold2 = pOptionData->MouseAccel.nThreshold2; /* snap to default button */ - if (SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0)) - pOptionData->bSnapToDefaultButton = FALSE; + SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0); pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton; /* mouse trails */ - if (!SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0)) - pOptionData->uMouseTrails = 0; + SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0); pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails; /* hide pointer while typing */ - if (!SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0)) - pOptionData->bMouseVanish = FALSE; + SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0); pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish; /* show pointer with Ctrl-Key */ - if (!SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0)) - pOptionData->bMouseSonar = FALSE; + SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0); pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar; /* Set mouse speed */ @@ -1744,10 +1743,7 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pWheelData); /* Get wheel scroll lines */ - if (!SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &pWheelData->uWheelScrollLines, 0)) - { - pWheelData->uWheelScrollLines = DEFAULT_WHEEL_SCROLL_LINES; - } + SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &pWheelData->uWheelScrollLines, 0); ShowDialogWheelControls(hwndDlg, pWheelData->uWheelScrollLines, TRUE); SendDlgItemMessage(hwndDlg, IDC_UPDOWN_WHEEL_SCROLL_LINES, UDM_SETRANGE, 0, MAKELONG((short)100, (short)0)); Modified: trunk/reactos/subsystems/win32/win32k/include/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/sysparams.h [iso-8859-1] Tue Oct 6 11:02:31 2009 @@ -31,6 +31,7 @@ UPM_TOOLTIPANIMATION = 0x800, UPM_TOOLTIPFADE = 0x1000, UPM_CURSORSHADOW = 0x2000, + UPM_CLICKLOCK = 0x8000, // room for more UPM_UIEFFECTS = 0x80000000, UPM_DEFAULT = 0x80003E9E Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Tue Oct 6 11:02:31 2009 @@ -66,6 +66,7 @@ static const WCHAR* VAL_DRAGWIDTH = L"DragWidth"; static const WCHAR* VAL_FNTSMOOTH = L"FontSmoothing"; static const WCHAR* VAL_SCRLLLINES = L"WheelScrollLines"; +static const WCHAR* VAL_CLICKLOCKTIME = L"ClickLockTime"; #if (_WIN32_WINNT >= 0x0600) static const WCHAR* VAL_SCRLLCHARS = L"WheelScrollChars"; #endif @@ -94,6 +95,18 @@ /** Loading the settings ******************************************************/ + +static +INT +SpiLoadDWord(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) +{ + DWORD Result; + if (!RegReadUserSetting(pwszKey, pwszValue, REG_DWORD, &Result, sizeof(Result))) + { + return iValue; + } + return Result; +} static INT @@ -235,6 +248,7 @@ /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); + gspv.dwMouseClickLockTime = SpiLoadDWord(KEY_DESKTOP, VAL_CLICKLOCKTIME, 1200); #if (_WIN32_WINNT >= 0x0600) gspv.iWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); #endif @@ -299,6 +313,17 @@ static VOID +SpiStoreDWord(PCWSTR pwszKey, PCWSTR pwszValue, DWORD Value) +{ + RegWriteUserSetting(pwszKey, + pwszValue, + REG_DWORD, + &Value, + sizeof(Value)); +} + +static +VOID SpiStoreSz(PCWSTR pwszKey, PCWSTR pwszValue, PCWSTR pwsz) { RegWriteUserSetting(pwszKey, @@ -442,6 +467,19 @@ if (fl & SPIF_UPDATEINIFILE) { SpiStoreSzInt(pwszKey, pwszValue, iValue); + } + return (UINT_PTR)pwszKey; +} + +static inline +UINT_PTR +SpiSetDWord(PVOID pvData, INT iValue, PCWSTR pwszKey, PCWSTR pwszValue, FLONG fl) +{ + REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); + *(INT*)pvData = iValue; + if (fl & SPIF_UPDATEINIFILE) + { + SpiStoreDWord(pwszKey, pwszValue, iValue); } return (UINT_PTR)pwszKey; } @@ -1268,10 +1306,10 @@ return SpiSetBool(&gspv.bMouseSonar, uiParam, KEY_MOUSE, L"", fl); case SPI_GETMOUSECLICKLOCK: - return SpiGetInt(pvParam, &gspv.bMouseClickLock, fl); + return SpiGetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_SETMOUSECLICKLOCK: - return SpiSetBool(&gspv.bMouseClickLock, uiParam, KEY_MOUSE, L"", fl); + return SpiSetUserPref(UPM_CLICKLOCK, pvParam, fl); case SPI_GETMOUSEVANISH: return SpiGetInt(pvParam, &gspv.bMouseVanish, fl); @@ -1351,7 +1389,7 @@ return SpiGetInt(pvParam, &gspv.dwMouseClickLockTime, fl); case SPI_SETMOUSECLICKLOCKTIME: - return SpiSetInt(&gspv.dwMouseClickLockTime, uiParam, KEY_MOUSE, L"", fl); + return SpiSetDWord(&gspv.dwMouseClickLockTime, uiParam, KEY_DESKTOP, VAL_CLICKLOCKTIME, fl); case SPI_GETFONTSMOOTHINGTYPE: return SpiGetInt(pvParam, &gspv.uiFontSmoothingType, fl);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs