Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[janderwald] 41726: - Remove dead code - Reuse free audio handle index
by janderwald＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: janderwald Date: Wed Jul 1 19:00:12 2009 New Revision: 41726 URL: http://svn.reactos.org/svn/reactos?rev=41726&view=rev Log: - Remove dead code - Reuse free audio handle index Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c 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 Jul 1 19:00:12 2009 @@ -184,24 +184,7 @@ return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } - InstanceInfo->Property.Set = KSPROPSETID_Sysaudio; - InstanceInfo->Property.Id = KSPROPERTY_SYSAUDIO_INSTANCE_INFO; - InstanceInfo->Property.Flags = KSPROPERTY_TYPE_SET; - InstanceInfo->Flags = 0; - InstanceInfo->DeviceNumber = FilterId; - DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - Status = KsSynchronousIoControlDevice(DeviceExtension->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)InstanceInfo, sizeof(SYSAUDIO_INSTANCE_INFO), NULL, 0, &BytesReturned); - - if (!NT_SUCCESS(Status)) - { - /* failed to acquire audio device */ - DPRINT1("KsSynchronousIoControlDevice failed with %x\n", Status); - ExFreePool(InstanceInfo); - return SetIrpIoStatus(Irp, Status, 0); - } - if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE || DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE || DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) @@ -261,13 +244,17 @@ for(Index = 0; Index < ClientInfo->NumPins; Index++) { - if (ClientInfo->hPins[Index].Handle == PinHandle) + if (ClientInfo->hPins[Index].Handle == NULL) { - /* the pin handle has been re-used */ + /* re-use a free index */ + ClientInfo->hPins[Index].Handle = PinHandle; + ClientInfo->hPins[Index].FilterId = FilterId; + ClientInfo->hPins[Index].PinId = PinId; + ClientInfo->hPins[Index].Type = DeviceInfo->DeviceType; + DeviceInfo->hDevice = PinHandle; return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } - } Handels = ExAllocatePool(NonPagedPool, sizeof(WDMAUD_HANDLE) * (ClientInfo->NumPins+1));

1 0

[janderwald] 41725: - Partly Implement StreamClassReadWriteConfig - Allocate a HwInstance buffer which is passed to each instantiated filter instance
by janderwald＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: janderwald Date: Wed Jul 1 18:44:31 2009 New Revision: 41725 URL: http://svn.reactos.org/svn/reactos?rev=41725&view=rev Log: - Partly Implement StreamClassReadWriteConfig - Allocate a HwInstance buffer which is passed to each instantiated filter instance Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] Wed Jul 1 18:44:31 2009 @@ -290,6 +290,7 @@ IN PVOID HwDeviceExtension) { PSTREAM_DEVICE_EXTENSION DeviceExtension; + /* Get our DeviceExtension */ DeviceExtension = (PSTREAM_DEVICE_EXTENSION) ((ULONG_PTR)HwDeviceExtension - sizeof(STREAM_DEVICE_EXTENSION)); ASSERT(DeviceExtension->DeviceExtension == HwDeviceExtension); @@ -297,3 +298,97 @@ return DeviceExtension->DmaCommonBuffer; } +NTSTATUS +NTAPI +StreamClassRWCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PIO_STATUS_BLOCK IoStatusBlock = (PIO_STATUS_BLOCK)Context; + + IoStatusBlock->Information = Irp->IoStatus.Information; + IoStatusBlock->Status = Irp->IoStatus.Status; + + return STATUS_SUCCESS; +} + +/* + *@implemented + */ +BOOLEAN +STREAMAPI +StreamClassReadWriteConfig( + IN PVOID HwDeviceExtension, + IN BOOLEAN Read, + IN PVOID Buffer, + IN ULONG OffSet, + IN ULONG Length) +{ + PIRP Irp; + ULONG MajorFunction; + KEVENT Event; + PSTREAM_DEVICE_EXTENSION DeviceExtension; + LARGE_INTEGER Offset; + IO_STATUS_BLOCK StatusBlock; + NTSTATUS Status; + + /* Get our DeviceExtension */ + DeviceExtension = (PSTREAM_DEVICE_EXTENSION) ((ULONG_PTR)HwDeviceExtension - sizeof(STREAM_DEVICE_EXTENSION)); + ASSERT(DeviceExtension->DeviceExtension == HwDeviceExtension); + + if (Read) + { + /* Zero input buffer */ + RtlZeroMemory(Buffer, Length); + } + + /* Set request type */ + MajorFunction = (Read ? IRP_MJ_READ : IRP_MJ_WRITE); + + /* Initialize event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Set offset */ + Offset.QuadPart = OffSet; + + /* Pre-init status block */ + StatusBlock.Status = STATUS_NOT_SUPPORTED; + + /* Create Irp */ + Irp = IoBuildSynchronousFsdRequest(MajorFunction, + DeviceExtension->LowerDeviceObject, /* Verify */ + Buffer, + Length, + &Offset, + &Event, + &StatusBlock); + + if (!Irp) + { + /* Failed to allocate memory */ + return FALSE; + } + + /* Setup a completion routine */ + IoSetCompletionRoutine(Irp, StreamClassRWCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + + /* Call driver */ + Status = IoCallDriver(DeviceExtension->LowerDeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + /* Request is pending, wait for result */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + /* Fetch result */ + Status = StatusBlock.Status; + } + + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + /* FIXME Handle Length != InputLength */ + return TRUE; +} Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] Wed Jul 1 18:44:31 2009 @@ -102,6 +102,7 @@ PKSOBJECT_CREATE_ITEM CreateItem; PIO_STACK_LOCATION IoStack; HW_STREAM_REQUEST_BLOCK_EXT RequestBlock; + PVOID HwInstanceExtension = NULL; /* Get device extension */ DeviceExtension = (PSTREAM_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -119,11 +120,23 @@ { /* driver supports more than one filter instance */ RtlZeroMemory(&RequestBlock, sizeof(HW_STREAM_REQUEST_BLOCK_EXT)); + + /* allocate instance extension */ + HwInstanceExtension = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->Data.FilterInstanceExtensionSize); + if (!HwInstanceExtension) + { + /* Not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Zero instance extension */ + RtlZeroMemory(HwInstanceExtension, DeviceExtension->DriverExtension->Data.FilterInstanceExtensionSize); /* set up request block */ RequestBlock.Block.Command = SRB_OPEN_DEVICE_INSTANCE; RequestBlock.Block.HwDeviceExtension = DeviceExtension->DeviceExtension; RequestBlock.Block.Irp = Irp; + RequestBlock.Block.HwInstanceExtension = HwInstanceExtension; KeInitializeEvent(&RequestBlock.Event, SynchronizationEvent, FALSE); /*FIXME SYNCHRONIZATION */ @@ -139,6 +152,7 @@ if (!NT_SUCCESS(RequestBlock.Block.Status)) { /* Resource is not available */ + ExFreePool(HwInstanceExtension); return RequestBlock.Block.Status; } } @@ -162,8 +176,17 @@ { /* Failed to create header */ ExFreePool(CreateItem); + if (HwInstanceExtension) + { + /* free instance buffer */ + ExFreePool(HwInstanceExtension); + } return Status; } + + /* Store instance buffer in file object context */ + IoStack->FileObject->FsContext2 = HwInstanceExtension; + /* Increment total instance count */ InterlockedIncrement(&DeviceExtension->InstanceCount); /* Return result */ Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/stream.spec [iso-8859-1] Wed Jul 1 18:44:31 2009 @@ -5,4 +5,5 @@ @ stdcall StreamClassDebugAssert(long long ptr long) @ cdecl StreamClassDebugPrint (long str) @ cdecl StreamClassDeviceNotification(long ptr) -@ stdcall StreamClassGetDmaBuffer(ptr) +@ stdcall StreamClassGetDmaBuffer(ptr) +@ stdcall StreamClassReadWriteConfig(ptr long ptr long long)

1 0

[dgorbachev] 41724: Fix some warnings / bugs.
by dgorbachev＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: dgorbachev Date: Wed Jul 1 13:59:47 2009 New Revision: 41724 URL: http://svn.reactos.org/svn/reactos?rev=41724&view=rev Log: Fix some warnings / bugs. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Jul 1 13:59:47 2009 @@ -1186,8 +1186,8 @@ return MiMapPageInHyperSpace(HyperProcess, Page, &HyperIrql); } +FORCEINLINE PVOID -FORCEINLINE MiMapPageToZeroInHyperSpace(IN PFN_NUMBER Page) { PMMPFN Pfn1 = MiGetPfnEntry(Page); Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Wed Jul 1 13:59:47 2009 @@ -309,7 +309,7 @@ } /* Check if the block matches us, and we haven't tried combining yet */ - if ((BlockType == MemoryType) && !(Combined)) + if (((TYPE_OF_MEMORY)BlockType == MemoryType) && !(Combined)) { /* Check if it starts where we end */ if (BlockBegin == PageEnd) Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Wed Jul 1 13:59:47 2009 @@ -328,7 +328,7 @@ // // Get the correct cache type // - IsIoMapping = Mdl->MdlFlags & MDL_IO_SPACE; + IsIoMapping = (Mdl->MdlFlags & MDL_IO_SPACE) != 0; CacheAttribute = MiPlatformCacheAttributes[IsIoMapping][CacheType]; // Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Wed Jul 1 13:59:47 2009 @@ -453,7 +453,7 @@ KIRQL OldIrql; PLIST_ENTRY ListEntry; PPHYSICAL_PAGE Pfn1; - ULONG LookForZeroedPages; + INT LookForZeroedPages; ASSERT (KeGetCurrentIrql() <= APC_LEVEL); // @@ -689,7 +689,7 @@ // Check if we've reached the end // Page = *MdlPage; - if (Page == -1) break; + if (Page == (PFN_NUMBER)-1) break; // // Get the PFN entry for the page and check if we should zero it out

1 0

[cgutman] 41723: - Fix corruption of ARP target protocol address - We were copying the address type (1 byte) and 3 bytes of the target address instead of all 4 bytes of the target address
by cgutman＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: cgutman Date: Wed Jul 1 09:14:56 2009 New Revision: 41723 URL: http://svn.reactos.org/svn/reactos?rev=41723&view=rev Log: - Fix corruption of ARP target protocol address - We were copying the address type (1 byte) and 3 bytes of the target address instead of all 4 bytes of the target address Modified: trunk/reactos/lib/drivers/ip/network/arp.c Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Wed Jul 1 09:14:56 2009 @@ -147,7 +147,7 @@ Interface->Address, /* Sender's (local) hardware address */ &Interface->Unicast.Address.IPv4Address,/* Sender's (local) protocol address */ NULL, /* Don't care */ - &Address->Address, /* Target's (remote) protocol address */ + &Address->Address.IPv4Address, /* Target's (remote) protocol address */ ARP_OPCODE_REQUEST); /* ARP request */ if( !NdisPacket ) return FALSE;

1 0

[tkreuzer] 41722: intrin_x86: Don't test for __MSVCSRT__ when implementing _rotr and _rotl. gcc defines __MSVCSRT__ and "knows" these funtions, but doesn't implemnt them.
by tkreuzer＠svn.reactos.org 01 Jul '09

01 Jul '09

Author: tkreuzer Date: Wed Jul 1 04:40:07 2009 New Revision: 41722 URL: http://svn.reactos.org/svn/reactos?rev=41722&view=rev Log: intrin_x86: Don't test for __MSVCSRT__ when implementing _rotr and _rotl. gcc defines __MSVCSRT__ and "knows" these funtions, but doesn't implemnt them. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Wed Jul 1 04:40:07 2009 @@ -837,7 +837,6 @@ return retval; } -#ifndef __MSVCRT__ __INTRIN_INLINE unsigned int _rotl(unsigned int value, int shift) { unsigned long retval; @@ -851,7 +850,6 @@ __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -#endif __INTRIN_INLINE unsigned char _rotr8(unsigned char value, unsigned char shift) {

1 0

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 July 2009