Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 47188: [USBHUB] - Include the DDK before debug.h - Fixes several warnings
by cgutman＠svn.reactos.org 12 May '10

12 May '10

Author: cgutman Date: Thu May 13 00:40:35 2010 New Revision: 47188 URL: http://svn.reactos.org/svn/reactos?rev=47188&view=rev Log: [USBHUB] - Include the DDK before debug.h - Fixes several warnings Modified: branches/aicom-hardware-fun/drivers/usb/usbhub/usbhub.h Modified: branches/aicom-hardware-fun/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-hardware-fun/drivers/usb/… ============================================================================== --- branches/aicom-hardware-fun/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ branches/aicom-hardware-fun/drivers/usb/usbhub/usbhub.h [iso-8859-1] Thu May 13 00:40:35 2010 @@ -1,7 +1,8 @@ -#include <debug.h> #include <ntddk.h> #include <usbioctl.h> + +#include <debug.h> #include "../miniport/usb_wrapper.h" #include "../usbport/hub.h"

1 0

[ekohl] 47187: [MSGINA] Use WLX_PROFILE_V2_0 instead of WLX_PROFILE_V1_0 and create an environment string that is filled with a single environment variable. WIP for bug #4102.
by ekohl＠svn.reactos.org 12 May '10

12 May '10

Author: ekohl Date: Thu May 13 00:10:07 2010 New Revision: 47187 URL: http://svn.reactos.org/svn/reactos?rev=47187&view=rev Log: [MSGINA] Use WLX_PROFILE_V2_0 instead of WLX_PROFILE_V1_0 and create an environment string that is filled with a single environment variable. WIP for bug #4102. Modified: trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Thu May 13 00:10:07 2010 @@ -415,8 +415,9 @@ IN PWSTR Password) { LPWSTR ProfilePath = NULL; + LPWSTR lpEnvironment = NULL; TOKEN_STATISTICS Stats; - PWLX_PROFILE_V1_0 pProfile = NULL; + PWLX_PROFILE_V2_0 pProfile = NULL; DWORD cbStats, cbSize; BOOL bResult; @@ -449,14 +450,24 @@ } /* Allocate memory for profile */ - pProfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WLX_PROFILE_V1_0)); + pProfile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WLX_PROFILE_V2_0)); if (!pProfile) { WARN("HeapAlloc() failed\n"); goto cleanup; } - pProfile->dwType = WLX_PROFILE_TYPE_V1_0; + pProfile->dwType = WLX_PROFILE_TYPE_V2_0; pProfile->pszProfile = ProfilePath; + + lpEnvironment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 32 * sizeof(WCHAR)); + if (!lpEnvironment) + { + WARN("HeapAlloc() failed\n"); + goto cleanup; + } + wcscpy(lpEnvironment, L"LOGONSERVER=\\\\Test"); + + pProfile->pszEnvironment = lpEnvironment; if (!GetTokenInformation(pgContext->UserToken, TokenStatistics, @@ -467,6 +478,7 @@ WARN("Couldn't get Authentication id from user token!\n"); goto cleanup; } + *pgContext->pAuthenticationId = Stats.AuthenticationId; pgContext->pMprNotifyInfo->pszUserName = DuplicationString(UserName); pgContext->pMprNotifyInfo->pszDomain = DuplicationString(Domain); @@ -477,6 +489,10 @@ return TRUE; cleanup: + if (pProfile) + { + HeapFree(GetProcessHeap(), 0, pProfile->pszEnvironment); + } HeapFree(GetProcessHeap(), 0, pProfile); HeapFree(GetProcessHeap(), 0, ProfilePath); return FALSE;

1 0

[sir_richard] 47186: [NTOS]: When grabbing physically contigous pages from the zero or free list, make sure to re-initialize their PFN entries correctly, since their data might be stale. Fixes potential weird memory corruption bugs. [NTOS]: Physically contiguous memory allocations are not guaranteed to be zeroed, so do not zero the pages. [NTOS]: When allocating contigous memory, mark the PFN entries appropriately after mapping the I/O ranges. [NTOS]: When freeing contiguous memory, assert that
by sir_richard＠svn.reactos.org 12 May '10

12 May '10

Author: sir_richard Date: Wed May 12 23:37:19 2010 New Revision: 47186 URL: http://svn.reactos.org/svn/reactos?rev=47186&view=rev Log: [NTOS]: When grabbing physically contigous pages from the zero or free list, make sure to re-initialize their PFN entries correctly, since their data might be stale. Fixes potential weird memory corruption bugs. [NTOS]: Physically contiguous memory allocations are not guaranteed to be zeroed, so do not zero the pages. [NTOS]: When allocating contigous memory, mark the PFN entries appropriately after mapping the I/O ranges. [NTOS]: When freeing contiguous memory, assert that all the freed pages correspond to PFN entries that we expect to have allocated for this purpose. Detects (not neccessarily fixes) memory corruption issues in contiguous memory allocations. [NTOS]: These changes mostly affect certain network card and sound card systems/real hardware, they fix possible bugs and detect corruption that was otherwise going by unnoticed. Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/contmem.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Wed May 12 23:37:19 2010 @@ -132,23 +132,14 @@ // MiUnlinkFreeOrZeroedPage(Pfn1); Pfn1->u3.e2.ReferenceCount = 1; + Pfn1->u2.ShareCount = 1; + Pfn1->u3.e1.PageLocation = ActiveAndValid; + Pfn1->u3.e1.StartOfAllocation = 0; + Pfn1->u3.e1.EndOfAllocation = 0; + Pfn1->u3.e1.PrototypePte = 0; + Pfn1->u4.VerifierAllocation = 0; + Pfn1->PteAddress = (PVOID)0xBAADF00D; - // - // Check if it was already zeroed - // - if (Pfn1->u3.e1.PageLocation != ZeroedPageList) - { - // - // It wasn't, so zero it - // - MiZeroPage(MiGetPfnEntryIndex(Pfn1)); - } - - // - // Mark it in use - // - Pfn1->u3.e1.PageLocation = ActiveAndValid; - // // Check if this is the last PFN, otherwise go on // @@ -331,7 +322,10 @@ { PFN_NUMBER Page; PHYSICAL_ADDRESS PhysicalAddress; - PAGED_CODE (); + PMMPFN Pfn1, EndPfn; + PMMPTE PointerPte; + PVOID BaseAddress; + PAGED_CODE(); ASSERT(SizeInPages != 0); // @@ -348,7 +342,22 @@ // We'll just piggyback on the I/O memory mapper // PhysicalAddress.QuadPart = Page << PAGE_SHIFT; - return MmMapIoSpace(PhysicalAddress, SizeInPages << PAGE_SHIFT, CacheType); + BaseAddress = MmMapIoSpace(PhysicalAddress, SizeInPages << PAGE_SHIFT, CacheType); + ASSERT(BaseAddress); + + /* Loop the PFN entries */ + Pfn1 = MiGetPfnEntry(Page); + EndPfn = Pfn1 + SizeInPages; + PointerPte = MiAddressToPte(BaseAddress); + do + { + /* Write the PTE address */ + Pfn1->PteAddress = PointerPte++; + Pfn1->u4.PteFrame = PFN_FROM_PTE(MiAddressToPte(PointerPte)); + } while (Pfn1++ < EndPfn); + + /* Return the address */ + return BaseAddress; } PVOID @@ -437,6 +446,7 @@ KIRQL OldIrql; PFN_NUMBER PageFrameIndex, LastPage, PageCount; PMMPFN Pfn1, StartPfn; + PMMPTE PointerPte; PAGED_CODE(); // @@ -455,10 +465,9 @@ return; } - // - // Otherwise, get the PTE and page number for the allocation - // - PageFrameIndex = PFN_FROM_PTE(MiAddressToPte(BaseAddress)); + /* Get the PTE and frame number for the allocation*/ + PointerPte = MiAddressToPte(BaseAddress); + PageFrameIndex = PFN_FROM_PTE(PointerPte); // // Now get the PFN entry for this, and make sure it's the correct one @@ -469,11 +478,11 @@ // // This probably means you did a free on an address that was in between // - KeBugCheckEx (BAD_POOL_CALLER, - 0x60, - (ULONG_PTR)BaseAddress, - 0, - 0); + KeBugCheckEx(BAD_POOL_CALLER, + 0x60, + (ULONG_PTR)BaseAddress, + 0, + 0); } // @@ -482,16 +491,21 @@ StartPfn = Pfn1; Pfn1->u3.e1.StartOfAllocation = 0; - // - // Look the PFNs - // + /* Look the PFNs until we find the one that marks the end of the allocation */ do { - // - // Until we find the one that marks the end of the allocation - // + /* Make sure these are the pages we setup in the allocation routine */ + ASSERT(Pfn1->u3.e2.ReferenceCount == 1); + ASSERT(Pfn1->u2.ShareCount == 1); + ASSERT(Pfn1->PteAddress == PointerPte); + ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); + ASSERT(Pfn1->u4.VerifierAllocation == 0); + ASSERT(Pfn1->u3.e1.PrototypePte == 0); + + /* Keep going for assertions */ + PointerPte++; } while (Pfn1++->u3.e1.EndOfAllocation == 0); - + // // Found it, unmark it //

1 0

[gschneider] 47185: [SHELL32] Amendment to r47182: GetAsyncKeyState -> GetKeyState (thanks to Giannis), simplify
by gschneider＠svn.reactos.org 12 May '10

12 May '10

Author: gschneider Date: Wed May 12 23:11:24 2010 New Revision: 47185 URL: http://svn.reactos.org/svn/reactos?rev=47185&view=rev Log: [SHELL32] Amendment to r47182: GetAsyncKeyState -> GetKeyState (thanks to Giannis), simplify Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Wed May 12 23:11:24 2010 @@ -1511,7 +1511,7 @@ msg.pt = 0;*/ LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; - SHORT ctrl = GetAsyncKeyState(VK_CONTROL); + SHORT ctrl = GetKeyState(VK_CONTROL) & 0x8000; /* initiate a rename of the selected file or directory */ if(plvKeyDown->wVKey == VK_F2) @@ -1592,11 +1592,11 @@ IShellBrowser_BrowseObject(lpSb, NULL, SBSP_PARENT); } } - else if(plvKeyDown->wVKey == 'C' && (ctrl & 0x8000)) + else if(plvKeyDown->wVKey == 'C' && ctrl) { FIXME("Need to copy\n"); } - else if(plvKeyDown->wVKey == 'V' && (ctrl & 0x8000)) + else if(plvKeyDown->wVKey == 'V' && ctrl) { FIXME("Need to paste\n"); }

1 0

[sir_richard] 47184: [NTOS]: Move MiFindContiguousPages to ARM3/contmem.c since I don't know what it was doing in freelist.c. No code change.
by sir_richard＠svn.reactos.org 12 May '10

12 May '10

Author: sir_richard Date: Wed May 12 22:57:21 2010 New Revision: 47184 URL: http://svn.reactos.org/svn/reactos?rev=47184&view=rev Log: [NTOS]: Move MiFindContiguousPages to ARM3/contmem.c since I don't know what it was doing in freelist.c. No code change. Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/contmem.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Wed May 12 22:57:21 2010 @@ -17,6 +17,194 @@ #include "../ARM3/miarm.h" /* PRIVATE FUNCTIONS **********************************************************/ + +PFN_NUMBER +NTAPI +MiFindContiguousPages(IN PFN_NUMBER LowestPfn, + IN PFN_NUMBER HighestPfn, + IN PFN_NUMBER BoundaryPfn, + IN PFN_NUMBER SizeInPages, + IN MEMORY_CACHING_TYPE CacheType) +{ + PFN_NUMBER Page, PageCount, LastPage, Length, BoundaryMask; + ULONG i = 0; + PMMPFN Pfn1, EndPfn; + KIRQL OldIrql; + PAGED_CODE (); + ASSERT(SizeInPages != 0); + + // + // Convert the boundary PFN into an alignment mask + // + BoundaryMask = ~(BoundaryPfn - 1); + + // + // Loop all the physical memory blocks + // + do + { + // + // Capture the base page and length of this memory block + // + Page = MmPhysicalMemoryBlock->Run[i].BasePage; + PageCount = MmPhysicalMemoryBlock->Run[i].PageCount; + + // + // Check how far this memory block will go + // + LastPage = Page + PageCount; + + // + // Trim it down to only the PFNs we're actually interested in + // + if ((LastPage - 1) > HighestPfn) LastPage = HighestPfn + 1; + if (Page < LowestPfn) Page = LowestPfn; + + // + // Skip this run if it's empty or fails to contain all the pages we need + // + if (!(PageCount) || ((Page + SizeInPages) > LastPage)) continue; + + // + // Now scan all the relevant PFNs in this run + // + Length = 0; + for (Pfn1 = MiGetPfnEntry(Page); Page < LastPage; Page++, Pfn1++) + { + // + // If this PFN is in use, ignore it + // + if (MiIsPfnInUse(Pfn1)) continue; + + // + // If we haven't chosen a start PFN yet and the caller specified an + // alignment, make sure the page matches the alignment restriction + // + if ((!(Length) && (BoundaryPfn)) && + (((Page ^ (Page + SizeInPages - 1)) & BoundaryMask))) + { + // + // It does not, so bail out + // + continue; + } + + // + // Increase the number of valid pages, and check if we have enough + // + if (++Length == SizeInPages) + { + // + // It appears we've amassed enough legitimate pages, rollback + // + Pfn1 -= (Length - 1); + Page -= (Length - 1); + + // + // Acquire the PFN lock + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + do + { + // + // Things might've changed for us. Is the page still free? + // + if (MiIsPfnInUse(Pfn1)) break; + + // + // So far so good. Is this the last confirmed valid page? + // + if (!--Length) + { + // + // Sanity check that we didn't go out of bounds + // + ASSERT(i != MmPhysicalMemoryBlock->NumberOfRuns); + + // + // Loop until all PFN entries have been processed + // + EndPfn = Pfn1 - SizeInPages + 1; + do + { + // + // This PFN is now a used page, set it up + // + MiUnlinkFreeOrZeroedPage(Pfn1); + Pfn1->u3.e2.ReferenceCount = 1; + + // + // Check if it was already zeroed + // + if (Pfn1->u3.e1.PageLocation != ZeroedPageList) + { + // + // It wasn't, so zero it + // + MiZeroPage(MiGetPfnEntryIndex(Pfn1)); + } + + // + // Mark it in use + // + Pfn1->u3.e1.PageLocation = ActiveAndValid; + + // + // Check if this is the last PFN, otherwise go on + // + if (Pfn1 == EndPfn) break; + Pfn1--; + } while (TRUE); + + // + // Mark the first and last PFN so we can find them later + // + Pfn1->u3.e1.StartOfAllocation = 1; + (Pfn1 + SizeInPages - 1)->u3.e1.EndOfAllocation = 1; + + // + // Now it's safe to let go of the PFN lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // Quick sanity check that the last PFN is consistent + // + EndPfn = Pfn1 + SizeInPages; + ASSERT(EndPfn == MiGetPfnEntry(Page + 1)); + + // + // Compute the first page, and make sure it's consistent + // + Page -= SizeInPages - 1; + ASSERT(Pfn1 == MiGetPfnEntry(Page)); + ASSERT(Page != 0); + return Page; + } + + // + // Keep going. The purpose of this loop is to reconfirm that + // after acquiring the PFN lock these pages are still usable + // + Pfn1++; + Page++; + } while (TRUE); + + // + // If we got here, something changed while we hadn't acquired + // the PFN lock yet, so we'll have to restart + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + Length = 0; + } + } + } while (++i != MmPhysicalMemoryBlock->NumberOfRuns); + + // + // And if we get here, it means no suitable physical memory runs were found + // + return 0; +} PVOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed May 12 22:57:21 2010 @@ -621,4 +621,10 @@ VOID ); +BOOLEAN +NTAPI +MiIsPfnInUse( + IN PMMPFN Pfn1 +); + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Wed May 12 22:57:21 2010 @@ -145,194 +145,6 @@ { /* Standby list or higher, unlinked, and with references */ return !MiIsPfnFree(Pfn1); -} - -PFN_NUMBER -NTAPI -MiFindContiguousPages(IN PFN_NUMBER LowestPfn, - IN PFN_NUMBER HighestPfn, - IN PFN_NUMBER BoundaryPfn, - IN PFN_NUMBER SizeInPages, - IN MEMORY_CACHING_TYPE CacheType) -{ - PFN_NUMBER Page, PageCount, LastPage, Length, BoundaryMask; - ULONG i = 0; - PMMPFN Pfn1, EndPfn; - KIRQL OldIrql; - PAGED_CODE (); - ASSERT(SizeInPages != 0); - - // - // Convert the boundary PFN into an alignment mask - // - BoundaryMask = ~(BoundaryPfn - 1); - - // - // Loop all the physical memory blocks - // - do - { - // - // Capture the base page and length of this memory block - // - Page = MmPhysicalMemoryBlock->Run[i].BasePage; - PageCount = MmPhysicalMemoryBlock->Run[i].PageCount; - - // - // Check how far this memory block will go - // - LastPage = Page + PageCount; - - // - // Trim it down to only the PFNs we're actually interested in - // - if ((LastPage - 1) > HighestPfn) LastPage = HighestPfn + 1; - if (Page < LowestPfn) Page = LowestPfn; - - // - // Skip this run if it's empty or fails to contain all the pages we need - // - if (!(PageCount) || ((Page + SizeInPages) > LastPage)) continue; - - // - // Now scan all the relevant PFNs in this run - // - Length = 0; - for (Pfn1 = MiGetPfnEntry(Page); Page < LastPage; Page++, Pfn1++) - { - // - // If this PFN is in use, ignore it - // - if (MiIsPfnInUse(Pfn1)) continue; - - // - // If we haven't chosen a start PFN yet and the caller specified an - // alignment, make sure the page matches the alignment restriction - // - if ((!(Length) && (BoundaryPfn)) && - (((Page ^ (Page + SizeInPages - 1)) & BoundaryMask))) - { - // - // It does not, so bail out - // - continue; - } - - // - // Increase the number of valid pages, and check if we have enough - // - if (++Length == SizeInPages) - { - // - // It appears we've amassed enough legitimate pages, rollback - // - Pfn1 -= (Length - 1); - Page -= (Length - 1); - - // - // Acquire the PFN lock - // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - do - { - // - // Things might've changed for us. Is the page still free? - // - if (MiIsPfnInUse(Pfn1)) break; - - // - // So far so good. Is this the last confirmed valid page? - // - if (!--Length) - { - // - // Sanity check that we didn't go out of bounds - // - ASSERT(i != MmPhysicalMemoryBlock->NumberOfRuns); - - // - // Loop until all PFN entries have been processed - // - EndPfn = Pfn1 - SizeInPages + 1; - do - { - // - // This PFN is now a used page, set it up - // - MiUnlinkFreeOrZeroedPage(Pfn1); - Pfn1->u3.e2.ReferenceCount = 1; - - // - // Check if it was already zeroed - // - if (Pfn1->u3.e1.PageLocation != ZeroedPageList) - { - // - // It wasn't, so zero it - // - MiZeroPage(MiGetPfnEntryIndex(Pfn1)); - } - - // - // Mark it in use - // - Pfn1->u3.e1.PageLocation = ActiveAndValid; - - // - // Check if this is the last PFN, otherwise go on - // - if (Pfn1 == EndPfn) break; - Pfn1--; - } while (TRUE); - - // - // Mark the first and last PFN so we can find them later - // - Pfn1->u3.e1.StartOfAllocation = 1; - (Pfn1 + SizeInPages - 1)->u3.e1.EndOfAllocation = 1; - - // - // Now it's safe to let go of the PFN lock - // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - // - // Quick sanity check that the last PFN is consistent - // - EndPfn = Pfn1 + SizeInPages; - ASSERT(EndPfn == MiGetPfnEntry(Page + 1)); - - // - // Compute the first page, and make sure it's consistent - // - Page -= SizeInPages - 1; - ASSERT(Pfn1 == MiGetPfnEntry(Page)); - ASSERT(Page != 0); - return Page; - } - - // - // Keep going. The purpose of this loop is to reconfirm that - // after acquiring the PFN lock these pages are still usable - // - Pfn1++; - Page++; - } while (TRUE); - - // - // If we got here, something changed while we hadn't acquired - // the PFN lock yet, so we'll have to restart - // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - Length = 0; - } - } - } while (++i != MmPhysicalMemoryBlock->NumberOfRuns); - - // - // And if we get here, it means no suitable physical memory runs were found - // - return 0; } PMDL

1 0

[sir_richard] 47183: [NTOS]: Add assertions to the paged pool and demand zero page faults, to catch possible errors and corruptions. These paths are not yet taken in today's builds, so they do not affect any runtime code. [NTOS]: Add assertions regarding the portability of certain code, which will need changes on ARM/x64. These should probably be C_ASSERT's but I don't want to break Timo's build. [NTOS]: Define MM_NOIRQL (found in assertions) instead of magical -1. [NTOS]: Add MI_IS_SESSION_PTE
by sir_richard＠svn.reactos.org 12 May '10

12 May '10

Author: sir_richard Date: Wed May 12 22:48:15 2010 New Revision: 47183 URL: http://svn.reactos.org/svn/reactos?rev=47183&view=rev Log: [NTOS]: Add assertions to the paged pool and demand zero page faults, to catch possible errors and corruptions. These paths are not yet taken in today's builds, so they do not affect any runtime code. [NTOS]: Add assertions regarding the portability of certain code, which will need changes on ARM/x64. These should probably be C_ASSERT's but I don't want to break Timo's build. [NTOS]: Define MM_NOIRQL (found in assertions) instead of magical -1. [NTOS]: Add MI_IS_SESSION_PTE macro. [NTOS]: Export the MiXxxPte variables. [NTOS]: Fix some typos in comments. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed May 12 22:48:15 2010 @@ -42,7 +42,7 @@ #define _1KB (1024) #define _1MB (1024 * _1KB) -/* Are mapped by a PDE */ +/* Area mapped by a PDE */ #define PDE_MAPPED_VA (PTE_COUNT * PAGE_SIZE) /* Size of a PDE directory, and size of a page table */ @@ -90,6 +90,18 @@ #define MM_NOACCESS (MM_DECOMMIT | MM_NOCACHE) // +// Assertions for session images, addresses, and PTEs +// +#define MI_IS_SESSION_IMAGE_ADDRESS(Address) \ + (((Address) >= MiSessionImageStart) && ((Address) < MiSessionImageEnd)) + +#define MI_IS_SESSION_ADDRESS(Address) \ + (((Address) >= MmSessionBase) && ((Address) < MiSessionSpaceEnd)) + +#define MI_IS_SESSION_PTE(Pte) \ + ((((PMMPTE)Pte) >= MiSessionBasePte) && (((PMMPTE)Pte) < MiSessionLastPte)) + +// // Corresponds to MMPTE_SOFTWARE.Protection // #ifdef _M_IX86 @@ -119,6 +131,11 @@ // #define LIST_HEAD 0xFFFFFFFF +// +// Special IRQL value (found in assertions) +// +#define MM_NOIRQL (KIRQL)0xFFFFFFFF + // // FIXFIX: These should go in ex.h after the pool merge // @@ -284,6 +301,10 @@ extern ULONG MmSystemViewSize; extern PVOID MmSessionBase; extern PVOID MiSessionSpaceEnd; +extern PMMPTE MiSessionImagePteStart; +extern PMMPTE MiSessionImagePteEnd; +extern PMMPTE MiSessionBasePte; +extern PMMPTE MiSessionLastPte; extern ULONG MmSizeOfPagedPoolInBytes; extern PMMPTE MmSystemPagePtes; extern PVOID MmSystemCacheStart; @@ -327,16 +348,17 @@ extern PFN_NUMBER MmTotalSystemDriverPages; extern PVOID MiSessionImageStart; extern PVOID MiSessionImageEnd; +extern PMMPTE MiHighestUserPte; +extern PMMPDE MiHighestUserPde; +extern PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; #define MI_PFN_TO_PFNENTRY(x) (&MmPfnDatabase[1][x]) #define MI_PFNENTRY_TO_PFN(x) (x - MmPfnDatabase[1]) -#define MI_IS_SESSION_IMAGE_ADDRESS(Address) \ - (((Address) >= MiSessionImageStart) && ((Address) < MiSessionImageEnd)) - -#define MI_IS_SESSION_ADDRESS(Address) \ - (((Address) >= MmSessionBase) && ((Address) < MiSessionSpaceEnd)) - +// +// Returns if the page is physically resident (ie: a large page) +// FIXFIX: CISC/x86 only? +// FORCEINLINE BOOLEAN MI_IS_PHYSICAL_ADDRESS(IN PVOID Address) Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed May 12 22:48:15 2010 @@ -27,6 +27,10 @@ PMMPDE PointerPde; NTSTATUS Status = STATUS_SUCCESS; + /* No session support in ReactOS yet */ + ASSERT(MI_IS_SESSION_ADDRESS(Address) == FALSE); + ASSERT(MI_IS_SESSION_PTE(Address) == FALSE); + // // Check if this is a fault while trying to access the page table itself // @@ -60,6 +64,9 @@ // if (PointerPde->u.Hard.Valid == 0) { + /* This seems to be making the assumption that one PDE is one page long */ + ASSERT(PAGE_SIZE == (PD_COUNT * (sizeof(MMPTE) * PDE_COUNT))); + // // Copy it from our double-mapped system page directory // @@ -88,6 +95,10 @@ Address, Process); + /* Must currently only be called by paging path, for system addresses only */ + ASSERT(OldIrql == MM_NOIRQL); + ASSERT(Process == NULL); + // // Lock the PFN database // @@ -110,11 +121,16 @@ // InterlockedIncrement(&KeGetCurrentPrcb()->MmDemandZeroCount); + /* Shouldn't see faults for user PTEs yet */ + ASSERT(PointerPte > MiHighestUserPte); + // // Build the PTE // TempPte = ValidKernelPte; TempPte.u.Hard.PageFrameNumber = PageFrameNumber; + ASSERT(TempPte.u.Hard.Valid == 1); + ASSERT(PointerPte->u.Hard.Valid == 0); *PointerPte = TempPte; ASSERT(PointerPte->u.Hard.Valid == 1); @@ -155,6 +171,9 @@ // TempPte = *PointerPte; + /* No prototype */ + ASSERT(PrototypePte == NULL); + // // The PTE must be invalid, but not totally blank // @@ -175,7 +194,8 @@ Status = MiResolveDemandZeroFault(Address, PointerPte, Process, - -1); + MM_NOIRQL); + ASSERT(KeAreAllApcsDisabled () == TRUE); if (NT_SUCCESS(Status)) { // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Wed May 12 22:48:15 2010 @@ -334,12 +334,13 @@ // // Save it into our double-buffered system page directory // + /* This seems to be making the assumption that one PDE is one page long */ + ASSERT(PAGE_SIZE == (PD_COUNT * (sizeof(MMPTE) * PDE_COUNT))); MmSystemPagePtes[(ULONG_PTR)PointerPte & (PAGE_SIZE - 1) / sizeof(MMPTE)] = TempPte; - // - // Write the actual PTE now - // + /* Write the actual PTE now */ + ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte++ = TempPte; // @@ -432,6 +433,7 @@ // // Write the demand zero PTE and keep going // + ASSERT(PointerPte->u.Hard.Valid == 0); *PointerPte++ = TempPte; } while (PointerPte < StartPte);

1 0

[gschneider] 47182: [SHELL32] Add initial ctrl+c/v handling (WIP for bug #4850)
by gschneider＠svn.reactos.org 12 May '10

12 May '10

Author: gschneider Date: Wed May 12 22:41:55 2010 New Revision: 47182 URL: http://svn.reactos.org/svn/reactos?rev=47182&view=rev Log: [SHELL32] Add initial ctrl+c/v handling (WIP for bug #4850) Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Wed May 12 22:41:55 2010 @@ -1511,6 +1511,7 @@ msg.pt = 0;*/ LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; + SHORT ctrl = GetAsyncKeyState(VK_CONTROL); /* initiate a rename of the selected file or directory */ if(plvKeyDown->wVKey == VK_F2) @@ -1590,6 +1591,14 @@ { IShellBrowser_BrowseObject(lpSb, NULL, SBSP_PARENT); } + } + else if(plvKeyDown->wVKey == 'C' && (ctrl & 0x8000)) + { + FIXME("Need to copy\n"); + } + else if(plvKeyDown->wVKey == 'V' && (ctrl & 0x8000)) + { + FIXME("Need to paste\n"); } else FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey);

1 0

[gschneider] 47181: [SHELL32] Remove misplaced function header
by gschneider＠svn.reactos.org 12 May '10

12 May '10

Author: gschneider Date: Wed May 12 22:37:48 2010 New Revision: 47181 URL: http://svn.reactos.org/svn/reactos?rev=47181&view=rev Log: [SHELL32] Remove misplaced function header Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] Wed May 12 22:37:48 2010 @@ -315,9 +315,6 @@ return NULL; } - /************************************************************************** - * ISF_ControlPanel_fnEnumObjects - */ static BOOL SHELL_RegisterCPanelApp(IEnumIDList* list, LPCSTR path) { LPITEMIDLIST pidl;

1 0

[gschneider] 47180: [SHELL32] Improve debug print by printing text
by gschneider＠svn.reactos.org 12 May '10

12 May '10

Author: gschneider Date: Wed May 12 21:54:02 2010 New Revision: 47180 URL: http://svn.reactos.org/svn/reactos?rev=47180&view=rev Log: [SHELL32] Improve debug print by printing text Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] Wed May 12 21:54:02 2010 @@ -1346,7 +1346,7 @@ } else { - FIXME("\n"); + FIXME("Couldn't retrieve pointer to cpl structure\n"); return E_FAIL; } if (SUCCEEDED(IShellLink_Constructor(NULL, &IID_IShellLinkA, (LPVOID*)&isl)))

1 0

[gschneider] 47179: [USRMGR] - Fix the friends of the bug of the month
by gschneider＠svn.reactos.org 12 May '10

12 May '10

Author: gschneider Date: Wed May 12 21:19:44 2010 New Revision: 47179 URL: http://svn.reactos.org/svn/reactos?rev=47179&view=rev Log: [USRMGR] - Fix the friends of the bug of the month Modified: trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Wed May 12 21:19:44 2010 @@ -234,10 +234,10 @@ } if (group.lgrpi1_name) - HeapFree(GetProcessHeap, 0, group.lgrpi1_name); + HeapFree(GetProcessHeap(), 0, group.lgrpi1_name); if (group.lgrpi1_comment) - HeapFree(GetProcessHeap, 0, group.lgrpi1_comment); + HeapFree(GetProcessHeap(), 0, group.lgrpi1_comment); } Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Wed May 12 21:19:44 2010 @@ -294,16 +294,16 @@ } if (user.usri3_name) - HeapFree(GetProcessHeap, 0, user.usri3_name); + HeapFree(GetProcessHeap(), 0, user.usri3_name); if (user.usri3_full_name) - HeapFree(GetProcessHeap, 0, user.usri3_full_name); + HeapFree(GetProcessHeap(), 0, user.usri3_full_name); if (user.usri3_comment) - HeapFree(GetProcessHeap, 0, user.usri3_comment); + HeapFree(GetProcessHeap(), 0, user.usri3_comment); if (user.usri3_password) - HeapFree(GetProcessHeap, 0, user.usri3_password); + HeapFree(GetProcessHeap(), 0, user.usri3_password); }

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