Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 48979: [NTOS]: Implement/fixup the code paths during page faults that are needed to succesfuly resolve a demand page associated with a pagefile backed ARM3 section (which uses Prototy...
by sir_richard＠svn.reactos.org 04 Oct '10

04 Oct '10

Author: sir_richard Date: Mon Oct 4 18:51:07 2010 New Revision: 48979 URL: http://svn.reactos.org/svn/reactos?rev=48979&view=rev Log: [NTOS]: Implement/fixup the code paths during page faults that are needed to succesfuly resolve a demand page associated with a pagefile backed ARM3 section (which uses Prototype PTEs). A lot of the code was already there but assumed we were using Prototype PTEs only for the shared user data page. By combining that code with the typical demand-zero fault code, we obtain the needed paths. For now, only tested with ARM3 sections that are page-filed backed (not image or data-file backed) mapped into system view space (MmMapViewOfSectionInSystemSpace), not user-mode addresses (which need VADs). The code to actually create/map these doesn't exist in trunk yet, the purpose of this checkin is to test the new fault changes to make sure they don't cause negative effects to already-working faults. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.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] Mon Oct 4 18:51:07 2010 @@ -176,15 +176,14 @@ { PFN_NUMBER PageFrameNumber = 0; MMPTE TempPte; - BOOLEAN NeedZero = FALSE; + BOOLEAN NeedZero = FALSE, HaveLock = FALSE; ULONG Color; DPRINT("ARM3 Demand Zero Page Fault Handler for address: %p in process: %p\n", Address, Process); /* Must currently only be called by paging path */ - ASSERT(OldIrql == MM_NOIRQL); - if (Process) + if ((Process) && (OldIrql == MM_NOIRQL)) { /* Sanity check */ ASSERT(MI_IS_PAGE_TABLE_ADDRESS(PointerPte)); @@ -194,45 +193,64 @@ /* Get process color */ Color = MI_GET_NEXT_PROCESS_COLOR(Process); + ASSERT(Color != 0xFFFFFFFF); /* We'll need a zero page */ NeedZero = TRUE; } else { + /* Check if we need a zero page */ + NeedZero = (OldIrql != MM_NOIRQL); + /* Get the next system page color */ Color = MI_GET_NEXT_COLOR(); } - - // - // Lock the PFN database - // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Check if the PFN database should be acquired */ + if (OldIrql == MM_NOIRQL) + { + /* Acquire it and remember we should release it after */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + HaveLock = TRUE; + } + + /* We either manually locked the PFN DB, or already came with it locked */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + /* Do we need a zero page? */ ASSERT(PointerPte->u.Hard.Valid == 0); - - /* Do we need a zero page? */ - if (NeedZero) + if ((NeedZero) && (Process)) { /* Try to get one, if we couldn't grab a free page and zero it */ PageFrameNumber = MiRemoveZeroPageSafe(Color); - if (PageFrameNumber) NeedZero = FALSE; - } - - /* Did we get a page? */ - if (!PageFrameNumber) - { - /* We either failed to find a zero page, or this is a system request */ + if (PageFrameNumber) + { + /* We got a genuine zero page, stop worrying about it */ + NeedZero = FALSE; + } + else + { + /* We'll need a free page and zero it manually */ + PageFrameNumber = MiRemoveAnyPage(Color); + } + } + else if (!NeedZero) + { + /* Process or system doesn't want a zero page, grab anything */ PageFrameNumber = MiRemoveAnyPage(Color); - DPRINT("New pool page: %lx\n", PageFrameNumber); + } + else + { + /* System wants a zero page, obtain one */ + PageFrameNumber = MiRemoveZeroPage(Color); } /* Initialize it */ MiInitializePfn(PageFrameNumber, PointerPte, TRUE); - // - // Release PFN lock - // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + /* Release PFN lock if needed */ + if (HaveLock) KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); // // Increment demand zero faults @@ -283,24 +301,53 @@ IN PMMPFN Pfn1) { MMPTE TempPte; + PMMPTE OriginalPte; + ULONG Protection; PFN_NUMBER PageFrameIndex; /* Must be called with an valid prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(PointerProtoPte->u.Hard.Valid == 1); - /* Quick-n-dirty */ - ASSERT(PointerPte->u.Soft.PageFileHigh == 0xFFFFF); - /* Get the page */ PageFrameIndex = PFN_FROM_PTE(PointerProtoPte); + + /* Get the PFN entry and set it as a prototype PTE */ + Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1->u3.e1.PrototypePte = 1; + + /* FIXME: Increment the share count for the page table */ + + /* Check where we should be getting the protection information from */ + if (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED) + { + /* Get the protection from the PTE, there's no real Proto PTE data */ + Protection = PointerPte->u.Soft.Protection; + } + else + { + /* Get the protection from the original PTE link */ + OriginalPte = &Pfn1->OriginalPte; + Protection = OriginalPte->u.Soft.Protection; + } /* Release the PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - /* Build the user PTE */ - ASSERT(Address < MmSystemRangeStart); - MI_MAKE_HARDWARE_PTE_USER(&TempPte, PointerPte, MM_READONLY, PageFrameIndex); + /* Remove caching bits */ + Protection &= ~(MM_NOCACHE | MM_NOACCESS); + + /* Check if this is a kernel or user address */ + if (Address < MmSystemRangeStart) + { + /* Build the user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&TempPte, PointerPte, Protection, PageFrameIndex); + } + else + { + /* Build the kernel PTE */ + MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, Protection, PageFrameIndex); + } /* Write the PTE */ MI_WRITE_VALID_PTE(PointerPte, TempPte); @@ -325,25 +372,56 @@ MMPTE TempPte; PMMPFN Pfn1; PFN_NUMBER PageFrameIndex; + NTSTATUS Status; /* Must be called with an invalid, prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(PointerPte->u.Soft.Prototype == 1); - /* Read the prototype PTE -- it must be valid since we only handle shared data */ + /* Read the prototype PTE and check if it's valid */ TempPte = *PointerProtoPte; - ASSERT(TempPte.u.Hard.Valid == 1); - - /* One more user of this mapped page */ - PageFrameIndex = PFN_FROM_PTE(&TempPte); - Pfn1 = MiGetPfnEntry(PageFrameIndex); - Pfn1->u2.ShareCount++; - - /* Call it a transition */ - InterlockedIncrement(&KeGetCurrentPrcb()->MmTransitionCount); + if (TempPte.u.Hard.Valid == 1) + { + /* One more user of this mapped page */ + PageFrameIndex = PFN_FROM_PTE(&TempPte); + Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1->u2.ShareCount++; + + /* Call it a transition */ + InterlockedIncrement(&KeGetCurrentPrcb()->MmTransitionCount); + + /* Complete the prototype PTE fault -- this will release the PFN lock */ + return MiCompleteProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + OldIrql, + NULL); + } + + /* Make sure there's some protection mask */ + if (TempPte.u.Long == 0) + { + /* Release the lock */ + DPRINT1("Access on reserved section?\n"); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + return STATUS_ACCESS_VIOLATION; + } + + /* This is the only thing we support right now */ + ASSERT(TempPte.u.Soft.PageFileHigh == 0); + ASSERT(TempPte.u.Proto.ReadOnly == 0); + ASSERT(PointerPte > MiHighestUserPte); + ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Soft.Transition == 0); + + /* Resolve the demand zero fault */ + Status = MiResolveDemandZeroFault(Address, PointerProtoPte, Process, OldIrql); + ASSERT(NT_SUCCESS(Status)); /* Complete the prototype PTE fault -- this will release the PFN lock */ + ASSERT(PointerPte->u.Hard.Valid == 0); return MiCompleteProtoPteFault(StoreInstruction, Address, PointerPte, @@ -388,39 +466,76 @@ { /* This should never happen */ ASSERT(!MI_IS_PHYSICAL_ADDRESS(PointerProtoPte)); + + /* Check if this is a kernel-mode address */ + SuperProtoPte = MiAddressToPte(PointerProtoPte); + if (Address >= MmSystemRangeStart) + { + /* Lock the PFN database */ + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* We currently only handle the shared user data PTE path */ - ASSERT(Address < MmSystemRangeStart); - ASSERT(PointerPte->u.Soft.Prototype == 1); - ASSERT(PointerPte->u.Soft.PageFileHigh == 0xFFFFF); - ASSERT(Vad == NULL); - - /* Lock the PFN database */ - LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* For the shared data page, this should be true */ - SuperProtoPte = MiAddressToPte(PointerProtoPte); - ASSERT(SuperProtoPte->u.Hard.Valid == 1); - ASSERT(TempPte.u.Hard.Valid == 0); - - /* Resolve the fault -- this will release the PFN lock */ - Status = MiResolveProtoPteFault(StoreInstruction, - Address, - PointerPte, - PointerProtoPte, - NULL, - NULL, - NULL, - Process, - LockIrql, - TrapInformation); - ASSERT(Status == STATUS_SUCCESS); - - /* Complete this as a transition fault */ - ASSERT(OldIrql == KeGetCurrentIrql()); - ASSERT(OldIrql <= APC_LEVEL); - ASSERT(KeAreAllApcsDisabled() == TRUE); - return STATUS_PAGE_FAULT_TRANSITION; + /* Has the PTE been made valid yet? */ + if (!SuperProtoPte->u.Hard.Valid) + { + UNIMPLEMENTED; + while (TRUE); + } + else + { + ASSERT(PointerPte->u.Hard.Valid == 0); + /* Resolve the fault -- this will release the PFN lock */ + Status = MiResolveProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + NULL, + NULL, + NULL, + Process, + LockIrql, + TrapInformation); + ASSERT(Status == STATUS_SUCCESS); + + /* Complete this as a transition fault */ + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return Status; + } + } + else + { + /* We currently only handle the shared user data PTE path */ + ASSERT(PointerPte->u.Soft.Prototype == 1); + ASSERT(PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED); + ASSERT(Vad == NULL); + + /* Lock the PFN database */ + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* For the shared data page, this should be true */ + ASSERT(SuperProtoPte->u.Hard.Valid == 1); + ASSERT(TempPte.u.Hard.Valid == 0); + + /* Resolve the fault -- this will release the PFN lock */ + Status = MiResolveProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + NULL, + NULL, + NULL, + Process, + LockIrql, + TrapInformation); + ASSERT(Status == STATUS_SUCCESS); + + /* Complete this as a transition fault */ + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return STATUS_PAGE_FAULT_TRANSITION; + } } // @@ -469,7 +584,7 @@ IN PVOID TrapInformation) { KIRQL OldIrql = KeGetCurrentIrql(), LockIrql; - PMMPTE PointerPte, ProtoPte; + PMMPTE PointerPte, ProtoPte = NULL; PMMPDE PointerPde; MMPTE TempPte; PETHREAD CurrentThread; @@ -645,9 +760,6 @@ /* Check one kind of prototype PTE */ if (TempPte.u.Soft.Prototype) { - /* The one used for protected pool... */ - ASSERT(MmProtectFreedNonPagedPool == TRUE); - /* Make sure protected pool is on, and that this is a pool address */ if ((MmProtectFreedNonPagedPool) && (((Address >= MmNonPagedPoolStart) && @@ -663,12 +775,41 @@ Mode, 4); } + + /* Get the prototype PTE! */ + ProtoPte = MiProtoPteToPte(&TempPte); } // // We don't implement transition PTEs // ASSERT(TempPte.u.Soft.Transition == 0); + + /* Check for no-access PTE */ + if (TempPte.u.Soft.Protection == MM_NOACCESS) + { + /* Bad boy, bad boy, whatcha gonna do, whatcha gonna do when ARM3 comes for you! */ + KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, + (ULONG_PTR)Address, + StoreInstruction, + (ULONG_PTR)TrapInformation, + 1); + } + + /* Check for demand page */ + if ((StoreInstruction) && !(ProtoPte) && !(TempPte.u.Hard.Valid)) + { + /* Get the protection code */ + if (!(TempPte.u.Soft.Protection & MM_READWRITE)) + { + /* Bad boy, bad boy, whatcha gonna do, whatcha gonna do when ARM3 comes for you! */ + KeBugCheckEx(ATTEMPTED_WRITE_TO_READONLY_MEMORY, + (ULONG_PTR)Address, + TempPte.u.Long, + (ULONG_PTR)TrapInformation, + 14); + } + } // // Now do the real fault handling @@ -676,7 +817,7 @@ Status = MiDispatchFault(StoreInstruction, Address, PointerPte, - NULL, + ProtoPte, FALSE, NULL, TrapInformation,

1 0

[sir_richard] 48978: [NTOS]: Initialize system views by calling MiInitializeSystemSpaceMap. This sets up the lock, bitmap, and hash table.
by sir_richard＠svn.reactos.org 04 Oct '10

04 Oct '10

Author: sir_richard Date: Mon Oct 4 18:36:37 2010 New Revision: 48978 URL: http://svn.reactos.org/svn/reactos?rev=48978&view=rev Log: [NTOS]: Initialize system views by calling MiInitializeSystemSpaceMap. This sets up the lock, bitmap, and hash table. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Mon Oct 4 18:36:37 2010 @@ -1674,6 +1674,9 @@ MiHighPagedPoolThreshold = (60 * _1MB) >> PAGE_SHIFT; MiHighPagedPoolThreshold = min(MiHighPagedPoolThreshold, (Size * 2) / 5); ASSERT(MiLowPagedPoolThreshold < MiHighPagedPoolThreshold); + + /* Setup the global session space */ + MiInitializeSystemSpaceMap(NULL); } NTSTATUS 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] Mon Oct 4 18:36:37 2010 @@ -70,6 +70,8 @@ (CHAR)MM_INVALID_PROTECTION }; +MMSESSION MmSession; + /* PRIVATE FUNCTIONS **********************************************************/ ULONG @@ -153,6 +155,58 @@ /* Return the final MM PTE protection mask */ return ProtectMask; } + +BOOLEAN +NTAPI +MiInitializeSystemSpaceMap(IN PVOID InputSession OPTIONAL) +{ + SIZE_T AllocSize, BitmapSize; + PMMSESSION Session; + + /* For now, always use the global session */ + ASSERT(InputSession == NULL); + Session = &MmSession; + + /* Initialize the system space lock */ + Session->SystemSpaceViewLockPointer = &Session->SystemSpaceViewLock; + KeInitializeGuardedMutex(Session->SystemSpaceViewLockPointer); + + /* Set the start address */ + Session->SystemSpaceViewStart = MiSystemViewStart; + + /* Create a bitmap to describe system space */ + BitmapSize = sizeof(RTL_BITMAP) + ((((MmSystemViewSize / 65536) + 31) / 32) * sizeof(ULONG)); + Session->SystemSpaceBitMap = ExAllocatePoolWithTag(NonPagedPool, + BitmapSize, + ' mM'); + ASSERT(Session->SystemSpaceBitMap); + RtlInitializeBitMap(Session->SystemSpaceBitMap, + (PULONG)(Session->SystemSpaceBitMap + 1), + MmSystemViewSize / 65536); + + /* Set system space fully empty to begin with */ + RtlClearAllBits(Session->SystemSpaceBitMap); + + /* Set default hash flags */ + Session->SystemSpaceHashSize = 31; + Session->SystemSpaceHashKey = Session->SystemSpaceHashSize - 1; + Session->SystemSpaceHashEntries = 0; + + /* Calculate how much space for the hash views we'll need */ + AllocSize = sizeof(MMVIEW) * Session->SystemSpaceHashSize; + ASSERT(AllocSize < PAGE_SIZE); + + /* Allocate and zero the view table */ + Session->SystemSpaceViewTable = ExAllocatePoolWithTag(NonPagedPool, + AllocSize, + ' mM'); + ASSERT(Session->SystemSpaceViewTable != NULL); + RtlZeroMemory(Session->SystemSpaceViewTable, AllocSize); + + /* Success */ + return TRUE; +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS

1 0

[sir_richard] 48977: [NTOS]: Define MI_MAKE_PROTOTYPE_PTE macro to make a real prototype PTE from a PTE. Define counter-part MiProtoPteToPte to recover the true PTE from a given Prototype PTE. [NTO...
by sir_richard＠svn.reactos.org 04 Oct '10

04 Oct '10

Author: sir_richard Date: Mon Oct 4 18:34:41 2010 New Revision: 48977 URL: http://svn.reactos.org/svn/reactos?rev=48977&view=rev Log: [NTOS]: Define MI_MAKE_PROTOTYPE_PTE macro to make a real prototype PTE from a PTE. Define counter-part MiProtoPteToPte to recover the true PTE from a given Prototype PTE. [NTOS]: Define MI_PTE_LOOKUP_NEEDED instead of using 0xFFFF. The name was found in checked build assertion strings. [NTOS]: Add MM_VIEW (used for System-mapped Section Views) and MM_SESSSION (used to define the system/session view mappings) structure definitions. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Mon Oct 4 18:34:41 2010 @@ -26,7 +26,7 @@ MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; /* Template PTE for prototype page */ -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | 0xFFFFF000}; +MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}; /* PRIVATE FUNCTIONS **********************************************************/ 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] Mon Oct 4 18:34:41 2010 @@ -232,6 +232,18 @@ #define MI_GET_PAGE_COLOR(x) ((x) & MmSecondaryColorMask) #define MI_GET_NEXT_COLOR(x) (MI_GET_PAGE_COLOR(++MmSystemPageColor)) #define MI_GET_NEXT_PROCESS_COLOR(x) (MI_GET_PAGE_COLOR(++(x)->NextPageColor)) + +// +// Decodes a Prototype PTE into the underlying PTE +// +#define MiProtoPteToPte(x) \ + (PMMPTE)((ULONG_PTR)MmPagedPoolStart + \ + ((x)->u.Proto.ProtoAddressHigh | (x)->u.Proto.ProtoAddressLow)) + +// +// Prototype PTEs that don't yet have a pagefile association +// +#define MI_PTE_LOOKUP_NEEDED 0xFFFFF // // FIXFIX: These should go in ex.h after the pool merge @@ -358,6 +370,25 @@ PFN_NUMBER StartFrame; PFN_NUMBER LastFrame; } MI_LARGE_PAGE_RANGES, *PMI_LARGE_PAGE_RANGES; + +typedef struct _MMVIEW +{ + ULONG_PTR Entry; + PCONTROL_AREA ControlArea; +} MMVIEW, *PMMVIEW; + +typedef struct _MMSESSION +{ + KGUARDED_MUTEX SystemSpaceViewLock; + PKGUARDED_MUTEX SystemSpaceViewLockPointer; + PCHAR SystemSpaceViewStart; + PMMVIEW SystemSpaceViewTable; + ULONG SystemSpaceHashSize; + ULONG SystemSpaceHashEntries; + ULONG SystemSpaceHashKey; + ULONG BitmapFailures; + PRTL_BITMAP SystemSpaceBitMap; +} MMSESSION, *PMMSESSION; extern MMPTE HyperTemplatePte; extern MMPDE ValidKernelPde; @@ -565,6 +596,31 @@ } // +// Builds a Prototype PTE for the address of the PTE +// +FORCEINLINE +VOID +MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, + IN PMMPTE PointerPte) +{ + ULONG_PTR Offset; + + /* Mark this as a prototype */ + NewPte->u.Long = 0; + NewPte->u.Proto.Prototype = 1; + + /* + * Prototype PTEs are only valid in paged pool by design, this little trick + * lets us only use 28 bits for the adress of the PTE + */ + Offset = (ULONG_PTR)PointerPte - (ULONG_PTR)MmPagedPoolStart; + + /* 7 bits go in the "low", and the other 21 bits go in the "high" */ + NewPte->u.Proto.ProtoAddressLow = Offset & 0x7F; + NewPte->u.Proto.ProtoAddressHigh = Offset & 0xFFFFF80; +} + +// // Returns if the page is physically resident (ie: a large page) // FIXFIX: CISC/x86 only? // @@ -1107,6 +1163,12 @@ IN PMMADDRESS_NODE Node ); +BOOLEAN +NTAPI +MiInitializeSystemSpaceMap( + IN PVOID InputSession OPTIONAL +); + // // MiRemoveZeroPage will use inline code to zero out the page manually if only // free pages are available. In some scenarios, we don't/can't run that piece of

1 0

[sir_richard] 48976: [NTOS]: Go ahead and now fill out the OriginalPte field for PFNs initialized with MiInitializePfn(ForOtherProcess). They should only belong to ARM3 so they'll never have SwapEn...
by sir_richard＠svn.reactos.org 04 Oct '10

04 Oct '10

Author: sir_richard Date: Mon Oct 4 18:22:50 2010 New Revision: 48976 URL: http://svn.reactos.org/svn/reactos?rev=48976&view=rev Log: [NTOS]: Go ahead and now fill out the OriginalPte field for PFNs initialized with MiInitializePfn(ForOtherProcess). They should only belong to ARM3 so they'll never have SwapEntry/RMAP associated with them. This functionality is important for future Prototype PTE support, among other things, as it lets us get the original PTE value written for a given PFN entry. 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] Mon Oct 4 18:22:50 2010 @@ -713,6 +713,16 @@ { /* Only valid from MmCreateProcessAddressSpace path */ ASSERT(PsGetCurrentProcess()->Vm.WorkingSetSize == 0); + + /* Make this a demand zero PTE */ + MI_MAKE_SOFTWARE_PTE(&Pfn1->OriginalPte, MM_READWRITE); + } + else + { + /* Copy the PTE data */ + Pfn1->OriginalPte = *PointerPte; + ASSERT(!((Pfn1->OriginalPte.u.Soft.Prototype == 0) && + (Pfn1->OriginalPte.u.Soft.Transition == 1))); } /* Otherwise this is a fresh page -- set it up */ @@ -870,11 +880,9 @@ /* Setup the PTE */ Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1->PteAddress = PointerPte; - -#if 0 // When using ARM3 PFN + /* Make this a software PTE */ MI_MAKE_SOFTWARE_PTE(&Pfn1->OriginalPte, MM_READWRITE); -#endif /* Setup the page */ ASSERT(Pfn1->u3.e2.ReferenceCount == 0);

1 0

[jimtabor] 48975: [PSDK] - Add more track popup menu types.
by jimtabor＠svn.reactos.org 04 Oct '10

04 Oct '10

Author: jimtabor Date: Mon Oct 4 15:41:25 2010 New Revision: 48975 URL: http://svn.reactos.org/svn/reactos?rev=48975&view=rev Log: [PSDK] - Add more track popup menu types. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Oct 4 15:41:25 2010 @@ -2340,6 +2340,15 @@ #define TPM_HORNEGANIMATION 0x0800 #define TPM_VERPOSANIMATION 0x1000 #define TPM_VERNEGANIMATION 0x2000 +#endif +#if(_WIN32_WINNT >= 0x0500) +#define TPM_NOANIMATION 16384 +#endif +#if (_WIN32_WINNT >= 0x0501) +#define TPM_LAYOUTRTL 32768 +#endif +#if (_WIN32_WINNT >= 0x0601) +#define TPM_WORKAREA 65536 #endif #define HELP_COMMAND 0x102 #define HELP_CONTENTS 3

1 0

[akhaldi] 48974: [CMAKE] - Fix bzip2.
by akhaldi＠svn.reactos.org 04 Oct '10

04 Oct '10

Author: akhaldi Date: Mon Oct 4 07:11:54 2010 New Revision: 48974 URL: http://svn.reactos.org/svn/reactos?rev=48974&view=rev Log: [CMAKE] - Fix bzip2. Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/bzip… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] Mon Oct 4 07:11:54 2010 @@ -1,6 +1,21 @@ add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) -file(GLOB_RECURSE SOURCE "*.c") -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/compress.c ${CMAKE_CURRENT_SOURCE_DIR}/randtable.c ${CMAKE_CURRENT_SOURCE_DIR}/bzip2recover.c ${CMAKE_CURRENT_SOURCE_DIR}/blocksort.c ${CMAKE_CURRENT_SOURCE_DIR}/bzip2.c ${CMAKE_CURRENT_SOURCE_DIR}/dlltest.c ${CMAKE_CURRENT_SOURCE_DIR}/spewG.c ${CMAKE_CURRENT_SOURCE_DIR}/unzcrash.c) +spec2def(bzip2 ${CMAKE_CURRENT_SOURCE_DIR}/unbzip2.spec ${CMAKE_CURRENT_BINARY_DIR}/unbzip2.def) -add_library(bzip2 ${SOURCE}) +list(APPEND SOURCE + bzlib.c + randtable.c + crctable.c + decompress.c + huffman.c + dllmain.c) + +add_library(bzip2 SHARED ${SOURCE}) + +set_target_properties(bzip2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" OUTPUT_NAME "unbzip2") + +target_link_libraries(bzip2 ${CMAKE_CURRENT_BINARY_DIR}/unbzip2.def) + +add_importlibs(bzip2 ntoskrnl) + +add_dependencies(bzip2 bzip2_def bugcodes)

1 0

[akhaldi] 48973: [CMAKE] - Add almost all base applications (some are included but disabled too). This is the work of a human being, so no bots BS, no rbuildism, every single module was tested, bui...
by akhaldi＠svn.reactos.org 03 Oct '10

03 Oct '10

Author: akhaldi Date: Sun Oct 3 22:26:21 2010 New Revision: 48973 URL: http://svn.reactos.org/svn/reactos?rev=48973&view=rev Log: [CMAKE] - Add almost all base applications (some are included but disabled too). This is the work of a human being, so no bots BS, no rbuildism, every single module was tested, built with the new build system mentality (no defines and linked libs redundancy, use of the the available macros, the linked libs are carefully selected, the dependencies are correctly tracked... etc) - Brought to you by Alexey Komarov, with my humble review. Added: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/logoff/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/magnify/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mmc/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/net/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/route/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/paint/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/regedit/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/sc/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/winver/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/write/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/applications/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -4,33 +4,33 @@ add_subdirectory(charmap) add_subdirectory(cmdutils) add_subdirectory(control) -#add_subdirectory(dxdiag) +add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(fontview) add_subdirectory(games) add_subdirectory(hh) add_subdirectory(iexplore) -#add_subdirectory(kbswitch) -#add_subdirectory(logoff) -#add_subdirectory(magnify) +add_subdirectory(kbswitch) +add_subdirectory(logoff) +add_subdirectory(magnify) #add_subdirectory(mmc) -#add_subdirectory(mplay32) -#add_subdirectory(msconfig) -#add_subdirectory(mscutils) -#add_subdirectory(mstsc) -#add_subdirectory(network) +add_subdirectory(mplay32) +add_subdirectory(msconfig) +add_subdirectory(mscutils) +add_subdirectory(mstsc) +add_subdirectory(network) #add_subdirectory(notepad) -#add_subdirectory(paint) +add_subdirectory(paint) #add_subdirectory(rapps) #add_subdirectory(regedit) -#add_subdirectory(regedt32) -#add_subdirectory(sc) +add_subdirectory(regedt32) +add_subdirectory(sc) #add_subdirectory(screensavers) -#add_subdirectory(shutdown) -#add_subdirectory(sndrec32) -#add_subdirectory(sndvol32) -#add_subdirectory(taskmgr) -#add_subdirectory(winhlp32) -#add_subdirectory(winver) +add_subdirectory(shutdown) +add_subdirectory(sndrec32) +add_subdirectory(sndvol32) +add_subdirectory(taskmgr) +add_subdirectory(winhlp32) +add_subdirectory(winver) #add_subdirectory(wordpad) -#add_subdirectory(write) +add_subdirectory(write) Added: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,30 @@ + +set_unicode() + +list(APPEND SOURCE + system.c + display.c + sound.c + music.c + input.c + network.c + help.c + dxdiag.c + dxdiag.rc + ddtest.c + d3dtest.c + d3dtest7.c + d3dtest8.c + d3dtest9.c) + +add_executable(dxdiag + ${CMAKE_CURRENT_BINARY_DIR}/dxdiag_precomp.h.gch + ${SOURCE}) + +add_pch(dxdiag ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(dxdiag win32gui) + +target_link_libraries(dxdiag dxguid) + +add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt) Propchange: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,9 @@ + +set_unicode() + +add_executable(kbswitch kbswitch.c kbswitch.rc) + +set_module_type(kbswitch win32gui) +add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt) + +add_subdirectory(kbsdll) Propchange: branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,13 @@ + +set_unicode() + +add_library(kbsdll SHARED kbsdll.c kbsdll.rc) + +spec2def(kbsdll ${CMAKE_CURRENT_SOURCE_DIR}/kbsdll.spec ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def) + +target_link_libraries(kbsdll ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def) + +set_module_type(kbsdll win32dll) +add_importlibs(kbsdll user32 comctl32 kernel32) + +add_dependencies(kbsdll kbsdll_def) Propchange: branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/logoff/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,13 @@ + +list(APPEND SOURCE + misc.c + logoff.c + logoff.rc) + +add_executable(logoff ${CMAKE_CURRENT_BINARY_DIR}/logoff_precomp.h.gch ${SOURCE}) + +add_pch(logoff ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(logoff win32cui) + +add_importlibs(logoff advapi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/logoff/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/magnify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/magnify/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,9 @@ + +add_executable(magnify + magnifier.c + settings.c + magnify.rc) + +set_module_type(magnify win32gui) + +add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt) Propchange: branches/cmake-bringup/base/applications/magnify/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mmc/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,16 @@ + +set_unicode() + +list(APPEND SOURCE + console.c + misc.c + mmc.c + mmc.rc) + +add_executable(mmcclient ${CMAKE_CURRENT_BINARY_DIR}/mmcclient_precomp.h.gch ${SOURCE}) + +add_pch(mmcclient ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(mmcclient win32gui) + +add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mmc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(mplay32 mplay32.c mplay32.rc) + +set_module_type(mplay32 win32gui) + +add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,20 @@ + +set_unicode() + +list(APPEND SOURCE + toolspage.c + srvpage.c + systempage.c + startuppage.c + freeldrpage.c + generalpage.c + msconfig.c + msconfig.rc) + +add_executable(msconfig ${CMAKE_CURRENT_BINARY_DIR}/msconfig_precomp.h.gch ${SOURCE}) + +add_pch(msconfig ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(msconfig win32gui) + +add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt) Propchange: branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,4 @@ + +add_subdirectory(devmgmt) +add_subdirectory(eventvwr) +add_subdirectory(servman) Propchange: branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,18 @@ + +set_unicode() + +list(APPEND SOURCE + about.c + devmgmt.c + enumdevices.c + mainwnd.c + misc.c + devmgmt.rc) + +add_executable(devmgmt ${CMAKE_CURRENT_BINARY_DIR}/devmgmt_precomp.h.gch ${SOURCE}) + +add_pch(devmgmt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(devmgmt win32gui) + +add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt) Propchange: branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(eventvwr eventvwr.c eventvwr.rc) + +set_module_type(eventvwr win32gui) + +add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,32 @@ + +set_unicode() + +list(APPEND SOURCE + about.c + control.c + create.c + delete.c + dependencies_tv1.c + dependencies_tv2.c + export.c + listview.c + mainwnd.c + misc.c + progress.c + propsheet.c + propsheet_depends.c + propsheet_general.c + query.c + servman.c + start.c + stop.c + stop_dependencies.c + servman.rc) + +add_executable(servman ${CMAKE_CURRENT_BINARY_DIR}/servman_precomp.h.gch ${SOURCE}) + +add_pch(servman ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(servman win32gui) + +add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,32 @@ + +set_unicode() + +list(APPEND SOURCE + bitmap.c + bsops.c + cache.c + channels.c + connectdialog.c + iso.c + licence.c + mcs.c + mppc.c + orders.c + pstcache.c + rdp5.c + rdp.c + secure.c + settings.c + ssl_calls.c + tcp.c + uimain.c + win32.c + rdc.rc) + +add_executable(mstsc ${CMAKE_CURRENT_BINARY_DIR}/mstsc_precomp.h.gch ${SOURCE}) + +add_pch(mstsc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(mstsc win32gui) + +add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,14 @@ + +add_subdirectory(arp) +#add_subdirectory(dwnl) +add_subdirectory(finger) +#add_subdirectory(ftp) +add_subdirectory(ipconfig) +add_subdirectory(net) +add_subdirectory(netstat) +add_subdirectory(nslookup) +add_subdirectory(ping) +#add_subdirectory(route) +add_subdirectory(telnet) +add_subdirectory(tracert) +#add_subdirectory(whois) Propchange: branches/cmake-bringup/base/applications/network/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,6 @@ + +add_executable(arp arp.c arp.rc) + +set_module_type(arp win32cui) + +add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,10 @@ + +set_unicode() + +add_executable(dwnl dwnl.c) + +set_module_type(dwnl win32cui) + +target_link_libraries(dwnl uuid) + +add_importlibs(dwnl urlmon wininet uuid msvcrt) Propchange: branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,12 @@ +add_definitions(-D__USE_W32_SOCKETS) + +add_executable(finger + finger.c + err.c + getopt.c + net.c + finger.rc) + +set_module_type(finger win32cui) + +add_importlibs(finger ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,13 @@ +add_executable(ftp + cmds.c + cmdtab.c + domacro.c + fake.c + ftp.c + main.c + ruserpass.c + ftp.rc) + +set_module_type(ftp win32cui) + +add_importlibs(ftp ws2_32 iphlpapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,6 @@ + +add_executable(ipconfig ipconfig.c ipconfig.rc) + +set_module_type(ipconfig win32cui) + +add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/net/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/net/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,15 @@ + +add_definitions(-D__USE_W32_SOCKETS) + +list(APPEND SOURCE + main.c + cmdstart.c + cmdStop.c + help.c + process.c) + +add_executable(net ${SOURCE}) + +set_module_type(net win32cui) + +add_importlibs(net ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/net/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,6 @@ + +add_executable(netstat netstat.c netstat.rc) + +set_module_type(netstat win32cui) + +add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,9 @@ + +add_executable(nslookup + nslookup.c + utility.c + nslookup.rc) + +set_module_type(nslookup win32cui) + +add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,7 @@ +add_definitions(-D__USE_W32_SOCKETS) + +add_executable(ping ping.c ping.rc) + +set_module_type(ping win32cui) + +add_importlibs(ping ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/route/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/route/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,7 @@ + +set_unicode() + +add_executable(route route.c route.rc) + +set_module_type(route win32cui) +add_importlibs(route ws2_32 iphlpapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/route/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,27 @@ +add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + +add_executable(telnet + src/ansiprsr.cpp + src/keytrans.cpp + src/tcharmap.cpp + src/tconsole.cpp + src/tkeydef.cpp + src/tkeymap.cpp + src/tmapldr.cpp + src/tmouse.cpp + src/tnclass.cpp + src/tnclip.cpp + src/tncon.cpp + src/tnconfig.cpp + src/tnerror.cpp + src/tnetwork.cpp + src/tnmain.cpp + src/tnmisc.cpp + src/tscript.cpp + src/tscroll.cpp + src/ttelhndl.cpp + telnet.rc) + +set_module_type(telnet win32cui) + +add_importlibs(telnet ws2_32 user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,7 @@ +add_definitions(-D__USE_W32_SOCKETS) + +add_executable(tracert tracert.c tracert.rc) + +set_module_type(tracert win32cui) + +add_importlibs(tracert ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,6 @@ + +add_executable(whois whois.c whois.rc) + +set_module_type(whois win32cui) + +add_importlibs(whois ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/paint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/paint/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/paint/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,21 @@ + +set_unicode() + +add_executable(paint + dialogs.c + dib.c + drawing.c + history.c + main.c + mouse.c + palette.c + registry.c + selection.c + sizebox.c + toolsettings.c + winproc.c + rsrc.rc) + +set_module_type(paint win32gui) + +add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt) Propchange: branches/cmake-bringup/base/applications/paint/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedit/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,31 @@ + +set_unicode() + +include_directories(BEFORE .) + +list(APPEND SOURCE + about.c + childwnd.c + edit.c + find.c + framewnd.c + hexedit.c + listview.c + main.c + regedit.c + regproc.c + security.c + treeview.c + regedit.rc) + +add_pch(regedit ${CMAKE_CURRENT_SOURCE_DIR}/regedit.h ${SOURCE}) + +add_executable(regedit ${CMAKE_CURRENT_BINARY_DIR}/regedit_regedit.h.gch ${SOURCE}) + +set_module_type(regedit win32gui) + +target_link_libraries(regedit uuid) + +add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt) + +#add_subdirectory(clb) Propchange: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(regedt32 regedt32.c resource.rc) + +set_module_type(regedt32 win32gui) + +add_importlibs(regedt32 shell32 shlwapi msvcrt) Propchange: branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sc/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/sc/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,22 @@ + +set_unicode() +add_definitions(-DDEFINE_GUID) + +list(APPEND SOURCE + control.c + create.c + delete.c + print.c + query.c + sc.c + start.c + usage.c + sc.rc) + +add_executable(sc ${CMAKE_CURRENT_BINARY_DIR}/sc_sc.h.gch ${SOURCE}) + +add_pch(sc ${CMAKE_CURRENT_SOURCE_DIR}/sc.h ${SOURCE}) + +set_module_type(sc win32cui) + +add_importlibs(sc advapi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/sc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,13 @@ + +list(APPEND SOURCE + misc.c + shutdown.c + shutdown.rc) + +add_executable(shutdown ${CMAKE_CURRENT_BINARY_DIR}/shutdown_precomp.h.gch ${SOURCE}) + +add_pch(shutdown ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(shutdown win32cui) + +add_importlibs(shutdown advapi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,15 @@ + +add_executable(sndrec32 + audio_format.cpp + audio_membuffer.cpp + audio_producer.cpp + audio_receiver.cpp + audio_resampler_acm.cpp + audio_wavein.cpp + audio_waveout.cpp + sndrec32.cpp + rsrc.rc) + +set_module_type(sndrec32 win32gui) + +add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,16 @@ + +set_unicode() + +list(APPEND SOURCE + misc.c + mixer.c + sndvol32.c + sndvol32.rc) + +add_executable(sndvol32 ${CMAKE_CURRENT_BINARY_DIR}/sndvol32_sndvol32.h.gch ${SOURCE}) + +add_pch(sndvol32 ${CMAKE_CURRENT_SOURCE_DIR}/sndvol32.h ${SOURCE}) + +set_module_type(sndvol32 win32gui) + +add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt) Propchange: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,31 @@ + +set_unicode() + +list(APPEND SOURCE + about.c + affinity.c + applpage.c + column.c + dbgchnl.c + debug.c + endproc.c + graph.c + optnmenu.c + perfdata.c + perfpage.c + priority.c + procpage.c + proclist.c + run.c + trayicon.c + taskmgr.c + graphctl.c + taskmgr.rc) + +add_executable(taskmgr ${CMAKE_CURRENT_BINARY_DIR}/taskmgr_precomp.h.gch ${SOURCE}) + +add_pch(taskmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(taskmgr win32gui) + +add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt) Propchange: branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,21 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__ROS_LONG64__) +add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +add_definitions(-Dfileno=_fileno) +add_definitions(-Disatty=_isatty) + +add_executable(winhlp32 + callback.c + hlpfile.c + macro.c + string.c + winhelp.c + lex.yy.c + rsrc.rc) + +set_module_type(winhlp32 win32gui) + +target_link_libraries(winhlp32 wine) + +add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt) Propchange: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/winver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winver/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/winver/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(winver winver.c) + +set_module_type(winver win32gui) + +add_importlibs(winver shell32 msvcrt) Propchange: branches/cmake-bringup/base/applications/winver/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/write/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/write/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/write/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(write write.c rsrc.rc) + +set_module_type(write win32gui) + +add_importlibs(write user32 gdi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/write/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48972: [CMAKE] - Improve win32csr. - Add libdevmgr.a
by akhaldi＠svn.reactos.org 03 Oct '10

03 Oct '10

Author: akhaldi Date: Sun Oct 3 21:57:08 2010 New Revision: 48972 URL: http://svn.reactos.org/svn/reactos?rev=48972&view=rev Log: [CMAKE] - Improve win32csr. - Add libdevmgr.a Added: branches/cmake-bringup/importlibs/libdevmgr.a (with props) Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt Added: branches/cmake-bringup/importlibs/libdevmgr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdev… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libdevmgr.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Sun Oct 3 21:57:08 2010 @@ -1,9 +1,10 @@ -include_directories(BEFORE .) -include_directories(${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) -include_directories(${REACTOS_SOURCE_DIR}/dll/cpl/console) +include_directories( + BEFORE . + ${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/drivers + ${REACTOS_SOURCE_DIR}/dll/cpl/console) spec2def(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/win32csr.spec ${CMAKE_CURRENT_BINARY_DIR}/win32csr.def) @@ -34,8 +35,8 @@ set_module_type(win32csr win32dll) -add_importlibs(win32csr ntdll user32 gdi32 advapi32 psapi) +add_importlibs(win32csr user32 gdi32 advapi32 psapi kernel32 ntdll) add_pch(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/w32csr.h ${SOURCE}) -add_dependencies(win32csr win32csr_def psdk bugcodes) +add_dependencies(win32csr win32csr_def bugcodes)

1 0

[spetreolle] 48971: Merge 48968 to 0.3.12 branch.
by spetreolle＠svn.reactos.org 03 Oct '10

03 Oct '10

Author: spetreolle Date: Sun Oct 3 21:33:31 2010 New Revision: 48971 URL: http://svn.reactos.org/svn/reactos?rev=48971&view=rev Log: Merge 48968 to 0.3.12 branch. Modified: branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c Modified: branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/drive… ============================================================================== --- branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Oct 3 21:33:31 2010 @@ -145,7 +145,7 @@ * - call at IRQL <= DISPATCH_LEVEL */ { - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(TimerCancelled); @@ -153,6 +153,7 @@ *TimerCancelled = KeCancelTimer (&Timer->Timer); +#if 0 if (*TimerCancelled) { KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -160,6 +161,7 @@ if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); } +#endif } VOID NTAPI @@ -170,6 +172,7 @@ { PNDIS_MINIPORT_TIMER Timer = DeferredContext; +#if 0 /* Only dequeue if the timer has a period of 0 */ if (!Timer->Timer.Period) { @@ -178,6 +181,7 @@ if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock); } +#endif Timer->MiniportTimerFunction(Dpc, Timer->MiniportTimerContext, @@ -240,14 +244,15 @@ */ { LARGE_INTEGER Timeout; - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); - + +#if 0 /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -260,6 +265,7 @@ /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); +#endif KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } @@ -285,7 +291,7 @@ */ { LARGE_INTEGER Timeout; - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); @@ -293,6 +299,7 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); +#if 0 /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -305,6 +312,7 @@ /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); +#endif KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc); }

1 0

[jimtabor] 48970: [Win32k] - Fixed ValidateTimerCallback, always returning true and just spinning in the loop. - Add one more process information flag with a point type and capturing the hit test i...
by jimtabor＠svn.reactos.org 03 Oct '10

03 Oct '10

Author: jimtabor Date: Sun Oct 3 19:18:19 2010 New Revision: 48970 URL: http://svn.reactos.org/svn/reactos?rev=48970&view=rev Log: [Win32k] - Fixed ValidateTimerCallback, always returning true and just spinning in the loop. - Add one more process information flag with a point type and capturing the hit test in desktop structure. Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -32,7 +32,7 @@ BOOL FASTCALL IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer); UINT_PTR FASTCALL IntSetTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, INT Type); PTIMER FASTCALL FindSystemTimer(PMSG); -BOOL FASTCALL ValidateTimerCallback(PTHREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); +BOOL FASTCALL ValidateTimerCallback(PTHREADINFO,LPARAM); VOID CALLBACK SystemTimerProc(HWND,UINT,UINT_PTR,DWORD); UINT_PTR FASTCALL SystemTimerSet(PWINDOW_OBJECT,UINT_PTR,UINT,TIMERPROC); BOOL FASTCALL PostTimerMessages(PWINDOW_OBJECT); Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -25,6 +25,7 @@ #define W32PF_SCREENSAVER 0x00200000 #define W32PF_IDLESCREENSAVER 0x00400000 #define W32PF_ICONTITLEREGISTERED 0x10000000 +#define W32PF_DPIAWARE 0x20000000 // ReactOS #define W32PF_NOWINDOWGHOSTING (0x01000000) #define W32PF_MANUALGUICHECK (0x02000000) @@ -93,6 +94,7 @@ HANDLE hEventQueueClient; PKEVENT pEventQueueServer; LIST_ENTRY PtiLink; + POINT ptLast; CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. /* ReactOS */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -394,7 +394,7 @@ { if (pMsg->message == WM_TIMER) { - if (ValidateTimerCallback(PsGetCurrentThreadWin32Thread(),Window,pMsg->wParam,pMsg->lParam)) + if (ValidateTimerCallback(PsGetCurrentThreadWin32Thread(),pMsg->lParam)) { KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); @@ -963,13 +963,15 @@ } MsgExit: + pti->rpdesk->htEx = HitTest; /* Now set the capture hit. */ + if ( ISITHOOKED(WH_MOUSE) && IS_MOUSE_MESSAGE(Msg->Msg.message)) { - if(!ProcessMouseMessage(&Msg->Msg, HitTest, RemoveMsg)) - { - return FALSE; - } - } + if (!ProcessMouseMessage(&Msg->Msg, HitTest, RemoveMsg)) + { + return FALSE; + } + } if ( ISITHOOKED(WH_KEYBOARD) && IS_KBD_MESSAGE(Msg->Msg.message)) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -1125,20 +1125,11 @@ LPARAM lParam) { BOOL Ret = FALSE; - PWINDOW_OBJECT Window = NULL; UserEnterShared(); - if (hWnd) - { - Window = UserGetWindowObject(hWnd); - if (!Window || !Window->Wnd) - goto Exit; - } - - Ret = ValidateTimerCallback(PsGetCurrentThreadWin32Thread(), Window, wParam, lParam); - -Exit: + Ret = ValidateTimerCallback(PsGetCurrentThreadWin32Thread(), lParam); + UserLeave(); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -167,11 +167,10 @@ BOOL FASTCALL ValidateTimerCallback(PTHREADINFO pti, - PWINDOW_OBJECT Window, - WPARAM wParam, LPARAM lParam) { PLIST_ENTRY pLE; + BOOL Ret = FALSE; PTIMER pTmr = FirstpTmr; if (!pTmr) return FALSE; @@ -180,18 +179,18 @@ do { if ( (lParam == (LPARAM)pTmr->pfn) && - (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && + !(pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && (pTmr->pti->ppi == pti->ppi) ) + { + Ret = TRUE; break; - + } pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); TimerLeave(); - if (!pTmr) return FALSE; - - return TRUE; + return Ret; } UINT_PTR FASTCALL @@ -616,8 +615,7 @@ DPRINT("Enter NtUserSetSystemTimer\n"); - // This is wrong, lpTimerFunc is NULL! - RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM)); + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM)); CLEANUP: DPRINT("Leave NtUserSetSystemTimer, ret=%i\n", _ret_);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs