Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[sir_richard] 48940: [NTOS]: He's climbing in yo PFN database, he snatching yo pages up, tryin to page em so y'all need to hide your pool hide your cache, and hide your working set cuz they grabbin...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Sep 30 04:40:31 2010 New Revision: 48940 URL: http://svn.reactos.org/svn/reactos?rev=48940&view=rev Log: [NTOS]: He's climbing in yo PFN database, he snatching yo pages up, tryin to page em so y'all need to hide your pool hide your cache, and hide your working set cuz they grabbin' all the pages out there. We gonna page you, we gonna page you, so you can run and fault on that, run and fault on that, home boy, homeboy, home homeboy. Enable ARM3 Paged Pool and remove all related deprecated code. Install tested on several VMs, it might cause new regressions. Let's fix them before 0.3.13 instead of reverting. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/ppool.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=489… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Sep 30 04:40:31 2010 @@ -1270,8 +1270,6 @@ SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARCHITECTURE; } -extern BOOLEAN AllowPagedPool; - VOID NTAPI Phase1InitializationDiscard(IN PVOID Context) @@ -1891,9 +1889,6 @@ /* Update progress bar */ InbvUpdateProgressBar(90); - /* Enough fun for now */ - AllowPagedPool = FALSE; - /* Launch initial process */ ProcessInfo = &InitBuffer->ProcessInfo; ExpLoadInitialProcess(InitBuffer, &ProcessParameters, &Environment); 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] Thu Sep 30 04:40:31 2010 @@ -19,8 +19,6 @@ #undef ExAllocatePoolWithQuota #undef ExAllocatePoolWithQuotaTag -BOOLEAN AllowPagedPool = TRUE; - /* GLOBALS ********************************************************************/ ULONG ExpNumberOfPagedPools; @@ -454,11 +452,6 @@ PPOOL_HEADER Entry, NextEntry, FragmentEntry; KIRQL OldIrql; ULONG BlockSize, i; - - // - // Check for paged pool - // - if (!(AllowPagedPool) && (PoolType == PagedPool)) return ExAllocatePagedPoolWithTag(PagedPool, NumberOfBytes, Tag); // // Some sanity checks @@ -761,19 +754,6 @@ BOOLEAN Combined = FALSE; // - // Check for paged pool - // - if ((P >= MmPagedPoolBase) && - (P <= (PVOID)((ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize))) - { - // - // Use old allocator - // - ExFreePagedPool(P); - return; - } - - // // Quickly deal with big page allocations // if (PAGE_ALIGN(P) == P) Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Thu Sep 30 04:40:31 2010 @@ -105,10 +105,6 @@ switch (MemoryArea->Type) { - case MEMORY_AREA_PAGED_POOL: - Status = STATUS_SUCCESS; - break; - case MEMORY_AREA_SECTION_VIEW: Status = MmAccessFaultSectionView(AddressSpace, MemoryArea, @@ -196,12 +192,6 @@ switch (MemoryArea->Type) { - case MEMORY_AREA_PAGED_POOL: - { - Status = MmCommitPagedPoolAddress((PVOID)Address, Locked); - break; - } - case MEMORY_AREA_SECTION_VIEW: Status = MmNotPresentFaultSectionView(AddressSpace, MemoryArea, @@ -293,25 +283,3 @@ } } -NTSTATUS -NTAPI -MmCommitPagedPoolAddress(PVOID Address, BOOLEAN Locked) -{ - NTSTATUS Status; - PFN_NUMBER AllocatedPage; - - Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - Status = MmRequestPageMemoryConsumer(MC_PPOOL, TRUE, &AllocatedPage); - MmLockAddressSpace(MmGetKernelAddressSpace()); - } - Status = - MmCreateVirtualMapping(NULL, - (PVOID)PAGE_ROUND_DOWN(Address), - PAGE_READWRITE, - &AllocatedPage, - 1); - return(Status); -} Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Sep 30 04:40:31 2010 @@ -199,21 +199,6 @@ ASSERT(Status == STATUS_SUCCESS); // - // And now, ReactOS paged pool - // - BaseAddress = MmPagedPoolBase; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_PAGED_POOL | MEMORY_AREA_STATIC, - &BaseAddress, - MmPagedPoolSize, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - ASSERT(Status == STATUS_SUCCESS); - - // // Next, the KPCR // BaseAddress = (PVOID)PCR; @@ -287,10 +272,6 @@ MmSystemRangeStart, (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, "Boot Loaded Image"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmPagedPoolBase, - (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, - "Paged Pool"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmPfnDatabase, (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), @@ -373,12 +354,7 @@ /* Initialize ARMÂ³ in phase 0 */ MmArmInitSystem(0, KeLoaderBlock); - - /* Put the paged pool after the loaded modules */ - MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MmSystemRangeStart + - MmBootImageSize); - MmPagedPoolSize = MM_PAGED_POOL_SIZE; - + /* Intialize system memory areas */ MiInitSystemMemoryAreas(); @@ -387,7 +363,6 @@ } else if (Phase == 1) { - MmInitializePagedPool(); MiInitializeUserPfnBitmap(); MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); MmInitializeRmapList(); Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Thu Sep 30 04:40:31 2010 @@ -13,10 +13,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitializePagedPool) -#endif #undef ASSERT #define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } @@ -967,26 +963,6 @@ R_RELEASE_MUTEX(pool); } -VOID -INIT_FUNCTION -NTAPI -MmInitializePagedPool(VOID) -{ - /* - * We are still at a high IRQL level at this point so explicitly commit - * the first page of the paged pool before writing the first block header. - */ - MmCommitPagedPoolAddress ( (PVOID)MmPagedPoolBase, FALSE ); - - MmPagedPool = RPoolInit ( MmPagedPoolBase, - MmPagedPoolSize, - MM_POOL_ALIGNMENT, - MM_CACHE_LINE_SIZE, - PAGE_SIZE ); - - ExInitializeFastMutex(&MmPagedPool->Mutex); -} - PVOID NTAPI ExAllocatePagedPoolWithTag (IN POOL_TYPE PoolType, IN ULONG NumberOfBytes,

14 years

[sir_richard] 48939: [NTOS]: Use SYSTEM_PD_SIZE instead of assuming that this is PAGE_SIZE, since this is not the case on (future) ARM and (current) AMD64 ports. [NTOS]: Remove some magic numbers i...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Sep 30 03:26:13 2010 New Revision: 48939 URL: http://svn.reactos.org/svn/reactos?rev=48939&view=rev Log: [NTOS]: Use SYSTEM_PD_SIZE instead of assuming that this is PAGE_SIZE, since this is not the case on (future) ARM and (current) AMD64 ports. [NTOS]: Remove some magic numbers in the pool code, using PTE_COUNT, MiAddressToPde, when needed. Also, the expansion code uses PDEs, not PTEs, so differentiate this, because on some systems (ARM), there are different structures for both. [NTOS]: Use MI_WRITE_INVALID_PTE. ARM3 paged pool now works, the expansion bug has been fixed (and the code is more portable). Expect to see it gradually enabled soon. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c 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] Thu Sep 30 03:26:13 2010 @@ -107,16 +107,11 @@ #ifdef _M_AMD64 ASSERT(FALSE); #else - /* This seems to be making the assumption that one PDE is one page long */ - C_ASSERT(PAGE_SIZE == (PD_COUNT * (sizeof(MMPTE) * PDE_COUNT))); - // // Copy it from our double-mapped system page directory // InterlockedExchangePte(PointerPde, - MmSystemPagePtes[((ULONG_PTR)PointerPde & - (PAGE_SIZE - 1)) / - sizeof(MMPTE)].u.Long); + MmSystemPagePtes[(ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)].u.Long); #endif } 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] Thu Sep 30 03:26:13 2010 @@ -377,7 +377,10 @@ KIRQL OldIrql; PLIST_ENTRY NextEntry, NextHead, LastHead; PMMPTE PointerPte, StartPte; + PMMPDE PointerPde; + ULONG EndAllocation; MMPTE TempPte; + MMPDE TempPde; PMMPFN Pfn1; PVOID BaseVa, BaseVaStart; PMMFREE_POOL_ENTRY FreeEntry; @@ -409,7 +412,7 @@ // // Get the page bit count // - i = ((SizeInPages - 1) / 1024) + 1; + i = ((SizeInPages - 1) / PTE_COUNT) + 1; DPRINT1("Paged pool expansion: %d %x\n", i, SizeInPages); // @@ -450,15 +453,15 @@ } // - // Get the template PTE we'll use to expand - // - TempPte = ValidKernelPte; + // Get the template PDE we'll use to expand + // + TempPde = ValidKernelPde; // // Get the first PTE in expansion space // - PointerPte = MmPagedPoolInfo.NextPdeForPagedPoolExpansion; - BaseVa = MiPteToAddress(PointerPte); + PointerPde = MmPagedPoolInfo.NextPdeForPagedPoolExpansion; + BaseVa = MiPteToAddress(PointerPde); BaseVaStart = BaseVa; // @@ -470,11 +473,13 @@ // // It should not already be valid // - ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(PointerPde->u.Hard.Valid == 0); /* Request a page */ + DPRINT1("Requesting %d PDEs\n", i); PageFrameNumber = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); - TempPte.u.Hard.PageFrameNumber = PageFrameNumber; + TempPde.u.Hard.PageFrameNumber = PageFrameNumber; + DPRINT1("We have a PDE: %lx\n", PageFrameNumber); #if (_MI_PAGING_LEVELS >= 3) /* On PAE/x64 systems, there's no double-buffering */ @@ -483,38 +488,38 @@ // // Save it into our double-buffered system page directory // - /* This seems to be making the assumption that one PDE is one page long */ - C_ASSERT(PAGE_SIZE == (PD_COUNT * (sizeof(MMPTE) * PDE_COUNT))); - MmSystemPagePtes[(ULONG_PTR)PointerPte & (PAGE_SIZE - 1) / - sizeof(MMPTE)] = TempPte; - + MmSystemPagePtes[(ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)] = TempPde; + /* Initialize the PFN */ MiInitializePfnForOtherProcess(PageFrameNumber, - PointerPte, - MmSystemPageDirectory[(PointerPte - (PMMPTE)PDE_BASE) / PDE_COUNT]); + PointerPde, + MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]); - /* Write the actual PTE now */ - MI_WRITE_VALID_PTE(PointerPte++, TempPte); + /* Write the actual PDE now */ + MI_WRITE_VALID_PTE(PointerPde, TempPde); #endif // // Move on to the next expansion address // + PointerPde++; BaseVa = (PVOID)((ULONG_PTR)BaseVa + PAGE_SIZE); - } while (--i > 0); + i--; + } while (i > 0); // // Release the PFN database lock // KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - + // // These pages are now available, clear their availablity bits // + EndAllocation = (MmPagedPoolInfo.NextPdeForPagedPoolExpansion - + MiAddressToPte(MmPagedPoolInfo.FirstPteForPagedPool)) * + PTE_COUNT; RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, - (MmPagedPoolInfo.NextPdeForPagedPoolExpansion - - MiAddressToPte(MmPagedPoolInfo.FirstPteForPagedPool)) * - 1024, - SizeInPages * 1024); + EndAllocation, + SizeInPages * PTE_COUNT); // // Update the next expansion location @@ -553,7 +558,8 @@ // Update the end bitmap so we know the bounds of this allocation when // the time comes to free it // - RtlSetBit(MmPagedPoolInfo.EndOfPagedPoolBitmap, i + SizeInPages - 1); + EndAllocation = i + SizeInPages - 1; + RtlSetBit(MmPagedPoolInfo.EndOfPagedPoolBitmap, EndAllocation); // // Now we can release the lock (it mainly protects the bitmap) @@ -583,9 +589,8 @@ // // Write the demand zero PTE and keep going // - ASSERT(PointerPte->u.Hard.Valid == 0); - *PointerPte++ = TempPte; - } while (PointerPte < StartPte); + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + } while (++PointerPte < StartPte); // // Return the allocation address to the caller

14 years

[sir_richard] 48938: [NTOS]: MiSetConsumer no longer achieves anything. Remove it.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Sep 30 03:21:02 2010 New Revision: 48938 URL: http://svn.reactos.org/svn/reactos?rev=48938&view=rev Log: [NTOS]: MiSetConsumer no longer achieves anything. Remove it. Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Thu Sep 30 03:21:02 2010 @@ -234,8 +234,6 @@ PsGetCurrentThread() == MiBalancerThreadId.UniqueThread; } -VOID NTAPI MiSetConsumer(IN PFN_NUMBER Pfn, IN ULONG Consumer); - NTSTATUS NTAPI MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, @@ -321,7 +319,6 @@ KeBugCheck(NO_PAGES_AVAILABLE); } /* Update the Consumer and make the page active */ - MiSetConsumer(Page, Consumer); if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage = Page; (void)InterlockedDecrementUL(&MiPagesRequired); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Thu Sep 30 03:21:02 2010 @@ -567,14 +567,6 @@ VOID NTAPI -MiSetConsumer(IN PFN_NUMBER Pfn, - IN ULONG Type) -{ - MiGetPfnEntry(Pfn)->u3.e1.PageLocation = ActiveAndValid; -} - -VOID -NTAPI MmDereferencePage(PFN_NUMBER Pfn) { PPHYSICAL_PAGE Page; @@ -591,6 +583,7 @@ Page->u3.e1.PageLocation = ActiveAndValid; /* Bring it back into the free list */ + DPRINT("Legacy free: %lx\n", Pfn); MiInsertPageInFreeList(Pfn); } } @@ -617,6 +610,7 @@ return 0; } + DPRINT("Legacy allocate: %lx\n", PfnOffset); Pfn1 = MiGetPfnEntry(PfnOffset); Pfn1->u3.e2.ReferenceCount = 1; Pfn1->u3.e1.PageLocation = ActiveAndValid;

14 years

[sir_richard] 48937: [NTOS]: Add definition for size of a page directory, and size of all page directories required per process (some architectures have more than one page directory per process/add...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Sep 30 03:18:44 2010 New Revision: 48937 URL: http://svn.reactos.org/svn/reactos?rev=48937&view=rev Log: [NTOS]: Add definition for size of a page directory, and size of all page directories required per process (some architectures have more than one page directory per process/address space). Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h 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] Thu Sep 30 03:18:44 2010 @@ -62,11 +62,18 @@ /* Size of a page table */ #define PT_SIZE (PTE_COUNT * sizeof(MMPTE)) +/* Size of a page directory */ +#define PD_SIZE (PDE_COUNT * sizeof(MMPDE)) + +/* Size of all page directories for a process */ +#define SYSTEM_PD_SIZE (PD_COUNT * PD_SIZE) + /* Architecture specific count of PDEs in a directory, and count of PTEs in a PT */ #ifdef _M_IX86 #define PD_COUNT 1 #define PDE_COUNT 1024 #define PTE_COUNT 1024 +C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); #elif _M_ARM #define PD_COUNT 1 #define PDE_COUNT 4096

14 years

[sir_richard] 48936: [NTOS]: Fix a bug in MiRemoveAnyPage: it was always checking the colored zero page list, instead of checking the colored free page list the second time around.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Sep 30 03:17:14 2010 New Revision: 48936 URL: http://svn.reactos.org/svn/reactos?rev=48936&view=rev Log: [NTOS]: Fix a bug in MiRemoveAnyPage: it was always checking the colored zero page list, instead of checking the colored free page list the second time around. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.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] Thu Sep 30 03:17:14 2010 @@ -339,10 +339,12 @@ #if 0 /* Check the colored free list */ PageIndex = MmFreePagesByColor[FreePageList][Color].Flink; + DPRINT1("Found free page: %lx\n", PageIndex); if (PageIndex == LIST_HEAD) { /* Check the colored zero list */ PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; + DPRINT1("Found zero page: %lx\n", PageIndex); if (PageIndex == LIST_HEAD) { #endif @@ -413,7 +415,7 @@ Zero = TRUE; #if 0 /* Check the colored free list */ - PageIndex = MmFreePagesByColor[ZeroedPageList][Color].Flink; + PageIndex = MmFreePagesByColor[FreePageList][Color].Flink; if (PageIndex == LIST_HEAD) { #endif

14 years

[pschweitzer] 48935: [PSDK] Fixed build

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 29 22:54:00 2010 New Revision: 48935 URL: http://svn.reactos.org/svn/reactos?rev=48935&view=rev Log: [PSDK] Fixed build Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed Sep 29 22:54:00 2010 @@ -148,8 +148,8 @@ #endif typedef wchar_t WCHAR; -typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR; -typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR; +typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR,*PZZWSTR; +typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR,*PCZZWSTR; typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR; typedef CONST CHAR *LPCCH,*PCCH,*PCSTR,*LPCSTR; typedef PWSTR *PZPWSTR; @@ -160,6 +160,7 @@ typedef PSTR *PZPSTR; typedef CONST PSTR *PCZPSTR; typedef PCSTR *PZPCSTR; + #ifdef UNICODE #ifndef _TCHAR_DEFINED

14 years

[fireball] 48934: [REGE[REGEDIT] - Katayama Hirofumi: Don't leak open handles to keys. - Katayama Hirofumi: Misc code changes/ cleanup. See issue #5547 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Sep 29 21:52:16 2010 New Revision: 48934 URL: http://svn.reactos.org/svn/reactos?rev=48934&view=rev Log: [REGE[REGEDIT] - Katayama Hirofumi: Don't leak open handles to keys. - Katayama Hirofumi: Misc code changes/ cleanup. See issue #5547 for more details. Modified: trunk/reactos/base/applications/regedit/framewnd.c Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Wed Sep 29 21:52:16 2010 @@ -95,7 +95,7 @@ dwIndex = 0; do { - cbValueName = sizeof(szValueName) / sizeof(szValueName[0]); + cbValueName = COUNT_OF(szValueName); cbValueData = sizeof(abValueData); lResult = RegEnumValue(hKey, dwIndex, szValueName, &cbValueName, NULL, &dwType, abValueData, &cbValueData); if ((lResult == ERROR_SUCCESS) && (dwType == REG_SZ)) @@ -521,7 +521,7 @@ if (!GetKeyName(szBuffer, COUNT_OF(szBuffer), hRootKey, keyName)) goto done; - hGlobal = GlobalAlloc(GMEM_MOVEABLE, (_tcslen(szBuffer) + 1) * sizeof(TCHAR)); + hGlobal = GlobalAlloc(GMEM_MOVEABLE, (lstrlen(szBuffer) + 1) * sizeof(TCHAR)); if (!hGlobal) goto done; @@ -553,21 +553,18 @@ HKEY hKey; LVFINDINFO lvfi; - if (RegOpenKey(hRootKey, pszKeyPath, &hKey) != ERROR_SUCCESS) + if (RegOpenKeyEx(hRootKey, pszKeyPath, 0, KEY_QUERY_VALUE | KEY_SET_VALUE, + &hKey) != ERROR_SUCCESS) return FALSE; - LoadString(hInst, IDS_NEW_VALUE, szNewValueFormat, sizeof(szNewValueFormat) - / sizeof(szNewValueFormat[0])); + LoadString(hInst, IDS_NEW_VALUE, szNewValueFormat, COUNT_OF(szNewValueFormat)); do { - _sntprintf(szNewValue, sizeof(szNewValue) / sizeof(szNewValue[0]), - szNewValueFormat, iIndex++); - + wsprintf(szNewValue, szNewValueFormat, iIndex++); cbData = sizeof(data); lResult = RegQueryValueEx(hKey, szNewValue, NULL, &dwExistingType, data, &cbData); - } - while(lResult == ERROR_SUCCESS); + } while(lResult == ERROR_SUCCESS); switch(dwType) { case REG_DWORD: @@ -589,8 +586,11 @@ } memset(data, 0, cbData); lResult = RegSetValueEx(hKey, szNewValue, 0, dwType, data, cbData); + RegCloseKey(hKey); if (lResult != ERROR_SUCCESS) + { return FALSE; + } RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); @@ -862,7 +862,7 @@ } } } - if (GetFocus() == g_pChildWnd->hTreeWnd) + else if (GetFocus() == g_pChildWnd->hTreeWnd) { /* Get focused entry of treeview (if any) */ HTREEITEM hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); @@ -905,8 +905,8 @@ } } } - } else - if (GetFocus() == g_pChildWnd->hTreeWnd) + } + else if (GetFocus() == g_pChildWnd->hTreeWnd) { if (keyPath == 0 || *keyPath == 0) { @@ -918,7 +918,8 @@ RefreshTreeView(g_pChildWnd->hTreeWnd); } } - break; + break; + } case ID_EDIT_NEW_STRINGVALUE: CreateNewValue(hKeyRoot, keyPath, REG_SZ); break; @@ -928,14 +929,12 @@ case ID_EDIT_NEW_DWORDVALUE: CreateNewValue(hKeyRoot, keyPath, REG_DWORD); break; - case ID_EDIT_NEW_MULTISTRINGVALUE: + case ID_EDIT_NEW_MULTISTRINGVALUE: CreateNewValue(hKeyRoot, keyPath, REG_MULTI_SZ); break; - case ID_EDIT_NEW_EXPANDABLESTRINGVALUE: + case ID_EDIT_NEW_EXPANDABLESTRINGVALUE: CreateNewValue(hKeyRoot, keyPath, REG_EXPAND_SZ); break; - - } case ID_EDIT_FIND: FindDialog(hWnd); break;

14 years

[fireball] 48933: [REGEDIT] - Katayama Hirofumi: Unicodify regedit, add support for import/export of v5 reg files. Based on Wine regedit.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Sep 29 21:43:39 2010 New Revision: 48933 URL: http://svn.reactos.org/svn/reactos?rev=48933&view=rev Log: [REGEDIT] - Katayama Hirofumi: Unicodify regedit, add support for import/export of v5 reg files. Based on Wine regedit. Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/main.c trunk/reactos/base/applications/regedit/main.h trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/regedit.rbuild trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/regproc.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/regproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…

14 years

[pschweitzer] 48932: [KMTEST] Added a small testcase for FsRtlIsNameInExpression(). It's quite relevant for daily and simple use of the function. It shouldn't fail on ReactOS given our current impl...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 29 21:42:11 2010 New Revision: 48932 URL: http://svn.reactos.org/svn/reactos?rev=48932&view=rev Log: [KMTEST] Added a small testcase for FsRtlIsNameInExpression(). It's quite relevant for daily and simple use of the function. It shouldn't fail on ReactOS given our current implementation. Added: trunk/rostests/drivers/kmtest/ntos_fsrtl.c (with props) Modified: trunk/rostests/drivers/kmtest/kmtest.c trunk/rostests/drivers/kmtest/kmtest.rbuild Modified: trunk/rostests/drivers/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.c?r… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.c [iso-8859-1] Wed Sep 29 21:42:11 2010 @@ -174,6 +174,7 @@ BOOLEAN DetachDeviceTest(PDEVICE_OBJECT); BOOLEAN AttachDeviceTest(PDEVICE_OBJECT, PWCHAR); VOID LowerDeviceKernelAPITest(PDEVICE_OBJECT, BOOLEAN); +VOID NtoskrnlFsRtlTest(HANDLE KeyHandle); typedef enum { TestStageExTimer = 0, @@ -185,6 +186,7 @@ TestStageOb, TestStageKeStall, TestStageDrv, + TestStageFsRtl, TestStageMax } TEST_STAGE; @@ -397,6 +399,10 @@ } FinishTest(KeyHandle, L"DriverTest"); + break; + + case TestStageFsRtl: + NtoskrnlFsRtlTest(KeyHandle); break; default: Modified: trunk/rostests/drivers/kmtest/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.rbu… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] Wed Sep 29 21:42:11 2010 @@ -14,5 +14,6 @@ <file>ntos_ke.c</file> <file>ntos_ob.c</file> <file>ntos_pools.c</file> + <file>ntos_fsrtl.c</file> <file>kmtest.rc</file> </module> Added: trunk/rostests/drivers/kmtest/ntos_fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_fsrtl… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_fsrtl.c (added) +++ trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] Wed Sep 29 21:42:11 2010 @@ -1,0 +1,125 @@ +/* + * FsRtl Test + * + * Copyright 2010 Pierre Schweitzer <pierre.schweitzer(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; see the file COPYING.LIB. + * If not, write to the Free Software Foundation, + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* INCLUDES *******************************************************************/ + +#include "kmtest.h" +#include <ntifs.h> + +#define NDEBUG +#include "debug.h" + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID FsRtlIsNameInExpressionTest() +{ + UNICODE_STRING Expression, Name; + + RtlInitUnicodeString(&Expression, L"ntdll.dll"); + RtlInitUnicodeString(&Name, L"."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"~1"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L".."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"ntdll.dll"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + RtlInitUnicodeString(&Expression, L"smss.exe"); + RtlInitUnicodeString(&Name, L"."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"~1"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L".."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"ntdll.dll"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"NTDLL.dll"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + + RtlInitUnicodeString(&Expression, L"nt??krnl.???"); + RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + RtlInitUnicodeString(&Expression, L"he*o"); + RtlInitUnicodeString(&Name, L"hello"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"helo"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"hella"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + + RtlInitUnicodeString(&Expression, L"he*"); + RtlInitUnicodeString(&Name, L"hello"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"helo"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"hella"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + RtlInitUnicodeString(&Expression, L"*.cpl"); + RtlInitUnicodeString(&Name, L"kdcom.dll"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"bootvid.dll"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + + RtlInitUnicodeString(&Expression, L"."); + RtlInitUnicodeString(&Name, L"NTDLL.DLL"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + + RtlInitUnicodeString(&Expression, L"F0_*.*"); + RtlInitUnicodeString(&Name, L"."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L".."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"SETUP.EXE"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"F0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + + RtlInitUnicodeString(&Expression, L"*.TTF"); + RtlInitUnicodeString(&Name, L"."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L".."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"SETUP.INI"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + + RtlInitUnicodeString(&Expression, L"*"); + RtlInitUnicodeString(&Name, L"."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L".."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"SETUP.INI"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +NtoskrnlFsRtlTest(HANDLE KeyHandle) +{ + FsRtlIsNameInExpressionTest(); + + FinishTest(KeyHandle, L"FsRtlTest"); +} Propchange: trunk/rostests/drivers/kmtest/ntos_fsrtl.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years

[fireball] 48931: PSDK - Edison Henrique Andreassy <ehasis@hotmail.com>: Add FILEMUIINFO definition. See issue #5640 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Sep 29 21:32:56 2010 New Revision: 48931 URL: http://svn.reactos.org/svn/reactos?rev=48931&view=rev Log: PSDK - Edison Henrique Andreassy <ehasis(a)hotmail.com>: Add FILEMUIINFO definition. See issue #5640 for more details. Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Wed Sep 29 21:32:56 2010 @@ -573,6 +573,21 @@ NormalizationKD = 0x6 } NORM_FORM; #endif /* (WINVER >= 0x0600) */ +typedef struct _FILEMUIINFO { + DWORD dwSize; + DWORD dwVersion; + DWORD dwFileType; + BYTE pChecksum[16]; + BYTE pServiceChecksum[16]; + DWORD dwLanguageNameOffset; + DWORD dwTypeIDMainSize; + DWORD dwTypeIDMainOffset; + DWORD dwTypeNameMainOffset; + DWORD dwTypeIDMUISize; + DWORD dwTypeIDMUIOffset; + DWORD dwTypeNameMUIOffset; + BYTE abBuffer[8]; +} FILEMUIINFO, *PFILEMUIINFO; int WINAPI CompareStringA(LCID,DWORD,LPCSTR,int,LPCSTR,int); int WINAPI CompareStringW(LCID,DWORD,LPCWSTR,int,LPCWSTR,int); @@ -634,6 +649,7 @@ BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR); BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); BOOL WINAPI SetThreadLocale(LCID); +LANGID WINAPI SetThreadUILanguage(LANGID); BOOL WINAPI SetUserDefaultLCID(LCID); BOOL WINAPI SetUserDefaultUILanguage(LANGID); BOOL WINAPI SetUserGeoID(GEOID); @@ -654,14 +670,24 @@ BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); #endif /* (WINVER >= 0x0500) */ #if (WINVER >= 0x0600) +BOOL WINAPI GetFileMUIInfo(DWORD,PCWSTR,PFILEMUIINFO,DWORD*); +BOOL WINAPI GetFileMUIPath(DWORD,PCWSTR,PWSTR,PULONG,PWSTR,PULONG,PULONGLONG); WINBASEAPI int WINAPI GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,int); +BOOL WINAPI GetProcessPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); +BOOL WINAPI GetSystemPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); +BOOL WINAPI GetThreadPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); +LANGID WINAPI GetThreadUILanguage(void); +BOOL WINAPI GetUILanguageInfo(DWORD,PCZZWSTR,PZZWSTR,PDWORD,PDWORD); +BOOL WINAPI GetUserPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); int WINAPI IdnToAscii(DWORD,LPCWSTR,int,LPWSTR,int); int WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,int,LPWSTR,int); int WINAPI IdnToUnicode(DWORD,LPCWSTR,int,LPWSTR,int); BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,int); int WINAPI NormalizeString(NORM_FORM,LPCWSTR,int,LPWSTR,int); int WINAPI GetStringScripts(DWORD,LPCWSTR,int,LPWSTR,int); +BOOL WINAPI SetProcessPreferredUILanguages(DWORD,PCZZWSTR,PULONG); +BOOL WINAPI SetThreadPreferredUILanguages(DWORD,PCZZWSTR,PULONG); BOOL WINAPI VerifyScripts(DWORD,LPCWSTR,int,LPCWSTR,int); #endif /* (WINVER >= 0x0600) */

14 years

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 2010