Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 44226: Fix a rather embarrasing typo. This works a lot better now.
by arty＠svn.reactos.org 18 Nov '09

18 Nov '09

Author: arty Date: Wed Nov 18 18:14:05 2009 New Revision: 44226 URL: http://svn.reactos.org/svn/reactos?rev=44226&view=rev Log: Fix a rather embarrasing typo. This works a lot better now. Modified: branches/arty-newcc/ntoskrnl/fsrtl/largemcb.c Modified: branches/arty-newcc/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/large… ============================================================================== --- branches/arty-newcc/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Wed Nov 18 18:14:05 2009 @@ -29,6 +29,23 @@ LIST_ENTRY Sequence; } LARGE_MCB_MAPPING_ENTRY, *PLARGE_MCB_MAPPING_ENTRY; +static VOID McbPrintTree(PBASE_MCB Mcb) +{ + PLARGE_MCB_MAPPING_ENTRY Entry; + for (Entry = (PLARGE_MCB_MAPPING_ENTRY) + RtlEnumerateGenericTable(Mcb->Mapping, TRUE); + Entry; + Entry = (PLARGE_MCB_MAPPING_ENTRY) + RtlEnumerateGenericTable(Mcb->Mapping, FALSE)) + { + DPRINT1 + ("Vbn %x Lbn %x Count %x\n", + Entry->RunStartVbn.LowPart, + Entry->StartingLbn.LowPart, + Entry->SectorCount.LowPart); + } +} + static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) { PVOID Result; @@ -45,17 +62,19 @@ } static RTL_GENERIC_COMPARE_RESULTS NTAPI McbMappingCompare -(RTL_GENERIC_TABLE Table, PVOID PtrA, PVOID PtrB) +(PRTL_GENERIC_TABLE Table, PVOID PtrA, PVOID PtrB) { PLARGE_MCB_MAPPING_ENTRY A = PtrA, B = PtrB; RTL_GENERIC_COMPARE_RESULTS Result; + DPRINT("Starting to compare element %x to element %x\n", PtrA, PtrB); Result = - (A->RunStartVbn.QuadPart + A->SectorCount.QuadPart < + (A->RunStartVbn.QuadPart + A->SectorCount.QuadPart <= B->RunStartVbn.QuadPart) ? GenericLessThan : - (A->RunStartVbn.QuadPart > + (A->RunStartVbn.QuadPart >= B->RunStartVbn.QuadPart + B->SectorCount.QuadPart) ? GenericGreaterThan : GenericEqual; - DPRINT("Compare: %x:%x to %x:%x => %d\n", + DPRINT("Compare(%x:%x): %x:%x to %x:%x => %d\n", + A,B, A->RunStartVbn.LowPart, A->SectorCount.LowPart, B->RunStartVbn.LowPart, B->SectorCount.LowPart, Result); @@ -77,6 +96,8 @@ LARGE_MCB_MAPPING_ENTRY Node; PLARGE_MCB_MAPPING_ENTRY Existing = NULL; BOOLEAN NewElement = FALSE; + + McbPrintTree(Mcb); Node.RunStartVbn.QuadPart = Vbn; Node.StartingLbn.QuadPart = Lbn; @@ -139,6 +160,7 @@ } DPRINT("!!Existing %d\n", !!Existing); + McbPrintTree(Mcb); return !!Existing; } @@ -392,7 +414,7 @@ Index); KeReleaseGuardedMutex(Mcb->GuardedMutex); - DPRINT("Done %d\n", Result); + DPRINT("Done %d (%x)\n", Result, Lbn ? (ULONG)*Lbn : 0); return Result; }

1 0

[fireball] 44225: [rapps] Andrey Yastrebov <menone7@gmail.com> - Fix app uninstallation feature (wrong lparam usage - it's pointer to PINSTALLED_INFO and not an hkey). See issue #4961 for more details.
by fireball＠svn.reactos.org 18 Nov '09

18 Nov '09

Author: fireball Date: Wed Nov 18 15:37:31 2009 New Revision: 44225 URL: http://svn.reactos.org/svn/reactos?rev=44225&view=rev Log: [rapps] Andrey Yastrebov <menone7(a)gmail.com> - Fix app uninstallation feature (wrong lparam usage - it's pointer to PINSTALLED_INFO and not an hkey). See issue #4961 for more details. Modified: trunk/reactos/base/applications/rapps/installed.c Modified: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… ============================================================================== --- trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/installed.c [iso-8859-1] Wed Nov 18 15:37:31 2009 @@ -89,6 +89,7 @@ INT ItemIndex; LVITEM Item; HKEY hKey; + PINSTALLED_INFO ItemInfo; if (!IS_INSTALLED_ENUM(SelectedEnumType)) return FALSE; @@ -114,7 +115,8 @@ if (!ListView_GetItem(hListView, &Item)) return FALSE; - hKey = (HKEY)Item.lParam; + ItemInfo = (PINSTALLED_INFO)Item.lParam; + hKey = ItemInfo->hSubKey; dwType = REG_SZ; dwSize = MAX_PATH;

1 0

[fireball] 44224: - Properly convert mswsock.def to mswsock.spec (we have all functions properly stubbed). - Remove WSPStartup from ws2_32, it doesn't belong there. Spotted by Gabriel Ilardi. See issue #4956 for more details.
by fireball＠svn.reactos.org 18 Nov '09

18 Nov '09

Author: fireball Date: Wed Nov 18 15:16:34 2009 New Revision: 44224 URL: http://svn.reactos.org/svn/reactos?rev=44224&view=rev Log: - Properly convert mswsock.def to mswsock.spec (we have all functions properly stubbed). - Remove WSPStartup from ws2_32, it doesn't belong there. Spotted by Gabriel Ilardi. See issue #4956 for more details. Removed: trunk/reactos/dll/win32/mswsock/mswsock.def Modified: trunk/reactos/dll/win32/mswsock/mswsock.spec trunk/reactos/dll/win32/ws2_32/misc/stubs.c Removed: trunk/reactos/dll/win32/mswsock/mswsock.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswsock.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswsock.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswsock.def (removed) @@ -1,39 +1,0 @@ -; $Id$ -; -; MSWSOCK.DLL - Windows Sockets 2 DLL - -LIBRARY mswsock.dll - -EXPORTS -ServiceMain@8 @0 -SvchostPushServiceGlobals@4 @1 -AcceptEx@32 @2 -EnumProtocolsA@12 @3 -EnumProtocolsW@12 @4 -GetAcceptExSockaddrs@32 @5 -GetAddressByNameA@40 @6 -GetAddressByNameW@40 @7 -GetNameByTypeA@12 @8 -GetNameByTypeW@12 @9 -GetServiceA@28 @10 -GetServiceW@28 @11 -GetTypeByNameA@8 @12 -GetTypeByNameW@8 @13 -MigrateWinsockConfiguration@12 @14 -NPLoadNameSpaces@12 @15 -NSPStartup@8 @16 -SetServiceA@24 @17 -SetServiceW@24 @18 -StartWsdpService@0 @19 -StopWsdpService@0 @20 -TransmitFile@28 @21 -WSARecvEx@16 @22 -WSPStartup@76 @23 -dn_expand@20 @24 -getnetbyname@4 @25 -inet_network@4 @26 -rcmd@24 @27 -rexec@24 @28 -rresvport@4 @29 -s_perror@4 @30 -sethostname@8 @31 Modified: trunk/reactos/dll/win32/mswsock/mswsock.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswsock.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswsock.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswsock.spec [iso-8859-1] Wed Nov 18 15:16:34 2009 @@ -2,31 +2,31 @@ @ stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA @ stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW @ stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) -@ stub GetAddressByNameA -@ stub GetAddressByNameW -@ stub GetNameByTypeA -@ stub GetNameByTypeW -@ stub GetServiceA -@ stub GetServiceW -@ stub GetTypeByNameA -@ stub GetTypeByNameW -@ stub MigrateWinsockConfiguration -@ stub NPLoadNameSpaces -@ stub NSPStartup -@ stub ServiceMain -@ stub SetServiceA -@ stub SetServiceW -@ stub StartWsdpService -@ stub StopWsdpService -@ stub SvchostPushServiceGlobals +@ stdcall GetAddressByNameA(long ptr ptr ptr long ptr ptr ptr ptr ptr) +@ stdcall GetAddressByNameW(long ptr ptr ptr long ptr ptr ptr ptr ptr) +@ stdcall GetNameByTypeA(ptr ptr long) +@ stdcall GetNameByTypeW(ptr ptr long) +@ stdcall GetServiceA(long ptr ptr long ptr ptr ptr) +@ stdcall GetServiceW(long ptr ptr long ptr ptr ptr) +@ stdcall GetTypeByNameA(ptr ptr) +@ stdcall GetTypeByNameW(ptr ptr) +@ stdcall MigrateWinsockConfiguration(long long long) +@ stdcall NPLoadNameSpaces(ptr ptr ptr) +@ stdcall NSPStartup(ptr ptr) +@ stdcall ServiceMain(long long) +@ stdcall SetServiceA(long long long ptr ptr ptr) +@ stdcall SetServiceW(long long long ptr ptr ptr) +@ stdcall StartWsdpService() +@ stdcall StopWsdpService() +@ stdcall SvchostPushServiceGlobals(long) @ stdcall TransmitFile(long long long long ptr ptr long) @ stdcall WSARecvEx(long ptr long ptr) -@ stub WSPStartup -@ stub dn_expand -@ stub getnetbyname -@ stub inet_network -@ stub rcmd -@ stub rexec -@ stub rresvport -@ stub s_perror -@ stub sethostname +@ stdcall WSPStartup(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall dn_expand(ptr ptr ptr ptr long) +@ stdcall getnetbyname(ptr) +@ stdcall inet_network(ptr) +@ stdcall rcmd(ptr long ptr ptr ptr ptr) +@ stdcall rexec(ptr long ptr ptr ptr ptr) +@ stdcall rresvport(ptr) +@ stdcall s_perror(ptr) +@ stdcall sethostname(ptr long) Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Wed Nov 18 15:16:34 2009 @@ -708,23 +708,6 @@ */ INT EXPORT -WSPStartup(IN WORD wVersionRequested, - OUT LPWSPDATA lpWSPData, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - IN WSPUPCALLTABLE UpcallTable, - OUT LPWSPPROC_TABLE lpProcTable) -{ - UNIMPLEMENTED - - return WSASYSCALLFAILURE; -} - - -/* - * @unimplemented - */ -INT -EXPORT WSCDeinstallProvider(IN LPGUID lpProviderId, OUT LPINT lpErrno) {

1 0

[arty] 44223: io: don't need these references. data: pair references to section on map and unmap, pair references to file on section build, teardown and segment create and teardown.
by arty＠svn.reactos.org 18 Nov '09

18 Nov '09

Author: arty Date: Wed Nov 18 08:13:08 2009 New Revision: 44223 URL: http://svn.reactos.org/svn/reactos?rev=44223&view=rev Log: io: don't need these references. data: pair references to section on map and unmap, pair references to file on section build, teardown and segment create and teardown. Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/io.c Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Wed Nov 18 08:13:08 2009 @@ -1715,6 +1715,7 @@ ExAcquireFastMutex(&Segment->Lock); DPRINT("Filling out Segment info (No previous data section)\n"); + ObReferenceObject(FileObject); Segment->FileObject = FileObject; Segment->Protection = SectionPageProtection; Segment->Flags = MM_DATAFILE_SEGMENT; @@ -2201,6 +2202,7 @@ ASSERT(FALSE); } MiFreePageTablesSectionSegment(Segment); + ObDereferenceObject(Segment->FileObject); ExFreePool(Segment); FileObject->SectionObjectPointer->DataSectionObject = NULL; @@ -3078,6 +3080,9 @@ MmUnlockSectionSegment(Section->Segment); MmUnlockAddressSpace(AddressSpace); + + if (Status == STATUS_SUCCESS) + ObReferenceObject(Section); return Status; } Modified: branches/arty-newcc/ntoskrnl/mm/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] Wed Nov 18 08:13:08 2009 @@ -263,8 +263,6 @@ Irp->Flags |= IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_API; - ObReferenceObject(FileObject); - Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -286,12 +284,9 @@ { DPRINT1("Warning: Failed to wait for synchronous IRP\n"); ASSERT(FALSE); - ObDereferenceObject(FileObject); return Status; } } - - ObDereferenceObject(FileObject); DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); Status =

1 0

[tkreuzer] 44222: [MM] Overall code improvements.
by tkreuzer＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: tkreuzer Date: Tue Nov 17 20:30:35 2009 New Revision: 44222 URL: http://svn.reactos.org/svn/reactos?rev=44222&view=rev Log: [MM] Overall code improvements. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue Nov 17 20:30:35 2009 @@ -12,6 +12,7 @@ /* Memory layout base addresses */ #define HYPER_SPACE 0xFFFFF70000000000ULL #define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL +#define MI_SESSION_SPACE_MINIMUM (PVOID)0xFFFFF90000000000ULL #define MI_SESSION_VIEW_END (PVOID)0xFFFFF97FFF000000ULL #define MI_SESSION_SPACE_END (PVOID)0xFFFFF98000000000ULL #define MI_SYSTEM_PTE_START (PVOID)0xFFFFFAA000000000ULL @@ -103,6 +104,8 @@ /* Nothing to do */ } +#define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) +#define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) /// MIARM.H Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Tue Nov 17 20:30:35 2009 @@ -20,30 +20,8 @@ /* GLOBALS *****************************************************************/ -ULONG64 MmUserProbeAddress = 0x7FFFFFF0000ULL; -PVOID MmHighestUserAddress = (PVOID)0x7FFFFFEFFFFULL; -PVOID MmSystemRangeStart = (PVOID)0xFFFF080000000000ULL; - -/* Size of session view, pool, and image */ -ULONG64 MmSessionSize = MI_SESSION_SIZE; -ULONG64 MmSessionViewSize = MI_SESSION_VIEW_SIZE; -ULONG64 MmSessionPoolSize = MI_SESSION_POOL_SIZE; -ULONG64 MmSessionImageSize = MI_SESSION_IMAGE_SIZE; - -/* Session space addresses */ -PVOID MiSessionSpaceEnd = MI_SESSION_SPACE_END; // FFFFF98000000000 -PVOID MiSessionImageEnd; // FFFFF98000000000 = MiSessionSpaceEnd -PVOID MiSessionImageStart; // ?FFFFF97FFF000000 = MiSessionImageEnd - MmSessionImageSize -PVOID MiSessionViewEnd; // FFFFF97FFF000000 -PVOID MiSessionViewStart; // = MiSessionViewEnd - MmSessionViewSize -PVOID MiSessionPoolEnd; // = MiSessionViewStart -PVOID MiSessionPoolStart; // FFFFF90000000000 = MiSessionPoolEnd - MmSessionPoolSize -PVOID MmSessionBase; // FFFFF90000000000 = MiSessionPoolStart - -/* System view */ -ULONG64 MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; -PVOID MiSystemViewStart; - +/* Sizes */ +ULONG64 MmBootImageSize; ULONG64 MmMinimumNonPagedPoolSize = 256 * 1024; ULONG64 MmSizeOfNonPagedPoolInBytes; ULONG64 MmMaximumNonPagedPoolInBytes; @@ -51,39 +29,57 @@ ULONG64 MmMinAdditionNonPagedPoolPerMb = 32 * 1024; ULONG64 MmMaxAdditionNonPagedPoolPerMb = 400 * 1024; ULONG64 MmDefaultMaximumNonPagedPool = 1024 * 1024; -PVOID MmNonPagedSystemStart; +ULONG64 MmSessionSize = MI_SESSION_SIZE; +ULONG64 MmSessionViewSize = MI_SESSION_VIEW_SIZE; +ULONG64 MmSessionPoolSize = MI_SESSION_POOL_SIZE; +ULONG64 MmSessionImageSize = MI_SESSION_IMAGE_SIZE; +ULONG64 MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; +ULONG64 MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; +ULONG64 MiNonPagedSystemSize; + +/* Address ranges */ +ULONG64 MmUserProbeAddress = 0x7FFFFFF0000ULL; +PVOID MmHighestUserAddress = (PVOID)0x7FFFFFEFFFFULL; +PVOID MmSystemRangeStart = (PVOID)0xFFFF080000000000ULL; +PVOID MmSessionBase; // FFFFF90000000000 = MiSessionPoolStart +PVOID MiSessionPoolStart; // FFFFF90000000000 = MiSessionPoolEnd - MmSessionPoolSize +PVOID MiSessionPoolEnd; // = MiSessionViewStart +PVOID MiSessionViewStart; // = MiSessionViewEnd - MmSessionViewSize +PVOID MiSessionViewEnd; // FFFFF97FFF000000 +PVOID MiSessionImageStart; // ?FFFFF97FFF000000 = MiSessionImageEnd - MmSessionImageSize +PVOID MiSessionImageEnd; // FFFFF98000000000 = MiSessionSpaceEnd +PVOID MiSessionSpaceEnd = MI_SESSION_SPACE_END; // FFFFF98000000000 +PVOID MmSystemCacheStart; // FFFFF98000000000 +PVOID MmSystemCacheEnd; // FFFFFA8000000000 +PVOID MmPagedPoolStart = MI_PAGED_POOL_START; // FFFFFA8000000000 +PVOID MmPagedPoolEnd; // FFFFFAA000000000 +PVOID MiSystemViewStart; +PVOID MmNonPagedSystemStart; // FFFFFAA000000000 PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; -PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; - -ULONG64 MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; -PVOID MmPagedPoolStart = MI_PAGED_POOL_START; -PVOID MmPagedPoolEnd; - - -ULONG64 MmBootImageSize; +PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; // 0xFFFFFAE000000000 + PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; // FIXME: ULONG64 + +ULONG MmNumberOfSystemPtes; +PMMPTE MmSystemPagePtes; +MMSUPPORT MmSystemCacheWs; + RTL_BITMAP MiPfnBitMap; -ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; // FIXME: ULONG64 -ULONG64 MmNumberOfSystemPtes; -PMMPTE MmSystemPagePtes; ULONG64 MxPfnAllocation; ULONG64 MxPfnSizeInBytes; -PVOID MmSystemCacheStart; -PVOID MmSystemCacheEnd; -MMSUPPORT MmSystemCacheWs; - +PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; +MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; ULONG MiNumberDescriptors = 0; BOOLEAN MiIncludeType[LoaderMaximum]; -/////////////////////////////////////////////// - -PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; -MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; - PFN_NUMBER MxFreePageBase; ULONG64 MxFreePageCount = 0; + + +/* FUNCTIONS *****************************************************************/ ULONG NoDbgPrint(const char *Format, ...) @@ -291,7 +287,7 @@ /* Check if the registy setting or our dynamic calculation was too high */ if (MmSizeOfNonPagedPoolInBytes > MI_MAX_INIT_NONPAGED_POOL_SIZE) { - // Set it to the maximum */ + /* Set it to the maximum */ MmSizeOfNonPagedPoolInBytes = MI_MAX_INIT_NONPAGED_POOL_SIZE; } @@ -333,131 +329,82 @@ /* This is where we will load Win32k.sys and the video driver */ MiSessionImageEnd = MiSessionSpaceEnd; - MiSessionImageStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - - MmSessionImageSize); + MiSessionImageStart = (PCHAR)MiSessionImageEnd - MmSessionImageSize; /* The view starts right below the session working set (itself below * the image area) */ MiSessionViewEnd = MI_SESSION_VIEW_END; - MiSessionViewStart = (PVOID)((ULONG_PTR)MiSessionViewStart - - MmSessionViewSize); + MiSessionViewStart = (PCHAR)MiSessionViewEnd - MmSessionViewSize; + ASSERT(IS_PAGE_ALIGNED(MiSessionViewStart)); /* Session pool follows */ MiSessionPoolEnd = MiSessionViewStart; - MiSessionPoolStart = (PVOID)((ULONG_PTR)MiSessionPoolEnd - - MmSessionPoolSize); + MiSessionPoolStart = (PCHAR)MiSessionPoolEnd - MmSessionPoolSize; + ASSERT(IS_PAGE_ALIGNED(MiSessionPoolStart)); /* And it all begins here */ MmSessionBase = MiSessionPoolStart; /* System view space ends at session space, so now that we know where * this is, we can compute the base address of system view space itself. */ - MiSystemViewStart = (PVOID)((ULONG_PTR)MmSessionBase - - MmSystemViewSize); - - /* Use the default */ + MiSystemViewStart = (PCHAR)MmSessionBase - MmSystemViewSize; + ASSERT(IS_PAGE_ALIGNED(MiSystemViewStart)); + + /* Calculate the size of the PFN database and convert to pages */ + MxPfnSizeInBytes = ROUND_TO_PAGES((MmHighestPhysicalPage + 1) * sizeof(MMPFN)); + MxPfnAllocation = MxPfnSizeInBytes >> PAGE_SHIFT; + + /* The PFN database is at the start of the non paged region */ + MmPfnDatabase = (PVOID)((PCHAR)MmNonPagedPoolEnd - + MmMaximumNonPagedPoolInBytes); + + /* Reduce maximum non paged pool size */ + MmMaximumNonPagedPoolInBytes -= MxPfnSizeInBytes; + + /* Put non paged pool after the PFN database */ + MmNonPagedPoolStart = (PCHAR)MmPfnDatabase + MxPfnSizeInBytes; + ASSERT(IS_PAGE_ALIGNED(MmNonPagedPoolStart)); + + /* Calculate the nonpaged pool expansion start region */ + MmNonPagedPoolExpansionStart = (PCHAR)MmNonPagedPoolStart + + MmSizeOfNonPagedPoolInBytes; + ASSERT(IS_PAGE_ALIGNED(MmNonPagedPoolExpansionStart)); + + /* Use the default numer of system PTEs */ MmNumberOfSystemPtes = MI_NUMBER_SYSTEM_PTES; + /* System PTE pool is below the PFN database */ + MiNonPagedSystemSize = (MmNumberOfSystemPtes + 1) * PAGE_SIZE; + MmNonPagedSystemStart = (PCHAR)MmPfnDatabase - MiNonPagedSystemSize; + MmNonPagedSystemStart = MM_ROUND_DOWN(MmNonPagedSystemStart, 512 * PAGE_SIZE); + + /* Don't let it go below the minimum */ + if (MmNonPagedSystemStart < (PVOID)MI_NON_PAGED_SYSTEM_START_MIN) + { + /* This is a hard-coded limit in the Windows NT address space */ + MmNonPagedSystemStart = (PVOID)MI_NON_PAGED_SYSTEM_START_MIN; + + /* Reduce the amount of system PTEs to reach this point */ + MmNumberOfSystemPtes = ((ULONG64)MmPfnDatabase - + (ULONG64)MmNonPagedSystemStart) >> + PAGE_SHIFT; + MmNumberOfSystemPtes--; + ASSERT(MmNumberOfSystemPtes > 1000); + } + + /* Sanity checks */ ASSERT(MiSessionViewEnd <= MiSessionImageStart); ASSERT(MmSessionBase <= MiSessionPoolStart); } - -VOID -MiArmInitializePageTable() -{ - ULONG64 PageFrameOffset; - PMMPTE Pte, StartPte, EndPte; - MMPTE TmplPte; - - /* HACK: don't use freeldr debug print anymore */ - FrLdrDbgPrint = NoDbgPrint; - - /* Get current directory base */ - PageFrameOffset = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber << PAGE_SHIFT; - ASSERT(PageFrameOffset == __readcr3()); - - /* Set directory base for the system process */ - PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameOffset; - - /* Enable global pages */ - __writecr4(__readcr4() | CR4_PGE); - ASSERT(__readcr4() & CR4_PGE); - - /* Set user mode address range */ - StartPte = MiAddressToPxe(0); - EndPte = MiAddressToPxe(MmHighestUserAddress); - - /* Loop the user mode PXEs */ - for (Pte = StartPte; Pte <= EndPte; Pte++) - { - /* Zero the PXE, clear all mappings */ - Pte->u.Long = 0; - } - - /* Set up a template PTE */ - TmplPte.u.Long = 0; - TmplPte.u.Flush.Valid = 1; - TmplPte.u.Flush.Write = 1; - HyperTemplatePte = TmplPte; - - /* Create PDPTs (72 KB) for shared system address space, - * skip page tables and hyperspace */ - - /* Set the range */ - StartPte = MiAddressToPxe((PVOID)(HYPER_SPACE_END + 1)); - EndPte = MiAddressToPxe(MI_HIGHEST_SYSTEM_ADDRESS); - - /* Loop the PXEs */ - for (Pte = StartPte; Pte <= EndPte; Pte++) - { - /* Is the PXE already valid? */ - if (!Pte->u.Hard.Valid) - { - /* It's not Initialize it */ - TmplPte.u.Flush.PageFrameNumber = MxGetNextPage(1); - *Pte = TmplPte; - - /* Zero the page. The PXE is the PTE for the PDPT. */ - RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); - } - } - - /* Set the range of system PTEs */ - StartPte = MiAddressToPte(MI_SYSTEM_PTE_START); - EndPte = StartPte + MmNumberOfSystemPtes - 1; - - /* Loop the system PTEs */ - for (Pte = StartPte; Pte <= EndPte; Pte++) - { - /* Make sure the PTE is valid */ - MxGetPte(MiPteToAddress(Pte)); - } - - /* Flush the TLB */ - KeFlushCurrentTb(); - - /* Setup the mapping PTEs */ - MmFirstReservedMappingPte = MxGetPte((PVOID)MI_MAPPING_RANGE_START); - MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; - MmLastReservedMappingPte = MiAddressToPte((PVOID)MI_MAPPING_RANGE_END); - - /* Setup debug mapping PTE */ - MmDebugPte = MxGetPte(MI_DEBUG_MAPPING); -} - - VOID NTAPI MiArmPreparePfnDatabse(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; PLIST_ENTRY ListEntry; + PUCHAR Page, FirstPage; SIZE_T Size; - PUCHAR Page, FirstPage; - - /* The PFN database is at the start of the non paged region */ - MmPfnDatabase = (PVOID)((ULONG64)MmNonPagedPoolEnd - MmMaximumNonPagedPoolInBytes); /* Loop the memory descriptors */ for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; @@ -493,55 +440,83 @@ /* Zero out the pages */ RtlZeroMemory(FirstPage, Size); } - - /* Calculate the number of bytes, and then convert to pages */ - MxPfnSizeInBytes = ROUND_TO_PAGES(MmHighestPhysicalPage + 1) * sizeof(MMPFN); - MxPfnAllocation = MxPfnSizeInBytes >> PAGE_SHIFT; - - /* Reduce maximum pool size */ - MmMaximumNonPagedPoolInBytes -= MxPfnSizeInBytes; -} - - -VOID -NTAPI -MiArmPrepareNonPagedPool() -{ +} + + +VOID +MiArmInitializePageTable() +{ + ULONG64 PageFrameOffset; + PMMPTE Pte, StartPte, EndPte; + MMPTE TmplPte; PFN_NUMBER PageCount; PVOID Address; - /* Non paged pool comes after the PFN database */ - MmNonPagedPoolStart = (PVOID)((ULONG64)MmPfnDatabase + - MxPfnSizeInBytes); - ASSERT((ULONG64)MmNonPagedPoolEnd == (ULONG64)MmNonPagedPoolStart + - MmMaximumNonPagedPoolInBytes); - - /* Calculate the nonpaged pool expansion start region */ - MmNonPagedPoolExpansionStart = (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - - MmMaximumNonPagedPoolInBytes + - MmSizeOfNonPagedPoolInBytes); - MmNonPagedPoolExpansionStart = (PVOID)PAGE_ALIGN(MmNonPagedPoolExpansionStart); - - /* Now calculate the nonpaged system VA region, which includes the - * nonpaged pool expansion (above) and the system PTEs. Note that it is - * then aligned to a PDE boundary (4MB). */ - MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedPoolExpansionStart - - (MmNumberOfSystemPtes + 1) * PAGE_SIZE); - MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedSystemStart & - ~((4 * 1024 * 1024) - 1)); - - /* Don't let it go below the minimum */ - if (MmNonPagedSystemStart < (PVOID)MI_NON_PAGED_SYSTEM_START_MIN) - { - /* This is a hard-coded limit in the Windows NT address space */ - MmNonPagedSystemStart = (PVOID)MI_NON_PAGED_SYSTEM_START_MIN; - - /* Reduce the amount of system PTEs to reach this point */ - MmNumberOfSystemPtes = ((ULONG_PTR)MmNonPagedPoolExpansionStart - - (ULONG_PTR)MmNonPagedSystemStart) >> - PAGE_SHIFT; - MmNumberOfSystemPtes--; - ASSERT(MmNumberOfSystemPtes > 1000); + /* HACK: don't use freeldr debug print anymore */ + FrLdrDbgPrint = NoDbgPrint; + + /* Get current directory base */ + PageFrameOffset = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber << PAGE_SHIFT; + ASSERT(PageFrameOffset == __readcr3()); + + /* Set directory base for the system process */ + PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameOffset; + + /* Enable global pages */ + __writecr4(__readcr4() | CR4_PGE); + ASSERT(__readcr4() & CR4_PGE); + + /* Set user mode address range */ + StartPte = MiAddressToPxe(0); + EndPte = MiAddressToPxe(MmHighestUserAddress); + + /* Loop the user mode PXEs */ + for (Pte = StartPte; Pte <= EndPte; Pte++) + { + /* Zero the PXE, clear all mappings */ + Pte->u.Long = 0; + } + + /* Flush the TLB */ + KeFlushCurrentTb(); + + /* Set up a template PTE */ + TmplPte.u.Long = 0; + TmplPte.u.Flush.Valid = 1; + TmplPte.u.Flush.Write = 1; + HyperTemplatePte = TmplPte; + + /* Create PDPTs (72 KB) for shared system address space, + * skip page tables and hyperspace */ + + /* Set the range */ + StartPte = MiAddressToPxe((PVOID)(HYPER_SPACE_END + 1)); + EndPte = MiAddressToPxe(MI_HIGHEST_SYSTEM_ADDRESS); + + /* Loop the PXEs */ + for (Pte = StartPte; Pte <= EndPte; Pte++) + { + /* Is the PXE already valid? */ + if (!Pte->u.Hard.Valid) + { + /* It's not Initialize it */ + TmplPte.u.Flush.PageFrameNumber = MxGetNextPage(1); + *Pte = TmplPte; + + /* Zero the page. The PXE is the PTE for the PDPT. */ + RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); + } + } + + /* Set the range of system PTEs */ + StartPte = MiAddressToPte(MI_SYSTEM_PTE_START); + EndPte = StartPte + MmNumberOfSystemPtes - 1; + + /* Loop the system PTEs */ + for (Pte = StartPte; Pte <= EndPte; Pte++) + { + /* Make sure the PTE is valid */ + MxGetPte(MiPteToAddress(Pte)); } /* Map the nonpaged pool */ @@ -557,10 +532,13 @@ MxGetPte(Address)->u.Long = 0; } - /* Sanity check */ - ASSERT(MiAddressToPte(MmNonPagedSystemStart) < - MiAddressToPte(MmNonPagedPoolExpansionStart)); - + /* Setup the mapping PTEs */ + MmFirstReservedMappingPte = MxGetPte((PVOID)MI_MAPPING_RANGE_START); + MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; + MmLastReservedMappingPte = MiAddressToPte((PVOID)MI_MAPPING_RANGE_END); + + /* Setup debug mapping PTE */ + MmDebugPte = MxGetPte(MI_DEBUG_MAPPING); } @@ -673,9 +651,6 @@ /* Prepare PFN database mappings */ MiArmPreparePfnDatabse(LoaderBlock); - /* Prepare paged pool mappings */ - MiArmPrepareNonPagedPool(); - /* Initialize some mappings */ MiArmInitializePageTable();

1 0

[tkreuzer] 44221: Ammendment to r44220
by tkreuzer＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: tkreuzer Date: Tue Nov 17 20:25:19 2009 New Revision: 44221 URL: http://svn.reactos.org/svn/reactos?rev=44221&view=rev Log: Ammendment to r44220 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Nov 17 20:25:19 2009 @@ -19,6 +19,7 @@ extern ULONG MmHighestPhysicalPage; extern ULONG MmAvailablePages; extern ULONG MmResidentAvailablePages; +extern ULONG MmNumberOfSystemPtes; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize;

1 0

[tkreuzer] 44220: [MM] - MmCreateMemoryArea: the area type is a bitfield rather than an enum so use %lx instead of %ld to DPRINT it, add 2 more DPRINTs on failure - MiInitSystemMemoryAreas: fix calculation of memory area sizes for 64 bit
by tkreuzer＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: tkreuzer Date: Tue Nov 17 20:22:55 2009 New Revision: 44220 URL: http://svn.reactos.org/svn/reactos?rev=44220&view=rev Log: [MM] - MmCreateMemoryArea: the area type is a bitfield rather than an enum so use %lx instead of %ld to DPRINT it, add 2 more DPRINTs on failure - MiInitSystemMemoryAreas: fix calculation of memory area sizes for 64 bit Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Tue Nov 17 20:22:55 2009 @@ -178,6 +178,7 @@ #define PTE_TOP 0xC03FFFFF #define PDE_BASE 0xC1000000 #define HYPER_SPACE 0xC1100000 +#define HYPER_SPACE_END 0xC07FFFFF struct _EPROCESS; PULONG MmGetPageDirectory(VOID); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Tue Nov 17 20:22:55 2009 @@ -19,6 +19,7 @@ #define PDE_BASE 0xC0300000 #define PTE_TOP 0xC03FFFFF #define HYPER_SPACE 0xC0400000 +#define HYPER_SPACE_END 0xC07FFFFF /* Converting address to a corresponding PDE or PTE entry */ #define MiAddressToPde(x) \ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Nov 17 20:22:55 2009 @@ -932,7 +932,7 @@ ULONG tmpLength; PMEMORY_AREA MemoryArea; - DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %p, " + DPRINT("MmCreateMemoryArea(Type 0x%lx, BaseAddress %p, " "*BaseAddress %p, Length %p, AllocationFlags %x, " "FixedAddress %x, Result %p)\n", Type, BaseAddress, *BaseAddress, Length, AllocationFlags, @@ -968,6 +968,7 @@ if (MmGetAddressSpaceOwner(AddressSpace) && (ULONG_PTR)(*BaseAddress) + tmpLength > (ULONG_PTR)MmSystemRangeStart) { + DPRINT("Memory area for user mode address space exceeds MmSystemRangeStart\n"); return STATUS_ACCESS_VIOLATION; } @@ -1008,7 +1009,11 @@ TAG_MAREA); } - if (!MemoryArea) return STATUS_NO_MEMORY; + if (!MemoryArea) + { + DPRINT("Not enough memory.\n"); + return STATUS_NO_MEMORY; + } RtlZeroMemory(MemoryArea, sizeof(MEMORY_AREA)); MemoryArea->Type = Type; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Nov 17 20:22:55 2009 @@ -84,7 +84,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, - 4 * 1024 * 1024, + PTE_BASE - PTE_TOP + 1, PAGE_READWRITE, &MArea, TRUE, @@ -99,7 +99,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, - 4 * 1024 * 1024, + HYPER_SPACE_END - HYPER_SPACE + 1, PAGE_READWRITE, &MArea, TRUE, @@ -144,8 +144,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, - (ULONG_PTR)MmNonPagedPoolEnd - - (ULONG_PTR)MmNonPagedSystemStart, + (MmNumberOfSystemPtes + 1) * PAGE_SIZE, PAGE_READWRITE, &MArea, TRUE,

1 0

[tkreuzer] 44219: Remove unused variable.
by tkreuzer＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: tkreuzer Date: Tue Nov 17 20:11:12 2009 New Revision: 44219 URL: http://svn.reactos.org/svn/reactos?rev=44219&view=rev Log: Remove unused variable. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Nov 17 20:11:12 2009 @@ -411,7 +411,6 @@ PDBGKD_READ_MEMORY64 ReadMemory = &State->u.ReadMemory; STRING Header; ULONG Length = ReadMemory->TransferCount; - ULONG64 TargetBaseAddress = State->u.ReadMemory.TargetBaseAddress; /* Setup the header */ Header.Length = sizeof(DBGKD_MANIPULATE_STATE64);

1 0

[tkreuzer] 44218: Create a better definition of C_ASSERT to avoid multiple definition errors caused by included files.
by tkreuzer＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: tkreuzer Date: Tue Nov 17 20:09:38 2009 New Revision: 44218 URL: http://svn.reactos.org/svn/reactos?rev=44218&view=rev Log: Create a better definition of C_ASSERT to avoid multiple definition errors caused by included files. Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h [iso-8859-1] Tue Nov 17 20:09:38 2009 @@ -679,10 +679,8 @@ // // C_ASSERT Definition // -#define __C_ASSERT_JOIN(X, Y) __C_ASSERT_DO_JOIN(X, Y) -#define __C_ASSERT_DO_JOIN(X, Y) __C_ASSERT_DO_JOIN2(X, Y) -#define __C_ASSERT_DO_JOIN2(X, Y) X##Y -#define C_ASSERT(e) typedef char __C_ASSERT_JOIN(__C_ASSERT__, __LINE__)[(e) ? 1 : -1] +#define C_ASSERT(exp) \ + extern char __c_assert__[exp ? 1 : -1];

1 0

[arty] 44217: VOID type for deprecated CcRosInitializeFileCache, in case somebody builds with _NEWCC_ = 0
by arty＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: arty Date: Tue Nov 17 19:12:30 2009 New Revision: 44217 URL: http://svn.reactos.org/svn/reactos?rev=44217&view=rev Log: VOID type for deprecated CcRosInitializeFileCache, in case somebody builds with _NEWCC_ = 0 Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/cc.h [iso-8859-1] Tue Nov 17 19:12:30 2009 @@ -297,7 +297,7 @@ CACHE_SEGMENT **CacheSeg ); -NTSTATUS +VOID NTAPI CcRosInitializeFileCache( PFILE_OBJECT FileObject,

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