Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[ros-arm-bringup] 41506: - Get rid of MmPageArray and MmPageArraySize since these were defined as just being ReactOS-specific clones of MmPfnDatabase and MmHighestPhysicalPage. Ergo, use the latter in relevant places.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 21 08:14:49 2009 New Revision: 41506 URL: http://svn.reactos.org/svn/reactos?rev=41506&view=rev Log: - Get rid of MmPageArray and MmPageArraySize since these were defined as just being ReactOS-specific clones of MmPfnDatabase and MmHighestPhysicalPage. Ergo, use the latter in relevant places. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mdlsup.c trunk/reactos/ntoskrnl/mm/mminit.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] Sun Jun 21 08:14:49 2009 @@ -21,7 +21,6 @@ extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; extern ULONG MmHighestPhysicalPage; -extern PVOID MmPfnDatabase; struct _KTRAP_FRAME; struct _EPROCESS; @@ -352,9 +351,7 @@ } u4; } MMPFN, *PMMPFN; -extern PMMPFN MmPageArray; -extern ULONG MmPageArraySize; - +extern PMMPFN MmPfnDatabase; extern MM_STATS MmStats; typedef struct _MM_PAGEOP @@ -1041,10 +1038,10 @@ PMMPFN Page; /* Make sure the PFN number is valid */ - if (Pfn > MmPageArraySize) return NULL; + if (Pfn > MmHighestPhysicalPage) return NULL; /* Get the entry */ - Page = &MmPageArray[Pfn]; + Page = &MmPfnDatabase[Pfn]; /* Make sure it's valid */ ASSERT_PFN(Page); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sun Jun 21 08:14:49 2009 @@ -48,8 +48,8 @@ #define PHYSICAL_PAGE MMPFN #define PPHYSICAL_PAGE PMMPFN -PPHYSICAL_PAGE MmPageArray; -ULONG MmPageArraySize; +PPHYSICAL_PAGE MmPfnDatabase; +ULONG MmHighestPhysicalPage; /* List of pages allocated to the MC_USER Consumer */ static LIST_ENTRY UserPageListHead; @@ -84,7 +84,7 @@ PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); ASSERT_PFN(PageDescriptor); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - return PageDescriptor - MmPageArray; + return PageDescriptor - MmPfnDatabase; } VOID @@ -123,7 +123,7 @@ } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - return PageDescriptor - MmPageArray; + return PageDescriptor - MmPfnDatabase; } VOID @@ -152,7 +152,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - last = min(HighestAcceptableAddress.LowPart / PAGE_SIZE, MmPageArraySize - 1); + last = min(HighestAcceptableAddress.LowPart / PAGE_SIZE, MmHighestPhysicalPage - 1); boundary = BoundaryAddressMultiple.LowPart / PAGE_SIZE; for (j = 0; j < 2; j++) @@ -204,7 +204,7 @@ PPHYSICAL_PAGE Page; Page = MiGetPfnEntry(i); RemoveEntryList(&Page->ListEntry); - if (MmPageArray[i].Flags.Zero == 0) + if (MmPfnDatabase[i].Flags.Zero == 0) { UnzeroedPageCount--; } @@ -268,14 +268,12 @@ InitializeListHead(&FreeZeroedPageListHead); /* Set the size and start of the PFN Database */ - MmPageArray = (PHYSICAL_PAGE *)MmPfnDatabase; - MmPageArraySize = MmHighestPhysicalPage; - Reserved = PAGE_ROUND_UP((MmPageArraySize * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; + Reserved = PAGE_ROUND_UP((MmHighestPhysicalPage * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; /* Loop every page required to hold the PFN database */ for (i = 0; i < Reserved; i++) { - PVOID Address = (char*)MmPageArray + (i * PAGE_SIZE); + PVOID Address = (char*)MmPfnDatabase + (i * PAGE_SIZE); /* Check if FreeLDR has already allocated it for us */ if (!MmIsPagePresent(NULL, Address)) @@ -302,7 +300,7 @@ } /* Clear the PFN database */ - RtlZeroMemory(MmPageArray, (MmPageArraySize + 1) * sizeof(PHYSICAL_PAGE)); + RtlZeroMemory(MmPfnDatabase, (MmHighestPhysicalPage + 1) * sizeof(PHYSICAL_PAGE)); /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); @@ -333,11 +331,11 @@ for (i = 0; i < Md->PageCount; i++) { /* Skip memory we ignore completely */ - if ((Md->BasePage + i) > MmPageArraySize) break; + if ((Md->BasePage + i) > MmHighestPhysicalPage) break; /* These are pages reserved by the BIOS/ROMs */ - MmPageArray[Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPageArray[Md->BasePage + i].Flags.Consumer = MC_NPPOOL; + MmPfnDatabase[Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; + MmPfnDatabase[Md->BasePage + i].Flags.Consumer = MC_NPPOOL; MmStats.NrSystemPages++; } } @@ -350,9 +348,9 @@ for (i = 0; i < Md->PageCount; i++) { /* Mark it as a free page */ - MmPageArray[Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_FREE; + MmPfnDatabase[Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_FREE; InsertTailList(&FreeUnzeroedPageListHead, - &MmPageArray[Md->BasePage + i].ListEntry); + &MmPfnDatabase[Md->BasePage + i].ListEntry); UnzeroedPageCount++; MmStats.NrFreePages++; } @@ -363,7 +361,7 @@ for (i = 0; i < Md->PageCount; i++) { /* Everything else is used memory */ - MmPageArray[Md->BasePage + i] = UsedPage; + MmPfnDatabase[Md->BasePage + i] = UsedPage; MmStats.NrSystemPages++; } } @@ -375,10 +373,10 @@ i++) { /* Ensure this page was not added previously */ - ASSERT(MmPageArray[i].Flags.Type == 0); + ASSERT(MmPfnDatabase[i].Flags.Type == 0); /* Mark it as used kernel memory */ - MmPageArray[i] = UsedPage; + MmPfnDatabase[i] = UsedPage; MmStats.NrSystemPages++; } @@ -421,7 +419,7 @@ KIRQL oldIrql; PPHYSICAL_PAGE Page; - if (Pfn <= MmPageArraySize) + if (Pfn <= MmHighestPhysicalPage) { oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); @@ -443,7 +441,7 @@ KIRQL oldIrql; PPHYSICAL_PAGE Page; - if (Pfn <= MmPageArraySize) + if (Pfn <= MmHighestPhysicalPage) { oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); @@ -497,7 +495,7 @@ DPRINT("MmReferencePageUnsafe(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); - if (Pfn == 0 || Pfn > MmPageArraySize) + if (Pfn == 0 || Pfn > MmHighestPhysicalPage) { return; } @@ -778,7 +776,7 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - PfnOffset = PageDescriptor - MmPageArray; + PfnOffset = PageDescriptor - MmPfnDatabase; if (NeedClear) { MiZeroPage(PfnOffset); @@ -822,16 +820,16 @@ if ((HighestAddress.u.LowPart % PAGE_SIZE) != 0) HighestPage++; - if (LowestPage >= MmPageArraySize) + if (LowestPage >= MmHighestPhysicalPage) { DPRINT1("MmAllocPagesSpecifyRange(): Out of memory\n"); return -1; } - if (HighestPage > MmPageArraySize) - HighestPage = MmPageArraySize; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - if (LowestPage == 0 && HighestPage == MmPageArraySize) + if (HighestPage > MmHighestPhysicalPage) + HighestPage = MmHighestPhysicalPage; + + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + if (LowestPage == 0 && HighestPage == MmHighestPhysicalPage) { PLIST_ENTRY ListEntry; while (NumberOfPagesFound < NumberOfPages) @@ -876,7 +874,7 @@ MmStats.NrFreePages--; /* Remember the page */ - pfn = PageDescriptor - MmPageArray; + pfn = PageDescriptor - MmPfnDatabase; Pages[NumberOfPagesFound++] = pfn; if(Consumer == MC_USER) MmInsertLRULastUserPage(pfn); } @@ -888,7 +886,7 @@ { for (pfn = LowestPage; pfn < HighestPage; pfn++) { - PageDescriptor = MmPageArray + pfn; + PageDescriptor = MmPfnDatabase + pfn; if (PageDescriptor->Flags.Type != MM_PHYSICAL_PAGE_FREE) continue; @@ -1000,7 +998,7 @@ /* We set the page to used, because MmCreateVirtualMapping failed with unused pages */ PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - Pfn = PageDescriptor - MmPageArray; + Pfn = PageDescriptor - MmPfnDatabase; Status = MiZeroPageInternal(Pfn); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); 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] Sun Jun 21 08:14:49 2009 @@ -26,7 +26,6 @@ RTL_BITMAP MiMdlMappingRegionAllocMap; ULONG MiMdlMappingRegionHint; KSPIN_LOCK MiMdlMappingRegionLock; -extern ULONG MmPageArraySize; /* PRIVATE FUNCTIONS **********************************************************/ @@ -418,7 +417,7 @@ /* Check if this is an MDL in I/O Space */ if (Mdl->StartVa >= MmSystemRangeStart && - MmGetPfnForProcess(NULL, Mdl->StartVa) >= MmPageArraySize) + MmGetPfnForProcess(NULL, Mdl->StartVa) >= MmHighestPhysicalPage) { /* Just loop each page */ for (i = 0; i < NrPages; i++) @@ -521,7 +520,7 @@ for (j = 0; j < i; j++) { Page = MdlPages[j]; - if (Page < MmPageArraySize) + if (Page < MmHighestPhysicalPage) { MmUnlockPage(Page); MmDereferencePage(Page); @@ -532,7 +531,7 @@ } Page = MmGetPfnForProcess(NULL, Address); MdlPages[i] = Page; - if (Page >= MmPageArraySize) + if (Page >= MmHighestPhysicalPage) { Mdl->MdlFlags |= MDL_IO_SPACE; } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Jun 21 08:14:49 2009 @@ -53,7 +53,6 @@ ULONG MmBootImageSize; ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; ULONG_PTR MiKSeg0Start, MiKSeg0End; -PVOID MmPfnDatabase; ULONG_PTR MmPfnDatabaseEnd; PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg;

15 years, 4 months

[ros-arm-bringup] 41505: - It is very possible for MiGetPfnEntry to be called for a page above the page array size, since not all pages are represented in the array. In this scenario, MiGetPfnEntry should return NULL (and the caller should be prepared for this scenario). - Also move out the extern definitions outside of the inline, so that other functions may access them and consequently removing a needless UNREFERENCED_PARAMETER.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 21 08:09:25 2009 New Revision: 41505 URL: http://svn.reactos.org/svn/reactos?rev=41505&view=rev Log: - It is very possible for MiGetPfnEntry to be called for a page above the page array size, since not all pages are represented in the array. In this scenario, MiGetPfnEntry should return NULL (and the caller should be prepared for this scenario). - Also move out the extern definitions outside of the inline, so that other functions may access them and consequently removing a needless UNREFERENCED_PARAMETER. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h 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] Sun Jun 21 08:09:25 2009 @@ -352,6 +352,9 @@ } u4; } MMPFN, *PMMPFN; +extern PMMPFN MmPageArray; +extern ULONG MmPageArraySize; + extern MM_STATS MmStats; typedef struct _MM_PAGEOP @@ -1036,14 +1039,9 @@ MiGetPfnEntry(IN PFN_TYPE Pfn) { PMMPFN Page; - extern PMMPFN MmPageArray; - extern ULONG MmPageArraySize; - - /* Mark MmPageArraySize as unreferenced, otherwise it will appear as an unused variable on a Release build */ - UNREFERENCED_PARAMETER(MmPageArraySize); /* Make sure the PFN number is valid */ - ASSERT(Pfn <= MmPageArraySize); + if (Pfn > MmPageArraySize) return NULL; /* Get the entry */ Page = &MmPageArray[Pfn];

15 years, 4 months

[ros-arm-bringup] 41504: - Add missing flags for MmAllocatePagesForMdlEx.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 21 07:59:23 2009 New Revision: 41504 URL: http://svn.reactos.org/svn/reactos?rev=41504&view=rev Log: - Add missing flags for MmAllocatePagesForMdlEx. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Jun 21 07:59:23 2009 @@ -5182,6 +5182,9 @@ #define MM_KSEG0_BASE MM_SYSTEM_RANGE_START #define MM_SYSTEM_SPACE_END 0xFFFFFFFF + +#define MM_DONT_ZERO_ALLOCATION 0x00000001 +#define MM_ALLOCATE_FROM_LOCAL_NODE_ONLY 0x00000002 #elif defined(__x86_64__)

15 years, 4 months

[ros-arm-bringup] 41503: - Remove MmGetPageFlags and MmSetPageFlags, there are no consumers of these two functions. - Get rid of PHYSICAL_PAGE structure and move to WinNT MMPFN structure instead: - Define a preprocessor legacy mapping so that freelist.c receives only minimal changes: - This mapping allows the old meanings of the PHYSICAL_PAGE fields to remain, but now part of the new MMPFN structure - Other modules (balance.c and mm.h) use the new structure directly, since only 3 lines of code r

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sun Jun 21 07:57:42 2009 New Revision: 41503 URL: http://svn.reactos.org/svn/reactos?rev=41503&view=rev Log: - Remove MmGetPageFlags and MmSetPageFlags, there are no consumers of these two functions. - Get rid of PHYSICAL_PAGE structure and move to WinNT MMPFN structure instead: - Define a preprocessor legacy mapping so that freelist.c receives only minimal changes: - This mapping allows the old meanings of the PHYSICAL_PAGE fields to remain, but now part of the new MMPFN structure - Other modules (balance.c and mm.h) use the new structure directly, since only 3 lines of code required changes. - The NT structure is 8 bytes smaller than the ReactOS structure, which saves about 1MB of physical memory and kernel VA space for each 512MB of RAM, or 25% less. This also enables ReactOS to support 25% more memory than before (64GB instead of 48GB). Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.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] Sun Jun 21 07:57:42 2009 @@ -289,30 +289,68 @@ ULONG PagingRequestsInLastFifteenMinutes; } MM_STATS; -typedef struct _PHYSICAL_PAGE -{ +typedef struct _MMPFNENTRY +{ + USHORT Modified:1; + USHORT ReadInProgress:1; // StartOfAllocation + USHORT WriteInProgress:1; // EndOfAllocation + USHORT PrototypePte:1; // Zero + USHORT PageColor:4; // LockCount + USHORT PageLocation:3; // Consumer + USHORT RemovalRequested:1; + USHORT CacheAttribute:2; // Type + USHORT Rom:1; + USHORT ParityError:1; +} MMPFNENTRY; + +typedef struct _MMPFN +{ + union + { + PFN_NUMBER Flink; // ListEntry.Flink + ULONG WsIndex; + PKEVENT Event; + NTSTATUS ReadStatus; + SINGLE_LIST_ENTRY NextStackPfn; + } u1; + PMMPTE PteAddress; // ListEntry.Blink + union + { + PFN_NUMBER Blink; + ULONG_PTR ShareCount; // MapCount + } u2; union { struct { - ULONG Type: 2; - ULONG Consumer: 3; - ULONG Zero: 1; - ULONG StartOfAllocation: 1; - ULONG EndOfAllocation: 1; - } - Flags; - ULONG AllFlags; + USHORT ReferenceCount; // ReferenceCount + MMPFNENTRY e1; + }; + struct + { + USHORT ReferenceCount; + USHORT ShortFlags; + } e2; + } u3; + union + { + MMPTE OriginalPte; + LONG AweReferenceCount; // RmapListHead }; - - LIST_ENTRY ListEntry; - ULONG ReferenceCount; - SWAPENTRY SavedSwapEntry; - ULONG LockCount; - ULONG MapCount; - struct _MM_RMAP_ENTRY* RmapListHead; -} -PHYSICAL_PAGE, *PPHYSICAL_PAGE; + union + { + ULONG_PTR EntireFrame; // SavedSwapEntry + struct + { + ULONG_PTR PteFrame:25; + ULONG_PTR InPageError:1; + ULONG_PTR VerifierAllocation:1; + ULONG_PTR AweAllocation:1; + ULONG_PTR Priority:3; + ULONG_PTR MustBeCached:1; + }; + } u4; +} MMPFN, *PMMPFN; extern MM_STATS MmStats; @@ -991,14 +1029,14 @@ /* freelist.c **********************************************************/ -#define ASSERT_PFN(x) ASSERT((x)->Flags.Type != 0) +#define ASSERT_PFN(x) ASSERT((x)->u3.e1.CacheAttribute != 0) FORCEINLINE -PPHYSICAL_PAGE +PMMPFN MiGetPfnEntry(IN PFN_TYPE Pfn) { - PPHYSICAL_PAGE Page; - extern PPHYSICAL_PAGE MmPageArray; + PMMPFN Page; + extern PMMPFN MmPageArray; extern ULONG MmPageArraySize; /* Mark MmPageArraySize as unreferenced, otherwise it will appear as an unused variable on a Release build */ @@ -1277,16 +1315,6 @@ BOOLEAN NTAPI MmIsPageInUse(PFN_TYPE Page); - -VOID -NTAPI -MmSetFlagsPage( - PFN_TYPE Page, - ULONG Flags); - -ULONG -NTAPI -MmGetFlagsPage(PFN_TYPE Page); VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sun Jun 21 07:57:42 2009 @@ -277,7 +277,7 @@ KeBugCheck(NO_PAGES_AVAILABLE); } /* Update the Consumer */ - MiGetPfnEntry(Page)->Flags.Consumer = Consumer; + MiGetPfnEntry(Page)->u3.e1.PageLocation = Consumer; if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage = Page; (void)InterlockedDecrementUL(&MiPagesRequired); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sun Jun 21 07:57:42 2009 @@ -27,6 +27,27 @@ /* GLOBALS ****************************************************************/ +// +// +// ReactOS to NT Physical Page Descriptor Entry Legacy Mapping Definitions +// +// REACTOS NT +// +#define Consumer PageLocation +#define Type CacheAttribute +#define Zero PrototypePte +#define LockCount u3.e1.PageColor +#define MapCount u2.ShareCount +#define RmapListHead AweReferenceCount +#define SavedSwapEntry u4.EntireFrame +#define Flags u3.e1 +#define ReferenceCount u3.ReferenceCount +#define RemoveEntryList(x) RemoveEntryList((PLIST_ENTRY)x) +#define InsertTailList(x, y) InsertTailList(x, (PLIST_ENTRY)y) +#define ListEntry u1 +#define PHYSICAL_PAGE MMPFN +#define PPHYSICAL_PAGE PMMPFN + PPHYSICAL_PAGE MmPageArray; ULONG MmPageArraySize; @@ -94,7 +115,7 @@ Page = MiGetPfnEntry(PreviousPfn); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); - NextListEntry = Page->ListEntry.Flink; + NextListEntry = (PLIST_ENTRY)Page->ListEntry.Flink; if (NextListEntry == &UserPageListHead) { KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); @@ -295,10 +316,12 @@ NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; NextEntry = NextEntry->Flink) { +#undef ListEntry /* Get the descriptor */ Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); +#define ListEntry u1 /* Skip bad memory */ if ((Md->MemoryType == LoaderFirmwarePermanent) || @@ -368,23 +391,12 @@ VOID NTAPI -MmSetFlagsPage(PFN_TYPE Pfn, ULONG Flags) -{ - KIRQL oldIrql; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MiGetPfnEntry(Pfn)->AllFlags = Flags; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); -} - -VOID -NTAPI MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead) { KIRQL oldIrql; oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MiGetPfnEntry(Pfn)->RmapListHead = ListHead; + MiGetPfnEntry(Pfn)->RmapListHead = (LONG)ListHead; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -396,7 +408,7 @@ struct _MM_RMAP_ENTRY* ListHead; oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - ListHead = MiGetPfnEntry(Pfn)->RmapListHead; + ListHead = (struct _MM_RMAP_ENTRY*)MiGetPfnEntry(Pfn)->RmapListHead; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(ListHead); @@ -451,29 +463,14 @@ } } -ULONG -NTAPI -MmGetFlagsPage(PFN_TYPE Pfn) -{ - KIRQL oldIrql; - ULONG Flags; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Flags = MiGetPfnEntry(Pfn)->AllFlags; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - - return(Flags); -} - - -VOID -NTAPI -MmSetSavedSwapEntryPage(PFN_TYPE Pfn, SWAPENTRY SavedSwapEntry) -{ - KIRQL oldIrql; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MiGetPfnEntry(Pfn)->SavedSwapEntry = SavedSwapEntry; +VOID +NTAPI +MmSetSavedSwapEntryPage(PFN_TYPE Pfn, SWAPENTRY SwapEntry) +{ + KIRQL oldIrql; + + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + MiGetPfnEntry(Pfn)->SavedSwapEntry = SwapEntry; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -481,14 +478,14 @@ NTAPI MmGetSavedSwapEntryPage(PFN_TYPE Pfn) { - SWAPENTRY SavedSwapEntry; - KIRQL oldIrql; - - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - SavedSwapEntry = MiGetPfnEntry(Pfn)->SavedSwapEntry; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - - return(SavedSwapEntry); + SWAPENTRY SwapEntry; + KIRQL oldIrql; + + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + SwapEntry = MiGetPfnEntry(Pfn)->SavedSwapEntry; + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + + return(SwapEntry); } VOID @@ -591,7 +588,7 @@ MmStats.NrFreePages++; MmStats.NrSystemPages--; if (Page->Flags.Consumer == MC_USER) RemoveEntryList(&Page->ListEntry); - if (Page->RmapListHead != NULL) + if (Page->RmapListHead != (LONG)NULL) { DPRINT1("Freeing page with rmap entries.\n"); KeBugCheck(MEMORY_MANAGEMENT); @@ -636,7 +633,7 @@ MmGetLockCountPage(PFN_TYPE Pfn) { KIRQL oldIrql; - ULONG LockCount; + ULONG CurrentLockCount; PPHYSICAL_PAGE Page; DPRINT("MmGetLockCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); @@ -650,10 +647,10 @@ KeBugCheck(MEMORY_MANAGEMENT); } - LockCount = Page->LockCount; - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - - return(LockCount); + CurrentLockCount = Page->LockCount; + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + + return(CurrentLockCount); } VOID @@ -711,7 +708,7 @@ PFN_TYPE NTAPI -MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry) +MmAllocPage(ULONG Consumer, SWAPENTRY SwapEntry) { PFN_TYPE PfnOffset; PLIST_ENTRY ListEntry; @@ -774,7 +771,7 @@ PageDescriptor->ReferenceCount = 1; PageDescriptor->LockCount = 0; PageDescriptor->MapCount = 0; - PageDescriptor->SavedSwapEntry = SavedSwapEntry; + PageDescriptor->SavedSwapEntry = SwapEntry; MmStats.NrSystemPages++; MmStats.NrFreePages--; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Jun 21 07:57:42 2009 @@ -403,7 +403,7 @@ /* We'll put the PFN array right after the loaded modules */ MmPfnDatabase = (PVOID)MiKSeg0End; - MmPfnDatabaseEnd = (ULONG_PTR)MmPfnDatabase + (MmHighestPhysicalPage * sizeof(PHYSICAL_PAGE)); + MmPfnDatabaseEnd = (ULONG_PTR)MmPfnDatabase + (MmHighestPhysicalPage * sizeof(MMPFN)); MmPfnDatabaseEnd = PAGE_ROUND_UP(MmPfnDatabaseEnd); /*

15 years, 4 months

[tkreuzer] 41502: wdmaud: Make DeviceIndex a ULONG_PTR

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 21 06:23:48 2009 New Revision: 41502 URL: http://svn.reactos.org/svn/reactos?rev=41502&view=rev Log: wdmaud: Make DeviceIndex a ULONG_PTR Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Sun Jun 21 06:23:48 2009 @@ -26,7 +26,7 @@ typedef struct { SOUND_DEVICE_TYPE DeviceType; - ULONG DeviceIndex; + ULONG_PTR DeviceIndex; HANDLE hDevice; ULONG DeviceCount;

15 years, 4 months

[tkreuzer] 41501: Fix uninitialized variable warning.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 21 05:25:57 2009 New Revision: 41501 URL: http://svn.reactos.org/svn/reactos?rev=41501&view=rev Log: Fix uninitialized variable warning. Modified: branches/ros-amd64-bringup/reactos/dll/win32/secur32/sspi.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Sun Jun 21 05:25:57 2009 @@ -100,7 +100,7 @@ ) { SECURITY_STATUS ret; - PSecPkgInfoW info; + PSecPkgInfoW info = {0}; ret = EnumerateSecurityPackagesW(pcPackages, &info); if (ret == SEC_E_OK && *pcPackages && info)

15 years, 4 months

[tkreuzer] 41500: Pass ULONG* to MiniQueryInformation for the number of written bytes instead of ULONG_PTR*

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 21 04:36:29 2009 New Revision: 41500 URL: http://svn.reactos.org/svn/reactos?rev=41500&view=rev Log: Pass ULONG* to MiniQueryInformation for the number of written bytes instead of ULONG_PTR* Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/miniport.c Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Jun 21 04:36:29 2009 @@ -2053,6 +2053,7 @@ PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)DeviceObject->DeviceExtension; PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); NDIS_STATUS Status = STATUS_NOT_SUPPORTED; + ULONG Written; Irp->IoStatus.Information = 0; @@ -2065,7 +2066,8 @@ *(PNDIS_OID)Irp->AssociatedIrp.SystemBuffer, Stack->Parameters.DeviceIoControl.OutputBufferLength, MmGetSystemAddressForMdl(Irp->MdlAddress), - &Irp->IoStatus.Information); + &Written); + Irp->IoStatus.Information = Written; break; default:

15 years, 4 months

[tkreuzer] 41499: reenable the dirty wine hack, but not for amd64!

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 21 04:29:43 2009 New Revision: 41499 URL: http://svn.reactos.org/svn/reactos?rev=41499&view=rev Log: reenable the dirty wine hack, but not for amd64! Modified: branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h [iso-8859-1] Sun Jun 21 04:29:43 2009 @@ -1,9 +1,11 @@ #ifndef _BASETSD_H #define _BASETSD_H +#ifndef _M_AMD64 #if !defined(__ROS_LONG64__) #ifdef __WINESRC__ -//#define __ROS_LONG64__ +#define __ROS_LONG64__ +#endif #endif #endif Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jun 21 04:29:43 2009 @@ -1,9 +1,11 @@ #ifndef _WINNT_H #define _WINNT_H +#ifndef _M_AMD64 #if !defined(__ROS_LONG64__) #ifdef __WINESRC__ -//#define __ROS_LONG64__ <- hack of fail!!! +#define __ROS_LONG64__ +#endif #endif #endif

15 years, 4 months

[janderwald] 41498: - Use interval of 10ms for the periodic timer IPortPinWaveRT - Initialize a periodic timer for IPortPinWavePci - Might fix Vortex AU8820C0 card

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jun 21 04:16:32 2009 New Revision: 41498 URL: http://svn.reactos.org/svn/reactos?rev=41498&view=rev Log: - Use interval of 10ms for the periodic timer IPortPinWaveRT - Initialize a periodic timer for IPortPinWavePci - Might fix Vortex AU8820C0 card Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c 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] Sun Jun 21 04:16:32 2009 @@ -34,6 +34,8 @@ ULONG PreCompleted; ULONG PostCompleted; + ULONG Delay; + }IPortPinWavePciImpl; @@ -136,7 +138,13 @@ { /* reset start stream */ This->IrpQueue->lpVtbl->CancelBuffers(This->IrpQueue); //FIX function name + This->ServiceGroup->lpVtbl->CancelDelayedService(This->ServiceGroup); DPRINT1("Stopping PreCompleted %u PostCompleted %u\n", This->PreCompleted, This->PostCompleted); + } + if (This->State == KSSTATE_RUN) + { + /* start the notification timer */ + This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, This->Delay); } } } @@ -743,6 +751,9 @@ This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); } + /* delay of 10 milisec */ + This->Delay = Int32x32To64(10, -10000); + This->IrpQueue = IPortWavePciStream_GetIrpQueue(This->WaveStream); Status = This->Stream->lpVtbl->GetAllocatorFraming(This->Stream, &AllocatorFraming); @@ -752,9 +763,8 @@ return Status; } - DPRINT("OptionFlags %x RequirementsFlag %x PoolType %x Frames %lu FrameSize %lu FileAlignment %lu\n", - AllocatorFraming.OptionsFlags, AllocatorFraming.RequirementsFlags, AllocatorFraming.PoolType, AllocatorFraming.Frames, AllocatorFraming.FrameSize, AllocatorFraming.FileAlignment); - + DPRINT("OptionFlags %x RequirementsFlag %x PoolType %x Frames %lu FrameSize %lu FileAlignment %lu\n", + AllocatorFraming.OptionsFlags, AllocatorFraming.RequirementsFlags, AllocatorFraming.PoolType, AllocatorFraming.Frames, AllocatorFraming.FrameSize, AllocatorFraming.FileAlignment); Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, AllocatorFraming.FrameSize, AllocatorFraming.FileAlignment); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] Sun Jun 21 04:16:32 2009 @@ -1040,8 +1040,8 @@ goto cleanup; This->Stream->lpVtbl->GetHWLatency(This->Stream, &Latency); - /* minimum delay of 10 milisec */ - This->Delay = Int32x32To64(min(max(Latency.ChipsetDelay + Latency.CodecDelay + Latency.FifoSize, 10), 10), -10000); + /* delay of 10 milisec */ + This->Delay = Int32x32To64(10, -10000); Status = This->Stream->lpVtbl->AllocateAudioBuffer(This->Stream, 16384 * 11, &This->Mdl, &This->CommonBufferSize, &This->CommonBufferOffset, &This->CacheType); if (!NT_SUCCESS(Status))

15 years, 4 months

[janderwald] 41497: - Define private interface IPortWaveRTStreamInit in order to deal with PHYSICAL_ADDRESS as return value - Implement reading/writing into cyclic buffer for IPortPinWaveRT - Allocate an audio buffer when the pin is initialized. This needs to be changed once KSPROPERTY_RTAUDIO_BUFFER is implemented - Fix a bug in PcNewPort - Remove obsolete code from IPortWavePci - Return the allocated MDL from IPortWaveRTStream::AllocateContiguousPagesForMdl - Create a system thread when using

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jun 21 03:37:55 2009 New Revision: 41497 URL: http://svn.reactos.org/svn/reactos?rev=41497&view=rev Log: - Define private interface IPortWaveRTStreamInit in order to deal with PHYSICAL_ADDRESS as return value - Implement reading/writing into cyclic buffer for IPortPinWaveRT - Allocate an audio buffer when the pin is initialized. This needs to be changed once KSPROPERTY_RTAUDIO_BUFFER is implemented - Fix a bug in PcNewPort - Remove obsolete code from IPortWavePci - Return the allocated MDL from IPortWaveRTStream::AllocateContiguousPagesForMdl - Create a system thread when using IServiceGroup::RequestDelayedService - ReactOS now partly supports Vista audio driver model Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c 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] Sun Jun 21 03:37:55 2009 @@ -710,4 +710,62 @@ #undef INTERFACE +/***************************************************************************** + * IPortWaveRTStreamInit + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IPortWaveRTStreamInit + + +DECLARE_INTERFACE_(IPortWaveRTStreamInit, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(PMDL, AllocatePagesForMdl) + ( THIS_ + IN PHYSICAL_ADDRESS HighAddress, + IN SIZE_T TotalBytes + ) PURE; + + STDMETHOD_(PMDL, AllocateContiguousPagesForMdl) + ( THIS_ + IN PHYSICAL_ADDRESS LowAddress, + IN PHYSICAL_ADDRESS HighAddress, + IN SIZE_T TotalBytes + ) PURE; + + STDMETHOD_(PVOID, MapAllocatedPages) + ( THIS_ + IN PMDL MemoryDescriptorList, + IN MEMORY_CACHING_TYPE CacheType + ) PURE; + + STDMETHOD_(VOID, UnmapAllocatedPages) + ( THIS_ + IN PVOID BaseAddress, + IN PMDL MemoryDescriptorList + ) PURE; + + STDMETHOD_(VOID, FreePagesFromMdl) + ( THIS_ + IN PMDL MemoryDescriptorList + ) PURE; + + STDMETHOD_(ULONG, GetPhysicalPagesCount) + ( THIS_ + IN PMDL MemoryDescriptorList + ) PURE; + + STDMETHOD_(PHYSICAL_ADDRESS, GetPhysicalPageAddress) + ( THIS_ + IN PPHYSICAL_ADDRESS Address, + IN PMDL MemoryDescriptorList, + IN ULONG Index + ) PURE; +}; + +#undef INTERFACE + #endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] Sun Jun 21 03:37:55 2009 @@ -59,6 +59,85 @@ IN IPortPinWaveRTImpl * This, IN KSSTATE State); +static +VOID +UpdateCommonBuffer( + IPortPinWaveRTImpl * This, + ULONG Position) +{ + ULONG BufferLength; + ULONG BytesToCopy; + ULONG BufferSize; + PUCHAR Buffer; + NTSTATUS Status; + + BufferLength = Position - This->CommonBufferOffset; + while(BufferLength) + { + Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); + if (!NT_SUCCESS(Status)) + return; + + BytesToCopy = min(BufferLength, BufferSize); + + if (This->Capture) + { + RtlMoveMemory(Buffer, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, BytesToCopy); + } + else + { + RtlMoveMemory((PUCHAR)This->CommonBuffer + This->CommonBufferOffset, Buffer, BytesToCopy); + } + + This->IrpQueue->lpVtbl->UpdateMapping(This->IrpQueue, BytesToCopy); + This->CommonBufferOffset += BytesToCopy; + + BufferLength = Position - This->CommonBufferOffset; + } +} + +static +VOID +UpdateCommonBufferOverlap( + IPortPinWaveRTImpl * This, + ULONG Position) +{ + ULONG BufferLength; + ULONG BytesToCopy; + ULONG BufferSize; + PUCHAR Buffer; + NTSTATUS Status; + + + BufferLength = This->CommonBufferSize - This->CommonBufferOffset; + while(BufferLength) + { + Status = This->IrpQueue->lpVtbl->GetMapping(This->IrpQueue, &Buffer, &BufferSize); + if (!NT_SUCCESS(Status)) + return; + + BytesToCopy = min(BufferLength, BufferSize); + + if (This->Capture) + { + RtlMoveMemory(Buffer, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, BytesToCopy); + } + else + { + RtlMoveMemory((PUCHAR)This->CommonBuffer + This->CommonBufferOffset, Buffer, BytesToCopy); + } + + This->IrpQueue->lpVtbl->UpdateMapping(This->IrpQueue, BytesToCopy); + This->CommonBufferOffset += BytesToCopy; + + BufferLength = This->CommonBufferSize - This->CommonBufferOffset; + } + This->CommonBufferOffset = 0; + UpdateCommonBuffer(This, Position); +} + + + //================================================================================================================================== static NTSTATUS @@ -137,14 +216,16 @@ } Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); - DPRINT("PlayOffset %llu WriteOffset %llu %u Buffer %p BufferSize %u\n", Position.PlayOffset, Position.WriteOffset, Buffer, This->CommonBufferSize, BufferSize); - - //FIXME - // implement writing into cyclic buffer - // - - /* reschedule the timer */ - This->ServiceGroup->lpVtbl->RequestDelayedService(This->ServiceGroup, This->Delay); + DPRINT("PlayOffset %lu WriteOffset %lu Buffer %p BufferSize %u CommonBufferSize %u\n", Position.PlayOffset, Position.WriteOffset, Buffer, BufferSize, This->CommonBufferSize); + + if (Position.PlayOffset < This->CommonBufferOffset) + { + UpdateCommonBufferOverlap(This, Position.PlayOffset); + } + else if (Position.PlayOffset >= This->CommonBufferOffset) + { + UpdateCommonBuffer(This, Position.PlayOffset); + } } static IServiceSinkVtbl vt_IServiceSink = @@ -962,18 +1043,25 @@ /* minimum delay of 10 milisec */ This->Delay = Int32x32To64(min(max(Latency.ChipsetDelay + Latency.CodecDelay + Latency.FifoSize, 10), 10), -10000); - Status = This->Stream->lpVtbl->AllocateAudioBuffer(This->Stream, 16384, &This->Mdl, &This->CommonBufferSize, &This->CommonBufferOffset, &This->CacheType); + Status = This->Stream->lpVtbl->AllocateAudioBuffer(This->Stream, 16384 * 11, &This->Mdl, &This->CommonBufferSize, &This->CommonBufferOffset, &This->CacheType); if (!NT_SUCCESS(Status)) { DPRINT1("AllocateAudioBuffer failed with %x\n", Status); goto cleanup; } - This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); - This->State = KSSTATE_STOP; - This->Capture = Capture; - - This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); + This->CommonBuffer = MmGetSystemAddressForMdlSafe(This->Mdl, NormalPagePriority); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get system address %x\n", Status); + IoFreeMdl(This->Mdl); + This->Mdl = NULL; + goto cleanup; + } + + DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); + DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); + This->State = KSSTATE_PAUSE; return STATUS_SUCCESS; cleanup: @@ -995,12 +1083,20 @@ This->ServiceGroup = NULL; } - if (This->PortStream) - { - This->PortStream->lpVtbl->Release(This->PortStream); - This->PortStream = NULL; - } - + if (This->Stream) + { + This->Stream->lpVtbl->Release(This->Stream); + This->Stream = NULL; + } + else + { + if (This->PortStream) + { + This->PortStream->lpVtbl->Release(This->PortStream); + This->PortStream = NULL; + } + + } return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c [iso-8859-1] Sun Jun 21 03:37:55 2009 @@ -40,10 +40,8 @@ Status = NewPortWaveCyclic(OutPort); else if (IsEqualGUIDAligned(ClassId, &CLSID_PortWavePci)) Status = NewPortWavePci(OutPort); -#if (NTDDI_VERSION >= NTDDI_VISTA) - else if (IsEqualGUIDAligned(ClassId, &CLSID_PortWavePci)) + else if (IsEqualGUIDAligned(ClassId, &CLSID_PortWaveRT)) Status = NewPortWaveRT(OutPort); -#endif else { 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] Sun Jun 21 03:37:55 2009 @@ -22,7 +22,6 @@ PMINIPORTWAVEPCI Miniport; PDEVICE_OBJECT pDeviceObject; - KDPC Dpc; BOOL bInitialized; PRESOURCELIST pResourceList; PSERVICEGROUP ServiceGroup; @@ -331,26 +330,6 @@ return This->ref; } -VOID -NTAPI -ServiceNotifyRoutine( - IN struct _KDPC *Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - DPRINT("ServiceNotifyRoutine entered %p %p %p\n", DeferredContext, SystemArgument1, SystemArgument2); - - IPortWavePciImpl * This = (IPortWavePciImpl*)DeferredContext; - if (This->ServiceGroup && This->bInitialized) - { - DPRINT("ServiceGroup %p\n", This->ServiceGroup); - This->ServiceGroup->lpVtbl->RequestService(This->ServiceGroup); - } -} - - - NTSTATUS NTAPI IPortWavePci_fnInit( @@ -385,15 +364,11 @@ return STATUS_INVALID_PARAMETER; } - /* initialize the dpc */ - KeInitializeDpc(&This->Dpc, ServiceNotifyRoutine, (PVOID)This); - /* Initialize port object */ This->Miniport = Miniport; This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; This->pResourceList = ResourceList; - /* increment reference on miniport adapter */ Miniport->lpVtbl->AddRef(Miniport); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c [iso-8859-1] Sun Jun 21 03:37:55 2009 @@ -10,7 +10,7 @@ typedef struct { - IPortWaveRTStreamVtbl *lpVtbl; + IPortWaveRTStreamInitVtbl *lpVtbl; LONG ref; }IPortWaveRTStreamImpl; @@ -21,8 +21,8 @@ static NTSTATUS NTAPI -IPortWaveRTStream_fnQueryInterface( - IPortWaveRTStream* iface, +IPortWaveRTStreamInit_fnQueryInterface( + IPortWaveRTStreamInit * iface, IN REFIID refiid, OUT PVOID* Output) { @@ -46,8 +46,8 @@ static ULONG NTAPI -IPortWaveRTStream_fnAddRef( - IPortWaveRTStream* iface) +IPortWaveRTStreamInit_fnAddRef( + IPortWaveRTStreamInit * iface) { IPortWaveRTStreamImpl * This = (IPortWaveRTStreamImpl*)iface; DPRINT("IPortWaveRTStream_fnAddRef entered\n"); @@ -61,8 +61,8 @@ static ULONG NTAPI -IPortWaveRTStream_fnRelease( - IPortWaveRTStream* iface) +IPortWaveRTStreamInit_fnRelease( + IPortWaveRTStreamInit * iface) { IPortWaveRTStreamImpl * This = (IPortWaveRTStreamImpl*)iface; @@ -85,8 +85,8 @@ static PMDL NTAPI -IPortWaveRTStream_fnAllocatePagesForMdl( - IN IPortWaveRTStream* iface, +IPortWaveRTStreamInit_fnAllocatePagesForMdl( + IN IPortWaveRTStreamInit * iface, IN PHYSICAL_ADDRESS HighAddress, IN SIZE_T TotalBytes) { @@ -99,8 +99,8 @@ static PMDL NTAPI -IPortWaveRTStream_fnAllocateContiguousPagesForMdl( - IN IPortWaveRTStream* iface, +IPortWaveRTStreamInit_fnAllocateContiguousPagesForMdl( + IN IPortWaveRTStreamInit * iface, IN PHYSICAL_ADDRESS LowAddress, IN PHYSICAL_ADDRESS HighAddress, IN SIZE_T TotalBytes) @@ -129,12 +129,14 @@ if (MmGetMdlByteCount(Mdl) < TotalBytes) { + DPRINT1("ByteCount %u Required %u\n", MmGetMdlByteCount(Mdl), TotalBytes); MmFreePagesFromMdl(Mdl); ExFreePool(Mdl); return NULL; } - return NULL; + DPRINT("Result %p\n", Mdl); + return Mdl; } /* @@ -143,8 +145,8 @@ static PVOID NTAPI -IPortWaveRTStream_fnMapAllocatedPages( - IN IPortWaveRTStream* iface, +IPortWaveRTStreamInit_fnMapAllocatedPages( + IN IPortWaveRTStreamInit * iface, IN PMDL MemoryDescriptorList, IN MEMORY_CACHING_TYPE CacheType) { @@ -157,8 +159,8 @@ static VOID NTAPI -IPortWaveRTStream_fnUnmapAllocatedPages( - IN IPortWaveRTStream* iface, +IPortWaveRTStreamInit_fnUnmapAllocatedPages( + IN IPortWaveRTStreamInit * iface, IN PVOID BaseAddress, IN PMDL MemoryDescriptorList) { @@ -171,8 +173,8 @@ static VOID NTAPI -IPortWaveRTStream_fnFreePagesFromMdl( - IN IPortWaveRTStream* iface, +IPortWaveRTStreamInit_fnFreePagesFromMdl( + IN IPortWaveRTStreamInit * iface, IN PMDL MemoryDescriptorList) { MmFreePagesFromMdl(MemoryDescriptorList); @@ -185,8 +187,8 @@ static ULONG NTAPI -IPortWaveRTStream_fnGetPhysicalPagesCount( - IN IPortWaveRTStream* iface, +IPortWaveRTStreamInit_fnGetPhysicalPagesCount( + IN IPortWaveRTStreamInit * iface, IN PMDL MemoryDescriptorList) { return ADDRESS_AND_SIZE_TO_SPAN_PAGES(0, MmGetMdlByteCount(MemoryDescriptorList)); @@ -198,13 +200,15 @@ static PHYSICAL_ADDRESS NTAPI -IPortWaveRTStream_fnGetPhysicalPageAddress( - IN IPortWaveRTStream* iface, - IN PMDL MemoryDescriptorList, +IPortWaveRTStreamInit_fnGetPhysicalPageAddress( + IN IPortWaveRTStreamInit * iface, + IN PPHYSICAL_ADDRESS Address, + IN PMDL MemoryDescriptorList, IN ULONG Index) { PVOID Buffer; ULONG Pages; + PHYSICAL_ADDRESS Result, Addr; Pages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(0, MmGetMdlByteCount(MemoryDescriptorList)); if (Pages <= Index) @@ -214,21 +218,26 @@ } Buffer = UlongToPtr(PtrToUlong(MmGetSystemAddressForMdl(MemoryDescriptorList)) + Index * PAGE_SIZE); - return MmGetPhysicalAddress(Buffer); -} - -static IPortWaveRTStreamVtbl vt_PortWaveRTStream = -{ - IPortWaveRTStream_fnQueryInterface, - IPortWaveRTStream_fnAddRef, - IPortWaveRTStream_fnRelease, - IPortWaveRTStream_fnAllocatePagesForMdl, - IPortWaveRTStream_fnAllocateContiguousPagesForMdl, - IPortWaveRTStream_fnMapAllocatedPages, - IPortWaveRTStream_fnUnmapAllocatedPages, - IPortWaveRTStream_fnFreePagesFromMdl, - IPortWaveRTStream_fnGetPhysicalPagesCount, - IPortWaveRTStream_fnGetPhysicalPageAddress + + Addr = MmGetPhysicalAddress(Buffer); + Address->QuadPart = Addr.QuadPart; + Result.QuadPart = (PtrToUlong(Address)); + + return Result; +} + +static IPortWaveRTStreamInitVtbl vt_PortWaveRTStream = +{ + IPortWaveRTStreamInit_fnQueryInterface, + IPortWaveRTStreamInit_fnAddRef, + IPortWaveRTStreamInit_fnRelease, + IPortWaveRTStreamInit_fnAllocatePagesForMdl, + IPortWaveRTStreamInit_fnAllocateContiguousPagesForMdl, + IPortWaveRTStreamInit_fnMapAllocatedPages, + IPortWaveRTStreamInit_fnUnmapAllocatedPages, + IPortWaveRTStreamInit_fnFreePagesFromMdl, + IPortWaveRTStreamInit_fnGetPhysicalPagesCount, + IPortWaveRTStreamInit_fnGetPhysicalPageAddress }; NTSTATUS 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] Sun Jun 21 03:37:55 2009 @@ -7,9 +7,11 @@ #ifndef PORTCLS_PRIVATE_H #define PORTCLS_PRIVATE_H +//#define _KS_NO_ANONYMOUS_STRUCTURES_ + #include <ntddk.h> #include <portcls.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <dmusicks.h> @@ -182,24 +184,6 @@ NewIrpQueue( IN IIrpQueue **Queue); - -typedef struct -{ - LIST_ENTRY Entry; - KSOBJECT_HEADER ObjectHeader; -}SUBDEVICE_ENTRY; - -typedef struct -{ - LIST_ENTRY Entry; - ISubdevice * FromSubDevice; - LPWSTR FromUnicodeString; - ULONG FromPin; - ISubdevice * ToSubDevice; - LPWSTR ToUnicodeString; - ULONG ToPin; -}PHYSICAL_CONNECTION; - NTSTATUS NTAPI TopologyPropertyHandler( @@ -213,37 +197,6 @@ IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - -typedef struct -{ - KSDEVICE_HEADER KsDeviceHeader; - PDEVICE_OBJECT PhysicalDeviceObject; - PDEVICE_OBJECT PrevDeviceObject; - PCPFNSTARTDEVICE StartDevice; - ULONG_PTR Unused[4]; - IAdapterPowerManagement * AdapterPowerManagement; - ULONG MaxSubDevices; - KSOBJECT_CREATE_ITEM * CreateItems; - - IResourceList* resources; - LIST_ENTRY SubDeviceList; - LIST_ENTRY PhysicalConnectionList; - -} PCLASS_DEVICE_EXTENSION, *PPCLASS_DEVICE_EXTENSION; - - -typedef struct -{ - KSSTREAM_HEADER Header; - PIRP Irp; -}CONTEXT_WRITE, *PCONTEXT_WRITE; - -typedef struct -{ - PVOID Pin; - PIO_WORKITEM WorkItem; - PIRP Irp; -}CLOSESTREAM_CONTEXT, *PCLOSESTREAM_CONTEXT; NTSTATUS NTAPI @@ -353,4 +306,52 @@ DEFINE_KSPROPERTY_ITEM_PIN_PROPOSEDATAFORMAT(PropGeneral)\ } +typedef struct +{ + LIST_ENTRY Entry; + KSOBJECT_HEADER ObjectHeader; +}SUBDEVICE_ENTRY; + +typedef struct +{ + LIST_ENTRY Entry; + ISubdevice * FromSubDevice; + LPWSTR FromUnicodeString; + ULONG FromPin; + ISubdevice * ToSubDevice; + LPWSTR ToUnicodeString; + ULONG ToPin; +}PHYSICAL_CONNECTION; + +typedef struct +{ + KSDEVICE_HEADER KsDeviceHeader; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT PrevDeviceObject; + PCPFNSTARTDEVICE StartDevice; + ULONG_PTR Unused[4]; + IAdapterPowerManagement * AdapterPowerManagement; + ULONG MaxSubDevices; + KSOBJECT_CREATE_ITEM * CreateItems; + + IResourceList* resources; + LIST_ENTRY SubDeviceList; + LIST_ENTRY PhysicalConnectionList; + +} PCLASS_DEVICE_EXTENSION, *PPCLASS_DEVICE_EXTENSION; + + +typedef struct +{ + KSSTREAM_HEADER Header; + PIRP Irp; +}CONTEXT_WRITE, *PCONTEXT_WRITE; + +typedef struct +{ + PVOID Pin; + PIO_WORKITEM WorkItem; + PIRP Irp; +}CLOSESTREAM_CONTEXT, *PCLOSESTREAM_CONTEXT; + #endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.c [iso-8859-1] Sun Jun 21 03:37:55 2009 @@ -26,6 +26,8 @@ BOOL TimerActive; KTIMER Timer; KDPC Dpc; + KEVENT Event; + LONG ThreadActive; }IServiceGroupImpl; @@ -94,6 +96,10 @@ FreeItem(Entry, TAG_PORTCLASS); } KeCancelTimer(&This->Timer); + if (This->ThreadActive) + { + KeSetEvent(&This->Event, 0, TRUE); + } FreeItem(This, TAG_PORTCLASS); return 0; } @@ -203,18 +209,60 @@ } } + +VOID +NTAPI +ServiceGroupThread(IN PVOID StartContext) +{ + NTSTATUS Status; + KWAIT_BLOCK WaitBlockArray[2]; + PVOID WaitObjects[2]; + IServiceGroupImpl * This = (IServiceGroupImpl*)StartContext; + + /* Set thread state */ + InterlockedIncrement(&This->ThreadActive); + + /* Setup the wait objects */ + WaitObjects[0] = &This->Timer; + WaitObjects[1] = &This->Event; + + do + { + /* Wait on our objects */ + Status = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, Executive, KernelMode, FALSE, NULL, WaitBlockArray); + + switch(Status) + { + case STATUS_WAIT_0: + IServiceGroupDpc(&This->Dpc, (PVOID)This, NULL, NULL); + break; + case STATUS_WAIT_1: + PsTerminateSystemThread(STATUS_SUCCESS); + break; + } + }while(TRUE); +} + VOID NTAPI IServiceGroup_fnSupportDelayedService( IN IServiceGroup * iface) { + NTSTATUS Status; + HANDLE ThreadHandle; IServiceGroupImpl * This = (IServiceGroupImpl*)iface; ASSERT_IRQL(DISPATCH_LEVEL); - if (!This->Initialized) - { - KeInitializeTimerEx(&This->Timer, NotificationTimer); + if (This->Initialized) + return; + + KeInitializeTimerEx(&This->Timer, NotificationTimer); + + Status = PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, NULL, 0, NULL, ServiceGroupThread, (PVOID)This); + if (NT_SUCCESS(Status)) + { + ZwClose(ThreadHandle); This->Initialized = TRUE; } } @@ -290,6 +338,7 @@ This->ref = 1; KeInitializeDpc(&This->Dpc, IServiceGroupDpc, (PVOID)This); KeSetImportanceDpc(&This->Dpc, HighImportance); + KeInitializeEvent(&This->Event, NotificationEvent, FALSE); InitializeListHead(&This->ServiceSinkHead); *OutServiceGroup = (PSERVICEGROUP)&This->lpVtbl;

15 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009