Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[jimtabor] 49005: [Win32k|User32] - Implement NtUserGetMenuIndex, see Bug 5528.
by jimtabor＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: jimtabor Date: Tue Oct 5 20:13:32 2010 New Revision: 49005 URL: http://svn.reactos.org/svn/reactos?rev=49005&view=rev Log: [Win32k|User32] - Implement NtUserGetMenuIndex, see Bug 5528. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Tue Oct 5 20:13:32 2010 @@ -538,12 +538,11 @@ } /* - * @unimplemented + * @implemented */ DWORD WINAPI GetMenuIndex(HMENU hMenu, HMENU hSubMenu) { - UNIMPLEMENTED; - return 0; + return NtUserGetMenuIndex(hMenu, hSubMenu); } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Tue Oct 5 20:13:32 2010 @@ -2034,20 +2034,40 @@ END_CLEANUP; } - /* - * @unimplemented + * @implemented */ UINT APIENTRY NtUserGetMenuIndex( HMENU hMenu, - UINT wID) -{ - UNIMPLEMENTED - - return 0; -} - + HMENU hSubMenu) +{ + PMENU_OBJECT Menu, SubMenu; + PMENU_ITEM MenuItem; + DECLARE_RETURN(UINT); + + DPRINT("Enter NtUserGetMenuIndex\n"); + UserEnterShared(); + + if ( !(Menu = UserGetMenuObject(hMenu)) || + !(SubMenu = UserGetMenuObject(hSubMenu)) ) + RETURN(0xFFFFFFFF); + + MenuItem = Menu->MenuItemList; + while(MenuItem) + { + if (MenuItem->hSubMenu == hSubMenu) + RETURN(MenuItem->wID); + MenuItem = MenuItem->Next; + } + + RETURN(0xFFFFFFFF); + +CLEANUP: + DPRINT("Leave NtUserGetMenuIndex, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} /* * @implemented @@ -2217,10 +2237,6 @@ return( Res); } - - - - /* * @implemented

1 0

[sir_richard] 49004: [NTOS]: High-level interface fixes to NtAllocateVirtualMemory/NtFreeVirtualMemory: - Validate MEM_LARGE_PAGES, MEM_PHYSICAL flags. Check for permission to use MEM_LARGE_PAGES. ...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 20:00:32 2010 New Revision: 49004 URL: http://svn.reactos.org/svn/reactos?rev=49004&view=rev Log: [NTOS]: High-level interface fixes to NtAllocateVirtualMemory/NtFreeVirtualMemory: - Validate MEM_LARGE_PAGES, MEM_PHYSICAL flags. Check for permission to use MEM_LARGE_PAGES. - Validate protection mask. - Validate MEM_RELEASE and MEM_DECOMMIT. - Perform correct SEH in NtFreeVirtualMemory. - Protect against overflows past VAD/User address ranegs. - Only reference the process by handle if this isn't already the current process. - If this isn't the current process, attach to it during the duration of the VM operation. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Tue Oct 5 20:00:32 2010 @@ -42,6 +42,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define MODULE_INVOLVED_IN_ARM3 +#include "ARM3/miarm.h" /* FUNCTIONS *****************************************************************/ @@ -663,31 +666,14 @@ /* * @implemented */ -NTSTATUS NTAPI -NtAllocateVirtualMemory(IN HANDLE ProcessHandle, +NTSTATUS +NTAPI +NtAllocateVirtualMemory(IN HANDLE ProcessHandle, IN OUT PVOID* UBaseAddress, - IN ULONG_PTR ZeroBits, + IN ULONG_PTR ZeroBits, IN OUT PSIZE_T URegionSize, - IN ULONG AllocationType, - IN ULONG Protect) -/* - * FUNCTION: Allocates a block of virtual memory in the process address space - * ARGUMENTS: - * ProcessHandle = The handle of the process which owns the virtual memory - * BaseAddress = A pointer to the virtual memory allocated. If you - * supply a non zero value the system will try to - * allocate the memory at the address supplied. It round - * it down to a multiple of the page size. - * ZeroBits = (OPTIONAL) You can specify the number of high order bits - * that must be zero, ensuring that the memory will be - * allocated at a address below a certain value. - * RegionSize = The number of bytes to allocate - * AllocationType = Indicates the type of virtual memory you like to - * allocated, can be a combination of MEM_COMMIT, - * MEM_RESERVE, MEM_RESET, MEM_TOP_DOWN. - * Protect = Indicates the protection type of the pages allocated. - * RETURNS: Status - */ + IN ULONG AllocationType, + IN ULONG Protect) { PEPROCESS Process; MEMORY_AREA* MemoryArea; @@ -699,132 +685,188 @@ ULONG RegionSize; PVOID PBaseAddress; ULONG PRegionSize; - ULONG MemProtection; PHYSICAL_ADDRESS BoundaryAddressMultiple; - KPROCESSOR_MODE PreviousMode; - - PAGED_CODE(); - - DPRINT("NtAllocateVirtualMemory(*UBaseAddress %x, " - "ZeroBits %d, *URegionSize %x, AllocationType %x, Protect %x)\n", - *UBaseAddress,ZeroBits,*URegionSize,AllocationType, - Protect); - - /* Check for valid protection flags */ - MemProtection = Protect & ~(PAGE_GUARD|PAGE_NOCACHE); - if (MemProtection != PAGE_NOACCESS && - MemProtection != PAGE_READONLY && - MemProtection != PAGE_READWRITE && - MemProtection != PAGE_WRITECOPY && - MemProtection != PAGE_EXECUTE && - MemProtection != PAGE_EXECUTE_READ && - MemProtection != PAGE_EXECUTE_READWRITE && - MemProtection != PAGE_EXECUTE_WRITECOPY) - { - DPRINT1("Invalid page protection\n"); - return STATUS_INVALID_PAGE_PROTECTION; - } - - /* Check for valid Zero bits */ - if (ZeroBits > 21) - { - DPRINT1("Too many zero bits\n"); - return STATUS_INVALID_PARAMETER_3; - } - - /* Check for valid Allocation Types */ - if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | - MEM_TOP_DOWN | MEM_WRITE_WATCH))) - { - DPRINT1("Invalid Allocation Type\n"); - return STATUS_INVALID_PARAMETER_5; - } - - /* Check for at least one of these Allocation Types to be set */ - if (!(AllocationType & (MEM_COMMIT | MEM_RESERVE | MEM_RESET))) - { - DPRINT1("No memory allocation base type\n"); - return STATUS_INVALID_PARAMETER_5; - } - - /* MEM_RESET is an exclusive flag, make sure that is valid too */ - if ((AllocationType & MEM_RESET) && (AllocationType != MEM_RESET)) - { - DPRINT1("Invalid use of MEM_RESET\n"); - return STATUS_INVALID_PARAMETER_5; - } - - /* MEM_WRITE_WATCH can only be used if MEM_RESERVE is also used */ - if ((AllocationType & MEM_WRITE_WATCH) && !(AllocationType & MEM_RESERVE)) - { - DPRINT1("MEM_WRITE_WATCH used without MEM_RESERVE\n"); - return STATUS_INVALID_PARAMETER_5; - } - - /* MEM_PHYSICAL can only be used with MEM_RESERVE, and can only be R/W */ - if (AllocationType & MEM_PHYSICAL) - { - /* First check for MEM_RESERVE exclusivity */ - if (AllocationType != (MEM_RESERVE | MEM_PHYSICAL)) - { - DPRINT1("MEM_PHYSICAL used with other flags then MEM_RESERVE or" - "MEM_RESERVE was not present at all\n"); - return STATUS_INVALID_PARAMETER_5; - } - - /* Then make sure PAGE_READWRITE is used */ - if (Protect != PAGE_READWRITE) - { - DPRINT1("MEM_PHYSICAL used without PAGE_READWRITE\n"); - return STATUS_INVALID_PAGE_PROTECTION; - } - } - - PreviousMode = KeGetPreviousMode(); - - _SEH2_TRY - { - if (PreviousMode != KernelMode) - { - ProbeForWritePointer(UBaseAddress); - ProbeForWriteUlong(URegionSize); - } - PBaseAddress = *UBaseAddress; - PRegionSize = *URegionSize; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - - BoundaryAddressMultiple.QuadPart = 0; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + KAPC_STATE ApcState; + ULONG ProtectionMask; + BOOLEAN Attached = FALSE; + BoundaryAddressMultiple.QuadPart = 0; + PAGED_CODE(); + + /* Check for valid Zero bits */ + if (ZeroBits > 21) + { + DPRINT1("Too many zero bits\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check for valid Allocation Types */ + if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | + MEM_TOP_DOWN | MEM_WRITE_WATCH))) + { + DPRINT1("Invalid Allocation Type\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Check for at least one of these Allocation Types to be set */ + if (!(AllocationType & (MEM_COMMIT | MEM_RESERVE | MEM_RESET))) + { + DPRINT1("No memory allocation base type\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* MEM_RESET is an exclusive flag, make sure that is valid too */ + if ((AllocationType & MEM_RESET) && (AllocationType != MEM_RESET)) + { + DPRINT1("Invalid use of MEM_RESET\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Check if large pages are being used */ + if (AllocationType & MEM_LARGE_PAGES) + { + /* Large page allocations MUST be committed */ + if (!(AllocationType & MEM_COMMIT)) + { + DPRINT1("Must supply MEM_COMMIT with MEM_LARGE_PAGES\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* These flags are not allowed with large page allocations */ + if (AllocationType & (MEM_PHYSICAL | MEM_RESET | MEM_WRITE_WATCH)) + { + DPRINT1("Using illegal flags with MEM_LARGE_PAGES\n"); + return STATUS_INVALID_PARAMETER_5; + } + } + + /* MEM_WRITE_WATCH can only be used if MEM_RESERVE is also used */ + if ((AllocationType & MEM_WRITE_WATCH) && !(AllocationType & MEM_RESERVE)) + { + DPRINT1("MEM_WRITE_WATCH used without MEM_RESERVE\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* MEM_PHYSICAL can only be used if MEM_RESERVE is also used */ + if ((AllocationType & MEM_PHYSICAL) && !(AllocationType & MEM_RESERVE)) + { + DPRINT1("MEM_WRITE_WATCH used without MEM_RESERVE\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Check for valid MEM_PHYSICAL usage */ + if (AllocationType & MEM_PHYSICAL) + { + /* Only these flags are allowed with MEM_PHYSIAL */ + if (AllocationType & ~(MEM_RESERVE | MEM_TOP_DOWN | MEM_PHYSICAL)) + { + DPRINT1("Using illegal flags with MEM_PHYSICAL\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Then make sure PAGE_READWRITE is used */ + if (Protect != PAGE_READWRITE) + { + DPRINT1("MEM_PHYSICAL used without PAGE_READWRITE\n"); + return STATUS_INVALID_PARAMETER_6; + } + } + + /* Calculate the protection mask and make sure it's valid */ + ProtectionMask = MiMakeProtectionMask(Protect); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid protection mask\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* Enter SEH */ + _SEH2_TRY + { + /* Check for user-mode parameters */ + if (PreviousMode != KernelMode) + { + /* Make sure they are writable */ + ProbeForWritePointer(UBaseAddress); + ProbeForWriteUlong(URegionSize); + } + + /* Capture their values */ + PBaseAddress = *UBaseAddress; + PRegionSize = *URegionSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Make sure the allocation isn't past the VAD area */ + if (PBaseAddress >= MM_HIGHEST_VAD_ADDRESS) + { + DPRINT1("Virtual allocation base above User Space\n"); + return STATUS_INVALID_PARAMETER_2; + } + + /* Make sure the allocation wouldn't overflow past the VAD area */ + if ((((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) - (ULONG_PTR)PBaseAddress) < PRegionSize) + { + DPRINT1("Region size would overflow into kernel-memory\n"); + return STATUS_INVALID_PARAMETER_4; + } + + /* Make sure there's a size specified */ + if (!PRegionSize) + { + DPRINT1("Region size is invalid (zero)\n"); + return STATUS_INVALID_PARAMETER_4; + } + + /* Check if this is for the current process */ + if (ProcessHandle == NtCurrentProcess()) + { + /* We already have the current process, no need to go through Ob */ + Process = CurrentProcess; + } + else + { + /* Reference the handle for correct permissions */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if not running in the current process */ + if (CurrentProcess != Process) + { + /* Attach to it */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + } + + /* Check for large page allocations */ + if (AllocationType & MEM_LARGE_PAGES) + { + /* The lock memory privilege is required */ + if (!SeSinglePrivilegeCheck(SeLockMemoryPrivilege, PreviousMode)) + { + /* Fail without it */ + DPRINT1("Privilege not held for MEM_LARGE_PAGES\n"); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_PRIVILEGE_NOT_HELD; + } + } BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - PAGE_ROUND_DOWN(PBaseAddress); - /* - * We've captured and calculated the data, now do more checks - * Yes, MmCreateMemoryArea does similar checks, but they don't return - * the right status codes that a caller of this routine would expect. - */ - if ((ULONG_PTR)BaseAddress >= USER_SHARED_DATA) - { - DPRINT1("Virtual allocation base above User Space\n"); - return STATUS_INVALID_PARAMETER_2; - } - if (!RegionSize) - { - DPRINT1("Region size is invalid (zero)\n"); - return STATUS_INVALID_PARAMETER_4; - } - if ((USER_SHARED_DATA - (ULONG_PTR)BaseAddress) < RegionSize) - { - DPRINT1("Region size would overflow into kernel-memory\n"); - return STATUS_INVALID_PARAMETER_4; - } /* * Copy on Write is reserved for system use. This case is a certain failure @@ -835,19 +877,6 @@ { DPRINT1("Copy on write is not supported by VirtualAlloc\n"); return STATUS_INVALID_PAGE_PROTECTION; - } - - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - return(Status); } Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; @@ -871,8 +900,8 @@ (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); return STATUS_MEMORY_NOT_ALLOCATED; } @@ -888,7 +917,8 @@ } MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); /* MEM_RESET does not modify any attributes of region */ return STATUS_SUCCESS; @@ -904,7 +934,8 @@ BaseAddress, RegionSize, Type, Protect, MmModifyAttributes); MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); DPRINT("NtAllocateVirtualMemory() = %x\n",Status); /* Give the caller rounded BaseAddress and area length */ @@ -935,7 +966,8 @@ } MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); DPRINT("NtAllocateVirtualMemory() = %x\n",Status); /* Give the caller rounded BaseAddress and area length */ @@ -951,7 +983,8 @@ else { MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); return(STATUS_UNSUCCESSFUL); } } @@ -969,7 +1002,8 @@ if (!NT_SUCCESS(Status)) { MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); DPRINT("NtAllocateVirtualMemory() = %x\n",Status); return(Status); } @@ -986,13 +1020,15 @@ const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; MmReserveSwapPages(nPages); } + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); *UBaseAddress = BaseAddress; *URegionSize = MemoryAreaLength; DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); return(STATUS_SUCCESS); } @@ -1261,8 +1297,8 @@ */ NTSTATUS NTAPI NtFreeVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID* PBaseAddress, - IN PSIZE_T PRegionSize, + IN PVOID* UBaseAddress, + IN PSIZE_T URegionSize, IN ULONG FreeType) /* * FUNCTION: Frees a range of virtual memory @@ -1281,51 +1317,94 @@ NTSTATUS Status; PEPROCESS Process; PMMSUPPORT AddressSpace; - PVOID BaseAddress; - ULONG RegionSize; - - PAGED_CODE(); - - DPRINT("NtFreeVirtualMemory(ProcessHandle %x, *PBaseAddress %x, " - "*PRegionSize %x, FreeType %x)\n",ProcessHandle,*PBaseAddress, - *PRegionSize,FreeType); - + PVOID BaseAddress, PBaseAddress; + ULONG RegionSize, PRegionSize; + PEPROCESS CurrentProcess = PsGetCurrentProcess(); + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + KAPC_STATE ApcState; + BOOLEAN Attached = FALSE; + PAGED_CODE(); + + /* Only two flags are supported */ if (!(FreeType & (MEM_RELEASE | MEM_DECOMMIT))) { DPRINT1("Invalid FreeType\n"); return STATUS_INVALID_PARAMETER_4; } - - if (ExGetPreviousMode() != KernelMode) - { - _SEH2_TRY + + /* Check if no flag was used, or if both flags were used */ + if (!((FreeType & (MEM_DECOMMIT | MEM_RELEASE))) || + ((FreeType & (MEM_DECOMMIT | MEM_RELEASE)) == (MEM_DECOMMIT | MEM_RELEASE))) + { + DPRINT1("Invalid FreeType combination\n"); + return STATUS_INVALID_PARAMETER_4; + } + + /* Enter SEH */ + _SEH2_TRY + { + /* Check for user-mode parameters */ + if (PreviousMode != KernelMode) { - /* Probe user pointers */ - ProbeForWriteSize_t(PRegionSize); - ProbeForWritePointer(PBaseAddress); + /* Make sure they are writable */ + ProbeForWritePointer(UBaseAddress); + ProbeForWriteUlong(URegionSize); } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - } - - BaseAddress = (PVOID)PAGE_ROUND_DOWN((*PBaseAddress)); - RegionSize = PAGE_ROUND_UP((ULONG_PTR)(*PBaseAddress) + (*PRegionSize)) - - PAGE_ROUND_DOWN((*PBaseAddress)); - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + + /* Capture their values */ + PBaseAddress = *UBaseAddress; + PRegionSize = *URegionSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Make sure the allocation isn't past the user area */ + if (PBaseAddress >= MM_HIGHEST_USER_ADDRESS) + { + DPRINT1("Virtual free base above User Space\n"); + return STATUS_INVALID_PARAMETER_2; + } + + /* Make sure the allocation wouldn't overflow past the user area */ + if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)PBaseAddress) < PRegionSize) + { + DPRINT1("Region size would overflow into kernel-memory\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check if this is for the current process */ + if (ProcessHandle == NtCurrentProcess()) + { + /* We already have the current process, no need to go through Ob */ + Process = CurrentProcess; + } + else + { + /* Reference the handle for correct permissions */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if not running in the current process */ + if (CurrentProcess != Process) + { + /* Attach to it */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + } + + BaseAddress = (PVOID)PAGE_ROUND_DOWN((PBaseAddress)); + RegionSize = PAGE_ROUND_UP((ULONG_PTR)(PBaseAddress) + (PRegionSize)) - + PAGE_ROUND_DOWN((PBaseAddress)); AddressSpace = &Process->Vm; @@ -1372,7 +1451,8 @@ unlock_deref_and_return: MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); return(Status); }

1 0

[fireball] 49003: [RTL] - Fix heap code to actually use the new lock instead of using RTL_CRITICAL_SECTION. - Fix a ROUND_UP and ROUND_DOWN macros: it is a *rule* to wrap every argument in braces i...
by fireball＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: fireball Date: Tue Oct 5 19:33:42 2010 New Revision: 49003 URL: http://svn.reactos.org/svn/reactos?rev=49003&view=rev Log: [RTL] - Fix heap code to actually use the new lock instead of using RTL_CRITICAL_SECTION. - Fix a ROUND_UP and ROUND_DOWN macros: it is a *rule* to wrap every argument in braces in a macro, otherwise shit happens. A couple of days were lost fighting a strange bug in the new heap manager code where it was doing ROUND_UP(Heap + 1, PAGE_SIZE)... Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=49003&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Tue Oct 5 19:33:42 2010 @@ -150,7 +150,7 @@ { SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ - RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ + HEAP_LOCK lock; /* Critical section for serialization */ DECLSPEC_ALIGN(8) FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ DWORD flags; /* Heap flags */ DWORD magic; /* Magic number */ @@ -717,15 +717,15 @@ { if (!processHeap) /* do it by hand to avoid memory allocations */ { - heap->critSection.DebugInfo = &process_heap_critsect_debug; - heap->critSection.LockCount = -1; - heap->critSection.RecursionCount = 0; - heap->critSection.OwningThread = 0; - heap->critSection.LockSemaphore = 0; - heap->critSection.SpinCount = 0; - process_heap_critsect_debug.CriticalSection = &heap->critSection; + heap->lock.CriticalSection.DebugInfo = &process_heap_critsect_debug; + heap->lock.CriticalSection.LockCount = -1; + heap->lock.CriticalSection.RecursionCount = 0; + heap->lock.CriticalSection.OwningThread = 0; + heap->lock.CriticalSection.LockSemaphore = 0; + heap->lock.CriticalSection.SpinCount = 0; + process_heap_critsect_debug.CriticalSection = &heap->lock.CriticalSection; } - else RtlInitializeHeapLock( &heap->critSection ); + else RtlInitializeHeapLock( &heap->lock ); } } @@ -1094,7 +1094,7 @@ flags |= heapPtr->flags; /* calling HeapLock may result in infinite recursion, so do the critsect directly */ if (!(flags & HEAP_NO_SERIALIZE)) - RtlEnterHeapLock( &heapPtr->critSection ); + RtlEnterHeapLock( &heapPtr->lock ); if (block) { @@ -1113,7 +1113,7 @@ ret = HEAP_ValidateInUseArena( subheap, (const ARENA_INUSE *)block - 1, quiet ); if (!(flags & HEAP_NO_SERIALIZE)) - RtlLeaveHeapLock( &heapPtr->critSection ); + RtlLeaveHeapLock( &heapPtr->lock ); return ret; } @@ -1143,7 +1143,7 @@ subheap = subheap->next; } - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); return ret; } @@ -1181,9 +1181,9 @@ if (processHeap) { HEAP *heapPtr = subheap->heap; - RtlEnterHeapLock( &processHeap->critSection ); + RtlEnterHeapLock( &processHeap->lock ); list_add_head( &processHeap->entry, &heapPtr->entry ); - RtlLeaveHeapLock( &processHeap->critSection ); + RtlLeaveHeapLock( &processHeap->lock ); } else { @@ -1224,12 +1224,12 @@ return heap; /* cannot delete the main process heap */ /* remove it from the per-process list */ - RtlEnterHeapLock( &processHeap->critSection ); + RtlEnterHeapLock( &processHeap->lock ); list_remove( &heapPtr->entry ); - RtlLeaveHeapLock( &processHeap->critSection ); + RtlLeaveHeapLock( &processHeap->lock ); } - RtlDeleteHeapLock( &heapPtr->critSection ); + RtlDeleteHeapLock( &heapPtr->lock ); subheap = &heapPtr->subheap; while (subheap) { @@ -1281,13 +1281,13 @@ if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; - if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->lock ); /* Locate a suitable free block */ if (!(pArena = HEAP_FindFreeBlock( heapPtr, rounded_size, &subheap ))) { TRACE("(%p,%08lx,%08lx): returning NULL\n", heap, flags, size ); - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); return NULL; } @@ -1319,7 +1319,7 @@ else mark_block_uninitialized( pInUse + 1, pInUse->size & ARENA_SIZE_MASK ); - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); TRACE("(%p,%08lx,%08lx): returning %p\n", heap, flags, size, pInUse + 1 ); return (LPVOID)(pInUse + 1); @@ -1357,10 +1357,10 @@ flags &= HEAP_NO_SERIALIZE; flags |= heapPtr->flags; - if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->lock ); if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) { - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); TRACE("(%p,%08lx,%p): returning FALSE\n", heap, flags, ptr ); return FALSE; @@ -1376,13 +1376,13 @@ HEAP_MakeInUseBlockFree( subheap, pInUse ); - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); TRACE("(%p,%08lx,%p): returning TRUE\n", heap, flags, ptr ); return TRUE; error: - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); TRACE("(%p,%08x,%p): returning FALSE\n", heap, flags, ptr ); return FALSE; @@ -1427,7 +1427,7 @@ //Flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | // HEAP_REALLOC_IN_PLACE_ONLY; flags |= heapPtr->flags; - if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->lock ); rounded_size = ROUND_SIZE(size); if (rounded_size < size) goto oom; /* overflow */ @@ -1510,19 +1510,19 @@ /* Return the new arena */ done: - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); TRACE("(%p,%08lx,%p,%08lx): returning %p\n", heap, flags, ptr, size, pArena + 1 ); return (LPVOID)(pArena + 1); oom: - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_NO_MEMORY ); TRACE("(%p,%08x,%p,%08lx): returning oom\n", heap, flags, ptr, size ); return NULL; error: - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); TRACE("(%p,%08x,%p,%08lx): returning error\n", heap, flags, ptr, size ); return NULL; @@ -1562,7 +1562,7 @@ HEAP *heapPtr = HEAP_GetPtr( Heap ); if (!heapPtr) return FALSE; - RtlEnterHeapLock( &heapPtr->critSection ); + RtlEnterHeapLock( &heapPtr->lock ); return TRUE; } @@ -1586,7 +1586,7 @@ HEAP *heapPtr = HEAP_GetPtr( Heap ); if (!heapPtr) return FALSE; - RtlLeaveHeapLock( &heapPtr->critSection ); + RtlLeaveHeapLock( &heapPtr->lock ); return TRUE; } @@ -1621,7 +1621,7 @@ } flags &= HEAP_NO_SERIALIZE; flags |= heapPtr->flags; - if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterHeapLock( &heapPtr->lock ); if (!HEAP_IsRealArena( heapPtr, HEAP_NO_SERIALIZE, ptr, QUIET )) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_INVALID_PARAMETER ); @@ -1632,7 +1632,7 @@ const ARENA_INUSE *pArena = (const ARENA_INUSE *)ptr - 1; ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; } - if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->critSection ); + if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveHeapLock( &heapPtr->lock ); TRACE("(%p,%08lx,%p): returning %08lx\n", heap, flags, ptr, ret ); return ret; @@ -1694,7 +1694,7 @@ NTSTATUS Status = STATUS_SUCCESS; struct list *ptr=NULL; - RtlEnterHeapLock(&processHeap->critSection); + RtlEnterHeapLock(&processHeap->lock); Status=HeapEnumerationRoutine(processHeap,lParam); LIST_FOR_EACH( ptr, &processHeap->entry ) @@ -1703,7 +1703,7 @@ Status = HeapEnumerationRoutine(ptr,lParam); } - RtlLeaveHeapLock(&processHeap->critSection); + RtlLeaveHeapLock(&processHeap->lock); return Status; } @@ -1719,7 +1719,7 @@ ULONG total = 1; /* main heap */ struct list *ptr; ULONG i=0; - RtlEnterHeapLock( &processHeap->critSection ); + RtlEnterHeapLock( &processHeap->lock ); LIST_FOR_EACH( ptr, &processHeap->entry ) total++; //if (total <= count) { @@ -1732,7 +1732,7 @@ *(heaps++) = LIST_ENTRY( ptr, HEAP, entry ); } } - RtlLeaveHeapLock( &processHeap->critSection ); + RtlLeaveHeapLock( &processHeap->lock ); return i; } @@ -1746,7 +1746,7 @@ BOOLEAN Result = TRUE; HEAP ** pptr; - RtlEnterHeapLock( &processHeap->critSection ); + RtlEnterHeapLock( &processHeap->lock ); for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr++) { @@ -1757,7 +1757,7 @@ } } - RtlLeaveHeapLock( &processHeap->critSection ); + RtlLeaveHeapLock( &processHeap->lock ); return Result; } Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=49003&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Tue Oct 5 19:33:42 2010 @@ -27,10 +27,10 @@ #endif #define ROUND_DOWN(n, align) \ - (((ULONG)n) & ~((align) - 1l)) + (((ULONG)(n)) & ~((align) - 1l)) #define ROUND_UP(n, align) \ - ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) + ROUND_DOWN(((ULONG)(n)) + (align) - 1, (align)) #define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m))) @@ -86,19 +86,19 @@ NTSTATUS NTAPI -RtlDeleteHeapLock(PRTL_CRITICAL_SECTION CriticalSection); +RtlDeleteHeapLock(PHEAP_LOCK Lock); NTSTATUS NTAPI -RtlEnterHeapLock(PRTL_CRITICAL_SECTION CriticalSection); +RtlEnterHeapLock(PHEAP_LOCK Lock); NTSTATUS NTAPI -RtlInitializeHeapLock(PRTL_CRITICAL_SECTION CriticalSection); +RtlInitializeHeapLock(PHEAP_LOCK Lock); NTSTATUS NTAPI -RtlLeaveHeapLock(PRTL_CRITICAL_SECTION CriticalSection); +RtlLeaveHeapLock(PHEAP_LOCK Lock); BOOLEAN NTAPI

1 0

[sir_richard] 49002: [NTOS]: Build fix.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 17:01:41 2010 New Revision: 49002 URL: http://svn.reactos.org/svn/reactos?rev=49002&view=rev Log: [NTOS]: Build fix. Modified: trunk/reactos/include/reactos/exeformat.h Modified: trunk/reactos/include/reactos/exeformat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/exeformat.… ============================================================================== --- trunk/reactos/include/reactos/exeformat.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/exeformat.h [iso-8859-1] Tue Oct 5 17:01:41 2010 @@ -95,6 +95,78 @@ #define EXEFMT_LOADED_ELF32 (0x00000004) #define EXEFMT_LOADED_ELF64 (0x00000005) +/* TODO: Intsafe should be made into a library, as it's generally useful */ +static __inline BOOLEAN Intsafe_CanAddULongPtr(IN ULONG_PTR Addend1, IN ULONG_PTR Addend2) +{ + return Addend1 <= (MAXULONG_PTR - Addend2); +} + +static __inline BOOLEAN Intsafe_CanAddLong64(IN LONG64 Addend1, IN LONG64 Addend2) +{ + return Addend1 <= (MAXLONGLONG - Addend2); +} + +static __inline BOOLEAN Intsafe_CanAddULong32(IN ULONG Addend1, IN ULONG Addend2) +{ + return Addend1 <= (MAXULONG - Addend2); +} + +static __inline BOOLEAN Intsafe_AddULong32(OUT PULONG Result, IN ULONG Addend1, IN ULONG Addend2) +{ + if(!Intsafe_CanAddULong32(Addend1, Addend2)) + return FALSE; + + *Result = Addend1 + Addend2; + return TRUE; +} + +static __inline BOOLEAN Intsafe_CanMulULong32(IN ULONG Factor1, IN ULONG Factor2) +{ + return Factor1 <= (MAXULONG / Factor2); +} + +static __inline BOOLEAN Intsafe_CanOffsetPointer(IN CONST VOID * Pointer, IN SIZE_T Offset) +{ + /* FIXME: (PVOID)MAXULONG_PTR isn't necessarily a valid address */ + return Intsafe_CanAddULongPtr((ULONG_PTR)Pointer, Offset); +} + +static __inline BOOLEAN IsPowerOf2(IN ULONG Number) +{ + if(Number == 0) + return FALSE; + return (Number & (Number - 1)) == 0; +} + +static __inline ULONG ModPow2(IN ULONG Address, IN ULONG Alignment) +{ + ASSERT(IsPowerOf2(Alignment)); + return Address & (Alignment - 1); +} + +static __inline BOOLEAN IsAligned(IN ULONG Address, IN ULONG Alignment) +{ + return ModPow2(Address, Alignment) == 0; +} + +static __inline BOOLEAN AlignUp(OUT PULONG AlignedAddress, IN ULONG Address, IN ULONG Alignment) +{ + ULONG nExcess = ModPow2(Address, Alignment); + + if(nExcess == 0) + { + *AlignedAddress = Address; + return nExcess == 0; + } + else + return Intsafe_AddULong32(AlignedAddress, Address, Alignment - nExcess); +} + +#define PEFMT_FIELDS_EQUAL(TYPE1_, TYPE2_, FIELD_) \ + ( \ + (FIELD_OFFSET(TYPE1_, FIELD_) == FIELD_OFFSET(TYPE2_, FIELD_)) && \ + (RTL_FIELD_SIZE(TYPE1_, FIELD_) == RTL_FIELD_SIZE(TYPE2_, FIELD_)) \ + ) #endif /* EOF */

1 0

[gadamopoulos] 49001: [win32k] - Don't place new windows with default position at the top left corner of the screen See issue #5484 for more details.
by gadamopoulos＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: gadamopoulos Date: Tue Oct 5 16:41:38 2010 New Revision: 49001 URL: http://svn.reactos.org/svn/reactos?rev=49001&view=rev Log: [win32k] - Don't place new windows with default position at the top left corner of the screen See issue #5484 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Oct 5 16:41:38 2010 @@ -1600,10 +1600,11 @@ /* default positioning for overlapped windows */ if(!(Cs->style & (WS_POPUP | WS_CHILD))) { - RECTL WorkArea; + PMONITOR pMonitor; PRTL_USER_PROCESS_PARAMETERS ProcessParams; - UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); + pMonitor = IntGetPrimaryMonitor(); + ASSERT(pMonitor); ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters; @@ -1618,8 +1619,17 @@ } else { - Cs->x = WorkArea.left; - Cs->y = WorkArea.top; + Cs->x = pMonitor->cWndStack * (UserGetSystemMetrics(SM_CXSIZE) + UserGetSystemMetrics(SM_CXFRAME)); + Cs->y = pMonitor->cWndStack * (UserGetSystemMetrics(SM_CYSIZE) + UserGetSystemMetrics(SM_CYFRAME)); + if (Cs->x > ((pMonitor->rcWork.right - pMonitor->rcWork.left) / 4) || + Cs->y > ((pMonitor->rcWork.bottom - pMonitor->rcWork.top) / 4)) + { + /* reset counter and position */ + Cs->x = 0; + Cs->y = 0; + pMonitor->cWndStack = 0; + } + pMonitor->cWndStack++; } } @@ -1632,8 +1642,8 @@ } else { - Cs->cx = (WorkArea.right - WorkArea.left) * 3 / 4 - Cs->x; - Cs->cy = (WorkArea.bottom - WorkArea.top) * 3 / 4 - Cs->y; + Cs->cx = (pMonitor->rcWork.right - pMonitor->rcWork.left) * 3 / 4; + Cs->cy = (pMonitor->rcWork.bottom - pMonitor->rcWork.top) * 3 / 4; } } /* neither x nor cx are default. Check the y values . @@ -1643,7 +1653,7 @@ else if (IS_DEFAULT(Cs->cy)) { DPRINT("Strange use of CW_USEDEFAULT in nHeight\n"); - Cs->cy = (WorkArea.bottom - WorkArea.top) * 3 / 4 - Cs->y; + Cs->cy = (pMonitor->rcWork.bottom - pMonitor->rcWork.top) * 3 / 4; } } else

1 0

[sir_richard] 49000: [NTOS]: Fix whitespace typo in comment (two spaces instead of one). That's right. I'm not a fun person.
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 15:59:47 2010 New Revision: 49000 URL: http://svn.reactos.org/svn/reactos?rev=49000&view=rev Log: [NTOS]: Fix whitespace typo in comment (two spaces instead of one). That's right. I'm not a fun person. Modified: trunk/reactos/ntoskrnl/mm/mminit.c 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] Tue Oct 5 15:59:47 2010 @@ -250,7 +250,7 @@ #if defined(_X86_) // - // Finally, reserve the 2 pages we currently make use of for HAL mappings + // Finally, reserve the 2 pages we currently make use of for HAL mappings // BaseAddress = (PVOID)0xFFC00000; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),

1 0

[sir_richard] 48999: [NTOS]: Delete a bunch of junk, 5 less files in Mm now (also moved some functions around). Delete unused functions where found. [NTOS]: The modified page writer should run at a...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 15:55:52 2010 New Revision: 48999 URL: http://svn.reactos.org/svn/reactos?rev=48999&view=rev Log: [NTOS]: Delete a bunch of junk, 5 less files in Mm now (also moved some functions around). Delete unused functions where found. [NTOS]: The modified page writer should run at a high priority such as 27, not in idle mode at priority 1 -- otherwise dirty pages never get flushed out. [NTOS]: Reimplement MmGetFileNameForAddress, MmGetFileNameForSection, MmGetFileObjectForSection to also support ARM3 sections. Shouldn't affect anything other than the user-mode debugging support. Removed: trunk/reactos/ntoskrnl/mm/mpw.c trunk/reactos/ntoskrnl/mm/pe.c trunk/reactos/ntoskrnl/mm/ppool.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=48… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… Removed: trunk/reactos/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev=4899… Removed: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=48998… Removed: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=48… Removed: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… Removed: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.…

1 0

[sir_richard] 48998: [NTOS]: When shutting down, call Cc to flush the dirty cached pages, otherwise these might've gotten lost (and lead to lost/corrupted data on disk). [NTOS]: Don't assume that C...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 15:52:00 2010 New Revision: 48998 URL: http://svn.reactos.org/svn/reactos?rev=48998&view=rev Log: [NTOS]: When shutting down, call Cc to flush the dirty cached pages, otherwise these might've gotten lost (and lead to lost/corrupted data on disk). [NTOS]: Don't assume that CcFlushDirtyPages will run with APCs disabled. Go ahead and actually enter/leave a critical region (Acquire/ReleaseForLazyWrite depend on this). The guarded mutex does disable APCs, but it's released when the actual flush happens. Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=489… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Tue Oct 5 15:52:00 2010 @@ -189,6 +189,7 @@ (*Count) = 0; + KeEnterCriticalRegion(); KeAcquireGuardedMutex(&ViewLock); WriteCount[0] = WriteCount[1]; @@ -278,6 +279,7 @@ } KeReleaseGuardedMutex(&ViewLock); + KeLeaveCriticalRegion(); DPRINT("CcRosFlushDirtyPages() finished\n"); return(STATUS_SUCCESS); Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Tue Oct 5 15:52:00 2010 @@ -659,6 +659,7 @@ KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); POP_POWER_ACTION Action = {0}; NTSTATUS Status; + ULONG Dummy; /* Check for invalid parameter combinations */ if ((MinSystemState >= PowerSystemMaximum) || @@ -742,9 +743,12 @@ /* Check if we're still in an invalid status */ if (!NT_SUCCESS(Status)) break; + + /* Flush dirty cache pages */ + CcRosFlushDirtyPages(-1, &Dummy); /* Flush all volumes and the registry */ - DPRINT1("Flushing volumes\n"); + DPRINT1("Flushing volumes, cache flushed %d pages\n", Dummy); PopFlushVolumes(PopAction.Shutdown); /* Set IRP for drivers */

1 0

[sir_richard] 48997: [NTOS]: Implement ARM3 version of MmMapViewOfSection, only for ARM3 pagefile-backed sections, and without any special flag support. Tested and works great, with the new pagefau...
by sir_richard＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: sir_richard Date: Tue Oct 5 14:36:09 2010 New Revision: 48997 URL: http://svn.reactos.org/svn/reactos?rev=48997&view=rev Log: [NTOS]: Implement ARM3 version of MmMapViewOfSection, only for ARM3 pagefile-backed sections, and without any special flag support. Tested and works great, with the new pagefault code correctly finding the Prototype PTE for the VAD. [NTOS]: Make every VAD insert also create a MEMORY_AREA. Now the two address space views should be completely synchronized and we can try removing the hack that was done for PEB/TEB support (which will remove the 200 thread regression). [NTOS]: Implement MiGetNextNode and MiFindEmptyAddressRangeInTree. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Oct 5 14:36:09 2010 @@ -460,6 +460,159 @@ /* Return the base adress of the mapping and success */ *MappedBase = Base; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MiMapViewOfDataSection(IN PCONTROL_AREA ControlArea, + IN PEPROCESS Process, + IN PVOID *BaseAddress, + IN PLARGE_INTEGER SectionOffset, + IN PSIZE_T ViewSize, + IN PSECTION Section, + IN SECTION_INHERIT InheritDisposition, + IN ULONG ProtectionMask, + IN ULONG CommitSize, + IN ULONG_PTR ZeroBits, + IN ULONG AllocationType) +{ + PMMVAD Vad; + PETHREAD Thread = PsGetCurrentThread(); + ULONG_PTR StartAddress, EndingAddress; + PSUBSECTION Subsection; + PSEGMENT Segment; + PFN_NUMBER PteOffset; + NTSTATUS Status; + + /* Get the segment and subection for this section */ + Segment = ControlArea->Segment; + Subsection = (PSUBSECTION)(ControlArea + 1); + + /* Non-pagefile-backed sections not supported */ + ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); + ASSERT(ControlArea->u.Flags.Rom == 0); + ASSERT(ControlArea->FilePointer == NULL); + ASSERT(Segment->SegmentFlags.TotalNumberOfPtes4132 == 0); + + /* Based sections not supported */ + ASSERT(Section->Address.StartingVpn == 0); + + /* These flags/parameters are not supported */ + ASSERT((AllocationType & MEM_DOS_LIM) == 0); + ASSERT((AllocationType & MEM_RESERVE) == 0); + ASSERT((AllocationType & MEM_TOP_DOWN) == 0); + ASSERT(Process->VmTopDown == 0); + ASSERT(Section->u.Flags.CopyOnWrite == FALSE); + ASSERT(ZeroBits == 0); + + /* First, increase the map count. No purging is supported yet */ + Status = MiCheckPurgeAndUpMapCount(ControlArea, FALSE); + ASSERT(NT_SUCCESS(Status)); + + /* Check if the caller specified the view size */ + if (!(*ViewSize)) + { + /* The caller did not, so pick a 64K aligned view size based on the offset */ + SectionOffset->LowPart &= ~(_64K - 1); + *ViewSize = Section->SizeOfSection.QuadPart - SectionOffset->QuadPart; + } + else + { + /* A size was specified, align it to a 64K boundary */ + *ViewSize += SectionOffset->LowPart & (_64K - 1); + + /* Align the offset as well to make this an aligned map */ + SectionOffset->LowPart &= ~((ULONG)_64K - 1); + } + + /* We must be dealing with a 64KB aligned offset */ + ASSERT((SectionOffset->LowPart & ((ULONG)_64K - 1)) == 0); + + /* It's illegal to try to map more than 2GB */ + if (*ViewSize >= 0x80000000) return STATUS_INVALID_VIEW_SIZE; + + /* Within this section, figure out which PTEs will describe the view */ + PteOffset = SectionOffset->QuadPart >> PAGE_SHIFT; + + /* The offset must be in this segment's PTE chunk and it must be valid */ + ASSERT(PteOffset < Segment->TotalNumberOfPtes); + ASSERT(((SectionOffset->QuadPart + *ViewSize + PAGE_SIZE - 1) >> PAGE_SHIFT) >= PteOffset); + + /* In ARM3, only one subsection is used for now. It must contain these PTEs */ + ASSERT(PteOffset < Subsection->PtesInSubsection); + ASSERT(Subsection->SubsectionBase != NULL); + + /* In ARM3, only MEM_COMMIT is supported for now. The PTEs must've been committed */ + ASSERT(Segment->NumberOfCommittedPages >= Segment->TotalNumberOfPtes); + + /* Did the caller specify an address? */ + if (!(*BaseAddress)) + { + /* No, find an address bottom-up */ + Status = MiFindEmptyAddressRangeInTree(*ViewSize, + _64K, + &Process->VadRoot, + (PMMADDRESS_NODE*)&Process->VadFreeHint, + &StartAddress); + ASSERT(NT_SUCCESS(Status)); + } + else + { + /* This (rather easy) code path is not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Get the ending address, which is the last piece we need for the VAD */ + EndingAddress = (StartAddress + *ViewSize - 1) | (PAGE_SIZE - 1); + + /* A VAD can now be allocated. Do so and zero it out */ + Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD), 'ldaV'); + ASSERT(Vad); + RtlZeroMemory(Vad, sizeof(MMVAD)); + + /* Write all the data required in the VAD for handling a fault */ + Vad->StartingVpn = StartAddress >> PAGE_SHIFT; + Vad->EndingVpn = EndingAddress >> PAGE_SHIFT; + Vad->ControlArea = ControlArea; + Vad->u.VadFlags.Protection = ProtectionMask; + Vad->u2.VadFlags2.FileOffset = SectionOffset->QuadPart >> 16; + Vad->u2.VadFlags2.Inherit = (InheritDisposition == ViewShare); + if ((AllocationType & SEC_NO_CHANGE) || (Section->u.Flags.NoChange)) + { + /* This isn't really implemented yet, but handle setting the flag */ + Vad->u.VadFlags.NoChange = 1; + Vad->u2.VadFlags2.SecNoChange = 1; + } + + /* Finally, write down the first and last prototype PTE */ + Vad->FirstPrototypePte = &Subsection->SubsectionBase[PteOffset]; + PteOffset += (Vad->EndingVpn - Vad->StartingVpn); + Vad->LastContiguousPte = &Subsection->SubsectionBase[PteOffset]; + + /* Make sure the last PTE is valid and still within the subsection */ + ASSERT(PteOffset < Subsection->PtesInSubsection); + ASSERT(Vad->FirstPrototypePte <= Vad->LastContiguousPte); + + /* FIXME: Should setup VAD bitmap */ + Status = STATUS_SUCCESS; + + /* Pretend as if we own the working set */ + MiLockProcessWorkingSet(Process, Thread); + + /* Insert the VAD */ + MiInsertVad(Vad, Process); + + /* Release the working set */ + MiUnlockProcessWorkingSet(Process, Thread); + + /* Windows stores this for accounting purposes, do so as well */ + if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = (PVOID)StartAddress; + + /* Finally, let the caller know where, and for what size, the view was mapped */ + *ViewSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)StartAddress + 1; + *BaseAddress = (PVOID)StartAddress; return STATUS_SUCCESS; } @@ -668,6 +821,146 @@ return Status; } +/* + * @implemented + */ +NTSTATUS +NTAPI +MmMapViewOfArm3Section(IN PVOID SectionObject, + IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, + IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PSIZE_T ViewSize, + IN SECTION_INHERIT InheritDisposition, + IN ULONG AllocationType, + IN ULONG Protect) +{ + KAPC_STATE ApcState; + BOOLEAN Attached = FALSE; + PSECTION Section; + PCONTROL_AREA ControlArea; + ULONG ProtectionMask; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the segment and control area */ + Section = (PSECTION)SectionObject; + ControlArea = Section->Segment->ControlArea; + + /* These flags/states are not yet supported by ARM3 */ + ASSERT(Section->u.Flags.Image == 0); + ASSERT(Section->u.Flags.NoCache == 0); + ASSERT(Section->u.Flags.WriteCombined == 0); + ASSERT((AllocationType & MEM_RESERVE) == 0); + ASSERT(ControlArea->u.Flags.PhysicalMemory == 0); + + +#if 0 + /* FIXME: Check if the mapping protection is compatible with the create */ + if (!MiIsProtectionCompatible(Section->InitialPageProtection, Protect)) + { + DPRINT1("Mapping protection is incompatible\n"); + return STATUS_SECTION_PROTECTION; + } +#endif + + /* Check if the offset and size would cause an overflow */ + if ((SectionOffset->QuadPart + *ViewSize) < SectionOffset->QuadPart) + { + DPRINT1("Section offset overflows\n"); + return STATUS_INVALID_VIEW_SIZE; + } + + /* Check if the offset and size are bigger than the section itself */ + if ((SectionOffset->QuadPart + *ViewSize) > Section->SizeOfSection.QuadPart) + { + DPRINT1("Section offset is larger than section\n"); + return STATUS_INVALID_VIEW_SIZE; + } + + /* Check if the caller did not specify a view size */ + if (!(*ViewSize)) + { + /* Compute it for the caller */ + *ViewSize = Section->SizeOfSection.QuadPart - SectionOffset->QuadPart; + + /* Check if it's larger than 4GB or overflows into kernel-mode */ + if ((*ViewSize > 0xFFFFFFFF) || + (((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - (ULONG_PTR)*BaseAddress) < *ViewSize)) + { + DPRINT1("Section view won't fit\n"); + return STATUS_INVALID_VIEW_SIZE; + } + } + + /* Check if the commit size is larger than the view size */ + if (CommitSize > *ViewSize) + { + DPRINT1("Attempting to commit more than the view itself\n"); + return STATUS_INVALID_PARAMETER_5; + } + + /* Check if the view size is larger than the section */ + if (*ViewSize > Section->SizeOfSection.QuadPart) + { + DPRINT1("The view is larger than the section\n"); + return STATUS_INVALID_VIEW_SIZE; + } + + /* Compute and validate the protection mask */ + ProtectionMask = MiMakeProtectionMask(Protect); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("The protection is invalid\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* We only handle pagefile-backed sections, which cannot be writecombined */ + if (Protect & PAGE_WRITECOMBINE) + { + DPRINT1("Cannot write combine a pagefile-backed section\n"); + return STATUS_INVALID_PARAMETER_10; + } + + /* Start by attaching to the current process if needed */ + if (PsGetCurrentProcess() != Process) + { + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + + /* Lock the address space and make sure the process is alive */ + MmLockAddressSpace(&Process->Vm); + if (!Process->VmDeleted) + { + /* Do the actual mapping */ + Status = MiMapViewOfDataSection(ControlArea, + Process, + BaseAddress, + SectionOffset, + ViewSize, + Section, + InheritDisposition, + ProtectionMask, + CommitSize, + ZeroBits, + AllocationType); + } + else + { + /* The process is being terminated, fail */ + DPRINT1("The process is dying\n"); + Status = STATUS_PROCESS_IS_TERMINATING; + } + + /* Unlock the address space and detatch if needed, then return status */ + MmUnlockAddressSpace(&Process->Vm); + if (Attached) KeUnstackDetachProcess(&ApcState); + return Status; +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Tue Oct 5 14:36:09 2010 @@ -121,6 +121,28 @@ /* Do the actual insert operation */ MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); + + /* Now insert an ARM3 MEMORY_AREA for this node, unless the insert was already from the MEMORY_AREA code */ + if (Vad->u.VadFlags.Spare == 0) + { + NTSTATUS Status; + PMEMORY_AREA MemoryArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + SIZE_T Size; + PVOID AllocatedBase = (PVOID)(Vad->StartingVpn << PAGE_SHIFT); + BoundaryAddressMultiple.QuadPart = 0; + Size = ((Vad->EndingVpn + 1) - Vad->StartingVpn) << PAGE_SHIFT; + Status = MmCreateMemoryArea(&Process->Vm, + MEMORY_AREA_OWNED_BY_ARM3, + &AllocatedBase, + Size, + PAGE_READWRITE, + &MemoryArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(NT_SUCCESS(Status)); + } } VOID @@ -179,6 +201,112 @@ /* Nothing found */ return NULL; +} + +PMMADDRESS_NODE +NTAPI +MiGetNextNode(IN PMMADDRESS_NODE Node) +{ + PMMADDRESS_NODE Parent; + + /* Get the right child */ + if (RtlRightChildAvl(Node)) + { + /* Get left-most child */ + Node = RtlRightChildAvl(Node); + while (RtlLeftChildAvl(Node)) Node = RtlLeftChildAvl(Node); + return Node; + } + + Parent = RtlParentAvl(Node); + ASSERT(Parent != NULL); + while (Parent != Node) + { + /* The parent should be a left child, return the real predecessor */ + if (RtlIsLeftChildAvl(Node)) + { + /* Return it */ + return Parent; + } + + /* Keep lopping until we find our parent */ + Node = Parent; + Parent = RtlParentAvl(Node); + } + + /* Nothing found */ + return NULL; +} + +NTSTATUS +NTAPI +MiFindEmptyAddressRangeInTree(IN SIZE_T Length, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PMMADDRESS_NODE *PreviousVad, + OUT PULONG_PTR Base) +{ + PMMADDRESS_NODE Node; + PMMADDRESS_NODE NextNode; + ULONG_PTR StartingVpn, HighestVpn, AlignmentVpn, LengthVpn, LowVpn; + ASSERT(Length != 0); + + /* Precompute page numbers for the length, alignment, and starting address */ + LengthVpn = (Length + (PAGE_SIZE - 1)) >> PAGE_SHIFT; + AlignmentVpn = Alignment >> PAGE_SHIFT; + StartingVpn = ROUND_DOWN((ULONG_PTR)MM_LOWEST_USER_ADDRESS >> PAGE_SHIFT, + AlignmentVpn); + + /* Check if the table is free, so the lowest possible address is available */ + if (!Table->NumberGenericTableElements) goto FoundAtBottom; + + /* Otherwise, follow the leftmost child of the right root node's child */ + Node = RtlRightChildAvl(&Table->BalancedRoot); + while (RtlLeftChildAvl(Node)) Node = RtlLeftChildAvl(Node); + + /* This is the node for the remaining gap at the bottom, can it be used? */ + if ((Node->StartingVpn > StartingVpn) && + (LengthVpn < Node->StartingVpn - StartingVpn)) + { +FoundAtBottom: + /* Use this VAD to store the allocation */ + *PreviousVad = NULL; + *Base = StartingVpn << PAGE_SHIFT; + return STATUS_SUCCESS; + } + + /* Otherwise, we start a search to find a gap */ + while (TRUE) + { + /* The last aligned page number in this entry */ + LowVpn = ROUND_DOWN(Node->EndingVpn + 1, AlignmentVpn); + + /* Keep going as long as there's still a next node */ + NextNode = MiGetNextNode(Node); + if (!NextNode) break; + + /* Can this allocation fit in this node? */ + if ((LengthVpn <= (NextNode->StartingVpn - LowVpn)) && + (NextNode->StartingVpn > LowVpn)) + { +Found: + /* Yes! Use this VAD to store the allocation */ + *PreviousVad = Node; + *Base = ROUND_DOWN((Node->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1), + Alignment); + return STATUS_SUCCESS; + } + + /* Try the next node */ + Node = NextNode; + } + + /* We're down to the last (top) VAD, will this allocation fit inside it? */ + HighestVpn = ((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1) >> PAGE_SHIFT; + if ((HighestVpn > LowVpn) && (LengthVpn <= HighestVpn - LowVpn)) goto Found; + + /* Nyet, there's no free address space for this allocation, so we'll fail */ + return STATUS_NO_MEMORY; } TABLE_SEARCH_RESULT Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Oct 5 14:36:09 2010 @@ -3956,7 +3956,19 @@ - +NTSTATUS +NTAPI +MmMapViewOfArm3Section(IN PVOID SectionObject, + IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN ULONG_PTR ZeroBits, + IN SIZE_T CommitSize, + IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PSIZE_T ViewSize, + IN SECTION_INHERIT InheritDisposition, + IN ULONG AllocationType, + IN ULONG Protect); + /********************************************************************** * NAME EXPORTED * MmMapViewOfSection @@ -4023,6 +4035,20 @@ ULONG ViewOffset; NTSTATUS Status = STATUS_SUCCESS; + if ((ULONG_PTR)SectionObject & 1) + { + return MmMapViewOfArm3Section((PVOID)((ULONG_PTR)SectionObject & ~1), + Process, + BaseAddress, + ZeroBits, + CommitSize, + SectionOffset, + ViewSize, + InheritDisposition, + AllocationType, + Protect); + } + ASSERT(Process); if (!Protect || Protect & ~PAGE_FLAGS_VALID_FOR_SECTION) @@ -4280,10 +4306,10 @@ PROS_SECTION_OBJECT Section; PMMSUPPORT AddressSpace; NTSTATUS Status; - + PAGED_CODE(); + if ((ULONG_PTR)SectionObject & 1) { - PAGED_CODE(); extern PVOID MmSession; return MiMapViewInSystemSpace((PVOID)((ULONG_PTR)SectionObject & ~1), &MmSession,

1 0

[akhaldi] 48996: [CMAKE] Alexey Komarov: - More work on base modules. - Add some dlls to build.
by akhaldi＠svn.reactos.org 05 Oct '10

05 Oct '10

Author: akhaldi Date: Tue Oct 5 13:03:47 2010 New Revision: 48996 URL: http://svn.reactos.org/svn/reactos?rev=48996&view=rev Log: [CMAKE] Alexey Komarov: - More work on base modules. - Add some dlls to build. Added: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt (with props) branches/cmake-bringup/base/services/eventlog/CMakeLists.txt (with props) branches/cmake-bringup/base/services/rpcss/CMakeLists.txt (with props) branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt (with props) branches/cmake-bringup/base/services/svchost/CMakeLists.txt (with props) branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt (with props) branches/cmake-bringup/base/services/telnetd/CMakeLists.txt (with props) branches/cmake-bringup/base/services/tftpd/CMakeLists.txt (with props) branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt (with props) branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/reactos/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/setup/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt (with props) branches/cmake-bringup/base/setup/welcome/CMakeLists.txt (with props) branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/version/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/CMakeLists.txt branches/cmake-bringup/base/services/CMakeLists.txt branches/cmake-bringup/base/setup/CMakeLists.txt branches/cmake-bringup/base/shell/CMakeLists.txt branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt Modified: branches/cmake-bringup/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,6 +1,6 @@ add_subdirectory(applications) -#add_subdirectory(services) +add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) add_subdirectory(system) Modified: branches/cmake-bringup/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/CMa… ============================================================================== --- branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,11 +1,11 @@ -#add_subdirectory(audiosrv) -#add_subdirectory(eventlog) +add_subdirectory(audiosrv) +add_subdirectory(eventlog) #add_subdirectory(rpcss) -#add_subdirectory(spoolsv) -#add_subdirectory(svchost) -#add_subdirectory(tcpsvcs) -#add_subdirectory(telnetd) -#add_subdirectory(tftpd) -#add_subdirectory(umpnpmgr) -#add_subdirectory(wlansvc) +add_subdirectory(spoolsv) +add_subdirectory(svchost) +add_subdirectory(tcpsvcs) +add_subdirectory(telnetd) +add_subdirectory(tftpd) +add_subdirectory(umpnpmgr) +add_subdirectory(wlansvc) Added: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/aud… ============================================================================== --- branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,15 @@ + +set_unicode(audiosrv yes) + +add_executable(audiosrv + main.c + pnp_list_manager.c + pnp_list_lock.c + pnp.c + services.c + debug.c + audiosrv.rc) + +set_module_type(audiosrv win32cui) +add_importlibs(audiosrv advapi32 user32 setupapi msvcrt) + Propchange: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,21 @@ + +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) + +set_unicode() + +list(APPEND SOURCE + eventlog.c + logport.c + eventlog.rc + rpc.c + file.c) + +add_executable(eventlog ${CMAKE_CURRENT_BINARY_DIR}/eventlog_eventlog.h.gch ${SOURCE}) + +target_link_libraries(eventlog eventlogrpc_server pseh) + +add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE}) + +set_module_type(eventlog win32cui) + +add_importlibs(eventlog advapi32 rpcrt4 msvcrt) Propchange: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,19 @@ + +set_unicode() + +add_executable(rpcss + epmp.c + irotp.c + rpcss_main.c + service_main.c + epm.idl + irot.idl + rpcss.rc) + +target_link_libraries(rpcss rpcss_epm_server rpcss_irot_server pseh) + +add_pch(rpcss ${CMAKE_CURRENT_SOURCE_DIR}/rpcss.h ${SOURCE}) + +set_module_type(rpcss win32cui) + +add_importlibs(rpcss advapi32 rpcrt4 msvcrt) Propchange: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/spo… ============================================================================== --- branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,9 @@ + +set_unicode() + +add_executable(spoolsv spoolsv.c spoolsv.rc) + +target_link_libraries(spoolsv wine) + +set_module_type(spoolsv win32cui) +add_importlibs(spoolsv advapi32 msvcrt) Propchange: branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/svc… ============================================================================== --- branches/cmake-bringup/base/services/svchost/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/svchost/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,5 @@ + +add_executable(svchost svchost.c svchost.rc) + +set_module_type(svchost win32cui) +add_importlibs(svchost advapi32 msvcrt) Propchange: branches/cmake-bringup/base/services/svchost/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tcp… ============================================================================== --- branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,20 @@ + +set_unicode() + +list(APPEND SOURCE + tcpsvcs.c + skelserver.c + echo.c + discard.c + daytime.c + qotd.c + chargen.c + tcpsvcs.rc + log.c) + +add_executable(tcpsvcs ${CMAKE_CURRENT_BINARY_DIR}/tcpsvcs_tcpsvcs.h.gch ${SOURCE}) + +add_pch(tcpsvcs ${CMAKE_CURRENT_SOURCE_DIR}/tcpsvcs.h ${SOURCE}) +set_module_type(tcpsvcs win32cui) +add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt) + Propchange: branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tel… ============================================================================== --- branches/cmake-bringup/base/services/telnetd/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,11 @@ + +add_executable(telnetd + telnetd.c + serviceentry.c + telnetd.rc) + +target_link_libraries(telnetd wine) + +set_module_type(telnetd win32cui) +add_importlibs(telnetd advapi32 ws2_32 msvcrt) + Propchange: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/tftpd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tft… ============================================================================== --- branches/cmake-bringup/base/services/tftpd/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/tftpd/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,7 @@ + +add_executable(tftpd tftpd.cpp) + +target_link_libraries(tftpd wine) + +set_module_type(tftpd win32cui) +add_importlibs(tftpd advapi32 ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/services/tftpd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,16 @@ + +set_unicode() +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_executable(umpnpmgr umpnpmgr.c umpnpmgr.rc) + +target_link_libraries(umpnpmgr pnp_server wdmguid pseh) + +set_module_type(umpnpmgr win32cui) +add_importlibs(umpnpmgr + advapi32 + rpcrt4 + userenv + msvcrt) Propchange: branches/cmake-bringup/base/services/umpnpmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt (added) +++ branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,14 @@ + +set_unicode() +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) + +add_executable(wlansvc wlansvc.c rpcserver.c) + +target_link_libraries(wlansvc wlansvc_server pseh) + +set_module_type(wlansvc win32cui) +add_importlibs(wlansvc + advapi32 + rpcrt4 + iphlpapi + msvcrt) Propchange: branches/cmake-bringup/base/services/wlansvc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/base/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/CMakeL… ============================================================================== --- branches/cmake-bringup/base/setup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,6 +1,6 @@ -#add_subdirectory(reactos) -#add_subdirectory(setup) +add_subdirectory(reactos) +add_subdirectory(setup) add_subdirectory(usetup) -#add_subdirectory(vmwinst) -#add_subdirectory(welcome) +add_subdirectory(vmwinst) +add_subdirectory(welcome) Added: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… ============================================================================== --- branches/cmake-bringup/base/setup/reactos/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,16 @@ + +set_unicode() + +add_executable(reactos + reactos.c + reactos.rc) + +target_link_libraries(reactos uuid) + +set_module_type(reactos win32gui) +add_importlibs(reactos + gdi32 + user32 + comctl32 + setupapi + msvcrt) Propchange: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/setup/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/setup/… ============================================================================== --- branches/cmake-bringup/base/setup/setup/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/setup/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,9 @@ + +set_unicode() + +add_executable(setup + setup.c + setup.rc) + +set_module_type(setup win32gui) +add_importlibs(setup userenv msvcrt) Propchange: branches/cmake-bringup/base/setup/setup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,19 @@ + +set_unicode() + +add_executable(vmwinst + vmwinst.c + vmwinst.rc) + +target_link_libraries(vmwinst pseh) + +set_module_type(vmwinst win32gui) +add_importlibs(vmwinst + advapi32 + comctl32 + comdlg32 + newdev + user32 + setupapi + shell32 + msvcrt) Propchange: branches/cmake-bringup/base/setup/vmwinst/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom… ============================================================================== --- branches/cmake-bringup/base/setup/welcome/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/welcome/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,9 @@ + +set_unicode() + +add_executable(welcome + welcome.c + welcome.rc) + +set_module_type(welcome win32gui) +add_importlibs(welcome gdi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/setup/welcome/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,4 +1,4 @@ add_subdirectory(cmd) add_subdirectory(explorer) -#add_subdirectory(explorer_new) +add_subdirectory(explorer-new) Added: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt (added) +++ branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,34 @@ + +set_unicode() + +add_definitions(-DWIN32) + +list(APPEND SOURCE + desktop.c + dragdrop.c + explorer.c + startmnu.c + taskband.c + taskswnd.c + tbsite.c + trayntfy.c + trayprop.c + traywnd.c + explorer.rc) + +add_executable(explorer_new ${CMAKE_CURRENT_BINARY_DIR}/explorer_new_precomp.h.gch ${SOURCE}) + +target_link_libraries(explorer_new uuid) + +add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +set_module_type(explorer_new win32gui) +add_importlibs(explorer_new + advapi32 + gdi32 + user32 + comctl32 + ole32 + oleaut32 + shell32 + shlwapi + msvcrt) Propchange: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -192,11 +192,11 @@ add_subdirectory(url) #add_subdirectory(urlmon) add_subdirectory(user32) -#add_subdirectory(userenv) +add_subdirectory(userenv) add_subdirectory(usp10) add_subdirectory(uxtheme) -#add_subdirectory(vdmdbg) -#add_subdirectory(version) +add_subdirectory(vdmdbg) +add_subdirectory(version) add_subdirectory(wdmaud.drv) add_subdirectory(windowscodecs) #add_subdirectory(winemp3.acm) Added: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/userenv… ============================================================================== --- branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,28 @@ + +spec2def(userenv ${CMAKE_CURRENT_SOURCE_DIR}/userenv.spec ${CMAKE_CURRENT_BINARY_DIR}/userenv.def) + +list(APPEND SOURCE + desktop.c + directory.c + environment.c + gpolicy.c + misc.c + profile.c + registry.c + setup.c + userenv.c + userenv.rc) + +add_library(userenv SHARED + ${CMAKE_CURRENT_BINARY_DIR}/userenv_precomp.h.gch + ${SOURCE}) + +set_module_type(userenv win32dll) + +target_link_libraries(userenv + ${CMAKE_CURRENT_BINARY_DIR}/userenv.def + uuid) + +add_importlibs(userenv advapi32 user32 kernel32 ntdll) +add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(userenv userenv_def) Propchange: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,18 @@ + +set_unicode() + +spec2def(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.spec ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) + +list(APPEND SOURCE vdmdbg.c) + +add_library(vdmdbg SHARED + ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg_vdmdbg.h.gch + ${SOURCE}) + +set_module_type(vdmdbg win32dll) + +target_link_libraries(vdmdbg ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) + +add_importlibs(vdmdbg kernel32 ntdll) +add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE}) +add_dependencies(vdmdbg vdmdbg_def) Propchange: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -1,0 +1,20 @@ + +add_definitions(-D__WINESRC__) +spec2def(version ${CMAKE_CURRENT_SOURCE_DIR}/version.spec ${CMAKE_CURRENT_BINARY_DIR}/version.def) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(version SHARED + info.c + install.c + resource.c + version.rc) + +set_entrypoint(version 0) + +target_link_libraries(version + ${CMAKE_CURRENT_BINARY_DIR}/version.def + wine) + +add_importlibs(version lz32 kernel32 ntdll) +add_dependencies(version version_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/version/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -33,4 +33,4 @@ mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) -add_dependencies(wdmaud.drv wdmaud.drv_def psdk) +add_dependencies(wdmaud.drv wdmaud.drv_def) Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Tue Oct 5 13:03:47 2010 @@ -24,4 +24,4 @@ wine) add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll) -add_dependencies(wuapi wuapi_def psdk buildno_header) +add_dependencies(wuapi wuapi_def)

1 0

← Newer
1
...
36
37
38
39
40
41
42
43
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010