Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgoette] 394: * cleanup folders * start to write a new listing page (for names, categories, ...), internally implemented with filters
by dgoette＠svn.reactos.org 28 Apr '09

28 Apr '09

1 0

[fireball] 40717: - Fix writing of BootConfig to the registry (previously, it wrote contents of DEVICE_NODE structure and caused nonpaged pool overrea). Similar error a few lines below was fixed by hpoussin in r15691.
by fireball＠svn.reactos.org 28 Apr '09

28 Apr '09

Author: fireball Date: Tue Apr 28 15:39:54 2009 New Revision: 40717 URL: http://svn.reactos.org/svn/reactos?rev=40717&view=rev Log: - Fix writing of BootConfig to the registry (previously, it wrote contents of DEVICE_NODE structure and caused nonpaged pool overrea). Similar error a few lines below was fixed by hpoussin in r15691. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Apr 28 15:39:54 2009 @@ -747,7 +747,7 @@ &KeyName, 0, REG_RESOURCE_LIST, - &DeviceNode->BootResources, + DeviceNode->BootResources, ListSize); } }

1 0

[janderwald] 40716: - Silence a few debug prints - The IrpQueue functions are called at DISPATCH_LEVEL, therefore use KeAcquireSpinLockAtDpcLevel instead - Fix multiple bugs when using IrpQueue tag functions
by janderwald＠svn.reactos.org 27 Apr '09

27 Apr '09

Author: janderwald Date: Tue Apr 28 03:16:49 2009 New Revision: 40716 URL: http://svn.reactos.org/svn/reactos?rev=40716&view=rev Log: - Silence a few debug prints - The IrpQueue functions are called at DISPATCH_LEVEL, therefore use KeAcquireSpinLockAtDpcLevel instead - Fix multiple bugs when using IrpQueue tag functions Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Tue Apr 28 03:16:49 2009 @@ -177,7 +177,7 @@ BOOL Success; IInterruptSyncImpl * This = (IInterruptSyncImpl*)ServiceContext; - DPRINT("IInterruptServiceRoutine Mode %u\n", This->Mode); + //DPRINT("IInterruptServiceRoutine Mode %u\n", This->Mode); if (This->Mode == InterruptSyncModeNormal) { 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] Tue Apr 28 03:16:49 2009 @@ -33,17 +33,12 @@ KSPIN_CONNECT *ConnectDetails; PKSDATAFORMAT_WAVEFORMATEX DataFormat; - PIRP_MAPPING FirstMap; - PIRP_MAPPING LastMap; - KSPIN_LOCK Lock; LIST_ENTRY ListHead; PVOID LastTag; - BOOL OutOfMapping; + ULONG OutOfMapping; ULONG MaxFrameSize; - - BOOL LastMappingFailed; }IIrpQueueImpl; @@ -128,7 +123,7 @@ This->ConnectDetails = ConnectDetails; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; This->MaxFrameSize = FrameSize; - This->LastTag = (PVOID)0x12345678; + This->LastTag = NULL; InitializeListHead(&This->ListHead); KeInitializeSpinLock(&This->Lock); @@ -158,17 +153,15 @@ if (This->MaxFrameSize) { Mapping->NumTags = max((Mapping->Header->DataUsed / This->MaxFrameSize) + 1, 1); - Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * This->NumMappings, TAG_PORTCLASS); + Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * Mapping->NumTags, TAG_PORTCLASS); + Mapping->ReferenceCount = Mapping->NumTags; } This->NumDataAvailable += Mapping->Header->DataUsed; DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Irp %p\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Irp); - /* FIXME use InterlockedCompareExchangePointer */ - if (InterlockedCompareExchange((volatile long *)&This->FirstMap, (LONG)Mapping, (LONG)0) != 0) - ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); - + ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); (void)InterlockedIncrement((volatile long*)&This->NumMappings); if (Irp) @@ -188,17 +181,28 @@ OUT PUCHAR * Buffer, OUT PULONG BufferSize) { - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - if (!This->FirstMap) - { - This->LastMappingFailed = TRUE; + + PIRP_MAPPING CurMapping; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + PLIST_ENTRY CurEntry; + + KeAcquireSpinLockAtDpcLevel(&This->Lock); + + + CurEntry = This->ListHead.Flink; + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + if (CurEntry == &This->ListHead) + { + KeReleaseSpinLockFromDpcLevel(&This->Lock); + This->OutOfMapping = TRUE; return STATUS_UNSUCCESSFUL; } - *Buffer = (PUCHAR)This->FirstMap->Header->Data + This->CurrentOffset; - *BufferSize = This->FirstMap->Header->DataUsed - This->CurrentOffset; - This->LastMappingFailed = FALSE; + *Buffer = (PUCHAR)CurMapping->Header->Data + This->CurrentOffset; + *BufferSize = CurMapping->Header->DataUsed - This->CurrentOffset; + This->OutOfMapping = FALSE; + + KeReleaseSpinLockFromDpcLevel(&This->Lock); return STATUS_SUCCESS; } @@ -210,21 +214,22 @@ IN IIrpQueue *iface, IN ULONG BytesWritten) { - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - PIRP_MAPPING Mapping, CurMapping; + PLIST_ENTRY CurEntry; + PIRP_MAPPING CurMapping; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; This->CurrentOffset += BytesWritten; This->NumDataAvailable -= BytesWritten; - if (This->FirstMap->Header->DataUsed <=This->CurrentOffset) + CurEntry = This->ListHead.Flink; + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + + if (CurMapping->Header->DataUsed <= This->CurrentOffset) { This->CurrentOffset = 0; - Mapping = (PIRP_MAPPING)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - CurMapping = This->FirstMap; - - (void)InterlockedExchangePointer((PVOID volatile*)&This->FirstMap, (PVOID)Mapping); + + (void)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); InterlockedDecrement(&This->NumMappings); - FreeMappingRoutine(CurMapping); } @@ -304,45 +309,37 @@ OUT PULONG ByteCount, OUT PULONG Flags) { - KIRQL OldIrql; PIRP_MAPPING CurMapping; PIRP_MAPPING Result; PLIST_ENTRY CurEntry; ULONG Index; + ULONG Offset; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; *Flags = 0; Result = NULL; - KeAcquireSpinLock(&This->Lock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&This->Lock); CurEntry = This->ListHead.Flink; + if (CurEntry == &This->ListHead) + { + KeReleaseSpinLockFromDpcLevel(&This->Lock); + This->OutOfMapping = TRUE; + return STATUS_UNSUCCESSFUL; + } + while (CurEntry != &This->ListHead) { CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); for(Index = 0; Index < CurMapping->NumTags; Index++) { - if (This->LastTag == (PVOID)0x12345678) - { - CurMapping->Tag[Index] = Tag; - CurMapping->ReferenceCount++; - Result = CurMapping; - if (Index + 1 == CurMapping->NumTags - 1) - { - /* indicate end of packet */ - *Flags = 1; - } - break; - } - - if (CurMapping->Tag[Index] == This->LastTag) { if (Index + 1 < CurMapping->NumTags) { CurMapping->Tag[Index+1] = Tag; - CurMapping->ReferenceCount++; Result = CurMapping; if (Index + 1 == CurMapping->NumTags - 1) @@ -350,6 +347,11 @@ /* indicate end of packet */ *Flags = 1; } + Offset = (Index + 1) * This->MaxFrameSize; + ASSERT(Result->Header->DataUsed > Offset); + *VirtualAddress = (PUCHAR)Result->Header->Data + Offset; + *PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress); + *ByteCount = min(Result->Header->DataUsed - Offset, This->MaxFrameSize); break; } @@ -357,30 +359,23 @@ if (&This->ListHead == CurEntry) { This->OutOfMapping = TRUE; - break; + KeReleaseSpinLockFromDpcLevel(&This->Lock); + return STATUS_UNSUCCESSFUL; } Result = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); Result->Tag[0] = Tag; - Result->ReferenceCount++; + *VirtualAddress = (PUCHAR)Result->Header->Data; + *PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress); + *ByteCount = min(Result->Header->DataUsed, This->MaxFrameSize); break; } } CurEntry = CurEntry->Flink; } - KeReleaseSpinLock(&This->Lock, OldIrql); - if (!Result) - { - This->LastMappingFailed = TRUE; - return STATUS_UNSUCCESSFUL; - } - - Result->Tag = Tag; - *PhysicalAddress = MmGetPhysicalAddress(Result->Header->Data); - *VirtualAddress = Result->Header->Data; - *ByteCount = Result->Header->DataUsed; + KeReleaseSpinLockFromDpcLevel(&This->Lock); This->LastTag = Tag; - This->LastMappingFailed = FALSE; + This->OutOfMapping = FALSE; return STATUS_SUCCESS; } @@ -390,13 +385,12 @@ IN IIrpQueue *iface, IN PVOID Tag) { - KIRQL OldIrql; PIRP_MAPPING CurMapping; PLIST_ENTRY CurEntry; ULONG Index; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - KeAcquireSpinLock(&This->Lock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&This->Lock); CurEntry = This->ListHead.Flink; while (CurEntry != &This->ListHead) @@ -427,7 +421,7 @@ CurEntry = CurEntry->Flink; } - KeReleaseSpinLock(&This->Lock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&This->Lock); } BOOL @@ -436,7 +430,7 @@ IN IIrpQueue *iface) { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - return This->LastMappingFailed; + return This->OutOfMapping; } static IIrpQueueVtbl vt_IIrpQueue = Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Tue Apr 28 03:16:49 2009 @@ -202,7 +202,7 @@ ASSERT_IRQL(DISPATCH_LEVEL); Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); - DPRINT("Position %llu Status %x\n", Position, Status); + DPRINT("Position %ull Status %x\n", Position, Status); This->Stream->lpVtbl->Service(This->Stream); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Tue Apr 28 03:16:49 2009 @@ -226,7 +226,7 @@ IServiceSink* iface) { IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblServiceSink); - DPRINT("IServiceSink_fnRequestService entered\n"); + //DPRINT("IServiceSink_fnRequestService entered\n"); if (This->Miniport) { This->Miniport->lpVtbl->Service(This->Miniport); @@ -576,9 +576,9 @@ IN IPortWavePci * iface, IN PSERVICEGROUP ServiceGroup) { - IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - - DPRINT("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup); + //IPortWavePciImpl * This = (IPortWavePciImpl*)iface; + + //DPRINT("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup); if (ServiceGroup) {

1 0

[janderwald] 40715: - Remove test code which should never have come into trunk
by janderwald＠svn.reactos.org 27 Apr '09

27 Apr '09

Author: janderwald Date: Tue Apr 28 02:43:08 2009 New Revision: 40715 URL: http://svn.reactos.org/svn/reactos?rev=40715&view=rev Log: - Remove test code which should never have come into trunk Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c 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] Tue Apr 28 02:43:08 2009 @@ -124,8 +124,6 @@ ULONG BufferSize; PUCHAR Buffer; NTSTATUS Status; - PUSHORT Data; - ULONG Index; BufferLength = Position - This->CommonBufferOffset; while(BufferLength) @@ -146,10 +144,6 @@ } else { - Data = (PUSHORT)Buffer; - for(Index = 0; Index < BytesToCopy / sizeof(USHORT); Index++) - Data[Index] = Data[Index] + 32768; - This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, Buffer, @@ -174,8 +168,7 @@ ULONG BufferSize; PUCHAR Buffer; NTSTATUS Status; - PUSHORT Data; - ULONG Index; + BufferLength = This->CommonBufferSize - This->CommonBufferOffset; while(BufferLength) @@ -195,10 +188,6 @@ } else { - Data = (PUSHORT)Buffer; - for(Index = 0; Index < BytesToCopy / sizeof(USHORT); Index++) - Data[Index] = Data[Index] + 32768; - This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, Buffer,

1 0

[janderwald] 40714: - Fix IPortWavePci_Notify routine - Add debug traces
by janderwald＠svn.reactos.org 27 Apr '09

27 Apr '09

Author: janderwald Date: Mon Apr 27 22:57:41 2009 New Revision: 40714 URL: http://svn.reactos.org/svn/reactos?rev=40714&view=rev Log: - Fix IPortWavePci_Notify routine - Add debug traces Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Mon Apr 27 22:57:41 2009 @@ -578,15 +578,12 @@ { IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - - DPRINT1("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup); - - //if (This->ServiceGroup) - //{ - // ServiceGroup->lpVtbl->RequestService (ServiceGroup); - //} - - // KeInsertQueueDpc(&This->Dpc, NULL, NULL); + DPRINT("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup); + + if (ServiceGroup) + { + ServiceGroup->lpVtbl->RequestService (ServiceGroup); + } } static IPortWavePciVtbl vt_IPortWavePci = Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c [iso-8859-1] Mon Apr 27 22:57:41 2009 @@ -86,10 +86,12 @@ OUT PULONG Flags) { IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; + NTSTATUS Status; + ASSERT_IRQL(DISPATCH_LEVEL); + Status = This->Queue->lpVtbl->GetMappingWithTag(This->Queue, Tag, PhysicalAddress, VirtualAddress, ByteCount, Flags); - ASSERT_IRQL(DISPATCH_LEVEL); - - return This->Queue->lpVtbl->GetMappingWithTag(This->Queue, Tag, PhysicalAddress, VirtualAddress, ByteCount, Flags); + DPRINT("IPortWavePciStream_fnGetMapping Tag %p Status %x\n", Tag, Status); + return Status; } static @@ -102,7 +104,7 @@ IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; ASSERT_IRQL(DISPATCH_LEVEL); - + DPRINT("IPortWavePciStream_fnReleaseMapping Tag %p\n", Tag); This->Queue->lpVtbl->ReleaseMappingWithTag(This->Queue, Tag); return STATUS_SUCCESS; } @@ -115,6 +117,7 @@ { UNIMPLEMENTED ASSERT_IRQL(DISPATCH_LEVEL); + DPRINT("IPortWavePciStream_fnTerminatePacket\n"); return STATUS_SUCCESS; }

1 0

[dgoette] 393: * get overview to show something again * start to implement a new entry detail view
by dgoette＠svn.reactos.org 27 Apr '09

27 Apr '09

1 0

[fireball] 40713: - Change storage of ReactOS-specific virtual address space from VadRoot to Vm EPROCESS structure member. Change containing "structure" from MM_AVL_TABLE to MMSUPPORT respectively .
by fireball＠svn.reactos.org 27 Apr '09

27 Apr '09

Author: fireball Date: Mon Apr 27 14:12:57 2009 New Revision: 40713 URL: http://svn.reactos.org/svn/reactos?rev=40713&view=rev Log: - Change storage of ReactOS-specific virtual address space from VadRoot to Vm EPROCESS structure member. Change containing "structure" from MM_AVL_TABLE to MMSUPPORT respectively . Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mdlsup.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/region.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.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] Mon Apr 27 14:12:57 2009 @@ -388,7 +388,7 @@ typedef VOID (*PMM_ALTER_REGION_FUNC)( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID BaseAddress, ULONG Length, ULONG OldType, @@ -412,7 +412,7 @@ NTSTATUS NTAPI MmCreateMemoryArea( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, ULONG Type, PVOID *BaseAddress, ULONG_PTR Length, @@ -426,21 +426,21 @@ PMEMORY_AREA NTAPI MmLocateMemoryAreaByAddress( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID Address ); ULONG_PTR NTAPI MmFindGapAtAddress( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID Address ); NTSTATUS NTAPI MmFreeMemoryArea( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PMM_FREE_PAGE_FUNC FreePage, PVOID FreePageContext @@ -449,7 +449,7 @@ NTSTATUS NTAPI MmFreeMemoryAreaByPtr( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID BaseAddress, PMM_FREE_PAGE_FUNC FreePage, PVOID FreePageContext @@ -457,12 +457,12 @@ VOID NTAPI -MmDumpMemoryAreas(PMM_AVL_TABLE AddressSpace); +MmDumpMemoryAreas(PMMSUPPORT AddressSpace); PMEMORY_AREA NTAPI MmLocateMemoryAreaByRegion( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID Address, ULONG_PTR Length ); @@ -470,7 +470,7 @@ PVOID NTAPI MmFindGap( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, ULONG_PTR Length, ULONG_PTR Granularity, BOOLEAN TopDown @@ -480,7 +480,7 @@ NTAPI MmReleaseMemoryAreaIfDecommitted( struct _EPROCESS *Process, - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID BaseAddress ); @@ -746,7 +746,7 @@ NTSTATUS NTAPI MmNotPresentFaultVirtualMemory( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked @@ -755,7 +755,7 @@ NTSTATUS NTAPI MmPageOutVirtualMemory( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, struct _MM_PAGEOP* PageOp @@ -780,7 +780,7 @@ NTSTATUS NTAPI MmProtectAnonMem( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID BaseAddress, ULONG Length, @@ -791,7 +791,7 @@ NTSTATUS NTAPI MmWritePageVirtualMemory( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA MArea, PVOID Address, PMM_PAGEOP PageOp @@ -1390,7 +1390,7 @@ NTSTATUS NTAPI MmAlterRegion( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID BaseAddress, PLIST_ENTRY RegionListHead, PVOID StartAddress, @@ -1458,7 +1458,7 @@ NTSTATUS NTAPI MmProtectSectionView( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID BaseAddress, ULONG Length, @@ -1469,7 +1469,7 @@ NTSTATUS NTAPI MmWritePageSectionView( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA MArea, PVOID Address, PMM_PAGEOP PageOp @@ -1482,7 +1482,7 @@ NTSTATUS NTAPI MmNotPresentFaultSectionView( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked @@ -1491,7 +1491,7 @@ NTSTATUS NTAPI MmPageOutSectionView( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, struct _MM_PAGEOP *PageOp @@ -1504,7 +1504,7 @@ NTSTATUS NTAPI MmAccessFaultSectionView( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked @@ -1608,39 +1608,39 @@ IN PKTHREAD Thread ); -extern PMM_AVL_TABLE MmKernelAddressSpace; +extern PMMSUPPORT MmKernelAddressSpace; FORCEINLINE VOID -MmLockAddressSpace(PMM_AVL_TABLE AddressSpace) -{ - KeAcquireGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock); +MmLockAddressSpace(PMMSUPPORT AddressSpace) +{ + KeAcquireGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock); } FORCEINLINE VOID -MmUnlockAddressSpace(PMM_AVL_TABLE AddressSpace) -{ - KeReleaseGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot)->AddressCreationLock); +MmUnlockAddressSpace(PMMSUPPORT AddressSpace) +{ + KeReleaseGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock); } FORCEINLINE PEPROCESS -MmGetAddressSpaceOwner(IN PMM_AVL_TABLE AddressSpace) +MmGetAddressSpaceOwner(IN PMMSUPPORT AddressSpace) { if (AddressSpace == MmKernelAddressSpace) return NULL; - return CONTAINING_RECORD(AddressSpace, EPROCESS, VadRoot); + return CONTAINING_RECORD(AddressSpace, EPROCESS, Vm); } FORCEINLINE -PMM_AVL_TABLE +PMMSUPPORT MmGetCurrentAddressSpace(VOID) { - return &((PEPROCESS)KeGetCurrentThread()->ApcState.Process)->VadRoot; + return &((PEPROCESS)KeGetCurrentThread()->ApcState.Process)->Vm; } FORCEINLINE -PMM_AVL_TABLE +PMMSUPPORT MmGetKernelAddressSpace(VOID) { return MmKernelAddressSpace; Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -47,7 +47,7 @@ NTSTATUS NTAPI -MmWritePageVirtualMemory(PMM_AVL_TABLE AddressSpace, +MmWritePageVirtualMemory(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, PMM_PAGEOP PageOp) @@ -130,7 +130,7 @@ NTSTATUS NTAPI -MmPageOutVirtualMemory(PMM_AVL_TABLE AddressSpace, +MmPageOutVirtualMemory(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, PMM_PAGEOP PageOp) @@ -239,7 +239,7 @@ NTSTATUS NTAPI -MmNotPresentFaultVirtualMemory(PMM_AVL_TABLE AddressSpace, +MmNotPresentFaultVirtualMemory(PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked) @@ -446,7 +446,7 @@ } static VOID -MmModifyAttributes(PMM_AVL_TABLE AddressSpace, +MmModifyAttributes(PMMSUPPORT AddressSpace, PVOID BaseAddress, ULONG RegionSize, ULONG OldType, @@ -562,7 +562,7 @@ ULONG_PTR MemoryAreaLength; ULONG Type; NTSTATUS Status; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; PVOID BaseAddress; ULONG RegionSize; PVOID PBaseAddress; @@ -713,7 +713,7 @@ Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; DPRINT("Type %x\n", Type); - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; MmLockAddressSpace(AddressSpace); if (PBaseAddress != 0) @@ -888,7 +888,7 @@ if (PageOp != NULL) { NTSTATUS Status; - MmUnlockAddressSpace(&Process->VadRoot); + MmUnlockAddressSpace(&Process->Vm); Status = KeWaitForSingleObject(&PageOp->CompletionEvent, 0, KernelMode, @@ -899,7 +899,7 @@ DPRINT1("Failed to wait for page op\n"); KeBugCheck(MEMORY_MANAGEMENT); } - MmLockAddressSpace(&Process->VadRoot); + MmLockAddressSpace(&Process->Vm); MmReleasePageOp(PageOp); } } @@ -915,7 +915,7 @@ } /* Actually free the memory area. */ - MmFreeMemoryArea(&Process->VadRoot, + MmFreeMemoryArea(&Process->Vm, MemoryArea, MmFreeVirtualMemoryPage, (PVOID)Process); @@ -945,7 +945,7 @@ MEMORY_AREA* MemoryArea; NTSTATUS Status; PEPROCESS Process; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; PVOID BaseAddress; ULONG RegionSize; @@ -974,7 +974,7 @@ return(Status); } - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); @@ -1024,7 +1024,7 @@ NTSTATUS NTAPI -MmProtectAnonMem(PMM_AVL_TABLE AddressSpace, +MmProtectAnonMem(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID BaseAddress, ULONG Length, Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -172,7 +172,7 @@ /* Initialize the Addresss Space */ KeInitializeGuardedMutex(&Process->AddressCreationLock); - Process->VadRoot.BalancedRoot.u1.Parent = NULL; + Process->Vm.WorkingSetExpansionLinks.Flink = NULL; /* The process now has an address space */ Process->HasAddressSpace = TRUE; Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=40… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -160,18 +160,18 @@ } #ifdef VALIDATE_MEMORY_AREAS -static VOID MmVerifyMemoryAreas(PMM_AVL_TABLE AddressSpace) +static VOID MmVerifyMemoryAreas(PMMSUPPORT AddressSpace) { PMEMORY_AREA Node; ASSERT(AddressSpace != NULL); /* Special case for empty tree. */ - if (AddressSpace->BalancedRoot.u1.Parent == NULL) + if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) return; /* Traverse the tree from left to right. */ - for (Node = MmIterateFirstNode(AddressSpace->BalancedRoot.u1.Parent); + for (Node = MmIterateFirstNode(AddressSpace->WorkingSetExpansionLinks.Flink); Node != NULL; Node = MmIterateNextNode(Node)) { @@ -186,18 +186,18 @@ #endif VOID NTAPI -MmDumpMemoryAreas(PMM_AVL_TABLE AddressSpace) +MmDumpMemoryAreas(PMMSUPPORT AddressSpace) { PMEMORY_AREA Node; DbgPrint("MmDumpMemoryAreas()\n"); /* Special case for empty tree. */ - if (AddressSpace->BalancedRoot.u1.Parent == NULL) + if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) return; /* Traverse the tree from left to right. */ - for (Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent); + for (Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); Node != NULL; Node = MmIterateNextNode(Node)) { @@ -211,10 +211,10 @@ PMEMORY_AREA NTAPI MmLocateMemoryAreaByAddress( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID Address) { - PMEMORY_AREA Node = (PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent; + PMEMORY_AREA Node = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; DPRINT("MmLocateMemoryAreaByAddress(AddressSpace %p, Address %p)\n", AddressSpace, Address); @@ -241,7 +241,7 @@ PMEMORY_AREA NTAPI MmLocateMemoryAreaByRegion( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID Address, ULONG_PTR Length) { @@ -251,11 +251,11 @@ MmVerifyMemoryAreas(AddressSpace); /* Special case for empty tree. */ - if (AddressSpace->BalancedRoot.u1.Parent == NULL) + if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) return NULL; /* Traverse the tree from left to right. */ - for (Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent); + for (Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); Node != NULL; Node = MmIterateNextNode(Node)) { @@ -302,11 +302,11 @@ static VOID MmCompressHelper( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, ULONG Count) { PMEMORY_AREA Root = NULL; - PMEMORY_AREA Red = (PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent; + PMEMORY_AREA Red = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; PMEMORY_AREA Black = Red->LeftChild; while (Count--) @@ -314,7 +314,7 @@ if (Root) Root->LeftChild = Black; else - AddressSpace->BalancedRoot.u1.Parent = (PVOID)Black; + AddressSpace->WorkingSetExpansionLinks.Flink = (PVOID)Black; Black->Parent = Root; Red->LeftChild = Black->RightChild; if (Black->RightChild) @@ -341,7 +341,7 @@ static VOID MmRebalanceTree( - PMM_AVL_TABLE AddressSpace) + PMMSUPPORT AddressSpace) { PMEMORY_AREA PreviousNode; PMEMORY_AREA CurrentNode; @@ -354,7 +354,7 @@ /* Transform the tree into Vine. */ PreviousNode = NULL; - CurrentNode = (PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent; + CurrentNode = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; while (CurrentNode != NULL) { if (CurrentNode->RightChild == NULL) @@ -379,7 +379,7 @@ if (PreviousNode != NULL) PreviousNode->LeftChild = TempNode; else - AddressSpace->BalancedRoot.u1.Parent = (PVOID)TempNode; + AddressSpace->WorkingSetExpansionLinks.Flink = (PVOID)TempNode; TempNode->Parent = PreviousNode; } } @@ -410,7 +410,7 @@ static VOID MmInsertMemoryArea( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA marea) { PMEMORY_AREA Node; @@ -419,14 +419,14 @@ MmVerifyMemoryAreas(AddressSpace); - if (AddressSpace->BalancedRoot.u1.Parent == NULL) - { - AddressSpace->BalancedRoot.u1.Parent = (PVOID)marea; + if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) + { + AddressSpace->WorkingSetExpansionLinks.Flink = (PVOID)marea; marea->LeftChild = marea->RightChild = marea->Parent = NULL; return; } - Node = (PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent; + Node = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; do { DPRINT("marea->EndingAddress: %p Node->StartingAddress: %p\n", @@ -466,7 +466,7 @@ static PVOID MmFindGapBottomUp( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, ULONG_PTR Length, ULONG_PTR Granularity) { @@ -486,7 +486,7 @@ AlignedAddress = MM_ROUND_UP(LowestAddress, Granularity); /* Special case for empty tree. */ - if (AddressSpace->BalancedRoot.u1.Parent == NULL) + if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) { if ((ULONG_PTR)HighestAddress - (ULONG_PTR)AlignedAddress >= Length) { @@ -498,7 +498,7 @@ } /* Go to the node with lowest address in the tree. */ - FirstNode = Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent); + FirstNode = Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); /* Traverse the tree from left to right. */ PreviousNode = Node; @@ -544,7 +544,7 @@ static PVOID MmFindGapTopDown( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, ULONG_PTR Length, ULONG_PTR Granularity) { @@ -567,7 +567,7 @@ return NULL; /* Special case for empty tree. */ - if (AddressSpace->BalancedRoot.u1.Parent == NULL) + if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) { if (AlignedAddress >= LowestAddress) { @@ -579,7 +579,7 @@ } /* Go to the node with highest address in the tree. */ - Node = MmIterateLastNode((PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent); + Node = MmIterateLastNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); /* Check if there is enough space after the last memory area. */ if (Node->EndingAddress <= AlignedAddress) @@ -630,7 +630,7 @@ PVOID NTAPI MmFindGap( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, ULONG_PTR Length, ULONG_PTR Granularity, BOOLEAN TopDown) @@ -643,10 +643,10 @@ ULONG_PTR NTAPI MmFindGapAtAddress( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID Address) { - PMEMORY_AREA Node = (PMEMORY_AREA)AddressSpace->BalancedRoot.u1.Parent; + PMEMORY_AREA Node = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; PMEMORY_AREA RightNeighbour = NULL; PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? @@ -725,7 +725,7 @@ NTSTATUS NTAPI MmFreeMemoryArea( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PMM_FREE_PAGE_FUNC FreePage, PVOID FreePageContext) @@ -789,7 +789,7 @@ ParentReplace = &MemoryArea->Parent->RightChild; } else - ParentReplace = (PMEMORY_AREA*)&AddressSpace->BalancedRoot.u1.Parent; + ParentReplace = (PMEMORY_AREA*)&AddressSpace->WorkingSetExpansionLinks.Flink; if (MemoryArea->RightChild == NULL) { @@ -867,7 +867,7 @@ NTSTATUS NTAPI MmFreeMemoryAreaByPtr( - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID BaseAddress, PMM_FREE_PAGE_FUNC FreePage, PVOID FreePageContext) @@ -918,7 +918,7 @@ */ NTSTATUS NTAPI -MmCreateMemoryArea(PMM_AVL_TABLE AddressSpace, +MmCreateMemoryArea(PMMSUPPORT AddressSpace, ULONG Type, PVOID *BaseAddress, ULONG_PTR Length, @@ -1042,7 +1042,7 @@ VOID NTAPI MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process, - PMM_AVL_TABLE AddressSpace, + PMMSUPPORT AddressSpace, PVOID BaseAddress) { PMEMORY_AREA MemoryArea; Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -366,12 +366,12 @@ ASSERT(Mdl->Process == PsGetCurrentProcess()); /* Find the memory area */ - MemoryArea = MmLocateMemoryAreaByAddress(&Mdl->Process->VadRoot, + MemoryArea = MmLocateMemoryAreaByAddress(&Mdl->Process->Vm, BaseAddress); ASSERT(MemoryArea); /* Free it */ - MmFreeMemoryArea(&Mdl->Process->VadRoot, + MmFreeMemoryArea(&Mdl->Process->Vm, MemoryArea, NULL, NULL); @@ -395,7 +395,7 @@ PFN_TYPE Page; PEPROCESS CurrentProcess; PETHREAD Thread; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; KIRQL OldIrql = KeGetCurrentIrql(); DPRINT("Probing MDL: %p\n", Mdl); @@ -480,7 +480,7 @@ Mdl->Process = CurrentProcess; /* Use the process lock */ - AddressSpace = &CurrentProcess->VadRoot; + AddressSpace = &CurrentProcess->Vm; } @@ -758,8 +758,8 @@ CurrentProcess = PsGetCurrentProcess(); - MmLockAddressSpace(&CurrentProcess->VadRoot); - Status = MmCreateMemoryArea(&CurrentProcess->VadRoot, + MmLockAddressSpace(&CurrentProcess->Vm); + Status = MmCreateMemoryArea(&CurrentProcess->Vm, MEMORY_AREA_MDL_MAPPING, &Base, PageCount * PAGE_SIZE, @@ -768,7 +768,7 @@ (Base != NULL), 0, BoundaryAddressMultiple); - MmUnlockAddressSpace(&CurrentProcess->VadRoot); + MmUnlockAddressSpace(&CurrentProcess->Vm); if (!NT_SUCCESS(Status)) { if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=40713… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -22,7 +22,7 @@ MM_STATS MmStats; -PMM_AVL_TABLE MmKernelAddressSpace; +PMMSUPPORT MmKernelAddressSpace; /* FUNCTIONS ****************************************************************/ @@ -81,7 +81,7 @@ */ { MEMORY_AREA* MemoryArea; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; if (VirtualAddress >= MmSystemRangeStart) { @@ -89,7 +89,7 @@ } else { - AddressSpace = &PsGetCurrentProcess()->VadRoot; + AddressSpace = &PsGetCurrentProcess()->Vm; } MmLockAddressSpace(AddressSpace); @@ -111,7 +111,7 @@ ULONG_PTR Address, BOOLEAN FromMdl) { - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; MEMORY_AREA* MemoryArea; NTSTATUS Status; BOOLEAN Locked = FromMdl; @@ -146,7 +146,7 @@ } else { - AddressSpace = &PsGetCurrentProcess()->VadRoot; + AddressSpace = &PsGetCurrentProcess()->Vm; } if (!FromMdl) @@ -211,7 +211,7 @@ ULONG_PTR Address, BOOLEAN FromMdl) { - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; MEMORY_AREA* MemoryArea; NTSTATUS Status; BOOLEAN Locked = FromMdl; @@ -242,7 +242,7 @@ } else { - AddressSpace = &PsGetCurrentProcess()->VadRoot; + AddressSpace = &PsGetCurrentProcess()->Vm; } if (!FromMdl) Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -80,7 +80,7 @@ PVOID BaseAddress) { NTSTATUS Status; - PMM_AVL_TABLE ProcessAddressSpace = &Process->VadRoot; + PMMSUPPORT ProcessAddressSpace = &Process->Vm; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID AllocatedBase = BaseAddress; @@ -163,7 +163,7 @@ MmDeleteTeb(PEPROCESS Process, PTEB Teb) { - PMM_AVL_TABLE ProcessAddressSpace = &Process->VadRoot; + PMMSUPPORT ProcessAddressSpace = &Process->Vm; PMEMORY_AREA MemoryArea; /* Lock the Address Space */ @@ -486,7 +486,7 @@ PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; NTSTATUS Status; - PMM_AVL_TABLE ProcessAddressSpace = &Process->VadRoot; + PMMSUPPORT ProcessAddressSpace = &Process->Vm; BoundaryAddressMultiple.QuadPart = 0; /* Create the shared data page */ @@ -512,7 +512,7 @@ IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) { NTSTATUS Status; - PMM_AVL_TABLE ProcessAddressSpace = &Process->VadRoot; + PMMSUPPORT ProcessAddressSpace = &Process->Vm; PVOID BaseAddress; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; @@ -523,7 +523,7 @@ /* Initialize the Addresss Space lock */ KeInitializeGuardedMutex(&Process->AddressCreationLock); - Process->VadRoot.BalancedRoot.u1.Parent = NULL; + Process->Vm.WorkingSetExpansionLinks.Flink = NULL; /* Acquire the Lock */ MmLockAddressSpace(ProcessAddressSpace); @@ -684,17 +684,17 @@ DPRINT("MmDeleteProcessAddressSpace(Process %x (%s))\n", Process, Process->ImageFileName); - MmLockAddressSpace(&Process->VadRoot); - - while ((MemoryArea = (PMEMORY_AREA)Process->VadRoot.BalancedRoot.u1.Parent) != NULL) + MmLockAddressSpace(&Process->Vm); + + while ((MemoryArea = (PMEMORY_AREA)Process->Vm.WorkingSetExpansionLinks.Flink) != NULL) { switch (MemoryArea->Type) { case MEMORY_AREA_SECTION_VIEW: Address = (PVOID)MemoryArea->StartingAddress; - MmUnlockAddressSpace(&Process->VadRoot); + MmUnlockAddressSpace(&Process->Vm); MmUnmapViewOfSection(Process, Address); - MmLockAddressSpace(&Process->VadRoot); + MmLockAddressSpace(&Process->Vm); break; case MEMORY_AREA_VIRTUAL_MEMORY: @@ -704,7 +704,7 @@ case MEMORY_AREA_SHARED_DATA: case MEMORY_AREA_NO_ACCESS: - MmFreeMemoryArea(&Process->VadRoot, + MmFreeMemoryArea(&Process->Vm, MemoryArea, NULL, NULL); @@ -721,7 +721,7 @@ Mmi386ReleaseMmInfo(Process); - MmUnlockAddressSpace(&Process->VadRoot); + MmUnlockAddressSpace(&Process->Vm); DPRINT("Finished MmReleaseMmInfo()\n"); return(STATUS_SUCCESS); Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -33,7 +33,7 @@ static PMM_REGION MmSplitRegion(PMM_REGION InitialRegion, PVOID InitialBaseAddress, PVOID StartAddress, ULONG Length, ULONG NewType, - ULONG NewProtect, PMM_AVL_TABLE AddressSpace, + ULONG NewProtect, PMMSUPPORT AddressSpace, PMM_ALTER_REGION_FUNC AlterFunc) { PMM_REGION NewRegion1; @@ -105,7 +105,7 @@ NTSTATUS NTAPI -MmAlterRegion(PMM_AVL_TABLE AddressSpace, PVOID BaseAddress, +MmAlterRegion(PMMSUPPORT AddressSpace, PVOID BaseAddress, PLIST_ENTRY RegionListHead, PVOID StartAddress, ULONG Length, ULONG NewType, ULONG NewProtect, PMM_ALTER_REGION_FUNC AlterFunc) { Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=407… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -58,7 +58,7 @@ { PMM_RMAP_ENTRY entry; PMEMORY_AREA MemoryArea; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; ULONG Type; PVOID Address; PEPROCESS Process; @@ -91,7 +91,7 @@ { return Status; } - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; } else { @@ -192,7 +192,7 @@ { PMM_RMAP_ENTRY entry; PMEMORY_AREA MemoryArea; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; ULONG Type; PVOID Address; PEPROCESS Process; @@ -222,7 +222,7 @@ { return Status; } - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; } else { Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -152,7 +152,7 @@ { PROS_SECTION_OBJECT Section; PMEMORY_AREA MemoryArea; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; POBJECT_NAME_INFORMATION ModuleNameInformation; NTSTATUS Status = STATUS_ADDRESS_NOT_ASSOCIATED; @@ -163,7 +163,7 @@ } else { - AddressSpace = &PsGetCurrentProcess()->VadRoot; + AddressSpace = &PsGetCurrentProcess()->Vm; } /* Lock address space */ @@ -753,7 +753,7 @@ NTSTATUS NTAPI -MmNotPresentFaultSectionView(PMM_AVL_TABLE AddressSpace, +MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked) @@ -1273,7 +1273,7 @@ NTSTATUS NTAPI -MmAccessFaultSectionView(PMM_AVL_TABLE AddressSpace, +MmAccessFaultSectionView(PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, BOOLEAN Locked) @@ -1458,7 +1458,7 @@ PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; if (Process) { - MmLockAddressSpace(&Process->VadRoot); + MmLockAddressSpace(&Process->Vm); } MmDeleteVirtualMapping(Process, @@ -1482,7 +1482,7 @@ } if (Process) { - MmUnlockAddressSpace(&Process->VadRoot); + MmUnlockAddressSpace(&Process->Vm); } if (PageOutContext->Private) @@ -1495,7 +1495,7 @@ NTSTATUS NTAPI -MmPageOutSectionView(PMM_AVL_TABLE AddressSpace, +MmPageOutSectionView(PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, PMM_PAGEOP PageOp) @@ -1849,7 +1849,7 @@ NTSTATUS NTAPI -MmWritePageSectionView(PMM_AVL_TABLE AddressSpace, +MmWritePageSectionView(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, PMM_PAGEOP PageOp) @@ -1996,7 +1996,7 @@ } static VOID -MmAlterViewAttributes(PMM_AVL_TABLE AddressSpace, +MmAlterViewAttributes(PMMSUPPORT AddressSpace, PVOID BaseAddress, ULONG RegionSize, ULONG OldType, @@ -2061,7 +2061,7 @@ NTSTATUS NTAPI -MmProtectSectionView(PMM_AVL_TABLE AddressSpace, +MmProtectSectionView(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID BaseAddress, ULONG Length, @@ -3611,7 +3611,7 @@ } static NTSTATUS -MmMapViewOfSegment(PMM_AVL_TABLE AddressSpace, +MmMapViewOfSegment(PMMSUPPORT AddressSpace, PROS_SECTION_OBJECT Section, PMM_SECTION_SEGMENT Segment, PVOID* BaseAddress, @@ -3722,7 +3722,7 @@ PROS_SECTION_OBJECT Section; PEPROCESS Process; KPROCESSOR_MODE PreviousMode; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; NTSTATUS Status = STATUS_SUCCESS; ULONG tmpProtect; @@ -3801,7 +3801,7 @@ return(Status); } - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; Status = ObReferenceObjectByHandle(SectionHandle, SECTION_MAP_READ, @@ -3883,10 +3883,10 @@ NTSTATUS Status; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; PEPROCESS Process; - AddressSpace = (PMM_AVL_TABLE)Context; + AddressSpace = (PMMSUPPORT)Context; Process = MmGetAddressSpaceOwner(AddressSpace); Address = (PVOID)PAGE_ROUND_DOWN(Address); @@ -3980,7 +3980,7 @@ } static NTSTATUS -MmUnmapViewOfSegment(PMM_AVL_TABLE AddressSpace, +MmUnmapViewOfSegment(PMMSUPPORT AddressSpace, PVOID BaseAddress) { NTSTATUS Status; @@ -4040,7 +4040,7 @@ { NTSTATUS Status; PMEMORY_AREA MemoryArea; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; PROS_SECTION_OBJECT Section; PMM_PAGEOP PageOp; ULONG_PTR Offset; @@ -4051,7 +4051,7 @@ ASSERT(Process); - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, @@ -4441,7 +4441,7 @@ PVOID Result; MEMORY_AREA* marea; NTSTATUS Status; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; PHYSICAL_ADDRESS BoundaryAddressMultiple; DPRINT("MmAllocateSection(Length %x)\n",Length); @@ -4537,7 +4537,7 @@ IN ULONG Protect) { PROS_SECTION_OBJECT Section; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; ULONG ViewOffset; NTSTATUS Status = STATUS_SUCCESS; @@ -4550,7 +4550,7 @@ Section = (PROS_SECTION_OBJECT)SectionObject; - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; AllocationType |= (Section->AllocationAttributes & SEC_NO_CHANGE); @@ -4815,7 +4815,7 @@ IN OUT PULONG ViewSize) { PROS_SECTION_OBJECT Section; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; NTSTATUS Status; DPRINT("MmMapViewInSystemSpace() called\n"); @@ -4875,7 +4875,7 @@ NTSTATUS NTAPI MmUnmapViewInSystemSpace (IN PVOID MappedBase) { - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; NTSTATUS Status; DPRINT("MmUnmapViewInSystemSpace() called\n"); Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Mon Apr 27 14:12:57 2009 @@ -421,7 +421,7 @@ NTSTATUS Status; PEPROCESS Process; MEMORY_AREA* MemoryArea; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_QUERY_INFORMATION, @@ -436,7 +436,7 @@ return(Status); } - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); @@ -576,7 +576,7 @@ OUT PULONG OldAccessProtection OPTIONAL) { PMEMORY_AREA MemoryArea; - PMM_AVL_TABLE AddressSpace; + PMMSUPPORT AddressSpace; ULONG OldAccessProtection_; NTSTATUS Status; @@ -585,7 +585,7 @@ PAGE_ROUND_DOWN(*BaseAddress); *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); - AddressSpace = &Process->VadRoot; + AddressSpace = &Process->Vm; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress);

1 0

[janderwald] 40712: - Experimental IPortPinWavePci implementation - Refactor IPortWavePciStream initilization - Add test code for IDrmAudioStream
by janderwald＠svn.reactos.org 27 Apr '09

27 Apr '09

Author: janderwald Date: Mon Apr 27 04:33:49 2009 New Revision: 40712 URL: http://svn.reactos.org/svn/reactos?rev=40712&view=rev Log: - Experimental IPortPinWavePci implementation - Refactor IPortWavePciStream initilization - Add test code for IDrmAudioStream Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.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/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] Mon Apr 27 04:33:49 2009 @@ -131,7 +131,7 @@ } /* initialize the pin */ - Status = Pin->lpVtbl->Init(Pin, This->Port, iface, ConnectDetails, &This->Descriptor->Factory.KsPinDescriptor[ConnectDetails->PinId], GetDeviceObjectFromWaveCyclic(This->Port)); + Status = Pin->lpVtbl->Init(Pin, This->Port, iface, ConnectDetails, &This->Descriptor->Factory.KsPinDescriptor[ConnectDetails->PinId], GetDeviceObjectFromPortWavePci(This->Port)); if (!NT_SUCCESS(Status)) { Pin->lpVtbl->Release(Pin); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Mon Apr 27 04:33:49 2009 @@ -51,7 +51,7 @@ const GUID IID_IPortEvents = {0xA80F29C4L, 0x5498, 0x11D2, {0x95, 0xD9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3}}; const GUID KSNAME_PIN = {0x146F1A80, 0x4791, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; - +const GUID IID_IDrmAudioStream = {0x1915c967, 0x3299, 0x48cb, {0xa3, 0xe4, 0x69, 0xfd, 0x1d, 0x1b, 0x30, 0x6e}}; //FIXME // 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] Mon Apr 27 04:33:49 2009 @@ -230,6 +230,7 @@ STDMETHOD_(VOID, ReleaseMappingWithTag)(THIS_ IN PVOID Tag); + STDMETHOD_(BOOL, HasLastMappingFailed)(THIS); }; 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] Mon Apr 27 04:33:49 2009 @@ -43,6 +43,8 @@ BOOL OutOfMapping; ULONG MaxFrameSize; + BOOL LastMappingFailed; + }IIrpQueueImpl; VOID @@ -189,11 +191,14 @@ IIrpQueueImpl * This = (IIrpQueueImpl*)iface; if (!This->FirstMap) + { + This->LastMappingFailed = TRUE; return STATUS_UNSUCCESSFUL; + } *Buffer = (PUCHAR)This->FirstMap->Header->Data + This->CurrentOffset; *BufferSize = This->FirstMap->Header->DataUsed - This->CurrentOffset; - + This->LastMappingFailed = FALSE; return STATUS_SUCCESS; } @@ -365,13 +370,17 @@ KeReleaseSpinLock(&This->Lock, OldIrql); if (!Result) + { + This->LastMappingFailed = TRUE; return STATUS_UNSUCCESSFUL; + } Result->Tag = Tag; *PhysicalAddress = MmGetPhysicalAddress(Result->Header->Data); *VirtualAddress = Result->Header->Data; *ByteCount = Result->Header->DataUsed; This->LastTag = Tag; + This->LastMappingFailed = FALSE; return STATUS_SUCCESS; } @@ -421,6 +430,15 @@ KeReleaseSpinLock(&This->Lock, OldIrql); } +BOOL +NTAPI +IIrpQueue_fnHasLastMappingFailed( + IN IIrpQueue *iface) +{ + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + return This->LastMappingFailed; +} + static IIrpQueueVtbl vt_IIrpQueue = { IIrpQueue_fnQueryInterface, @@ -436,7 +454,9 @@ IIrpQueue_fnCancelBuffers, IIrpQueue_fnUpdateFormat, IIrpQueue_fnGetMappingWithTag, - IIrpQueue_fnReleaseMappingWithTag + IIrpQueue_fnReleaseMappingWithTag, + IIrpQueue_fnHasLastMappingFailed + }; 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] Mon Apr 27 04:33:49 2009 @@ -37,6 +37,10 @@ ULONG FrameSize; BOOL Capture; + ULONG TotalPackets; + ULONG PreCompleted; + ULONG PostCompleted; + }IPortPinWaveCyclicImpl; @@ -120,6 +124,8 @@ ULONG BufferSize; PUCHAR Buffer; NTSTATUS Status; + PUSHORT Data; + ULONG Index; BufferLength = Position - This->CommonBufferOffset; while(BufferLength) @@ -140,6 +146,10 @@ } else { + Data = (PUSHORT)Buffer; + for(Index = 0; Index < BytesToCopy / sizeof(USHORT); Index++) + Data[Index] = Data[Index] + 32768; + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, Buffer, @@ -164,6 +174,8 @@ ULONG BufferSize; PUCHAR Buffer; NTSTATUS Status; + PUSHORT Data; + ULONG Index; BufferLength = This->CommonBufferSize - This->CommonBufferOffset; while(BufferLength) @@ -183,6 +195,10 @@ } else { + Data = (PUSHORT)Buffer; + for(Index = 0; Index < BytesToCopy / sizeof(USHORT); Index++) + Data[Index] = Data[Index] + 32768; + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, Buffer, @@ -228,7 +244,7 @@ { /* reset start stream */ This->IrpQueue->lpVtbl->CancelBuffers(This->IrpQueue); //FIX function name - DPRINT1("Stopping %u Irql %u\n", This, This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), KeGetCurrentIrql()); + DPRINT1("Stopping PreCompleted %u PostCompleted %u\n", This->PreCompleted, This->PostCompleted); } } } @@ -908,7 +924,9 @@ PIRP Irp; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; - DPRINT("IPortPinWaveCyclic_fnFastWrite entered\n"); + InterlockedIncrement((PLONG)&This->TotalPackets); + + DPRINT("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted); Packet = (PCONTEXT_WRITE)Buffer; @@ -917,6 +935,7 @@ { Irp = Packet->Irp; StatusBlock->Status = STATUS_PENDING; + InterlockedIncrement((PLONG)&This->PostCompleted); } else { @@ -925,6 +944,7 @@ Packet->Irp->IoStatus.Information = Packet->Header.FrameExtent; IoCompleteRequest(Packet->Irp, IO_SOUND_INCREMENT); StatusBlock->Status = STATUS_SUCCESS; + InterlockedIncrement((PLONG)&This->PreCompleted); } Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); @@ -958,6 +978,7 @@ PKSDATAFORMAT DataFormat; PDEVICE_OBJECT DeviceObject; BOOL Capture; + //IDrmAudioStream * DrmAudio = NULL; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; @@ -1016,6 +1037,21 @@ This->Format, &This->DmaChannel, &This->ServiceGroup); +#if 0 + Status = This->Stream->lpVtbl->QueryInterface(This->Stream, &IID_IDrmAudioStream, (PVOID*)&DrmAudio); + if (NT_SUCCESS(Status)) + { + DRMRIGHTS DrmRights; + DPRINT1("Got IID_IDrmAudioStream interface %p\n", DrmAudio); + + DrmRights.CopyProtect = FALSE; + DrmRights.Reserved = 0; + DrmRights.DigitalOutputDisable = FALSE; + + Status = DrmAudio->lpVtbl->SetContentId(DrmAudio, 1, &DrmRights); + DPRINT("Status %x\n", Status); + } +#endif DPRINT("IPortPinWaveCyclic_fnInit Status %x\n", Status); @@ -1033,7 +1069,7 @@ This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); //This->DmaChannel->lpVtbl->AddRef(This->DmaChannel); - + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); This->State = KSSTATE_STOP; This->CommonBufferOffset = 0; This->CommonBufferSize = This->DmaChannel->lpVtbl->AllocatedBufferSize(This->DmaChannel); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Mon Apr 27 04:33:49 2009 @@ -1,16 +1,829 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel Streaming - * FILE: drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c - * PURPOSE: WaveCyclic IRP Audio Pin + * FILE: drivers/wdm/audio/backpln/portcls/pin_WavePci.c + * PURPOSE: WavePci IRP Audio Pin * PROGRAMMER: Johannes Anderwald */ #include "private.h" -NTSTATUS -NewPortPinWavePci( +#include "private.h" + +typedef struct +{ + IPortPinWavePciVtbl *lpVtbl; + IServiceSinkVtbl *lpVtblServiceSink; + + LONG ref; + IPortWavePci * Port; + IPortFilterWavePci * Filter; + KSPIN_DESCRIPTOR * KsPinDescriptor; + PMINIPORTWAVEPCI Miniport; + PSERVICEGROUP ServiceGroup; + PDMACHANNEL DmaChannel; + PMINIPORTWAVEPCISTREAM Stream; + KSSTATE State; + PKSDATAFORMAT Format; + KSPIN_CONNECT * ConnectDetails; + + BOOL Capture; + PDEVICE_OBJECT DeviceObject; + PPORTWAVEPCISTREAM WaveStream; + IIrpQueue * IrpQueue; + + ULONG TotalPackets; + ULONG PreCompleted; + ULONG PostCompleted; + +}IPortPinWavePciImpl; + + +typedef struct +{ + IPortPinWavePciImpl *Pin; + PIO_WORKITEM WorkItem; + KSSTATE State; +}SETSTREAM_CONTEXT, *PSETSTREAM_CONTEXT; + +NTSTATUS +NTAPI +IPortWavePci_fnProcessNewIrp( + IPortPinWavePciImpl * This); + +//================================================================================================================================== + +static +NTSTATUS +NTAPI +IServiceSink_fnQueryInterface( + IServiceSink* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)CONTAINING_RECORD(iface, IPortPinWavePciImpl, lpVtblServiceSink); + + DPRINT("IServiceSink_fnQueryInterface entered\n"); + + if (IsEqualGUIDAligned(refiid, &IID_IServiceSink) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtblServiceSink; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +static +ULONG +NTAPI +IServiceSink_fnAddRef( + IServiceSink* iface) +{ + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)CONTAINING_RECORD(iface, IPortPinWavePciImpl, lpVtblServiceSink); + DPRINT("IServiceSink_fnAddRef entered\n"); + + return InterlockedIncrement(&This->ref); +} + +static +ULONG +NTAPI +IServiceSink_fnRelease( + IServiceSink* iface) +{ + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)CONTAINING_RECORD(iface, IPortPinWavePciImpl, lpVtblServiceSink); + + InterlockedDecrement(&This->ref); + + DPRINT("IServiceSink_fnRelease entered %u\n", This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} +static +VOID +NTAPI +SetStreamWorkerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + IPortPinWavePciImpl * This; + PSETSTREAM_CONTEXT Ctx = (PSETSTREAM_CONTEXT)Context; + KSSTATE State; + + This = Ctx->Pin; + State = Ctx->State; + + IoFreeWorkItem(Ctx->WorkItem); + FreeItem(Ctx, TAG_PORTCLASS); + + /* Has the audio stream resumed? */ + if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue) && State == KSSTATE_STOP) + return; + + /* Set the state */ + if (NT_SUCCESS(This->Stream->lpVtbl->SetState(This->Stream, State))) + { + /* Set internal state to stop */ + This->State = State; + + if (This->State == KSSTATE_STOP) + { + /* reset start stream */ + This->IrpQueue->lpVtbl->CancelBuffers(This->IrpQueue); //FIX function name + DPRINT1("Stopping PreCompleted %u PostCompleted %u\n", This->PreCompleted, This->PostCompleted); + } + } +} +static +VOID +NTAPI +SetStreamState( + IN IPortPinWavePciImpl * This, + IN KSSTATE State) +{ + PDEVICE_OBJECT DeviceObject; + PIO_WORKITEM WorkItem; + PSETSTREAM_CONTEXT Context; + + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + + /* Has the audio stream resumed? */ + if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue) && State == KSSTATE_STOP) + return; + + /* Has the audio state already been set? */ + if (This->State == State) + return; + + /* Get device object */ + DeviceObject = GetDeviceObjectFromPortWavePci(This->Port); + + /* allocate set state context */ + Context = AllocateItem(NonPagedPool, sizeof(SETSTREAM_CONTEXT), TAG_PORTCLASS); + + if (!Context) + return; + + /* allocate work item */ + WorkItem = IoAllocateWorkItem(DeviceObject); + + if (!WorkItem) + { + ExFreePool(Context); + return; + } + + Context->Pin = (PVOID)This; + Context->WorkItem = WorkItem; + Context->State = State; + + /* queue the work item */ + IoQueueWorkItem(WorkItem, SetStreamWorkerRoutine, DelayedWorkQueue, (PVOID)Context); +} + +static +VOID +NTAPI +IServiceSink_fnRequestService( + IServiceSink* iface) +{ + ULONGLONG Position; + NTSTATUS Status; + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)CONTAINING_RECORD(iface, IPortPinWavePciImpl, lpVtblServiceSink); + + ASSERT_IRQL(DISPATCH_LEVEL); + + Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); + DPRINT("Position %llu Status %x\n", Position, Status); + + This->Stream->lpVtbl->Service(This->Stream); +} + +static IServiceSinkVtbl vt_IServiceSink = +{ + IServiceSink_fnQueryInterface, + IServiceSink_fnAddRef, + IServiceSink_fnRelease, + IServiceSink_fnRequestService +}; + +//================================================================================================================================== +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnQueryInterface( + IPortPinWavePci* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IIrpTarget) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortPinWavePci_fnAddRef( + IPortPinWavePci* iface) +{ + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +/* + * @implemented + */ +ULONG +NTAPI +IPortPinWavePci_fnRelease( + IPortPinWavePci* iface) +{ + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + return This->ref; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnNewIrpTarget( + IN IPortPinWavePci* iface, + OUT struct IIrpTarget **OutTarget, + IN WCHAR * Name, + IN PUNKNOWN Unknown, + IN POOL_TYPE PoolType, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN KSOBJECT_CREATE *CreateObject) +{ + UNIMPLEMENTED + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnDeviceIoControl( + IN IPortPinWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnRead( + IN IPortPinWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnWrite( + IN IPortPinWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnFlush( + IN IPortPinWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +static +VOID +NTAPI +CloseStreamRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + PMINIPORTWAVEPCISTREAM Stream; + NTSTATUS Status; + ISubdevice *ISubDevice; + PSUBDEVICE_DESCRIPTOR Descriptor; + IPortPinWavePciImpl * This; + PCLOSESTREAM_CONTEXT Ctx = (PCLOSESTREAM_CONTEXT)Context; + + This = (IPortPinWavePciImpl*)Ctx->Pin; + + if (This->Stream) + { + if (This->State != KSSTATE_STOP) + { + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); + KeStallExecutionProcessor(10); + } + } + + if (This->ServiceGroup) + { + This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); + This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); + } + + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); + if (NT_SUCCESS(Status)) + { + Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); + if (NT_SUCCESS(Status)) + { + ISubDevice->lpVtbl->Release(ISubDevice); + Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; + } + } + + if (This->Format) + { + ExFreePool(This->Format); + This->Format = NULL; + } + + if (This->WaveStream) + { + This->WaveStream->lpVtbl->Release(This->WaveStream); + } + + /* complete the irp */ + Ctx->Irp->IoStatus.Information = 0; + Ctx->Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Ctx->Irp, IO_NO_INCREMENT); + + /* free the work item */ + IoFreeWorkItem(Ctx->WorkItem); + + /* free work item ctx */ + FreeItem(Ctx, TAG_PORTCLASS); + + if (This->Stream) + { + Stream = This->Stream; + This->Stream = NULL; + DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); + Stream->lpVtbl->Release(Stream); + /* this line is never reached */ + } +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnClose( + IN IPortPinWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PCLOSESTREAM_CONTEXT Ctx; + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + if (This->Stream) + { + Ctx = AllocateItem(NonPagedPool, sizeof(CLOSESTREAM_CONTEXT), TAG_PORTCLASS); + if (!Ctx) + { + DPRINT1("Failed to allocate stream context\n"); + goto cleanup; + } + + Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); + if (!Ctx->WorkItem) + { + DPRINT1("Failed to allocate work item\n"); + goto cleanup; + } + + Ctx->Irp = Irp; + Ctx->Pin = (PVOID)This; + + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + + /* defer work item */ + IoQueueWorkItem(Ctx->WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)Ctx); + /* Return result */ + return STATUS_PENDING; + } + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; + +cleanup: + + if (Ctx) + FreeItem(Ctx, TAG_PORTCLASS); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; + +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnQuerySecurity( + IN IPortPinWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnSetSecurity( + IN IPortPinWavePci* iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortPinWavePci_fnFastDeviceIoControl( + IN IPortPinWavePci* iface, + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN ULONG IoControlCode, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED + return FALSE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortPinWavePci_fnFastRead( + IN IPortPinWavePci* iface, + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PCONTEXT_WRITE Packet; + PIRP Irp; + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + DPRINT("IPortPinWavePci_fnFastRead entered\n"); + + Packet = (PCONTEXT_WRITE)Buffer; + + Irp = Packet->Irp; + StatusBlock->Status = STATUS_PENDING; + + Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); + + if (!NT_SUCCESS(Status)) + return FALSE; + + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && 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; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IPortPinWavePci_fnFastWrite( + IN IPortPinWavePci* iface, + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PIO_STATUS_BLOCK StatusBlock, + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PCONTEXT_WRITE Packet; + PIRP Irp; + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + InterlockedIncrement((PLONG)&This->TotalPackets); + + DPRINT("IPortPinWavePci_fnFastWrite entered Total %u Pre %u Post %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted); + + Packet = (PCONTEXT_WRITE)Buffer; + + + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)) + { + Irp = Packet->Irp; + StatusBlock->Status = STATUS_PENDING; + InterlockedIncrement((PLONG)&This->PostCompleted); + } + else + { + Irp = NULL; + Packet->Irp->IoStatus.Status = STATUS_SUCCESS; + Packet->Irp->IoStatus.Information = Packet->Header.FrameExtent; + IoCompleteRequest(Packet->Irp, IO_SOUND_INCREMENT); + StatusBlock->Status = STATUS_SUCCESS; + InterlockedIncrement((PLONG)&This->PreCompleted); + } + + Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); + + if (!NT_SUCCESS(Status)) + return FALSE; + + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) + { + SetStreamState(This, KSSTATE_RUN); + /* some should initiate a state request but didnt do it */ + DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); + } + + if (This->IrpQueue->lpVtbl->HasLastMappingFailed(This->IrpQueue)) + { + /* notify port driver that new mapping is available */ + This->Stream->lpVtbl->MappingAvailable(This->Stream); + } + + return TRUE; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IPortPinWavePci_fnInit( + IN IPortPinWavePci* iface, + IN PPORTWAVEPCI Port, + IN PPORTFILTERWAVEPCI Filter, + IN KSPIN_CONNECT * ConnectDetails, + IN KSPIN_DESCRIPTOR * KsPinDescriptor, + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PKSDATAFORMAT DataFormat; + BOOL Capture; + KSALLOCATOR_FRAMING AllocatorFraming; + + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + Port->lpVtbl->AddRef(Port); + Filter->lpVtbl->AddRef(Filter); + + This->Port = Port; + This->Filter = Filter; + This->KsPinDescriptor = KsPinDescriptor; + This->ConnectDetails = ConnectDetails; + This->Miniport = GetWavePciMiniport(Port); + This->DeviceObject = DeviceObject; + + DataFormat = (PKSDATAFORMAT)(ConnectDetails + 1); + + DPRINT("IPortPinWavePci_fnInit entered\n"); + + This->Format = ExAllocatePoolWithTag(NonPagedPool, DataFormat->FormatSize, TAG_PORTCLASS); + if (!This->Format) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlMoveMemory(This->Format, DataFormat, DataFormat->FormatSize); + + Status = NewIPortWavePciStream(&This->WaveStream); + if (!NT_SUCCESS(Status)) + { + ExFreePool(This->Format); + This->Format = NULL; + return Status; + } + + if (KsPinDescriptor->Communication == KSPIN_COMMUNICATION_SINK && KsPinDescriptor->DataFlow == KSPIN_DATAFLOW_IN) + { + Capture = FALSE; + } + else if (KsPinDescriptor->Communication == KSPIN_COMMUNICATION_SINK && KsPinDescriptor->DataFlow == KSPIN_DATAFLOW_OUT) + { + Capture = TRUE; + } + else + { + DPRINT1("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); + KeBugCheck(0); + } + + Status = This->Miniport->lpVtbl->NewStream(This->Miniport, + &This->Stream, + NULL, + NonPagedPool, + This->WaveStream, + Capture, + ConnectDetails->PinId, + This->Format, + &This->DmaChannel, + &This->ServiceGroup); + + DPRINT("IPortPinWavePci_fnInit Status %x\n", Status); + + if (!NT_SUCCESS(Status)) + return Status; + + if (This->ServiceGroup) + { + Status = This->ServiceGroup->lpVtbl->AddMember(This->ServiceGroup, + (PSERVICESINK)&This->lpVtblServiceSink); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to add pin to service group\n"); + return Status; + } + This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); + } + + This->IrpQueue = IPortWavePciStream_GetIrpQueue(This->WaveStream); + + Status = This->Stream->lpVtbl->GetAllocatorFraming(This->Stream, &AllocatorFraming); + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetAllocatorFraming failed with %x\n", Status); + return Status; + } + + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, AllocatorFraming.FrameSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IrpQueue_Init failed with %x\n", Status); + return Status; + } + + This->State = KSSTATE_STOP; + This->Capture = Capture; + + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +PVOID +NTAPI +IPortPinWavePci_fnGetIrpStream( + IN IPortPinWavePci* iface) +{ + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + return (PVOID)This->IrpQueue; +} + + +/* + * @implemented + */ +PMINIPORT +NTAPI +IPortPinWavePci_fnGetMiniport( + IN IPortPinWavePci* iface) +{ + IPortPinWavePciImpl * This = (IPortPinWavePciImpl*)iface; + + return (PMINIPORT)This->Miniport; +} + +static IPortPinWavePciVtbl vt_IPortPinWavePci = +{ + IPortPinWavePci_fnQueryInterface, + IPortPinWavePci_fnAddRef, + IPortPinWavePci_fnRelease, + IPortPinWavePci_fnNewIrpTarget, + IPortPinWavePci_fnDeviceIoControl, + IPortPinWavePci_fnRead, + IPortPinWavePci_fnWrite, + IPortPinWavePci_fnFlush, + IPortPinWavePci_fnClose, + IPortPinWavePci_fnQuerySecurity, + IPortPinWavePci_fnSetSecurity, + IPortPinWavePci_fnFastDeviceIoControl, + IPortPinWavePci_fnFastRead, + IPortPinWavePci_fnFastWrite, + IPortPinWavePci_fnInit, + IPortPinWavePci_fnGetIrpStream, + IPortPinWavePci_fnGetMiniport +}; + + + + +NTSTATUS NewPortPinWavePci( OUT IPortPinWavePci ** OutPin) { - return STATUS_UNSUCCESSFUL; -} + IPortPinWavePciImpl * This; + + This = AllocateItem(NonPagedPool, sizeof(IPortPinWavePciImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + /* initialize IPortPinWavePci */ + This->ref = 1; + This->lpVtbl = &vt_IPortPinWavePci; + This->lpVtblServiceSink = &vt_IServiceSink; + + + /* store result */ + *OutPin = (IPortPinWavePci*)&This->lpVtbl; + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Mon Apr 27 04:33:49 2009 @@ -813,10 +813,17 @@ } PDEVICE_OBJECT -GetDeviceObjectFromWaveCyclic( +GetDeviceObjectFromPortWavePci( IPortWavePci* iface) { IPortWavePciImpl * This = (IPortWavePciImpl*)iface; return This->pDeviceObject; } +PMINIPORTWAVEPCI +GetWavePciMiniport( + PPORTWAVEPCI iface) +{ + IPortWavePciImpl * This = (IPortWavePciImpl*)iface; + return This->Miniport; +} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c [iso-8859-1] Mon Apr 27 04:33:49 2009 @@ -66,6 +66,7 @@ if (This->ref == 0) { + This->Queue->lpVtbl->Release(This->Queue); FreeItem(This, TAG_PORTCLASS); return 0; } @@ -131,11 +132,7 @@ NTSTATUS NTAPI NewIPortWavePciStream( - OUT PPORTWAVEPCISTREAM *Stream, - IN KSPIN_CONNECT *ConnectDetails, - IN PKSDATAFORMAT DataFormat, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG FrameSize) + OUT PPORTWAVEPCISTREAM *Stream) { IIrpQueue * Queue; IPortWavePciStreamImpl * This; @@ -144,13 +141,6 @@ Status = NewIrpQueue(&Queue); if (!NT_SUCCESS(Status)) return Status; - - Status = Queue->lpVtbl->Init(Queue, ConnectDetails, DataFormat, DeviceObject, FrameSize); - if (!NT_SUCCESS(Status)) - { - Queue->lpVtbl->Release(Queue); - return Status; - } This = AllocateItem(NonPagedPool, sizeof(IPortWavePciStreamImpl), TAG_PORTCLASS); if (!This) @@ -167,15 +157,12 @@ return STATUS_SUCCESS; } -NTSTATUS +IIrpQueue* NTAPI -IPortWavePciStream_AddMapping( - IN IPortWavePciStream *iface, - IN PUCHAR Buffer, - IN ULONG BufferSize, - IN PIRP Irp) +IPortWavePciStream_GetIrpQueue( + IN IPortWavePciStream *iface) { IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; - return This->Queue->lpVtbl->AddMapping(This->Queue, Buffer, BufferSize, Irp); + return This->Queue; } 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] Mon Apr 27 04:33:49 2009 @@ -101,6 +101,13 @@ GetDeviceObjectFromWaveCyclic( IPortWavePci* iface); +PDEVICE_OBJECT +GetDeviceObjectFromPortWavePci( + IPortWavePci* iface); + +PMINIPORTWAVEPCI +GetWavePciMiniport( + PPORTWAVEPCI Port); NTSTATUS NTAPI @@ -272,22 +279,15 @@ GetDeviceObject( IPortWaveCyclic* iface); -NTSTATUS -NTAPI -IPortWavePciStream_AddMapping( - IN IPortWavePciStream *iface, - IN PUCHAR Buffer, - IN ULONG BufferSize, - IN PIRP Irp); +IIrpQueue* +NTAPI +IPortWavePciStream_GetIrpQueue( + IN IPortWavePciStream *iface); NTSTATUS NTAPI NewIPortWavePciStream( - OUT PPORTWAVEPCISTREAM *Stream, - IN KSPIN_CONNECT *ConnectDetails, - IN PKSDATAFORMAT DataFormat, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG FrameSize); + OUT PPORTWAVEPCISTREAM *Stream); #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\

1 0

[janderwald] 40711: - Fix warning - Fix KSALLOCATOR_FRAMING structure
by janderwald＠svn.reactos.org 27 Apr '09

27 Apr '09

Author: janderwald Date: Mon Apr 27 04:15:52 2009 New Revision: 40711 URL: http://svn.reactos.org/svn/reactos?rev=40711&view=rev Log: - Fix warning - Fix KSALLOCATOR_FRAMING structure Modified: trunk/reactos/include/ddk/drmk.h trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/ddk/drmk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/drmk.h?rev=407… ============================================================================== --- trunk/reactos/include/ddk/drmk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/drmk.h [iso-8859-1] Mon Apr 27 04:15:52 2009 @@ -82,6 +82,9 @@ DEFINE_GUID(IID_IDrmAudioStream, 0x1915c967, 0x3299, 0x48cb, 0xa3, 0xe4, 0x69, 0xfd, 0x1d, 0x1b, 0x30, 0x6e); +#undef INTERFACE +#define INTERFACE IDrmAudioStream + DECLARE_INTERFACE_(IDrmAudioStream, IUnknown) { STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4071… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Apr 27 04:15:52 2009 @@ -1417,6 +1417,19 @@ typedef struct { + union { + ULONG OptionsFlags; + ULONG RequirementsFlags; + }; +#if defined(_NTDDK_) + POOL_TYPE PoolType; +#else + ULONG PoolType; +#endif + ULONG Frames; + ULONG FrameSize; + ULONG FileAlignment; + ULONG Reserved; } KSALLOCATOR_FRAMING, *PKSALLOCATOR_FRAMING; typedef struct

1 0

[hpoussin] 40710: Remove MachGetMemoryMap() and replace it by ArcGetMemoryDescriptor(). Rework memory initialization to use it. As a bonus, we're not limited anymore to 32 memory descriptors, and having more than 4GB of RAM doesn't lead to out of bounds accesses
by hpoussin＠svn.reactos.org 26 Apr '09

26 Apr '09

Author: hpoussin Date: Mon Apr 27 00:22:16 2009 New Revision: 40710 URL: http://svn.reactos.org/svn/reactos?rev=40710&view=rev Log: Remove MachGetMemoryMap() and replace it by ArcGetMemoryDescriptor(). Rework memory initialization to use it. As a bonus, we're not limited anymore to 32 memory descriptors, and having more than 4GB of RAM doesn't lead to out of bounds accesses Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -1,130 +1,5 @@ -/* - * FreeLoader - * - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/* No need to duplicate code ; import the i386 version */ -#include <freeldr.h> -#include <debug.h> - -BOOLEAN AcpiPresent = FALSE; - -static PRSDP_DESCRIPTOR -FindAcpiBios(VOID) -{ - PUCHAR Ptr; - - /* Find the 'Root System Descriptor Table Pointer' */ - Ptr = (PUCHAR)0xE0000; - while ((ULONG_PTR)Ptr < 0x100000) - { - if (!memcmp(Ptr, "RSD PTR ", 8)) - { - DbgPrint((DPRINT_HWDETECT, "ACPI supported\n")); - - return (PRSDP_DESCRIPTOR)Ptr; - } - - Ptr = (PUCHAR)((ULONG_PTR)Ptr + 0x10); - } - - DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); - - return NULL; -} - - -VOID -DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) -{ - PCONFIGURATION_COMPONENT_DATA BiosKey; - PCM_PARTIAL_RESOURCE_LIST PartialResourceList; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - PRSDP_DESCRIPTOR Rsdp; - PACPI_BIOS_DATA AcpiBiosData; - BIOS_MEMORY_MAP BiosMemoryMap[32]; - ULONG BiosMemoryMapEntryCount, TableSize; - - Rsdp = FindAcpiBios(); - - if (Rsdp) - { - /* Set up the flag in the loader block */ - AcpiPresent = TRUE; - LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; - - /* Create new bus key */ - FldrCreateComponentKey(SystemKey, - L"MultifunctionAdapter", - *BusNumber, - AdapterClass, - MultiFunctionAdapter, - &BiosKey); - - /* Set 'Component Information' */ - FldrSetComponentInformation(BiosKey, - 0x0, - 0x0, - 0xFFFFFFFF); - - /* Get BIOS memory map */ - RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); - BiosMemoryMapEntryCount = MachGetMemoryMap(BiosMemoryMap, - sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); - - /* Calculate the table size */ - TableSize = BiosMemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP) + - sizeof(ACPI_BIOS_DATA) - sizeof(BIOS_MEMORY_MAP); - - /* Set 'Configuration Data' value */ - PartialResourceList = - MmHeapAlloc(sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize); - memset(PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize); - PartialResourceList->Version = 0; - PartialResourceList->Revision = 0; - PartialResourceList->Count = 1; - - PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; - PartialDescriptor->Type = CmResourceTypeDeviceSpecific; - PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; - PartialDescriptor->u.DeviceSpecificData.DataSize = TableSize; - - /* Fill the table */ - AcpiBiosData = (PACPI_BIOS_DATA)&PartialResourceList->PartialDescriptors[1]; - AcpiBiosData->RSDTAddress.LowPart = Rsdp->rsdt_physical_address; - AcpiBiosData->Count = BiosMemoryMapEntryCount; - memcpy(AcpiBiosData->MemoryMap, BiosMemoryMap, - BiosMemoryMapEntryCount * sizeof(BIOS_MEMORY_MAP)); - - DbgPrint((DPRINT_HWDETECT, "RSDT %p, data size %x\n", Rsdp->rsdt_physical_address, - TableSize)); - - FldrSetConfigurationData(BiosKey, - PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) + TableSize - ); - - /* Increment bus number */ - (*BusNumber)++; - - /* Set 'Identifier' value */ - FldrSetIdentifier(BiosKey, "ACPI BIOS"); - MmFreeMemory(PartialResourceList); - } -} +#include "../i386/hwacpi.c" /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -83,7 +83,7 @@ /* Get BIOS memory map */ RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); - BiosMemoryMapEntryCount = MachGetMemoryMap(BiosMemoryMap, + BiosMemoryMapEntryCount = PcMemGetMemoryMap(BiosMemoryMap, sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); /* Calculate the table size */ Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -59,6 +59,7 @@ VOID (*Beep)(VOID); VOID (*PrepareForReactOS)(IN BOOLEAN Setup); + MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(MEMORY_DESCRIPTOR* Current); ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); BOOLEAN (*DiskGetBootVolume)(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); @@ -98,7 +99,7 @@ VOID MachVideoGetPaletteColor(UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue); VOID MachVideoSync(VOID); VOID MachBeep(VOID); -ULONG MachGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); +MEMORY_DESCRIPTOR* ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current); BOOLEAN MachDiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); BOOLEAN MachDiskGetSystemVolume(char *SystemPath, @@ -138,7 +139,6 @@ #define MachVideoSync() MachVtbl.VideoSync() #define MachBeep() MachVtbl.Beep() #define MachPrepareForReactOS(a) MachVtbl.PrepareForReactOS(a) -#define MachGetMemoryMap(MMap, Size) MachVtbl.GetMemoryMap((MMap), (Size)) #define MachDiskGetBootVolume(Drv, Start, Cnt, FsType) MachVtbl.DiskGetBootVolume((Drv), (Start), (Cnt), (FsType)) #define MachDiskGetSystemVolume(SysPath, RemPath, Dev, Drv, Start, Cnt, FsType) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev), (Drv), (Start), (Cnt), (FsType)) #define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -88,21 +88,18 @@ extern ULONG LastFreePageHint; #ifdef DBG -PUCHAR MmGetSystemMemoryMapTypeString(ULONG Type); +PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type); #endif ULONG MmGetPageNumberFromAddress(PVOID Address); // Returns the page number that contains a linear address -PVOID MmGetEndAddressOfAnyMemory(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount); // Returns the last address of memory from the memory map -ULONG MmGetAddressablePageCountIncludingHoles(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount); // Returns the count of addressable pages from address zero including any memory holes and reserved memory regions -PVOID MmFindLocationForPageLookupTable(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount); // Returns the address for a memory chunk big enough to hold the page lookup table (starts search from end of memory) -VOID MmSortBiosMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount); // Sorts the BIOS_MEMORY_MAP array so the first element corresponds to the first address in memory -VOID MmInitPageLookupTable(PVOID PageLookupTable, ULONG TotalPageCount, PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount); // Inits the page lookup table according to the memory types in the memory map +ULONG MmGetAddressablePageCountIncludingHoles(VOID); // Returns the count of addressable pages from address zero including any memory holes and reserved memory regions +PVOID MmFindLocationForPageLookupTable(ULONG TotalPageCount); // Returns the address for a memory chunk big enough to hold the page lookup table (starts search from end of memory) +VOID MmInitPageLookupTable(PVOID PageLookupTable, ULONG TotalPageCount); // Inits the page lookup table according to the memory types in the memory map VOID MmMarkPagesInLookupTable(PVOID PageLookupTable, ULONG StartPage, ULONG PageCount, TYPE_OF_MEMORY PageAllocated); // Marks the specified pages as allocated or free in the lookup table VOID MmAllocatePagesInLookupTable(PVOID PageLookupTable, ULONG StartPage, ULONG PageCount, TYPE_OF_MEMORY MemoryType); // Allocates the specified pages in the lookup table ULONG MmCountFreePagesInLookupTable(PVOID PageLookupTable, ULONG TotalPageCount); // Returns the number of free pages in the lookup table ULONG MmFindAvailablePages(PVOID PageLookupTable, ULONG TotalPageCount, ULONG PagesNeeded, BOOLEAN FromEnd); // Returns the page number of the first available page range from the beginning or end of memory ULONG MmFindAvailablePagesBeforePage(PVOID PageLookupTable, ULONG TotalPageCount, ULONG PagesNeeded, ULONG LastPage); // Returns the page number of the first available page range before the specified page -VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount); // Removes entries in the memory map that describe memory above 4G VOID MmUpdateLastFreePageHint(PVOID PageLookupTable, ULONG TotalPageCount); // Sets the LastFreePageHint to the last usable page of memory BOOLEAN MmAreMemoryPagesAvailable(PVOID PageLookupTable, ULONG TotalPageCount, PVOID PageAddress, ULONG PageCount); // Returns TRUE if the specified pages of memory are available, otherwise FALSE VOID MmSetMemoryType(PVOID MemoryAddress, ULONG MemorySize, TYPE_OF_MEMORY NewType); // Use with EXTREME caution! Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -36,7 +36,6 @@ #undef MachVideoSync #undef MachBeep #undef MachPrepareForReactOS -#undef MachGetMemoryMap #undef MachDiskGetBootVolume #undef MachDiskGetSystemVolume #undef MachDiskGetBootPath @@ -153,10 +152,176 @@ MachVtbl.PrepareForReactOS(Setup); } -ULONG -MachGetMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize) -{ - return MachVtbl.GetMemoryMap(BiosMemoryMap, MaxMemoryMapSize); +typedef struct +{ + MEMORY_DESCRIPTOR m; + ULONG Index; + BOOLEAN GeneratedDescriptor; +} MEMORY_DESCRIPTOR_INT; +static const MEMORY_DESCRIPTOR_INT MemoryDescriptors[] = +{ +#if defined (__i386__) || defined (_M_AMD64) + { { MemoryFirmwarePermanent, 0x00, 1 }, 0, }, // realmode int vectors + { { MemoryFirmwareTemporary, 0x01, 7 }, 1, }, // freeldr stack + cmdline + { { MemoryLoadedProgram, 0x08, 0x70 }, 2, }, // freeldr image (roughly max. 0x64 pages) + { { MemorySpecialMemory, 0x78, 8 }, 3, }, // prot mode stack. BIOSCALLBUFFER + { { MemoryFirmwareTemporary, 0x80, 0x10 }, 4, }, // File system read buffer. FILESYSBUFFER + { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER + { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video + { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory +#elif __arm__ + { { MemoryFirmwarePermanent, 0x00, 1 }, 0, }, // arm exception handlers + { { MemoryFirmwareTemporary, 0x01, 7 }, 1, }, // arm board block + freeldr stack + cmdline + { { MemoryLoadedProgram, 0x08, 0x70 }, 2, }, // freeldr image (roughly max. 0x64 pages) +#endif +}; +MEMORY_DESCRIPTOR* +ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current) +{ + MEMORY_DESCRIPTOR_INT* CurrentDescriptor; + BIOS_MEMORY_MAP BiosMemoryMap[32]; + static ULONG BiosMemoryMapEntryCount; + static MEMORY_DESCRIPTOR_INT BiosMemoryDescriptors[32]; + static BOOLEAN MemoryMapInitialized = FALSE; + ULONG i, j; + + // + // Does machine provide an override for this function? + // + if (MachVtbl.GetMemoryDescriptor) + { + // + // Yes. Use it instead + // + return MachVtbl.GetMemoryDescriptor(Current); + } + + // + // Check if it is the first time we're called + // + if (!MemoryMapInitialized) + { + // + // Get the machine generated memory map + // + RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); + BiosMemoryMapEntryCount = MachVtbl.GetMemoryMap(BiosMemoryMap, + sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); + + // + // Copy the entries to our structure + // + for (i = 0, j = 0; i < BiosMemoryMapEntryCount; i++) + { + // + // Is it suitable memory? + // + if (BiosMemoryMap[i].Type != BiosMemoryUsable) + { + // + // No. Process next descriptor + // + continue; + } + + // + // Copy this memory descriptor + // + BiosMemoryDescriptors[j].m.MemoryType = MemoryFree; + BiosMemoryDescriptors[j].m.BasePage = BiosMemoryMap[i].BaseAddress / MM_PAGE_SIZE; + BiosMemoryDescriptors[j].m.PageCount = BiosMemoryMap[i].Length / MM_PAGE_SIZE; + BiosMemoryDescriptors[j].Index = j; + BiosMemoryDescriptors[j].GeneratedDescriptor = TRUE; + j++; + } + + // + // Remember how much descriptors we found + // + BiosMemoryMapEntryCount = j; + + // + // Mark memory map as already retrieved and initialized + // + MemoryMapInitialized = TRUE; + } + + CurrentDescriptor = CONTAINING_RECORD(Current, MEMORY_DESCRIPTOR_INT, m); + + if (Current == NULL) + { + // + // First descriptor requested + // + if (BiosMemoryMapEntryCount > 0) + { + // + // Return first generated memory descriptor + // + return &BiosMemoryDescriptors[0].m; + } + else if (sizeof(MemoryDescriptors) > 0) + { + // + // Return first fixed memory descriptor + // + return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[0].m; + } + else + { + // + // Strange case, we have no memory descriptor + // + return NULL; + } + } + else if (CurrentDescriptor->GeneratedDescriptor) + { + // + // Current entry is a generated descriptor + // + if (CurrentDescriptor->Index + 1 < BiosMemoryMapEntryCount) + { + // + // Return next generated descriptor + // + return &BiosMemoryDescriptors[CurrentDescriptor->Index + 1].m; + } + else if (sizeof(MemoryDescriptors) > 0) + { + // + // Return first fixed memory descriptor + // + return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[0].m; + } + else + { + // + // No fixed memory descriptor; end of memory map + // + return NULL; + } + } + else + { + // + // Current entry is a fixed descriptor + // + if (CurrentDescriptor->Index + 1 < sizeof(MemoryDescriptors) / sizeof(MemoryDescriptors[0])) + { + // + // Return next fixed descriptor + // + return (MEMORY_DESCRIPTOR*)&MemoryDescriptors[CurrentDescriptor->Index + 1].m; + } + else + { + // + // No more fixed memory descriptor; end of memory map + // + return NULL; + } + } } BOOLEAN Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -1,6 +1,7 @@ /* * FreeLoader * Copyright (C) 2006-2008 Aleksey Bragin <aleksey(a)reactos.org> + * Copyright (C) 2006-2009 Hervé Poussineau <hpoussin(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,19 +24,24 @@ #ifdef DBG typedef struct { - ULONG Type; - UCHAR TypeString[20]; + MEMORY_TYPE Type; + PCSTR TypeString; } FREELDR_MEMORY_TYPE, *PFREELDR_MEMORY_TYPE; -ULONG MemoryTypeCount = 5; -FREELDR_MEMORY_TYPE MemoryTypeArray[] = -{ - { 0, "Unknown Memory" }, - { BiosMemoryUsable, "Usable Memory" }, - { BiosMemoryReserved, "Reserved Memory" }, - { BiosMemoryAcpiReclaim, "ACPI Reclaim Memory" }, - { BiosMemoryAcpiNvs, "ACPI NVS Memory" }, +FREELDR_MEMORY_TYPE MemoryTypeArray[] = +{ + { MemoryMaximum, "Unknown memory" }, + { MemoryExceptionBlock, "Exception block" }, + { MemorySystemBlock, "System block" }, + { MemoryFree, "Free memory" }, + { MemoryBad, "Bad memory" }, + { MemoryLoadedProgram, "Loaded program" }, + { MemoryFirmwareTemporary, "Firmware temporary" }, + { MemoryFirmwarePermanent, "Firmware permanent" }, + { MemoryFreeContiguous, "Free contiguous memory" }, + { MemorySpecialMemory, "Special memory" }, }; +ULONG MemoryTypeCount = sizeof(MemoryTypeArray) / sizeof(MemoryTypeArray[0]); #endif PVOID PageLookupTableAddress = NULL; @@ -48,39 +54,27 @@ BOOLEAN MmInitializeMemoryManager(VOID) { - BIOS_MEMORY_MAP BiosMemoryMap[32]; - ULONG BiosMemoryMapEntryCount; #ifdef DBG - ULONG Index; + MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; #endif DPRINTM(DPRINT_MEMORY, "Initializing Memory Manager.\n"); - - RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); - - BiosMemoryMapEntryCount = MachGetMemoryMap(BiosMemoryMap, sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); #ifdef DBG // Dump the system memory map - if (BiosMemoryMapEntryCount != 0) - { - DPRINTM(DPRINT_MEMORY, "System Memory Map (Base Address, Length, Type):\n"); - for (Index=0; Index<BiosMemoryMapEntryCount; Index++) - { - DPRINTM(DPRINT_MEMORY, "%x%x\t %x%x\t %s\n", BiosMemoryMap[Index].BaseAddress, BiosMemoryMap[Index].Length, MmGetSystemMemoryMapTypeString(BiosMemoryMap[Index].Type)); - } + DPRINTM(DPRINT_MEMORY, "System Memory Map (Base Address, Length, Type):\n"); + while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) + { + DPRINTM(DPRINT_MEMORY, "%x\t %x\t %s\n", + MemoryDescriptor->BasePage * MM_PAGE_SIZE, + MemoryDescriptor->PageCount * MM_PAGE_SIZE, + MmGetSystemMemoryMapTypeString(MemoryDescriptor->MemoryType)); } #endif - // If we got the system memory map then fixup invalid entries - if (BiosMemoryMapEntryCount != 0) - { - MmFixupSystemMemoryMap(BiosMemoryMap, &BiosMemoryMapEntryCount); - } - // Find address for the page lookup table - TotalPagesInLookupTable = MmGetAddressablePageCountIncludingHoles(BiosMemoryMap, BiosMemoryMapEntryCount); - PageLookupTableAddress = MmFindLocationForPageLookupTable(BiosMemoryMap, BiosMemoryMapEntryCount); + TotalPagesInLookupTable = MmGetAddressablePageCountIncludingHoles(); + PageLookupTableAddress = MmFindLocationForPageLookupTable(TotalPagesInLookupTable); LastFreePageHint = TotalPagesInLookupTable; if (PageLookupTableAddress == 0) @@ -93,24 +87,8 @@ } // Initialize the page lookup table - MmInitPageLookupTable(PageLookupTableAddress, TotalPagesInLookupTable, BiosMemoryMap, BiosMemoryMapEntryCount); + MmInitPageLookupTable(PageLookupTableAddress, TotalPagesInLookupTable); MmUpdateLastFreePageHint(PageLookupTableAddress, TotalPagesInLookupTable); - - // Add machine-dependent stuff -#if defined (__i386__) || defined (_M_AMD64) - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x00, 1, LoaderFirmwarePermanent); // realmode int vectors - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x01, 7, LoaderFirmwareTemporary); // freeldr stack + cmdline - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x08, 0x70, LoaderLoadedProgram); // freeldr image (roughly max. 0x64 pages) - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x78, 8, LoaderOsloaderStack); // prot mode stack. BIOSCALLBUFFER - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x80, 0x10, LoaderOsloaderHeap); // File system read buffer. FILESYSBUFFER - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x90, 0x10, LoaderOsloaderHeap); // Disk read buffer for int 13h. DISKREADBUFFER - MmMarkPagesInLookupTable(PageLookupTableAddress, 0xA0, 0x60, LoaderFirmwarePermanent); // ROM / Video - MmMarkPagesInLookupTable(PageLookupTableAddress, 0xFFF, 1, LoaderSpecialMemory); // unusable memory -#elif __arm__ - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x00, 1, LoaderFirmwarePermanent); // arm exception handlers - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x01, 7, LoaderFirmwareTemporary); // arm board block + freeldr stack + cmdline - MmMarkPagesInLookupTable(PageLookupTableAddress, 0x08, 0x70, LoaderLoadedProgram); // freeldr image (roughly max. 0x64 pages) -#endif FreePagesInLookupTable = MmCountFreePagesInLookupTable(PageLookupTableAddress, TotalPagesInLookupTable); @@ -151,7 +129,7 @@ } #ifdef DBG -PUCHAR MmGetSystemMemoryMapTypeString(ULONG Type) +PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type) { ULONG Index; @@ -172,165 +150,157 @@ return ((ULONG_PTR)Address) / MM_PAGE_SIZE; } -PVOID MmGetEndAddressOfAnyMemory(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount) -{ - ULONGLONG MaxStartAddressSoFar; - ULONGLONG EndAddressOfMemory; - ULONG Index; - - MaxStartAddressSoFar = 0; - EndAddressOfMemory = 0; - for (Index=0; Index<MapCount; Index++) - { - if (MaxStartAddressSoFar <= BiosMemoryMap[Index].BaseAddress) - { - MaxStartAddressSoFar = BiosMemoryMap[Index].BaseAddress; - EndAddressOfMemory = (MaxStartAddressSoFar + BiosMemoryMap[Index].Length); - if (EndAddressOfMemory > 0xFFFFFFFF) - { - EndAddressOfMemory = 0xFFFFFFFF; - } - } - } - - DPRINTM(DPRINT_MEMORY, "MmGetEndAddressOfAnyMemory() returning 0x%x\n", (ULONG)EndAddressOfMemory); - - return (PVOID)(ULONG_PTR)EndAddressOfMemory; -} - -ULONG MmGetAddressablePageCountIncludingHoles(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount) -{ - ULONG PageCount; - ULONGLONG EndAddress; - - EndAddress = (ULONGLONG)(ULONG_PTR)MmGetEndAddressOfAnyMemory(BiosMemoryMap, MapCount); - - // Since MmGetEndAddressOfAnyMemory() won't - // return addresses higher than 0xFFFFFFFF - // then we need to adjust the end address - // to 0x100000000 so we don't get an - // off-by-one error - if (EndAddress >= 0xFFFFFFFF) - { - EndAddress = 0x100000000LL; - - DPRINTM(DPRINT_MEMORY, "MmGetEndAddressOfAnyMemory() returned 0xFFFFFFFF, correcting to be 0x100000000.\n"); - } - - PageCount = (EndAddress / MM_PAGE_SIZE); - - DPRINTM(DPRINT_MEMORY, "MmGetAddressablePageCountIncludingHoles() returning %d\n", PageCount); - - return PageCount; -} - -PVOID MmFindLocationForPageLookupTable(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount) -{ - ULONG TotalPageCount; - ULONG PageLookupTableSize; - PVOID PageLookupTableMemAddress; - int Index; - BIOS_MEMORY_MAP TempBiosMemoryMap[32]; - - TotalPageCount = MmGetAddressablePageCountIncludingHoles(BiosMemoryMap, MapCount); - PageLookupTableSize = TotalPageCount * sizeof(PAGE_LOOKUP_TABLE_ITEM); - PageLookupTableMemAddress = 0; - - RtlCopyMemory(TempBiosMemoryMap, BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); - MmSortBiosMemoryMap(TempBiosMemoryMap, MapCount); - - // Find a place, starting from the highest memory - // (thus leaving low memory for kernel/drivers) - for (Index=(MapCount-1); Index>=0; Index--) - { - // If this is usable memory with a big enough length - // then we'll put our page lookup table here - - // skip if this is not usable region - if (TempBiosMemoryMap[Index].Type != BiosMemoryUsable) - continue; - - if (TempBiosMemoryMap[Index].Length >= PageLookupTableSize) - { - PageLookupTableMemAddress = (PVOID)(ULONG_PTR) - (TempBiosMemoryMap[Index].BaseAddress + (TempBiosMemoryMap[Index].Length - PageLookupTableSize)); - break; - } - } - - DPRINTM(DPRINT_MEMORY, "MmFindLocationForPageLookupTable() returning 0x%x\n", PageLookupTableMemAddress); - - return PageLookupTableMemAddress; -} - -VOID MmSortBiosMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount) -{ - ULONG Index; - ULONG LoopCount; - BIOS_MEMORY_MAP TempMapItem; - - // Loop once for each entry in the memory map minus one - // On each loop iteration go through and sort the memory map - for (LoopCount=0; LoopCount<(MapCount-1); LoopCount++) - { - for (Index=0; Index<(MapCount-1); Index++) - { - if (BiosMemoryMap[Index].BaseAddress > BiosMemoryMap[Index+1].BaseAddress) - { - TempMapItem = BiosMemoryMap[Index]; - BiosMemoryMap[Index] = BiosMemoryMap[Index+1]; - BiosMemoryMap[Index+1] = TempMapItem; - } - } - } -} - -VOID MmInitPageLookupTable(PVOID PageLookupTable, ULONG TotalPageCount, PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MapCount) -{ - ULONG MemoryMapStartPage; - ULONG MemoryMapEndPage; - ULONG MemoryMapPageCount; - ULONG MemoryMapPageAllocated; - ULONG PageLookupTableStartPage; - ULONG PageLookupTablePageCount; - ULONG Index; - - DPRINTM(DPRINT_MEMORY, "MmInitPageLookupTable()\n"); - - // Mark every page as allocated initially - // We will go through and mark pages again according to the memory map - // But this will mark any holes not described in the map as allocated - MmMarkPagesInLookupTable(PageLookupTable, 0, TotalPageCount, LoaderFirmwarePermanent); - - for (Index=0; Index<MapCount; Index++) - { - MemoryMapStartPage = MmGetPageNumberFromAddress((PVOID)(ULONG_PTR)BiosMemoryMap[Index].BaseAddress); - MemoryMapEndPage = MmGetPageNumberFromAddress((PVOID)(ULONG_PTR)(BiosMemoryMap[Index].BaseAddress + BiosMemoryMap[Index].Length - 1)); - MemoryMapPageCount = (MemoryMapEndPage - MemoryMapStartPage) + 1; - - switch (BiosMemoryMap[Index].Type) - { - case BiosMemoryUsable: - MemoryMapPageAllocated = LoaderFree; - break; - - case BiosMemoryAcpiReclaim: - case BiosMemoryAcpiNvs: - MemoryMapPageAllocated = LoaderSpecialMemory; - break; - - default: - MemoryMapPageAllocated = LoaderSpecialMemory; - } - DPRINTM(DPRINT_MEMORY, "Marking pages as type %d: StartPage: %d PageCount: %d\n", MemoryMapPageAllocated, MemoryMapStartPage, MemoryMapPageCount); - MmMarkPagesInLookupTable(PageLookupTable, MemoryMapStartPage, MemoryMapPageCount, MemoryMapPageAllocated); - } - - // Mark the pages that the lookup table occupies as reserved - PageLookupTableStartPage = MmGetPageNumberFromAddress(PageLookupTable); - PageLookupTablePageCount = MmGetPageNumberFromAddress((PVOID)((ULONG_PTR)PageLookupTable + ROUND_UP(TotalPageCount * sizeof(PAGE_LOOKUP_TABLE_ITEM), MM_PAGE_SIZE))) - PageLookupTableStartPage; - DPRINTM(DPRINT_MEMORY, "Marking the page lookup table pages as reserved StartPage: %d PageCount: %d\n", PageLookupTableStartPage, PageLookupTablePageCount); - MmMarkPagesInLookupTable(PageLookupTable, PageLookupTableStartPage, PageLookupTablePageCount, LoaderFirmwareTemporary); +ULONG MmGetAddressablePageCountIncludingHoles(VOID) +{ + MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + ULONG EndPage = 0; + + // + // Go through the whole memory map to get max address + // + while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) + { + // + // Check if we got a higher end page address + // + if (MemoryDescriptor->BasePage + MemoryDescriptor->PageCount > EndPage) + { + // + // Yes, remember it + // + EndPage = MemoryDescriptor->BasePage + MemoryDescriptor->PageCount; + } + } + + DPRINTM(DPRINT_MEMORY, "MmGetAddressablePageCountIncludingHoles() returning 0x%x\n", EndPage); + + return EndPage; +} + +PVOID MmFindLocationForPageLookupTable(ULONG TotalPageCount) +{ + MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + ULONG PageLookupTableSize; + ULONG PageLookupTablePages; + ULONG PageLookupTableStartPage = 0; + PVOID PageLookupTableMemAddress = NULL; + + // + // Calculate how much pages we need to keep the page lookup table + // + PageLookupTableSize = TotalPageCount * sizeof(PAGE_LOOKUP_TABLE_ITEM); + PageLookupTablePages = PageLookupTableSize / MM_PAGE_SIZE; + + // + // Search the highest memory block big enough to contain lookup table + // + while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) + { + // + // Is it suitable memory? + // + if (MemoryDescriptor->MemoryType != MemoryFree) + { + // + // No. Process next descriptor + // + continue; + } + + // + // Is the block big enough? + // + if (MemoryDescriptor->PageCount < PageLookupTablePages) + { + // + // No. Process next descriptor + // + continue; + } + + // + // Is it at a higher address than previous suitable address? + // + if (MemoryDescriptor->BasePage < PageLookupTableStartPage) + { + // + // No. Process next descriptor + // + continue; + } + + // + // Memory block is more suitable than the previous one + // + PageLookupTableStartPage = MemoryDescriptor->BasePage; + PageLookupTableMemAddress = (PVOID)((ULONG_PTR) + (MemoryDescriptor->BasePage + MemoryDescriptor->PageCount) * MM_PAGE_SIZE + - PageLookupTableSize); + } + + DPRINTM(DPRINT_MEMORY, "MmFindLocationForPageLookupTable() returning 0x%x\n", PageLookupTableMemAddress); + + return PageLookupTableMemAddress; +} + +VOID MmInitPageLookupTable(PVOID PageLookupTable, ULONG TotalPageCount) +{ + MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; + TYPE_OF_MEMORY MemoryMapPageAllocated; + ULONG PageLookupTableStartPage; + ULONG PageLookupTablePageCount; + + DPRINTM(DPRINT_MEMORY, "MmInitPageLookupTable()\n"); + + // + // Mark every page as allocated initially + // We will go through and mark pages again according to the memory map + // But this will mark any holes not described in the map as allocated + // + MmMarkPagesInLookupTable(PageLookupTable, 0, TotalPageCount, LoaderFirmwarePermanent); + + // + // Parse the whole memory map + // + while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) + { + // + // Convert ARC memory type to loader memory type + // + switch (MemoryDescriptor->MemoryType) + { + case MemoryFree: + { + // + // Allocatable memory + // + MemoryMapPageAllocated = LoaderFree; + break; + } + default: + { + // + // Put something sensible here, which won't be overwritten + // + MemoryMapPageAllocated = LoaderSpecialMemory; + break; + } + } + + // + // Mark used pages in the lookup table + // + DPRINTM(DPRINT_MEMORY, "Marking pages as type %d: StartPage: %d PageCount: %d\n", MemoryMapPageAllocated, MemoryDescriptor->BasePage, MemoryDescriptor->PageCount); + MmMarkPagesInLookupTable(PageLookupTable, MemoryDescriptor->BasePage, MemoryDescriptor->PageCount, MemoryMapPageAllocated); + } + + // + // Mark the pages that the lookup table occupies as reserved + // + PageLookupTableStartPage = MmGetPageNumberFromAddress(PageLookupTable); + PageLookupTablePageCount = MmGetPageNumberFromAddress((PVOID)((ULONG_PTR)PageLookupTable + ROUND_UP(TotalPageCount * sizeof(PAGE_LOOKUP_TABLE_ITEM), MM_PAGE_SIZE))) - PageLookupTableStartPage; + DPRINTM(DPRINT_MEMORY, "Marking the page lookup table pages as reserved StartPage: %d PageCount: %d\n", PageLookupTableStartPage, PageLookupTablePageCount); + MmMarkPagesInLookupTable(PageLookupTable, PageLookupTableStartPage, PageLookupTablePageCount, LoaderFirmwareTemporary); } VOID MmMarkPagesInLookupTable(PVOID PageLookupTable, ULONG StartPage, ULONG PageCount, TYPE_OF_MEMORY PageAllocated) @@ -474,30 +444,6 @@ return 0; } -VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount) -{ - UINT32 Index; - UINT32 Index2; - - // Loop through each entry in the array - for (Index=0; Index<*MapCount; Index++) - { - // If the entry type isn't usable then remove - // it from the memory map (this will help reduce - // the size of our lookup table) - if (BiosMemoryMap[Index].Type != BiosMemoryUsable) - { - // Slide every entry after this down one - for (Index2=Index; Index2<(*MapCount - 1); Index2++) - { - BiosMemoryMap[Index2] = BiosMemoryMap[Index2 + 1]; - } - (*MapCount)--; - Index--; - } - } -} - VOID MmUpdateLastFreePageHint(PVOID PageLookupTable, ULONG TotalPageCount) { PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTable; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -642,7 +642,7 @@ LoaderBlock.DrivesAddr = reactos_arc_disk_info; LoaderBlock.RdAddr = (ULONG_PTR)gRamDiskBase; LoaderBlock.RdLength = gRamDiskSize; - LoaderBlock.MmapLength = (SIZE_T)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); + LoaderBlock.MmapLength = (SIZE_T)MachVtbl.GetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { ULONG i; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -72,7 +72,7 @@ LoaderBlock.PageDirectoryEnd = (ULONG_PTR)&PageDirectoryEnd; LoaderBlock.ModsCount = 0; LoaderBlock.ModsAddr = reactos_modules; - LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); + LoaderBlock.MmapLength = (unsigned long)MachVtbl.GetMemoryMap((PBIOS_MEMORY_MAP)reactos_memory_map, 32) * sizeof(memory_map_t); if (LoaderBlock.MmapLength) { #if defined (_M_IX86) || defined (_M_AMD64) Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Mon Apr 27 00:22:16 2009 @@ -269,7 +269,7 @@ CHAR ProgressString[256]; /* Inform user we are loading files */ - sprintf(ProgressString, "Loading %s...", FileName); + sprintf(ProgressString, "Loading %s...", strchr(FileName, '\\') + 1); UiDrawProgressBarCenter(1, 100, ProgressString); /* Open the image file */

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