Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[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

[sir_richard] 47178: [NTOS]: Fix MiInsertPageInFreeList, it was using the ARM3 PFN Database macro, even though we are still using the Mm PFN Database. Also, it was lacking the code to notify the zero-page thread, and to increase available pages.
by sir_richard＠svn.reactos.org 12 May '10

12 May '10

Author: sir_richard Date: Wed May 12 21:11:49 2010 New Revision: 47178 URL: http://svn.reactos.org/svn/reactos?rev=47178&view=rev Log: [NTOS]: Fix MiInsertPageInFreeList, it was using the ARM3 PFN Database macro, even though we are still using the Mm PFN Database. Also, it was lacking the code to notify the zero-page thread, and to increase available pages. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Wed May 12 21:11:49 2010 @@ -466,7 +466,7 @@ (PageFrameIndex >= MmLowestPhysicalPage)); /* Get the PFN entry */ - Pfn1 = MI_PFN_TO_PFNENTRY(PageFrameIndex); + Pfn1 = MiGetPfnEntry(PageFrameIndex); /* Sanity checks that a right kind of page is being inserted here */ ASSERT(Pfn1->u4.MustBeCached == 0); @@ -484,7 +484,7 @@ if (LastPage != LIST_HEAD) { /* Link us with the previous page, so we're at the end now */ - MI_PFN_TO_PFNENTRY(LastPage)->u1.Flink = PageFrameIndex; + MiGetPfnEntry(LastPage)->u1.Flink = PageFrameIndex; } else { @@ -507,8 +507,8 @@ Pfn1->u4.InPageError = 0; Pfn1->u4.AweAllocation = 0; - /* Not yet until we switch to this */ - //MmAvailablePages++; + /* Increase available pages */ + MmAvailablePages++; /* Check if we've reached the configured low memory threshold */ if (MmAvailablePages == MmLowMemoryThreshold) @@ -552,7 +552,13 @@ ColorTable->Count++; #endif - /* FIXME: Notify zero page thread if enough pages are on the free list now */ + /* Notify zero page thread if enough pages are on the free list now */ + extern KEVENT ZeroPageThreadEvent; + if ((MmFreePageListHead.Total > 8) && !(KeReadStateEvent(&ZeroPageThreadEvent))) + { + /* This is ReactOS-specific */ + KeSetEvent(&ZeroPageThreadEvent, IO_NO_INCREMENT, FALSE); + } } /* 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 21:11:49 2010 @@ -49,7 +49,7 @@ SIZE_T MmPeakCommitment; SIZE_T MmtotalCommitLimitMaximum; -static KEVENT ZeroPageThreadEvent; +KEVENT ZeroPageThreadEvent; static BOOLEAN ZeroPageThreadShouldTerminate = FALSE; static RTL_BITMAP MiUserPfnBitMap;

1 0

[ekohl] 47177: [WINLOGON] Fixed bug of the month. I'm surprised that winlogon worked at all.
by ekohl＠svn.reactos.org 12 May '10

12 May '10

Author: ekohl Date: Wed May 12 21:10:04 2010 New Revision: 47177 URL: http://svn.reactos.org/svn/reactos?rev=47177&view=rev Log: [WINLOGON] Fixed bug of the month. I'm surprised that winlogon worked at all. Modified: trunk/reactos/base/system/winlogon/environment.c Modified: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… ============================================================================== --- trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Wed May 12 21:10:04 2010 @@ -66,7 +66,7 @@ } /* Allocate enough memory */ - lpFullEnviron = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); + lpFullEnviron = HeapAlloc(GetProcessHeap(), 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); if (!lpFullEnviron) { TRACE("HeapAlloc() failed\n");

1 0

[akhaldi] 47176: [XDK] - Add RESULT_ZERO, RESULT_NEGATIVE and RESULT_POSITIVE definitions for other architectures than X86 [DDK] - Update ntddk.h to reflect XDK changes.
by akhaldi＠svn.reactos.org 12 May '10

12 May '10

Author: akhaldi Date: Wed May 12 20:43:23 2010 New Revision: 47176 URL: http://svn.reactos.org/svn/reactos?rev=47176&view=rev Log: [XDK] - Add RESULT_ZERO, RESULT_NEGATIVE and RESULT_POSITIVE definitions for other architectures than X86 [DDK] - Update ntddk.h to reflect XDK changes. Modified: branches/header-work/include/ddk/ntddk.h branches/header-work/include/xdk/exfuncs.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Wed May 12 20:43:23 2010 @@ -3283,11 +3283,19 @@ #define ExIsResourceAcquired ExIsResourceAcquiredSharedLite #define ExReleaseResourceForThread ExReleaseResourceForThreadLite +#ifndef _M_IX86 +#define RESULT_ZERO 0 +#define RESULT_NEGATIVE 1 +#define RESULT_POSITIVE 2 +#endif + +#if defined(_X86_) || defined(_IA64_) || defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; +#endif #ifdef _X86_ Modified: branches/header-work/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/exfuncs… ============================================================================== --- branches/header-work/include/xdk/exfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/exfuncs.h [iso-8859-1] Wed May 12 20:43:23 2010 @@ -299,11 +299,19 @@ #define ExIsResourceAcquired ExIsResourceAcquiredSharedLite #define ExReleaseResourceForThread ExReleaseResourceForThreadLite +#ifndef _M_IX86 +#define RESULT_ZERO 0 +#define RESULT_NEGATIVE 1 +#define RESULT_POSITIVE 2 +#endif + +#if defined(_X86_) || defined(_IA64_) || defined(_M_AMD64) && !defined(RC_INVOKED) && !defined(MIDL_PASS) typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; +#endif #ifdef _X86_

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
44
Older →

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 May 2010