Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[gadamopoulos] 53871: [shell32] - Fix auto complete init method based on Wine. Autocomplete shell tests should no longer crash now. - Brought to you by Claudiu Mihail.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Sep 27 11:58:19 2011 New Revision: 53871 URL: http://svn.reactos.org/svn/reactos?rev=53871&view=rev Log: [shell32] - Fix auto complete init method based on Wine. Autocomplete shell tests should no longer crash now. - Brought to you by Claudiu Mihail. Modified: trunk/reactos/dll/win32/shell32/autocomplete.cpp trunk/reactos/dll/win32/shell32/autocomplete.h Modified: trunk/reactos/dll/win32/shell32/autocomplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… ============================================================================== --- trunk/reactos/dll/win32/shell32/autocomplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/autocomplete.cpp [iso-8859-1] Tue Sep 27 11:58:19 2011 @@ -45,6 +45,7 @@ CAutoComplete::CAutoComplete() { enabled = TRUE; + initialized = FALSE; options = ACO_AUTOAPPEND; wpOrigEditProc = NULL; hwndListBox = NULL; @@ -105,7 +106,15 @@ if (options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); - hwndEdit = hwndEdit; + if (!hwndEdit || !punkACL) + return E_INVALIDARG; + + if (this->initialized) + { + WARN("Autocompletion object is already initialized\n"); + /* This->hwndEdit is set to NULL when the edit window is destroyed. */ + return this->hwndEdit ? E_FAIL : E_UNEXPECTED; + } if (!SUCCEEDED (punkACL->QueryInterface(IID_IEnumString, (LPVOID *)&enumstr))) { @@ -113,6 +122,8 @@ return E_NOINTERFACE; } + this->hwndEdit = hwndEdit; + this->initialized = TRUE; wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); SetWindowLongPtrW(hwndEdit, GWLP_USERDATA, (LONG_PTR)this); Modified: trunk/reactos/dll/win32/shell32/autocomplete.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… ============================================================================== --- trunk/reactos/dll/win32/shell32/autocomplete.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/autocomplete.h [iso-8859-1] Tue Sep 27 11:58:19 2011 @@ -29,6 +29,7 @@ { private: BOOL enabled; + BOOL initialized; HWND hwndEdit; HWND hwndListBox; WNDPROC wpOrigEditProc;

13 years, 2 months

[akhaldi] 53870: [NTOSKRNL] * Fix CMake build...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 26 23:31:30 2011 New Revision: 53870 URL: http://svn.reactos.org/svn/reactos?rev=53870&view=rev Log: [NTOSKRNL] * Fix CMake build... Modified: trunk/reactos/ntoskrnl/CMakeLists.txt Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Sep 26 23:31:30 2011 @@ -214,6 +214,7 @@ mm/ARM3/pool.c mm/ARM3/procsup.c mm/ARM3/section.c + mm/ARM3/special.c mm/ARM3/sysldr.c mm/ARM3/syspte.c mm/ARM3/vadnode.c

13 years, 2 months

[akhaldi] 53869: [SHELL32] * Implement CDefView::SetCurrentViewMode based on Wine, along with some other bugfixes. Shell32 shlview winetest doesn't crash anymore as a result. * Brought to you by Cl...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 26 23:10:38 2011 New Revision: 53869 URL: http://svn.reactos.org/svn/reactos?rev=53869&view=rev Log: [SHELL32] * Implement CDefView::SetCurrentViewMode based on Wine, along with some other bugfixes. Shell32 shlview winetest doesn't crash anymore as a result. * Brought to you by Claudiu Mihail. Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Mon Sep 26 23:10:38 2011 @@ -2327,7 +2327,7 @@ HRESULT WINAPI CDefView::GetItemObject(UINT uItem, REFIID riid, LPVOID *ppvOut) { - HRESULT hr = E_FAIL; + HRESULT hr = E_NOINTERFACE; TRACE("(%p)->(uItem=0x%08x,\n\tIID=%s, ppv=%p)\n",this, uItem, debugstr_guid(&riid), ppvOut); @@ -2342,6 +2342,8 @@ CDefFolderMenu_Create2(NULL, NULL, cidl, (LPCITEMIDLIST*)apidl, pSFParent, NULL, 0, NULL, (IContextMenu**)ppvOut); if (!ppvOut) hr = E_OUTOFMEMORY; + else + hr = S_OK; } break; @@ -2369,7 +2371,37 @@ HRESULT STDMETHODCALLTYPE CDefView::SetCurrentViewMode(UINT ViewMode) { - return E_NOTIMPL; + DWORD dwStyle; + TRACE("(%p)->(%u), stub\n", this, ViewMode); + + if ((ViewMode < FVM_FIRST || ViewMode > FVM_LAST) /* && (ViewMode != FVM_AUTO) */ ) + return E_INVALIDARG; + + /* Windows before Vista uses LVM_SETVIEW and possibly + LVM_SETEXTENDEDLISTVIEWSTYLE to set the style of the listview, + while later versions seem to accomplish this through other + means. */ + switch (ViewMode) + { + case FVM_ICON: dwStyle = LVS_ICON; break; + case FVM_DETAILS: dwStyle = LVS_REPORT; break; + case FVM_SMALLICON: dwStyle = LVS_SMALLICON; break; + case FVM_LIST: dwStyle = LVS_LIST; break; + default: + { + FIXME("ViewMode %d not implemented\n", ViewMode); + dwStyle = LVS_LIST; + break; + } + } + + SetStyle(dwStyle, LVS_TYPEMASK); + + /* This will not necessarily be the actual mode set above. + This mimics the behavior of Windows XP. */ + this->FolderSettings.ViewMode = ViewMode; + + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::GetFolder(REFIID riid, void **ppv) @@ -2512,7 +2544,7 @@ this, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); if (!prgCmds) - return E_POINTER; + return E_INVALIDARG; for (UINT i=0; i < cCmds; i++) { @@ -2532,6 +2564,9 @@ { FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08x Opt:0x%08x %p %p)\n", this, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); + + if (!pguidCmdGroup) + return OLECMDERR_E_UNKNOWNGROUP; if (IsEqualIID(*pguidCmdGroup, CGID_Explorer) && (nCmdID == 0x29) &&

13 years, 2 months

[fireball] 53868: [NTOS] - Introduce two MM_EMPTY_LIST definitions - one for PTE as a whole and one for MMPTE_LIST NextEntry field only and move them to the actual architecture specific headers. - ...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Sep 26 21:57:40 2011 New Revision: 53868 URL: http://svn.reactos.org/svn/reactos?rev=53868&view=rev Log: [NTOS] - Introduce two MM_EMPTY_LIST definitions - one for PTE as a whole and one for MMPTE_LIST NextEntry field only and move them to the actual architecture specific headers. - Implement special pool. This is a special (Capt. Obvious!) kernel pool which is used to catch overruns or underruns, freed memory access and perform additional validation for paged/nonpaged allocations access. Added: trunk/reactos/ntoskrnl/mm/ARM3/special.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/syspte.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Mon Sep 26 21:57:40 2011 @@ -75,6 +75,11 @@ #define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) #define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) +/* MMPTE related defines */ +#define MM_EMPTY_PTE_LIST ((ULONG64)0xFFFFFFFF) +#define MM_EMPTY_LIST ((ULONG_PTR)-1) +#define PTE_PER_PAGE 0x200 + #define ADDR_TO_PAGE_TABLE(v) ((ULONG)(((ULONG_PTR)(v)) / (512 * PAGE_SIZE))) #define ADDR_TO_PDE_OFFSET(v) ((ULONG)((((ULONG_PTR)(v)) / (512 * PAGE_SIZE)))) #define ADDR_TO_PTE_OFFSET(v) ((ULONG)((((ULONG_PTR)(v)) % (512 * PAGE_SIZE)) / PAGE_SIZE)) Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Mon Sep 26 21:57:40 2011 @@ -16,6 +16,10 @@ #define PAGE_MASK(x) ((x)&(~0xfff)) #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) +/* MMPTE related defines */ +#define MM_EMPTY_PTE_LIST ((ULONG)0xFFFFF) +#define MM_EMPTY_LIST ((ULONG_PTR)-1) + /* Base addresses of PTE and PDE */ #define PAGETABLE_MAP (0xc0000000) #define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) @@ -26,6 +30,8 @@ #define PDE_TOP 0xC0300FFF #define PTE_TOP 0xC03FFFFF #define HYPER_SPACE 0xC0400000 + +#define PTE_PER_PAGE 0x400 /* Converting address to a corresponding PDE or PTE entry */ #define MiAddressToPde(x) \ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon Sep 26 21:57:40 2011 @@ -887,6 +887,36 @@ ULONG ErrorCode ); +/* special.c *****************************************************************/ + +VOID +NTAPI +MiInitializeSpecialPool(); + +BOOLEAN +NTAPI +MmUseSpecialPool( + IN SIZE_T NumberOfBytes, + IN ULONG Tag); + +BOOLEAN +NTAPI +MmIsSpecialPoolAddress( + IN PVOID P); + +PVOID +NTAPI +MmAllocateSpecialPool( + IN SIZE_T NumberOfBytes, + IN ULONG Tag, + IN POOL_TYPE PoolType, + IN ULONG SpecialType); + +VOID +NTAPI +MmFreeSpecialPool( + IN PVOID P); + /* mm.c **********************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Mon Sep 26 21:57:40 2011 @@ -469,6 +469,18 @@ ASSERT(PoolDesc != NULL); // + // Check if this is a special pool allocation + // + if (MmUseSpecialPool(NumberOfBytes, Tag)) + { + // + // Try to allocate using special pool + // + Entry = MmAllocateSpecialPool(NumberOfBytes, Tag, PoolType, 2); + if (Entry) return Entry; + } + + // // Check if this is a big page allocation // if (NumberOfBytes > POOL_MAX_ALLOC) @@ -756,6 +768,18 @@ BOOLEAN Combined = FALSE; // + // Check if it was allocated from a special pool + // + if (MmIsSpecialPoolAddress(P)) + { + // + // It is, so handle it via special pool free routine + // + MmFreeSpecialPool(P); + return; + } + + // // Quickly deal with big page allocations // if (PAGE_ALIGN(P) == P) Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Mon Sep 26 21:57:40 2011 @@ -1792,6 +1792,9 @@ // InitializePool(PagedPool, 0); + /* Initialize special pool */ + MiInitializeSpecialPool(); + /* Default low threshold of 30MB or one fifth of paged pool */ MiLowPagedPoolThreshold = (30 * _1MB) >> PAGE_SHIFT; MiLowPagedPoolThreshold = min(MiLowPagedPoolThreshold, Size / 5); Added: trunk/reactos/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/special.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/special.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] Mon Sep 26 21:57:40 2011 @@ -1,0 +1,536 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/special.c + * PURPOSE: ARM Memory Manager Special Pool implementation + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* + References: + http://msdn.microsoft.com/en-us/library/ff551832(v=VS.85).aspx +*/ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +extern PMMPTE MmSystemPteBase; + +PMMPTE +NTAPI +MiReserveAlignedSystemPtes(IN ULONG NumberOfPtes, + IN MMSYSTEM_PTE_POOL_TYPE SystemPtePoolType, + IN ULONG Alignment); + +/* GLOBALS ********************************************************************/ + +#define SPECIAL_POOL_PAGED_PTE 0x2000 +#define SPECIAL_POOL_NONPAGED_PTE 0x4000 +#define SPECIAL_POOL_PAGED 0x8000 + +PVOID MmSpecialPoolStart; +PVOID MmSpecialPoolEnd; +PVOID MiSpecialPoolExtra; +ULONG MiSpecialPoolExtraCount; + +PMMPTE MiSpecialPoolFirstPte; +PMMPTE MiSpecialPoolLastPte; + +PFN_NUMBER MiSpecialPagesNonPagedMaximum; + +BOOLEAN MmSpecialPoolCatchOverruns = TRUE; + +typedef struct _MI_FREED_SPECIAL_POOL +{ + POOL_HEADER OverlaidPoolHeader; + /* TODO: Add overlaid verifier pool header */ + ULONG Signature; + ULONG TickCount; + ULONG NumberOfBytesRequested; + BOOLEAN Pagable; + PVOID VirtualAddress; + PVOID StackPointer; + ULONG StackBytes; + PETHREAD Thread; + UCHAR StackData[0x400]; +} MI_FREED_SPECIAL_POOL, *PMI_FREED_SPECIAL_POOL; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID NTAPI MiTestSpecialPool(); + +BOOLEAN +NTAPI +MmUseSpecialPool(SIZE_T NumberOfBytes, ULONG Tag) +{ + /* Special pool is not suitable for allocations bigger than 1 page */ + if (NumberOfBytes > (PAGE_SIZE - sizeof(POOL_HEADER))) + return FALSE; + + // FIXME + //return TRUE; + return FALSE; +} + +BOOLEAN +NTAPI +MmIsSpecialPoolAddress(PVOID P) +{ + return((P >= MmSpecialPoolStart) && + (P <= MmSpecialPoolEnd)); +} + +VOID +NTAPI +MiInitializeSpecialPool() +{ + ULONG SpecialPoolPtes, i; + PMMPTE PointerPte; + + /* Check if there is a special pool tag */ + if ((MmSpecialPoolTag == 0) || + (MmSpecialPoolTag == -1)) return; + + /* Calculate number of system PTEs for the special pool */ + if ( MmNumberOfSystemPtes >= 0x3000 ) + SpecialPoolPtes = MmNumberOfSystemPtes / 3; + else + SpecialPoolPtes = MmNumberOfSystemPtes / 6; + + /* Don't let the number go too high */ + if (SpecialPoolPtes > 0x6000) SpecialPoolPtes = 0x6000; + + /* Round up to the page size */ + SpecialPoolPtes = PAGE_ROUND_UP(SpecialPoolPtes); + + ASSERT((SpecialPoolPtes & (PTE_PER_PAGE - 1)) == 0); + + /* Reserve those PTEs */ + do + { + PointerPte = MiReserveAlignedSystemPtes(SpecialPoolPtes, 0, /*0x400000*/0); // FIXME: + if (PointerPte) break; + + /* Reserving didn't work, so try to reduce the requested size */ + ASSERT(SpecialPoolPtes >= PTE_PER_PAGE); + SpecialPoolPtes -= 1024; + } while (SpecialPoolPtes); + + /* Fail if we couldn't reserve them at all */ + if (!SpecialPoolPtes) return; + + /* Make sure we got enough */ + ASSERT(SpecialPoolPtes >= PTE_PER_PAGE); + + /* Save first PTE and its address */ + MiSpecialPoolFirstPte = PointerPte; + MmSpecialPoolStart = MiPteToAddress(PointerPte); + + for (i = 0; i<512; i++) + { + /* Point it to the next entry */ + PointerPte->u.List.NextEntry = &PointerPte[2] - MmSystemPteBase; + + /* Move to the next pair */ + PointerPte += 2; + } + + /* Save extra values */ + MiSpecialPoolExtra = PointerPte; + MiSpecialPoolExtraCount = SpecialPoolPtes - 1024; + + /* Mark the previous PTE as the last one */ + MiSpecialPoolLastPte = PointerPte - 2; + MiSpecialPoolLastPte->u.List.NextEntry = MM_EMPTY_PTE_LIST; + + /* Save end address of the special pool */ + MmSpecialPoolEnd = MiPteToAddress(MiSpecialPoolLastPte + 1); + + /* Calculate maximum non-paged part of the special pool */ + MiSpecialPagesNonPagedMaximum = MmResidentAvailablePages >> 4; + + /* And limit it if it turned out to be too big */ + if (MmNumberOfPhysicalPages > 0x3FFF) + MiSpecialPagesNonPagedMaximum = MmResidentAvailablePages >> 3; + + DPRINT1("Special pool start %p - end %p\n", MmSpecialPoolStart, MmSpecialPoolEnd); + + //MiTestSpecialPool(); +} + +PVOID +NTAPI +MmAllocateSpecialPool(SIZE_T NumberOfBytes, ULONG Tag, POOL_TYPE PoolType, ULONG SpecialType) +{ + KIRQL Irql; + MMPTE TempPte = ValidKernelPte; + PMMPTE PointerPte; + PFN_NUMBER PageFrameNumber; + LARGE_INTEGER TickCount; + PVOID Entry; + PPOOL_HEADER Header; + + DPRINT1("MmAllocateSpecialPool(%x %x %x %x)\n", NumberOfBytes, Tag, PoolType, SpecialType); + + /* Check if the pool is initialized and quit if it's not */ + if (!MiSpecialPoolFirstPte) return NULL; + + /* Get the pool type */ + PoolType &= BASE_POOL_TYPE_MASK; + + /* Check whether current IRQL matches the pool type */ + Irql = KeGetCurrentIrql(); + + if (((PoolType == PagedPool) && (Irql > APC_LEVEL)) || + ((PoolType != PagedPool) && (Irql > DISPATCH_LEVEL))) + { + /* Bad caller */ + KeBugCheckEx(SPECIAL_POOL_DETECTED_MEMORY_CORRUPTION, Irql, PoolType, NumberOfBytes, 0x30); + } + + /* TODO: Take into account various limitations */ + /*if ((PoolType != NonPagedPool) && + MiSpecialPagesNonPaged > MiSpecialPagesNonPagedMaximum)*/ + + /* Lock PFN database */ + Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Reject allocation in case amount of available pages is too small */ + if (MmAvailablePages < 0x100) + { + /* Release the PFN database lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + DPRINT1("Special pool: MmAvailablePages 0x%x is too small\n", MmAvailablePages); + return NULL; + } + + /* Reject allocation if special pool PTE list is exhausted */ + if (MiSpecialPoolFirstPte->u.List.NextEntry == MM_EMPTY_PTE_LIST) + { + /* Release the PFN database lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + DPRINT1("Special pool: No PTEs left!\n"); + /* TODO: Expand the special pool */ + return NULL; + } + + /* Save allocation time */ + KeQueryTickCount(&TickCount); + + /* Get a pointer to the first PTE */ + PointerPte = MiSpecialPoolFirstPte; + + /* Set the first PTE pointer to the next one in the list */ + MiSpecialPoolFirstPte = MmSystemPteBase + PointerPte->u.List.NextEntry; + + /* Allocate a physical page */ + PageFrameNumber = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); + + /* Initialize PFN and make it valid */ + TempPte.u.Hard.PageFrameNumber = PageFrameNumber; + MI_WRITE_VALID_PTE(PointerPte, TempPte); + MiInitializePfn(PageFrameNumber, PointerPte, TRUE); + + /* Release the PFN database lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + + /* Put some content into the page. Low value of tick count would do */ + Entry = MiPteToAddress(PointerPte); + RtlFillMemory(Entry, PAGE_SIZE, TickCount.LowPart); + + /* Calculate header and entry addresses */ + if ((SpecialType != 0) && + ((SpecialType == 1) || (!MmSpecialPoolCatchOverruns))) + { + /* We catch underruns. Data is at the beginning of the page */ + Header = (PPOOL_HEADER)((PUCHAR)Entry + PAGE_SIZE - sizeof(POOL_HEADER)); + } + else + { + /* We catch overruns. Data is at the end of the page */ + Header = (PPOOL_HEADER)Entry; + Entry = (PVOID)((ULONG_PTR)((PUCHAR)Entry - NumberOfBytes + PAGE_SIZE) & ~((LONG_PTR)sizeof(POOL_HEADER) - 1)); + } + + /* Initialize the header */ + RtlZeroMemory(Header, sizeof(POOL_HEADER)); + + /* Save allocation size there */ + Header->Ulong1 = NumberOfBytes; + + /* Make sure it's all good */ + ASSERT((NumberOfBytes <= PAGE_SIZE - sizeof(POOL_HEADER)) && + (PAGE_SIZE <= 32 * 1024)); + + /* Mark it as paged or nonpaged */ + if (PoolType == PagedPool) + { + /* Add pagedpool flag into the pool header too */ + Header->Ulong1 |= SPECIAL_POOL_PAGED; + + /* Also mark the next PTE as special-pool-paged */ + PointerPte[1].u.Soft.PageFileHigh |= SPECIAL_POOL_PAGED_PTE; + } + else + { + /* Mark the next PTE as special-pool-nonpaged */ + PointerPte[1].u.Soft.PageFileHigh |= SPECIAL_POOL_NONPAGED_PTE; + } + + /* Finally save tag and put allocation time into the header's blocksize. + That time will be used to check memory consistency within the allocated + page. */ + Header->PoolTag = Tag; + Header->BlockSize = TickCount.LowPart; + DPRINT1("%p\n", Entry); + return Entry; +} + +VOID +NTAPI +MiSpecialPoolCheckPattern(PUCHAR P, PPOOL_HEADER Header) +{ + ULONG BytesToCheck, BytesRequested, Index; + PUCHAR Ptr; + + /* Get amount of bytes user requested to be allocated by clearing out the paged mask */ + BytesRequested = (Header->Ulong1 & ~SPECIAL_POOL_PAGED) & 0xFFFF; + + /* Get a pointer to the end of user's area */ + Ptr = P + BytesRequested; + + /* Calculate how many bytes to check */ + BytesToCheck = (PUCHAR)PAGE_ALIGN(P) + PAGE_SIZE - Ptr; + + /* Remove pool header size if we're catching underruns */ + if (((ULONG_PTR)P & (PAGE_SIZE - 1)) == 0) + { + /* User buffer is located in the beginning of the page */ + BytesToCheck -= sizeof(POOL_HEADER); + } + + /* Check the pattern after user buffer */ + for (Index = 0; Index < BytesToCheck; Index++) + { + /* Bugcheck if bytes don't match */ + if (Ptr[Index] != Header->BlockSize) + { + KeBugCheckEx(BAD_POOL_HEADER, (ULONG_PTR)P, (ULONG_PTR)&Ptr[Index], Header->BlockSize, 0x24); + } + } +} + +VOID +NTAPI +MmFreeSpecialPool(PVOID P) +{ + PMMPTE PointerPte; + PPOOL_HEADER Header; + BOOLEAN Overruns = FALSE; + KIRQL Irql = KeGetCurrentIrql(); + POOL_TYPE PoolType; + ULONG BytesRequested, BytesReal = 0; + ULONG_PTR PtrOffset; + PUCHAR b; + PMI_FREED_SPECIAL_POOL FreedHeader; + LARGE_INTEGER TickCount; + PMMPFN Pfn; + + DPRINT1("MmFreeSpecialPool(%p)\n", P); + + /* Get the PTE */ + PointerPte = MiAddressToPte(P); + + /* Check if it's valid */ + if (PointerPte->u.Hard.Valid == 0) + { + /* Bugcheck if it has NOACCESS or 0 set as protection */ + if (PointerPte->u.Soft.Protection == MM_NOACCESS || + !PointerPte->u.Soft.Protection) + { + KeBugCheckEx(BAD_POOL_HEADER, (ULONG_PTR)P, (ULONG_PTR)PointerPte, 0, 0x20); + } + } + + /* Determine if it's a underruns or overruns pool pointer */ + PtrOffset = (ULONG_PTR)P & (PAGE_SIZE - 1); + if (PtrOffset) + { + /* Pool catches overruns */ + Header = PAGE_ALIGN(P); + Overruns = TRUE; + } + else + { + /* Pool catches underruns */ + Header = (PPOOL_HEADER)((PUCHAR)PAGE_ALIGN(P) + PAGE_SIZE - sizeof(POOL_HEADER)); + } + + /* Check if it's non paged pool */ + if ((Header->Ulong1 & SPECIAL_POOL_PAGED) == 0) + { + /* Non-paged allocation, ensure that IRQ is not higher that DISPATCH */ + ASSERT((PointerPte + 1)->u.Soft.PageFileHigh == SPECIAL_POOL_NONPAGED_PTE); + if (Irql > DISPATCH_LEVEL) + { + KeBugCheckEx(BAD_POOL_HEADER, Irql, (ULONG_PTR)P, 0, 0x31); + } + + PoolType = NonPagedPool; + } + else + { + /* Paged allocation, ensure */ + ASSERT((PointerPte + 1)->u.Soft.PageFileHigh == SPECIAL_POOL_PAGED_PTE); + if (Irql > DISPATCH_LEVEL) + { + KeBugCheckEx(BAD_POOL_HEADER, Irql, (ULONG_PTR)P, 1, 0x31); + } + + PoolType = PagedPool; + } + + /* Get amount of bytes user requested to be allocated by clearing out the paged mask */ + BytesRequested = (Header->Ulong1 & ~SPECIAL_POOL_PAGED) & 0xFFFF; + + /* Check memory before the allocated user buffer in case of overruns detection */ + if (Overruns) + { + /* Calculate the real placement of the buffer */ + BytesReal = PAGE_SIZE - PtrOffset; + + /* If they mismatch, it's unrecoverable */ + if (BytesRequested > BytesReal) + { + KeBugCheckEx(BAD_POOL_HEADER, (ULONG_PTR)P, BytesRequested, BytesReal, 0x21); + } + + if (BytesRequested + sizeof(POOL_HEADER) < BytesReal) + { + KeBugCheckEx(BAD_POOL_HEADER, (ULONG_PTR)P, BytesRequested, BytesReal, 0x22); + } + + /* Actually check the memory pattern */ + for (b = (PUCHAR)(Header + 1); b < (PUCHAR)P; b++) + { + if (Header->BlockSize != b[0]) + { + /* Bytes mismatch */ + KeBugCheckEx(BAD_POOL_HEADER, (ULONG_PTR)P, (ULONG_PTR)b, Header->BlockSize, 0x23); + } + } + } + + /* Check the memory pattern after the user buffer */ + MiSpecialPoolCheckPattern(P, Header); + + /* Fill the freed header */ + KeQueryTickCount(&TickCount); + FreedHeader = (PMI_FREED_SPECIAL_POOL)PAGE_ALIGN(P); + FreedHeader->Signature = 0x98764321; + FreedHeader->TickCount = TickCount.LowPart; + FreedHeader->NumberOfBytesRequested = BytesRequested; + FreedHeader->Pagable = PoolType; + FreedHeader->VirtualAddress = P; + FreedHeader->Thread = PsGetCurrentThread(); + /* TODO: Fill StackPointer and StackBytes */ + FreedHeader->StackPointer = NULL; + FreedHeader->StackBytes = 0; + + if (PoolType == NonPagedPool) + { + /* Non pagable. Get PFN element corresponding to the PTE */ + Pfn = MI_PFN_ELEMENT(PointerPte->u.Hard.PageFrameNumber); + + /* Lock PFN database */ + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Delete this PFN */ + MI_SET_PFN_DELETED(Pfn); + + /* Decrement share count of this PFN */ + MiDecrementShareCount(Pfn, PointerPte->u.Hard.PageFrameNumber); + + /* Flush the TLB */ + //FIXME: Use KeFlushSingleTb() instead + KeFlushEntireTb(TRUE, TRUE); + } + else + { + /* Pagable. Delete that virtual address */ + MiDeleteSystemPageableVm(PointerPte, 1, 0, NULL); + + /* Lock PFN database */ + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + } + + /* Mark next PTE as invalid */ + PointerPte[1].u.Long = 0; //|= 8000; + + /* Make sure that the last entry is really the last one */ + ASSERT(MiSpecialPoolLastPte->u.List.NextEntry == MM_EMPTY_PTE_LIST); + + /* Update the current last PTE next pointer */ + MiSpecialPoolLastPte->u.List.NextEntry = PointerPte - MmSystemPteBase; + + /* PointerPte becomes the new last PTE */ + PointerPte->u.List.NextEntry = MM_EMPTY_PTE_LIST; + MiSpecialPoolLastPte = PointerPte; + + /* Release the PFN database lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); +} + +VOID +NTAPI +MiTestSpecialPool() +{ + ULONG i; + PVOID p1, p2[100]; + //PUCHAR p3; + ULONG ByteSize; + POOL_TYPE PoolType = PagedPool; + + // First allocate/free + for (i=0; i<100; i++) + { + ByteSize = (100 * (i+1)) % (PAGE_SIZE - sizeof(POOL_HEADER)); + p1 = MmAllocateSpecialPool(ByteSize, 'TEST', PoolType, 0); + DPRINT1("p1 %p size %d\n", p1, ByteSize); + MmFreeSpecialPool(p1); + } + + // Now allocate all at once, then free at once + for (i=0; i<100; i++) + { + ByteSize = (100 * (i+1)) % (PAGE_SIZE - sizeof(POOL_HEADER)); + p2[i] = MmAllocateSpecialPool(ByteSize, 'TEST', PoolType, 0); + DPRINT1("p2[%d] %p size %d\n", i, p1, ByteSize); + } + for (i=0; i<100; i++) + { + DPRINT1("Freeing %p\n", p2[i]); + MmFreeSpecialPool(p2[i]); + } + + // Overrun the buffer to test + //ByteSize = 16; + //p3 = MmAllocateSpecialPool(ByteSize, 'TEST', NonPagedPool, 0); + //p3[ByteSize] = 0xF1; // This should cause an exception + + // Underrun the buffer to test + //p3 = MmAllocateSpecialPool(ByteSize, 'TEST', NonPagedPool, 1); + //p3--; + //*p3 = 0xF1; // This should cause an exception + +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/special.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Mon Sep 26 21:57:40 2011 @@ -55,9 +55,6 @@ // After the walk is complete, a new cluster is created that contains the PTEs // being released, which is then inserted in front of the recorded cluster. // - -/* This definition does not belong here and is most likely platform-dependent */ -#define MM_EMPTY_LIST (ULONG) (0xFFFFF) ULONG FORCEINLINE @@ -101,7 +98,7 @@ // PreviousPte = &MmFirstFreeSystemPte[SystemPtePoolType]; - while (PreviousPte->u.List.NextEntry != MM_EMPTY_LIST) + while (PreviousPte->u.List.NextEntry != MM_EMPTY_PTE_LIST) { // // Get the next cluster and its size @@ -124,7 +121,7 @@ // // Make sure we didn't reach the end of the cluster list // - if (PreviousPte->u.List.NextEntry == MM_EMPTY_LIST) + if (PreviousPte->u.List.NextEntry == MM_EMPTY_PTE_LIST) { // // Release the System PTE lock and return failure @@ -185,7 +182,7 @@ // PreviousPte = &MmFirstFreeSystemPte[SystemPtePoolType]; - while (PreviousPte->u.List.NextEntry != MM_EMPTY_LIST) + while (PreviousPte->u.List.NextEntry != MM_EMPTY_PTE_LIST) { // // Get the next cluster @@ -301,7 +298,7 @@ PreviousPte = &MmFirstFreeSystemPte[SystemPtePoolType]; InsertPte = NULL; - while (PreviousPte->u.List.NextEntry != MM_EMPTY_LIST) + while (PreviousPte->u.List.NextEntry != MM_EMPTY_PTE_LIST) { // // Get the next cluster and its size @@ -415,7 +412,7 @@ // // Make the first entry free and link it // - StartingPte->u.List.NextEntry = MM_EMPTY_LIST; + StartingPte->u.List.NextEntry = MM_EMPTY_PTE_LIST; MmFirstFreeSystemPte[PoolType].u.Long = 0; MmFirstFreeSystemPte[PoolType].u.List.NextEntry = StartingPte - MmSystemPteBase; Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Sep 26 21:57:40 2011 @@ -476,6 +476,7 @@ <file>pool.c</file> <file>procsup.c</file> <file>section.c</file> + <file>special.c</file> <file>sysldr.c</file> <file>syspte.c</file> <file>vadnode.c</file>

13 years, 2 months

[akhaldi] 53867: [SHELL32] * Implement more functions based on Wine. By Claudiu Mihail.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 26 19:55:35 2011 New Revision: 53867 URL: http://svn.reactos.org/svn/reactos?rev=53867&view=rev Log: [SHELL32] * Implement more functions based on Wine. By Claudiu Mihail. Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Mon Sep 26 19:55:35 2011 @@ -2358,7 +2358,13 @@ HRESULT STDMETHODCALLTYPE CDefView::GetCurrentViewMode(UINT *pViewMode) { - return E_NOTIMPL; + TRACE("(%p)->(%p), stub\n", this, pViewMode); + + if (!pViewMode) + return E_INVALIDARG; + + *pViewMode = this->FolderSettings.ViewMode; + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::SetCurrentViewMode(UINT ViewMode) @@ -2376,43 +2382,73 @@ HRESULT STDMETHODCALLTYPE CDefView::Item(int iItemIndex, LPITEMIDLIST *ppidl) { + LVITEMW item; + + TRACE("(%p)->(%d %p)\n", this, iItemIndex, ppidl); + + item.mask = LVIF_PARAM; + item.iItem = iItemIndex; + + if (SendMessageW(this->hWndList, LVM_GETITEMW, 0, (LPARAM)&item)) + { + *ppidl = ILClone((PITEMID_CHILD)item.lParam); + return S_OK; + } + + *ppidl = 0; + + return E_INVALIDARG; +} + +HRESULT STDMETHODCALLTYPE CDefView::ItemCount(UINT uFlags, int *pcItems) +{ + TRACE("(%p)->(%u %p)\n", this, uFlags, pcItems); + + if (uFlags != SVGIO_ALLVIEW) + FIXME("some flags unsupported, %x\n", uFlags & ~SVGIO_ALLVIEW); + + *pcItems = SendMessageW(this->hWndList, LVM_GETITEMCOUNT, 0, 0); + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CDefView::Items(UINT uFlags, REFIID riid, void **ppv) +{ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CDefView::ItemCount(UINT uFlags, int *pcItems) +HRESULT STDMETHODCALLTYPE CDefView::GetSelectionMarkedItem(int *piItem) +{ + TRACE("(%p)->(%p)\n", this, piItem); + + *piItem = SendMessageW(this->hWndList, LVM_GETSELECTIONMARK, 0, 0); + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CDefView::GetFocusedItem(int *piItem) +{ + TRACE("(%p)->(%p)\n", this, piItem); + + *piItem = SendMessageW(this->hWndList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CDefView::GetItemPosition(LPCITEMIDLIST pidl, POINT *ppt) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CDefView::Items(UINT uFlags, REFIID riid, void **ppv) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDefView::GetSelectionMarkedItem(int *piItem) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDefView::GetFocusedItem(int *piItem) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CDefView::GetItemPosition(LPCITEMIDLIST pidl, POINT *ppt) -{ - return E_NOTIMPL; -} - HRESULT STDMETHODCALLTYPE CDefView::GetSpacing(POINT *ppt) { TRACE("(%p)->(%p)\n", this, ppt); - if (NULL == hWndList) return S_FALSE; + if (NULL == this->hWndList) return S_FALSE; if (ppt) { - const DWORD ret = SendMessageW(hWndList, LVM_GETITEMSPACING, 0, 0); + const DWORD ret = SendMessageW(this->hWndList, LVM_GETITEMSPACING, 0, 0); ppt->x = LOWORD(ret); ppt->y = HIWORD(ret); @@ -2433,7 +2469,33 @@ HRESULT STDMETHODCALLTYPE CDefView::SelectItem(int iItem, DWORD dwFlags) { - return E_NOTIMPL; + LVITEMW lvItem; + + TRACE("(%p)->(%d, %x)\n", this, iItem, dwFlags); + + lvItem.state = 0; + lvItem.stateMask = LVIS_SELECTED; + + if (dwFlags & SVSI_ENSUREVISIBLE) + SendMessageW(this->hWndList, LVM_ENSUREVISIBLE, iItem, 0); + + /* all items */ + if (dwFlags & SVSI_DESELECTOTHERS) + SendMessageW(this->hWndList, LVM_SETITEMSTATE, -1, (LPARAM)&lvItem); + + /* this item */ + if (dwFlags & SVSI_SELECT) + lvItem.state |= LVIS_SELECTED; + + if (dwFlags & SVSI_FOCUSED) + lvItem.stateMask |= LVIS_FOCUSED; + + SendMessageW(this->hWndList, LVM_SETITEMSTATE, iItem, (LPARAM)&lvItem); + + if (dwFlags & SVSI_EDIT) + SendMessageW(this->hWndList, LVM_EDITLABELW, iItem, 0); + + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::SelectAndPositionItems(UINT cidl, LPCITEMIDLIST *apidl, POINT *apt, DWORD dwFlags)

13 years, 2 months

[gadamopoulos] 53866: [comctl32] - Do not subclass user32 controls when themes are disabled.This is a temporary hack bacause it turns out that subclassing causes problems. When it is fixed this wil...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Sep 26 19:36:01 2011 New Revision: 53866 URL: http://svn.reactos.org/svn/reactos?rev=53866&view=rev Log: [comctl32] - Do not subclass user32 controls when themes are disabled.This is a temporary hack bacause it turns out that subclassing causes problems. When it is fixed this will be reverted. This change means that in order to make themes work properly, the user has to reboot after enabling. Modified: trunk/reactos/dll/win32/comctl32/theming.c Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] Mon Sep 26 19:36:01 2011 @@ -118,7 +118,9 @@ { 'C','C','3','2','T','h','e','m','i','n','g','S','u','b','C','l',0 }; static const WCHAR refDataPropName[] = { 'C','C','3','2','T','h','e','m','i','n','g','D','a','t','a',0 }; - + + if (!IsThemeActive()) return; + atSubclassProp = GlobalAddAtomW (subclassPropName); atRefDataProp = GlobalAddAtomW (refDataPropName);

13 years, 2 months

[tkreuzer] 53865: [INSTALLFREELDR] Add to cmake build (built on demand)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 26 19:04:02 2011 New Revision: 53865 URL: http://svn.reactos.org/svn/reactos?rev=53865&view=rev Log: [INSTALLFREELDR] Add to cmake build (built on demand) Added: trunk/reactos/boot/freeldr/install/CMakeLists.txt (with props) Modified: trunk/reactos/boot/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/CMakeLists.txt [iso-8859-1] Mon Sep 26 19:04:02 2011 @@ -1,3 +1,4 @@ add_subdirectory(bootsect) -add_subdirectory(freeldr) +add_subdirectory(freeldr) +add_subdirectory(install) Added: trunk/reactos/boot/freeldr/install/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/install/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/install/CMakeLists.txt (added) +++ trunk/reactos/boot/freeldr/install/CMakeLists.txt [iso-8859-1] Mon Sep 26 19:04:02 2011 @@ -1,0 +1,8 @@ + +add_executable(installfreeldr EXCLUDE_FROM_ALL + install.c + volume.c) + +set_module_type(installfreeldr win32cui) + +add_importlibs(installfreeldr msvcrt kernel32) Propchange: trunk/reactos/boot/freeldr/install/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 2 months

[tkreuzer] 53864: [FREELDR] - Fix memory type for hal and referenced dlls - Don't allocate the LPB, MADs and all the other stuff from the heap, instead allocate one block of memory for the LPB, ext...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 26 16:06:19 2011 New Revision: 53864 URL: http://svn.reactos.org/svn/reactos?rev=53864&view=rev Log: [FREELDR] - Fix memory type for hal and referenced dlls - Don't allocate the LPB, MADs and all the other stuff from the heap, instead allocate one block of memory for the LPB, extension, etc and strings (fits into one page) and another page for the MADs limit to 200 MADs, 1024 is way over the top) - Map only those pages into kernel mode, that the kernel will need, this way we don't need to unmap anything later. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Mon Sep 26 16:06:19 2011 @@ -166,7 +166,8 @@ BOOLEAN MempSetupPaging(IN ULONG StartPage, - IN ULONG NumberOfPages) + IN ULONG NumberOfPages, + IN BOOLEAN KernelMapping) { TRACE(">>> MempSetupPaging(0x%lx, %ld, %p)\n", StartPage, NumberOfPages, StartPage * PAGE_SIZE + KSEG0_BASE); @@ -383,9 +384,6 @@ } RtlZeroMemory((PVOID)Pcr, 2 * MM_PAGE_SIZE); - /* Allocate a kernel stack */ - Pcr = (ULONG_PTR)MmAllocateMemoryWithType(2 * MM_PAGE_SIZE, LoaderStartupPcrPage); - /* Allocate TSS */ BlockSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); Tss = (ULONG_PTR)MmAllocateMemoryWithType(BlockSize, LoaderMemoryData); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] Mon Sep 26 16:06:19 2011 @@ -144,13 +144,15 @@ BOOLEAN MempSetupPaging(IN ULONG StartPage, - IN ULONG NumberOfPages) + IN ULONG NumberOfPages, + IN BOOLEAN KernelMapping) { PHARDWARE_PTE PhysicalPT; PHARDWARE_PTE KernelPT; ULONG Entry, Page; - //Print(L"MempSetupPaging: SP 0x%X, Number: 0x%X\n", StartPage, NumberOfPages); + TRACE("MempSetupPaging: SP 0x%X, Number: 0x%X, Kernel: %s\n", + StartPage, NumberOfPages, KernelMapping ? "yes" : "no"); // HACK if (StartPage+NumberOfPages >= 0x80000) @@ -184,9 +186,13 @@ PhysicalPT[Page & 0x3ff].Valid = (Page != 0); PhysicalPT[Page & 0x3ff].Write = (Page != 0); - KernelPT[Page & 0x3ff].PageFrameNumber = Page; - KernelPT[Page & 0x3ff].Valid = (Page != 0); - KernelPT[Page & 0x3ff].Write = (Page != 0); + if (KernelMapping) + { + if (KernelPT[Page & 0x3ff].Valid) WARN("xxx already mapped \n"); + KernelPT[Page & 0x3ff].PageFrameNumber = Page; + KernelPT[Page & 0x3ff].Valid = (Page != 0); + KernelPT[Page & 0x3ff].Write = (Page != 0); + } } return TRUE; Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Mon Sep 26 16:06:19 2011 @@ -20,6 +20,8 @@ #pragma once +#include <arc/setupblk.h> + /* Entry-point to kernel */ typedef VOID (NTAPI *KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); @@ -54,6 +56,34 @@ } RSDP_DESCRIPTOR, *PRSDP_DESCRIPTOR; #include <poppack.h> +typedef struct _ARC_DISK_SIGNATURE_EX +{ + ARC_DISK_SIGNATURE DiskSignature; + CHAR ArcName[MAX_PATH]; +} ARC_DISK_SIGNATURE_EX, *PARC_DISK_SIGNATURE_EX; + +#define MAX_OPTIONS_LENGTH 255 + +typedef struct _LOADER_SYSTEM_BLOCK +{ + LOADER_PARAMETER_BLOCK LoaderBlock; + LOADER_PARAMETER_EXTENSION Extension; + SETUP_LOADER_BLOCK SetupBlock; +#ifdef _M_IX86 + HEADLESS_LOADER_BLOCK HeadlessLoaderBlock; +#endif + NLS_DATA_BLOCK NlsDataBlock; + CHAR LoadOptions[MAX_OPTIONS_LENGTH+1]; + CHAR ArcBootDeviceName[MAX_PATH+1]; + // CHAR ArcHalDeviceName[MAX_PATH]; + CHAR NtBootPathName[MAX_PATH+1]; + CHAR NtHalPathName[MAX_PATH+1]; + ARC_DISK_INFORMATION ArcDiskInformation; + ARC_DISK_SIGNATURE_EX ArcDiskSignature[]; +} LOADER_SYSTEM_BLOCK, *PLOADER_SYSTEM_BLOCK; + +extern PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; + /////////////////////////////////////////////////////////////////////////////////////// // // ReactOS Loading Functions @@ -144,7 +174,8 @@ BOOLEAN MempSetupPaging(IN ULONG StartPage, - IN ULONG NumberOfPages); + IN ULONG NumberOfPages, + IN BOOLEAN KernelMapping); VOID MempUnmapPage(ULONG Page); Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Mon Sep 26 16:06:19 2011 @@ -76,7 +76,7 @@ /* Compare names */ if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) { - /* Yes, found it, report pointer to the loaded module's DTE + /* Yes, found it, report pointer to the loaded module's DTE to the caller and increase load count for it */ *LoadedEntry = DataTableEntry; DataTableEntry->LoadCount++; @@ -266,6 +266,7 @@ LONG Status; LARGE_INTEGER Position; ULONG i, BytesRead; + TRACE("WinLdrLoadImage(%s, %ld, *)\n", FileName, MemoryType); /* Open the image file */ Status = ArcOpen(FileName, OpenReadOnly, &FileId); @@ -424,7 +425,7 @@ /* Relocate the image, if it needs it */ if (NtHeaders->OptionalHeader.ImageBase != (ULONG_PTR)VirtualBase) { - WARN("Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, + WARN("Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); return (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, @@ -434,6 +435,7 @@ FALSE); } + TRACE("WinLdrLoadImage() done, PA = %p\n", *ImageBasePA); return TRUE; } @@ -447,7 +449,7 @@ PWSTR Buffer; UNICODE_STRING UnicodeNamePA; ULONG i, Length; - + /* First obvious check: for length of two names */ Length = strlen(DllName); @@ -615,7 +617,7 @@ /* Everything allright, get the ordinal */ Ordinal = OrdinalTable[Middle]; - + //TRACE("WinLdrpBindImportName() found Ordinal %d\n", Ordinal); } } @@ -733,7 +735,7 @@ //Print(L"Loading referenced DLL: %s\n", FullDllName); /* Load the image */ - Status = WinLdrLoadImage(FullDllName, LoaderHalCode, &BasePA); + Status = WinLdrLoadImage(FullDllName, LoaderSystemCode, &BasePA); if (!Status) { Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Mon Sep 26 16:06:19 2011 @@ -35,15 +35,6 @@ // TODO: Move to .h VOID AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock); - -//FIXME: Do a better way to retrieve Arc disk information -extern ULONG reactos_disk_count; -extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; -extern char reactos_arc_strings[32][256]; - -extern BOOLEAN UseRealHeap; -extern ULONG LoaderPagesSpanned; - VOID SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) @@ -226,8 +217,7 @@ AllocateAndInitLPB(&LoaderBlock); /* Allocate and initialize setup loader block */ - SetupBlock = MmHeapAlloc(sizeof(SETUP_LOADER_BLOCK)); - RtlZeroMemory(SetupBlock, sizeof(SETUP_LOADER_BLOCK)); + SetupBlock = &WinLdrSystemBlock->SetupBlock; LoaderBlock->SetupLdrBlock = SetupBlock; /* Set textmode setup flag */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Sep 26 16:06:19 2011 @@ -29,7 +29,6 @@ //FIXME: Do a better way to retrieve Arc disk information extern ULONG reactos_disk_count; extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; -extern char reactos_arc_strings[32][256]; extern BOOLEAN UseRealHeap; extern ULONG LoaderPagesSpanned; @@ -39,6 +38,8 @@ extern BOOLEAN WinLdrTerminalConnected; extern void WinLdrSetupEms(IN PCHAR BootOptions); +PLOADER_SYSTEM_BLOCK WinLdrSystemBlock; + // debug stuff VOID DumpMemoryAllocMap(VOID); @@ -47,24 +48,28 @@ AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock) { PLOADER_PARAMETER_BLOCK LoaderBlock; + ULONG SystemBlockSize; /* Allocate and zero-init the LPB */ - LoaderBlock = MmHeapAlloc(sizeof(LOADER_PARAMETER_BLOCK)); - RtlZeroMemory(LoaderBlock, sizeof(LOADER_PARAMETER_BLOCK)); + SystemBlockSize = sizeof(LOADER_SYSTEM_BLOCK) + + reactos_disk_count * sizeof(ARC_DISK_SIGNATURE_EX); + WinLdrSystemBlock = MmAllocateMemoryWithType(SystemBlockSize, + LoaderSystemBlock); + if (WinLdrSystemBlock == NULL) + { + UiMessageBox("Failed to allocate memory for system block!"); + return; + } + + RtlZeroMemory(WinLdrSystemBlock, sizeof(LOADER_SYSTEM_BLOCK)); + + LoaderBlock = &WinLdrSystemBlock->LoaderBlock; + LoaderBlock->NlsData = &WinLdrSystemBlock->NlsDataBlock; /* Init three critical lists, used right away */ InitializeListHead(&LoaderBlock->LoadOrderListHead); InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); InitializeListHead(&LoaderBlock->BootDriverListHead); - - /* Alloc space for NLS (it will be converted to VA in WinLdrLoadNLS) */ - LoaderBlock->NlsData = MmHeapAlloc(sizeof(NLS_DATA_BLOCK)); - if (LoaderBlock->NlsData == NULL) - { - UiMessageBox("Failed to allocate memory for NLS table data!"); - return; - } - RtlZeroMemory(LoaderBlock->NlsData, sizeof(NLS_DATA_BLOCK)); *OutLoaderBlock = LoaderBlock; } @@ -99,58 +104,56 @@ TRACE("Options: %s\n", Options); /* Fill Arc BootDevice */ - LoaderBlock->ArcBootDeviceName = MmHeapAlloc(strlen(ArcBoot)+1); - strcpy(LoaderBlock->ArcBootDeviceName, ArcBoot); + LoaderBlock->ArcBootDeviceName = WinLdrSystemBlock->ArcBootDeviceName; + strncpy(LoaderBlock->ArcBootDeviceName, ArcBoot, MAX_PATH); LoaderBlock->ArcBootDeviceName = PaToVa(LoaderBlock->ArcBootDeviceName); /* Fill Arc HalDevice, it matches ArcBoot path */ - LoaderBlock->ArcHalDeviceName = MmHeapAlloc(strlen(ArcBoot)+1); - strcpy(LoaderBlock->ArcHalDeviceName, ArcBoot); + LoaderBlock->ArcHalDeviceName = WinLdrSystemBlock->ArcBootDeviceName; LoaderBlock->ArcHalDeviceName = PaToVa(LoaderBlock->ArcHalDeviceName); /* Fill SystemRoot */ - LoaderBlock->NtBootPathName = MmHeapAlloc(strlen(SystemRoot)+1); - strcpy(LoaderBlock->NtBootPathName, SystemRoot); + LoaderBlock->NtBootPathName = WinLdrSystemBlock->NtBootPathName; + strncpy(LoaderBlock->NtBootPathName, SystemRoot, MAX_PATH); LoaderBlock->NtBootPathName = PaToVa(LoaderBlock->NtBootPathName); /* Fill NtHalPathName */ - LoaderBlock->NtHalPathName = MmHeapAlloc(strlen(HalPath)+1); - strcpy(LoaderBlock->NtHalPathName, HalPath); + LoaderBlock->NtHalPathName = WinLdrSystemBlock->NtHalPathName; + strncpy(LoaderBlock->NtHalPathName, HalPath, MAX_PATH); LoaderBlock->NtHalPathName = PaToVa(LoaderBlock->NtHalPathName); /* Fill load options */ - LoaderBlock->LoadOptions = MmHeapAlloc(strlen(Options)+1); - strcpy(LoaderBlock->LoadOptions, Options); + LoaderBlock->LoadOptions = WinLdrSystemBlock->LoadOptions; + strncpy(LoaderBlock->LoadOptions, Options, MAX_OPTIONS_LENGTH); LoaderBlock->LoadOptions = PaToVa(LoaderBlock->LoadOptions); /* Arc devices */ - LoaderBlock->ArcDiskInformation = (PARC_DISK_INFORMATION)MmHeapAlloc(sizeof(ARC_DISK_INFORMATION)); + LoaderBlock->ArcDiskInformation = &WinLdrSystemBlock->ArcDiskInformation; InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); /* Convert ARC disk information from freeldr to a correct format */ for (i = 0; i < reactos_disk_count; i++) { - PARC_DISK_SIGNATURE ArcDiskInfo; + PARC_DISK_SIGNATURE ArcDiskSig; /* Get the ARC structure */ - ArcDiskInfo = (PARC_DISK_SIGNATURE)MmHeapAlloc(sizeof(ARC_DISK_SIGNATURE)); - RtlZeroMemory(ArcDiskInfo, sizeof(ARC_DISK_SIGNATURE)); + ArcDiskSig = &WinLdrSystemBlock->ArcDiskSignature[i].DiskSignature; /* Copy the data over */ - ArcDiskInfo->Signature = reactos_arc_disk_info[i].Signature; - ArcDiskInfo->CheckSum = reactos_arc_disk_info[i].CheckSum; + ArcDiskSig->Signature = reactos_arc_disk_info[i].Signature; + ArcDiskSig->CheckSum = reactos_arc_disk_info[i].CheckSum; /* Copy the ARC Name */ - ArcDiskInfo->ArcName = (PCHAR)MmHeapAlloc(sizeof(CHAR)*256); - strcpy(ArcDiskInfo->ArcName, reactos_arc_disk_info[i].ArcName); - ArcDiskInfo->ArcName = (PCHAR)PaToVa(ArcDiskInfo->ArcName); + ArcDiskSig->ArcName = WinLdrSystemBlock->ArcDiskSignature[i].ArcName; + strncpy(ArcDiskSig->ArcName, reactos_arc_disk_info[i].ArcName, MAX_PATH); + ArcDiskSig->ArcName = PaToVa(ArcDiskSig->ArcName); /* Mark partition table as valid */ - ArcDiskInfo->ValidPartitionTable = TRUE; + ArcDiskSig->ValidPartitionTable = TRUE; /* Insert into the list */ InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead, - &ArcDiskInfo->ListEntry); + &ArcDiskSig->ListEntry); } /* Convert all list's to Virtual address */ @@ -174,15 +177,7 @@ List_PaToVa(&LoaderBlock->BootDriverListHead); /* Initialize Extension now */ - Extension = MmHeapAlloc(sizeof(LOADER_PARAMETER_EXTENSION)); - if (Extension == NULL) - { - UiMessageBox("Failed to allocate LPB Extension!"); - return; - } - RtlZeroMemory(Extension, sizeof(LOADER_PARAMETER_EXTENSION)); - - /* Fill LPB extension */ + Extension = &WinLdrSystemBlock->Extension; Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; Extension->MinorVersion = VersionToBoot & 0xFF; @@ -199,17 +194,10 @@ /* Set headless block pointer */ if (WinLdrTerminalConnected) { - Extension->HeadlessLoaderBlock = MmHeapAlloc(sizeof(HEADLESS_LOADER_BLOCK)); - if (Extension->HeadlessLoaderBlock == NULL) - { - UiMessageBox("Failed to allocate HLB Extension!"); - while (TRUE); - return; - } - RtlCopyMemory( - Extension->HeadlessLoaderBlock, - &LoaderRedirectionInformation, - sizeof(HEADLESS_LOADER_BLOCK)); + Extension->HeadlessLoaderBlock = &WinLdrSystemBlock->HeadlessLoaderBlock; + RtlCopyMemory(Extension->HeadlessLoaderBlock, + &LoaderRedirectionInformation, + sizeof(HEADLESS_LOADER_BLOCK)); Extension->HeadlessLoaderBlock = PaToVa(Extension->HeadlessLoaderBlock); } #endif @@ -217,7 +205,8 @@ strcpy(MiscFiles, BootPath); strcat(MiscFiles, "AppPatch\\drvmain.sdb"); Extension->DrvDBImage = PaToVa(WinLdrLoadModule(MiscFiles, - &Extension->DrvDBSize, LoaderRegistryData)); + &Extension->DrvDBSize, + LoaderRegistryData)); /* Convert extension and setup block pointers */ LoaderBlock->Extension = PaToVa(Extension); @@ -421,11 +410,13 @@ return _WIN32_WINNT_WS03; } +static PVOID LoadModule( PLOADER_PARAMETER_BLOCK LoaderBlock, PCCH Path, PCCH File, + TYPE_OF_MEMORY MemoryType, PLDR_DATA_TABLE_ENTRY *Dte, ULONG Percentage) { @@ -442,7 +433,7 @@ strcat(FullFileName, "SYSTEM32\\"); strcat(FullFileName, File); - Status = WinLdrLoadImage(FullFileName, LoaderSystemCode, &BaseAdress); + Status = WinLdrLoadImage(FullFileName, MemoryType, &BaseAdress); TRACE("%s loaded with status %d at %p\n", File, Status, BaseAdress); @@ -582,15 +573,15 @@ OperatingSystemVersion = WinLdrDetectVersion(); /* Load kernel */ - LoadModule(LoaderBlock, BootPath, "NTOSKRNL.EXE", &KernelDTE, 30); + LoadModule(LoaderBlock, BootPath, "NTOSKRNL.EXE", LoaderSystemCode, &KernelDTE, 30); /* Load HAL */ - LoadModule(LoaderBlock, BootPath, "HAL.DLL", &HalDTE, 45); + LoadModule(LoaderBlock, BootPath, "HAL.DLL", LoaderHalCode, &HalDTE, 45); /* Load kernel-debugger support dll */ if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) { - LoadModule(LoaderBlock, BootPath, "KDCOM.DLL", &KdComDTE, 60); + LoadModule(LoaderBlock, BootPath, "KDCOM.DLL", LoaderSystemCode, &KdComDTE, 60); } /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Mon Sep 26 16:06:19 2011 @@ -53,54 +53,10 @@ MEMORY_ALLOCATION_DESCRIPTOR *Mad; ULONG MadCount = 0; +/* 200 MADs fit into 1 page, that should really be enough! */ +#define MAX_MAD_COUNT 200 /* FUNCTIONS **************************************************************/ - -VOID -MempDisablePages() -{ - ULONG i; - - // - // We need to delete kernel mapping from memory areas which are - // marked as Special or Permanent memory (thus non-accessible) - // - - for (i=0; i<MadCount; i++) - { - ULONG StartPage, EndPage, Page; - - StartPage = Mad[i].BasePage; - EndPage = Mad[i].BasePage + Mad[i].PageCount; - - if (Mad[i].MemoryType == LoaderFirmwarePermanent || - Mad[i].MemoryType == LoaderSpecialMemory || - Mad[i].MemoryType == LoaderFree || - (Mad[i].MemoryType == LoaderFirmwareTemporary && EndPage <= LoaderPagesSpanned) || - Mad[i].MemoryType == LoaderOsloaderStack || - Mad[i].MemoryType == LoaderLoadedProgram) - { - // - // But, the first megabyte of memory always stays! - // And, to tell the truth, we don't care about what's higher - // than LoaderPagesSpanned - if (Mad[i].MemoryType == LoaderFirmwarePermanent || - Mad[i].MemoryType == LoaderSpecialMemory) - { - if (StartPage < 0x100) - StartPage = 0x100; - - if (EndPage > LoaderPagesSpanned) - EndPage = LoaderPagesSpanned; - } - - for (Page = StartPage; Page < EndPage; Page++) - { - MempUnmapPage(Page); - } - } - } -} VOID MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, @@ -108,8 +64,10 @@ ULONG PageCount, ULONG Type) { - BOOLEAN Status; - + BOOLEAN Status = TRUE; + + TRACE("MempAddMemoryBlock(BasePage=0x%lx, PageCount=0x%lx, Type=%ld)\n", + BasePage, PageCount, Type); // // Check for memory block after 4GB - we don't support it yet // Note: Even last page before 4GB limit is not supported @@ -133,6 +91,16 @@ PageCount = MM_MAX_PAGE - BasePage; } + /* Check if we have slots left */ + if (MadCount >= MAX_MAD_COUNT) + { + ERR("Error: no MAD slots left!\n"); + return; + } + + /* Get rid of the loader heap */ + //if (Type == LoaderOsloaderHeap) Type = LoaderFirmwareTemporary; + // // Set Base page, page count and type // @@ -140,26 +108,6 @@ Mad[MadCount].PageCount = PageCount; Mad[MadCount].MemoryType = Type; - // - // Check if it's more than the allowed for OS loader - // if yes - don't map the pages, just add as FirmwareTemporary - // - if (BasePage + PageCount > LoaderPagesSpanned) - { - if (Mad[MadCount].MemoryType != LoaderSpecialMemory && - Mad[MadCount].MemoryType != LoaderFirmwarePermanent && - Mad[MadCount].MemoryType != LoaderFree) - { - TRACE("Setting page %x %x to Temporary from %d\n", - BasePage, PageCount, Mad[MadCount].MemoryType); - Mad[MadCount].MemoryType = LoaderFirmwareTemporary; - } - - WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); - MadCount++; - - return; - } // // Add descriptor @@ -167,19 +115,61 @@ WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); MadCount++; - // - // Map it (don't map low 1Mb because it was already contiguously - // mapped in WinLdrPrepareMemoryLayout) - // - if (BasePage >= 0x100) - { - Status = MempSetupPaging(BasePage, PageCount); - if (!Status) - { - ERR("Error during MempSetupPaging\n"); - return; - } - } + switch (Type) + { + /* Pages used by the loader */ + case LoaderLoadedProgram: + case LoaderOsloaderStack: + case LoaderFirmwareTemporary: + case LoaderFirmwarePermanent: + /* Map these pages into user mode */ + Status = MempSetupPaging(BasePage, PageCount, FALSE); + break; + + /* Pages used by the kernel */ + case LoaderExceptionBlock: + case LoaderSystemBlock: + case LoaderSystemCode: + case LoaderHalCode: + case LoaderBootDriver: + case LoaderConsoleInDriver: + case LoaderConsoleOutDriver: + case LoaderStartupDpcStack: + case LoaderStartupKernelStack: + case LoaderStartupPanicStack: + case LoaderStartupPcrPage: + case LoaderStartupPdrPage: + case LoaderRegistryData: + case LoaderMemoryData: + case LoaderNlsData: + case LoaderOsloaderHeap: // FIXME + /* Map these pages into kernel mode */ + Status = MempSetupPaging(BasePage, PageCount, TRUE); + break; + + /* Pages not in use */ + case LoaderFree: + case LoaderBad: + break; + + /* Invisible to kernel */ + case LoaderSpecialMemory: + case LoaderHALCachedMemory: + case LoaderBBTMemory: + break; + + // FIXME: not known (not used anyway) + case LoaderReserve: + case LoaderXIPRom: + case LoaderLargePageFiller: + case LoaderErrorLogMemory: + break; + } + + if (!Status) + { + ERR("Error during MempSetupPaging\n"); + } } #ifdef _M_ARM @@ -219,7 +209,8 @@ // // Allocate memory for memory allocation descriptors - Mad = MmHeapAlloc(sizeof(MEMORY_ALLOCATION_DESCRIPTOR) * 1024); + Mad = MmAllocateMemoryWithType(sizeof(MEMORY_ALLOCATION_DESCRIPTOR) * MAX_MAD_COUNT, + LoaderMemoryData); // Setup an entry for each descriptor MemoryMap = MmGetMemoryMap(&NoEntries); @@ -236,7 +227,7 @@ TRACE("Got memory map with %d entries\n", NoEntries); // Always contiguously map low 1Mb of memory - Status = MempSetupPaging(0, 0x100); + Status = MempSetupPaging(0, 0x100, FALSE); if (!Status) { ERR("Error during MempSetupPaging of low 1Mb\n"); @@ -313,9 +304,6 @@ UiMessageBox("Error during MempSetupPaging"); return; }*/ - - // Unmap what is not needed from kernel page table - MempDisablePages(); // Fill the memory descriptor list and //PrepareMemoryDescriptorList();

13 years, 2 months

[akhaldi] 53863: [SHELL32] * Implemented CDefView::GetSpacing based on Wine. By Claudiu Mihail.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Sep 26 15:43:19 2011 New Revision: 53863 URL: http://svn.reactos.org/svn/reactos?rev=53863&view=rev Log: [SHELL32] * Implemented CDefView::GetSpacing based on Wine. By Claudiu Mihail. Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Mon Sep 26 15:43:19 2011 @@ -2406,7 +2406,19 @@ HRESULT STDMETHODCALLTYPE CDefView::GetSpacing(POINT *ppt) { - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", this, ppt); + + if (NULL == hWndList) return S_FALSE; + + if (ppt) + { + const DWORD ret = SendMessageW(hWndList, LVM_GETITEMSPACING, 0, 0); + + ppt->x = LOWORD(ret); + ppt->y = HIWORD(ret); + } + + return S_OK; } HRESULT STDMETHODCALLTYPE CDefView::GetDefaultSpacing(POINT *ppt)

13 years, 2 months

[dgorbachev] 53862: [NTOSKRNL] - Do not reference/dereference device node, but device object. - Fix compiler warning.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Sep 26 15:35:24 2011 New Revision: 53862 URL: http://svn.reactos.org/svn/reactos?rev=53862&view=rev Log: [NTOSKRNL] - Do not reference/dereference device node, but device object. - Fix compiler warning. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Sep 26 15:35:24 2011 @@ -122,7 +122,7 @@ if (!SystemPowerDeviceNodeCreated) { PopSystemPowerDeviceNode = DeviceNode; - ObReferenceObject(PopSystemPowerDeviceNode); + ObReferenceObject(PopSystemPowerDeviceNode->PhysicalDeviceObject); SystemPowerDeviceNodeCreated = TRUE; } } @@ -1937,7 +1937,7 @@ { /* Ignore this DO */ DPRINT1("IopCreateDeviceNode() failed with status 0x%08x. Skipping PDO %u\n", Status, i); - ObDereferenceObject(ChildDeviceNode); + ObDereferenceObject(ChildDeviceObject); } } else @@ -2764,7 +2764,8 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hPnpKey; PKEY_VALUE_PARTIAL_INFORMATION KeyInformation; - ULONG DesiredLength, Length, KeyValue; + ULONG DesiredLength, Length; + ULONG KeyValue = 0; NTSTATUS Status; InitializeObjectAttributes(&ObjectAttributes, &KeyPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -2797,7 +2798,6 @@ else { DPRINT1("ZwQueryValueKey(%wZ%wZ) failed\n", &KeyPathU, &KeyNameU); - KeyValue = 0; } ExFreePool(KeyInformation); @@ -2805,13 +2805,11 @@ else { DPRINT1("Failed to allocate memory for registry query\n"); - KeyValue = 0; } } else { DPRINT1("ZwQueryValueKey(%wZ%wZ) failed with status 0x%08lx\n", &KeyPathU, &KeyNameU, Status); - KeyValue = 0; } ZwClose(hPnpKey);

13 years, 2 months

← Newer
1
2
3
4
5
6
7
8
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011