Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 49781: [NTOS]: Some more ARM build and linker fixes, moving some of the new x86 C code into ARM. This should really be shared later. [NTOS]: Totally broke thread context switching on ...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 17:49:52 2010 New Revision: 49781 URL: http://svn.reactos.org/svn/reactos?rev=49781&view=rev Log: [NTOS]: Some more ARM build and linker fixes, moving some of the new x86 C code into ARM. This should really be shared later. [NTOS]: Totally broke thread context switching on ARM for now. It's a Good Thing. Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s trunk/reactos/ntoskrnl/ke/arm/thrdini.c trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/ntoskrnl/ke/arm/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/cpu.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/cpu.c [iso-8859-1] Wed Nov 24 17:49:52 2010 @@ -58,6 +58,15 @@ } VOID +FASTCALL +KeZeroPages(IN PVOID Address, + IN ULONG Size) +{ + /* Not using XMMI in this routine */ + RtlZeroMemory(Address, Size); +} + +VOID NTAPI KiSaveProcessorControlState(OUT PKPROCESSOR_STATE ProcessorState) { Modified: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] Wed Nov 24 17:49:52 2010 @@ -13,6 +13,10 @@ TEXTAREA NESTED_ENTRY KiSwapContext PROLOG_END KiSwapContext + + // BUSTEDDDD + b . + // // a1 = Old Thread // a2 = New Thread @@ -104,3 +108,19 @@ b . ENTRY_END KiThreadStartup + + NESTED_ENTRY KiSwitchThreads + PROLOG_END KiSwitchThreads + + // BUSTEDDDD + b . + + ENTRY_END KiSwitchThreads + + NESTED_ENTRY KiSwapContextInternal + PROLOG_END KiSwapContextInternal + + // BUSTEDDDD + b . + + ENTRY_END KiSwapContextInternal Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Wed Nov 24 17:49:52 2010 @@ -14,6 +14,13 @@ /* GLOBALS ********************************************************************/ +typedef struct _KSWITCHFRAME +{ + PVOID ExceptionList; + BOOLEAN ApcBypassDisable; + PVOID RetAddr; +} KSWITCHFRAME, *PKSWITCHFRAME; + typedef struct _KUINIT_FRAME { KEXCEPTION_FRAME CtxSwitchFrame; @@ -32,6 +39,15 @@ NTAPI KiThreadStartup(VOID); +VOID +FASTCALL +KiSwitchThreads( + IN PKTHREAD OldThread, + IN PKTHREAD NewThread +); + + +/* FIXME: THIS IS TOTALLY BUSTED NOW */ VOID NTAPI KiInitializeContextThread(IN PKTHREAD Thread, @@ -131,3 +147,217 @@ // Thread->KernelStack = (PVOID)CtxSwitchFrame; } + +VOID +FASTCALL +KiIdleLoop(VOID) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD OldThread, NewThread; + + /* Initialize the idle loop: disable interrupts */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + + /* Now loop forever */ + while (TRUE) + { + /* Check for pending timers, pending DPCs, or pending ready threads */ + if ((Prcb->DpcData[0].DpcQueueDepth) || + (Prcb->TimerRequest) || + (Prcb->DeferredReadyListHead.Next)) + { + /* Quiesce the DPC software interrupt */ + HalClearSoftwareInterrupt(DISPATCH_LEVEL); + + /* Handle it */ + KiRetireDpcList(Prcb); + } + + /* Check if a new thread is scheduled for execution */ + if (Prcb->NextThread) + { + /* Enable interupts */ + _enable(); + + /* Capture current thread data */ + OldThread = Prcb->CurrentThread; + NewThread = Prcb->NextThread; + + /* Set new thread data */ + Prcb->NextThread = NULL; + Prcb->CurrentThread = NewThread; + + /* The thread is now running */ + NewThread->State = Running; + + /* Switch away from the idle thread */ + KiSwapContext(APC_LEVEL, OldThread); + + /* We are back in the idle thread -- disable interrupts again */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + } + else + { + /* Continue staying idle. Note the HAL returns with interrupts on */ + Prcb->PowerState.IdleFunction(&Prcb->PowerState); + } + } +} + +BOOLEAN +FASTCALL +KiSwapContextExit(IN PKTHREAD OldThread, + IN PKSWITCHFRAME SwitchFrame) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPROCESS OldProcess, NewProcess; + PKTHREAD NewThread; + ARM_TTB_REGISTER TtbRegister; + + /* We are on the new thread stack now */ + NewThread = Pcr->PrcbData.CurrentThread; + + /* Now we are the new thread. Check if it's in a new process */ + OldProcess = OldThread->ApcState.Process; + NewProcess = NewThread->ApcState.Process; + if (OldProcess != NewProcess) + { + TtbRegister.AsUlong = NewProcess->DirectoryTableBase[0]; + ASSERT(TtbRegister.Reserved == 0); + KeArmTranslationTableRegisterSet(TtbRegister); + } + + /* Increase thread context switches */ + NewThread->ContextSwitches++; + + /* Load data from switch frame */ + Pcr->NtTib.ExceptionList = SwitchFrame->ExceptionList; + + /* DPCs shouldn't be active */ + if (Pcr->PrcbData.DpcRoutineActive) + { + /* Crash the machine */ + KeBugCheckEx(ATTEMPTED_SWITCH_FROM_DPC, + (ULONG_PTR)OldThread, + (ULONG_PTR)NewThread, + (ULONG_PTR)OldThread->InitialStack, + 0); + } + + /* Kernel APCs may be pending */ + if (NewThread->ApcState.KernelApcPending) + { + /* Are APCs enabled? */ + if (!NewThread->SpecialApcDisable) + { + /* Request APC delivery */ + if (SwitchFrame->ApcBypassDisable) HalRequestSoftwareInterrupt(APC_LEVEL); + return TRUE; + } + } + + /* Return */ + return FALSE; +} + +VOID +FASTCALL +KiSwapContextEntry(IN PKSWITCHFRAME SwitchFrame, + IN ULONG_PTR OldThreadAndApcFlag) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKTHREAD OldThread, NewThread; + + /* Save APC bypass disable */ + SwitchFrame->ApcBypassDisable = OldThreadAndApcFlag & 3; + SwitchFrame->ExceptionList = Pcr->NtTib.ExceptionList; + + /* Increase context switch count and check if tracing is enabled */ + Pcr->ContextSwitches++; + if (Pcr->PerfGlobalGroupMask) + { + /* We don't support this yet on x86 either */ + DPRINT1("WMI Tracing not supported\n"); + ASSERT(FALSE); + } + + /* Get thread pointers */ + OldThread = (PKTHREAD)(OldThreadAndApcFlag & ~3); + NewThread = Pcr->PrcbData.CurrentThread; + + /* Get the old thread and set its kernel stack */ + OldThread->KernelStack = SwitchFrame; + + /* Do the switch */ + KiSwitchThreads(OldThread, NewThread->KernelStack); +} + +VOID +NTAPI +KiDispatchInterrupt(VOID) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPRCB Prcb = &Pcr->PrcbData; + PVOID OldHandler; + PKTHREAD NewThread, OldThread; + + /* Disable interrupts */ + _disable(); + + /* Check for pending timers, pending DPCs, or pending ready threads */ + if ((Prcb->DpcData[0].DpcQueueDepth) || + (Prcb->TimerRequest) || + (Prcb->DeferredReadyListHead.Next)) + { + /* Switch to safe execution context */ + OldHandler = Pcr->NtTib.ExceptionList; + Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; + + /* Retire DPCs while under the DPC stack */ + //KiRetireDpcListInDpcStack(Prcb, Prcb->DpcStack); + // FIXME!!! // + KiRetireDpcList(Prcb); + + /* Restore context */ + Pcr->NtTib.ExceptionList = OldHandler; + } + + /* Re-enable interrupts */ + _enable(); + + /* Check for quantum end */ + if (Prcb->QuantumEnd) + { + /* Handle quantum end */ + Prcb->QuantumEnd = FALSE; + KiQuantumEnd(); + } + else if (Prcb->NextThread) + { + /* Capture current thread data */ + OldThread = Prcb->CurrentThread; + NewThread = Prcb->NextThread; + + /* Set new thread data */ + Prcb->NextThread = NULL; + Prcb->CurrentThread = NewThread; + + /* The thread is now running */ + NewThread->State = Running; + OldThread->WaitReason = WrDispatchInt; + + /* Make the old thread ready */ + KxQueueReadyThread(OldThread, Prcb); + + /* Swap to the new thread */ + KiSwapContext(APC_LEVEL, OldThread); + } +} + +/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Wed Nov 24 17:49:52 2010 @@ -112,7 +112,7 @@ @ FASTCALL ExInterlockedAddLargeStatistic(ptr long) #endif @ stdcall ExInterlockedAddUlong(ptr long ptr) -#ifndef __x86_64__ +#ifdef __x86__ @ FASTCALL ExInterlockedCompareExchange64(ptr ptr ptr ptr) @ stdcall ExInterlockedDecrementLong(ptr ptr) @ stdcall ExInterlockedExchangeUlong(ptr long ptr)

14 years, 11 months

[sir_richard] 49780: [NDK]: Fix definition of ARM PTE/PDE structure. [NTOS]: Fix up ARM code to match recent ARM3 changes. [NTOS]: Do not use initguid inside every single file to zillionplicate the...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 17:26:30 2010 New Revision: 49780 URL: http://svn.reactos.org/svn/reactos?rev=49780&view=rev Log: [NDK]: Fix definition of ARM PTE/PDE structure. [NTOS]: Fix up ARM code to match recent ARM3 changes. [NTOS]: Do not use initguid inside every single file to zillionplicate the GUIDs! Why doesn't the x86 linker catch this?!!? [ARMDDK]: Define some spinlock functions. Modified: trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/include/reactos/arm/armddk.h trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/arm/wlmemory.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -200,7 +200,7 @@ PFN_NUMBER Pfn; /* Setup templates */ - TempPte.Accessed = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Accessed = TempPde.Valid = 1; + TempPte.Sbo = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Sbo = TempPde.Valid = 1; /* Allocate the 1MB "PDR" (Processor Data Region). Must be 1MB aligned */ PdrPage = MmAllocateMemoryAtAddress(sizeof(KPDR_PAGE), Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4978… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -9726,7 +9726,7 @@ OUT PLARGE_INTEGER CurrentTime); #endif /* !_M_AMD64 */ -#if !defined(_X86_) +#if !defined(_X86_) && !defined(_M_ARM) NTKERNELAPI KIRQL NTAPI Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -68,7 +68,7 @@ ULONG NoExecute:1; ULONG Domain:4; ULONG Ecc:1; - ULONG Accessed:1; + ULONG Sbo:1; ULONG Owner:1; ULONG CacheAttributes:3; ULONG ReadOnly:1; @@ -85,7 +85,7 @@ ULONG Valid:1; ULONG Buffered:1; ULONG Cached:1; - ULONG Accessed:1; + ULONG Sbo:1; ULONG Owner:1; ULONG CacheAttributes:3; ULONG ReadOnly:1; @@ -100,9 +100,9 @@ typedef struct _MMPTE_SOFTWARE { - ULONG Valid:1; + ULONG Valid:2; ULONG PageFileLow:4; - ULONG Protection:5; + ULONG Protection:4; ULONG Prototype:1; ULONG Transition:1; ULONG PageFileHigh:20; @@ -110,12 +110,12 @@ typedef struct _MMPTE_TRANSITION { - ULONG Valid:1; - ULONG Write:1; + ULONG Valid:2; + ULONG Buffered:1; + ULONG Cached:1; ULONG Owner:1; - ULONG WriteThrough:1; - ULONG CacheDisable:1; - ULONG Protection:5; + ULONG Protection:4; + ULONG ReadOnly:1; ULONG Prototype:1; ULONG Transition:1; ULONG PageFrameNumber:20; @@ -123,19 +123,18 @@ typedef struct _MMPTE_PROTOTYPE { - ULONG Valid:1; + ULONG Valid:2; ULONG ProtoAddressLow:7; ULONG ReadOnly:1; - ULONG WhichPool:1; ULONG Prototype:1; ULONG ProtoAddressHigh:21; } MMPTE_PROTOTYPE; typedef struct _MMPTE_SUBSECTION { - ULONG Valid:1; + ULONG Valid:2; ULONG SubsectionAddressLow:4; - ULONG Protection:5; + ULONG Protection:4; ULONG Prototype:1; ULONG SubsectionAddressHigh:20; ULONG WhichPool:1; @@ -143,47 +142,38 @@ typedef struct _MMPTE_LIST { - ULONG Valid:1; + ULONG Valid:2; ULONG OneEntry:1; ULONG filler0:8; ULONG NextEntry:20; ULONG Prototype:1; - ULONG filler1:1; } MMPTE_LIST; typedef union _MMPTE_HARDWARE { - struct - { - ULONG NoExecute:1; - ULONG Valid:1; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access:1; - ULONG Owner:1; - ULONG CacheAttributes:3; - ULONG ReadOnly:1; - ULONG Shared:1; - ULONG NonGlobal:1; - ULONG PageFrameNumber:20; - }; - ULONG AsUlong; + ULONG NoExecute:1; + ULONG Valid:1; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Sbo:1; + ULONG Owner:1; + ULONG CacheAttributes:3; + ULONG ReadOnly:1; + ULONG Prototype:1; + ULONG NonGlobal:1; + ULONG PageFrameNumber:20; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; typedef union _MMPDE_HARDWARE { - struct - { - ULONG Valid:1; - ULONG LargePage:1; - ULONG Buffered:1; - ULONG Cached:1; - ULONG NoExecute:1; - ULONG Domain:4; - ULONG Ecc:1; - ULONG PageFrameNumber:22; - }; - ULONG AsUlong; + ULONG Valid:1; + ULONG LargePage:1; + ULONG Buffered:1; + ULONG Cached:1; + ULONG NoExecute:1; + ULONG Domain:4; + ULONG Ecc:1; + ULONG PageFrameNumber:22; } MMPDE_HARDWARE, *PMMPDE_HARDWARE; typedef struct _MMPDE Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -252,6 +252,35 @@ #define KeLowerIrql(NewIrql) KfLowerIrql(NewIrql) #define KeRaiseIrql(NewIrql, OldIrql) *(OldIrql) = KfRaiseIrql(NewIrql) +NTHALAPI +KIRQL +FASTCALL +KfAcquireSpinLock( + IN OUT PKSPIN_LOCK SpinLock); +#define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) + +NTHALAPI +VOID +FASTCALL +KfReleaseSpinLock( + IN OUT PKSPIN_LOCK SpinLock, + IN KIRQL NewIrql); +#define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) + +NTKERNELAPI +VOID +FASTCALL +KefAcquireSpinLockAtDpcLevel( + IN OUT PKSPIN_LOCK SpinLock); +#define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) + +NTKERNELAPI +VOID +FASTCALL +KefReleaseSpinLockFromDpcLevel( + IN OUT PKSPIN_LOCK SpinLock); +#define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) + // // Cache clean and flush // Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -6,7 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -#include "initguid.h" +#include <guiddef.h> #include <poclass.h> // Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -24,10 +24,7 @@ PVOID MmNonPagedSystemStart; PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; -PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; -PVOID MmPagedPoolStart = MI_PAGED_POOL_START; PVOID MmPagedPoolEnd; -ULONG MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; PVOID MiSessionSpaceEnd; PVOID MiSessionImageEnd; PVOID MiSessionImageStart; @@ -49,7 +46,7 @@ PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; -ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage; ULONG MmBootImageSize; ULONG MmUserProbeAddress; PVOID MmHighestUserAddress; @@ -61,17 +58,17 @@ /* PRIVATE FUNCTIONS **********************************************************/ -BOOLEAN +NTSTATUS NTAPI -MmArmInitSystem(IN ULONG Phase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) +INIT_FUNCTION +MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { // // Always return success for now // DPRINT1("NEVER TELL ME THE ODDS!\n"); while (TRUE); - return TRUE; + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -130,12 +130,12 @@ // // Access Flags // -#define PTE_READONLY 0 +#define PTE_READONLY 0 // Doesn't exist on x86 #define PTE_EXECUTE 0 // Not worrying about NX yet #define PTE_EXECUTE_READ 0 // Not worrying about NX yet #define PTE_READWRITE 0x2 #define PTE_WRITECOPY 0x200 -#define PTE_EXECUTE_READWRITE 0x0 +#define PTE_EXECUTE_READWRITE 0x2 // Not worrying about NX yet #define PTE_EXECUTE_WRITECOPY 0x200 #define PTE_PROTOTYPE 0x400 // @@ -145,6 +145,20 @@ #define PTE_DISABLE_CACHE 0x10 #define PTE_WRITECOMBINED_CACHE 0x10 #elif defined(_M_ARM) +#define PTE_READONLY 0x200 +#define PTE_EXECUTE 0 // Not worrying about NX yet +#define PTE_EXECUTE_READ 0 // Not worrying about NX yet +#define PTE_READWRITE 0 // Doesn't exist on ARM +#define PTE_WRITECOPY 0 // Doesn't exist on ARM +#define PTE_EXECUTE_READWRITE 0 // Not worrying about NX yet +#define PTE_EXECUTE_WRITECOPY 0 // Not worrying about NX yet +#define PTE_PROTOTYPE 0x400 // Using the Shared bit +// +// Cache flags +// +#define PTE_ENABLE_CACHE 0 +#define PTE_DISABLE_CACHE 0x10 +#define PTE_WRITECOMBINED_CACHE 0x10 #else #error Define these please! #endif @@ -179,7 +193,7 @@ #ifdef _M_IX86 #define MM_PTE_SOFTWARE_PROTECTION_BITS 5 #elif _M_ARM -#define MM_PTE_SOFTWARE_PROTECTION_BITS 5 +#define MM_PTE_SOFTWARE_PROTECTION_BITS 6 #elif _M_AMD64 #define MM_PTE_SOFTWARE_PROTECTION_BITS 5 #else Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -12,10 +12,111 @@ #define NDEBUG #include <debug.h> +#line 15 "ARMÂ³::ARMPAGE" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + /* GLOBALS ********************************************************************/ +const +ULONG +MmProtectToPteMask[32] = +{ + // + // These are the base MM_ protection flags + // + 0, + PTE_READONLY | PTE_ENABLE_CACHE, + PTE_EXECUTE | PTE_ENABLE_CACHE, + PTE_EXECUTE_READ | PTE_ENABLE_CACHE, + PTE_READWRITE | PTE_ENABLE_CACHE, + PTE_WRITECOPY | PTE_ENABLE_CACHE, + PTE_EXECUTE_READWRITE | PTE_ENABLE_CACHE, + PTE_EXECUTE_WRITECOPY | PTE_ENABLE_CACHE, + // + // These OR in the MM_NOCACHE flag + // + 0, + PTE_READONLY | PTE_DISABLE_CACHE, + PTE_EXECUTE | PTE_DISABLE_CACHE, + PTE_EXECUTE_READ | PTE_DISABLE_CACHE, + PTE_READWRITE | PTE_DISABLE_CACHE, + PTE_WRITECOPY | PTE_DISABLE_CACHE, + PTE_EXECUTE_READWRITE | PTE_DISABLE_CACHE, + PTE_EXECUTE_WRITECOPY | PTE_DISABLE_CACHE, + // + // These OR in the MM_DECOMMIT flag, which doesn't seem supported on x86/64/ARM + // + 0, + PTE_READONLY | PTE_ENABLE_CACHE, + PTE_EXECUTE | PTE_ENABLE_CACHE, + PTE_EXECUTE_READ | PTE_ENABLE_CACHE, + PTE_READWRITE | PTE_ENABLE_CACHE, + PTE_WRITECOPY | PTE_ENABLE_CACHE, + PTE_EXECUTE_READWRITE | PTE_ENABLE_CACHE, + PTE_EXECUTE_WRITECOPY | PTE_ENABLE_CACHE, + // + // These OR in the MM_NOACCESS flag, which seems to enable WriteCombining? + // + 0, + PTE_READONLY | PTE_WRITECOMBINED_CACHE, + PTE_EXECUTE | PTE_WRITECOMBINED_CACHE, + PTE_EXECUTE_READ | PTE_WRITECOMBINED_CACHE, + PTE_READWRITE | PTE_WRITECOMBINED_CACHE, + PTE_WRITECOPY | PTE_WRITECOMBINED_CACHE, + PTE_EXECUTE_READWRITE | PTE_WRITECOMBINED_CACHE, + PTE_EXECUTE_WRITECOPY | PTE_WRITECOMBINED_CACHE, +}; + +const +ULONG MmProtectToValue[32] = +{ + PAGE_NOACCESS, + PAGE_READONLY, + PAGE_EXECUTE, + PAGE_EXECUTE_READ, + PAGE_READWRITE, + PAGE_WRITECOPY, + PAGE_EXECUTE_READWRITE, + PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_NOCACHE | PAGE_READONLY, + PAGE_NOCACHE | PAGE_EXECUTE, + PAGE_NOCACHE | PAGE_EXECUTE_READ, + PAGE_NOCACHE | PAGE_READWRITE, + PAGE_NOCACHE | PAGE_WRITECOPY, + PAGE_NOCACHE | PAGE_EXECUTE_READWRITE, + PAGE_NOCACHE | PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_GUARD | PAGE_READONLY, + PAGE_GUARD | PAGE_EXECUTE, + PAGE_GUARD | PAGE_EXECUTE_READ, + PAGE_GUARD | PAGE_READWRITE, + PAGE_GUARD | PAGE_WRITECOPY, + PAGE_GUARD | PAGE_EXECUTE_READWRITE, + PAGE_GUARD | PAGE_EXECUTE_WRITECOPY, + PAGE_NOACCESS, + PAGE_WRITECOMBINE | PAGE_READONLY, + PAGE_WRITECOMBINE | PAGE_EXECUTE, + PAGE_WRITECOMBINE | PAGE_EXECUTE_READ, + PAGE_WRITECOMBINE | PAGE_READWRITE, + PAGE_WRITECOMBINE | PAGE_WRITECOPY, + PAGE_WRITECOMBINE | PAGE_EXECUTE_READWRITE, + PAGE_WRITECOMBINE | PAGE_EXECUTE_WRITECOPY +}; + ULONG MmGlobalKernelPageDirectory[4096]; -MMPDE HyperTemplatePde; + +/* Template PTE and PDE for a kernel page */ +MMPDE ValidKernelPde = {.u.Hard.Valid = 1}; +MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Sbo = 1}; + +/* Template PDE for a demand-zero page */ +MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; +MMPTE DemandZeroPte = {.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 | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}; /* PRIVATE FUNCTIONS **********************************************************/ @@ -47,25 +148,6 @@ { /* Nothing to do */ return; -} - -NTSTATUS -NTAPI -Mmi386ReleaseMmInfo(IN PEPROCESS Process) -{ - UNIMPLEMENTED; - while (TRUE); - return 0; -} - -NTSTATUS -NTAPI -MmInitializeHandBuiltProcess(IN PEPROCESS Process, - IN PULONG DirectoryTableBase) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; } PULONG @@ -246,16 +328,7 @@ { ULONG i; PULONG CurrentPageDirectory = (PULONG)PDE_BASE; - extern MMPTE HyperTemplatePte; - - /* Setup PTE template */ - HyperTemplatePte.u.Long = 0; - HyperTemplatePte.u.Hard.Valid = 1; - HyperTemplatePte.u.Hard.Access = 1; - - /* Setup PDE template */ - HyperTemplatePde.u.Long = 0; - HyperTemplatePde.u.Hard.Valid = 1; + /* Loop the 2GB of address space which belong to the kernel */ for (i = MiGetPdeOffset(MmSystemRangeStart); i < 2048; i++) Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -367,18 +367,6 @@ return TRUE; } -VOID -NTAPI -MmUpdatePageDir(IN PEPROCESS Process, - IN PVOID Address, - IN ULONG Size) -{ - // - // Nothing to do - // - return; -} - NTSTATUS NTAPI Mmi386ReleaseMmInfo(IN PEPROCESS Process) @@ -389,30 +377,6 @@ UNIMPLEMENTED; while (TRUE); return 0; -} - -NTSTATUS -NTAPI -MmInitializeHandBuiltProcess(IN PEPROCESS Process, - IN PULONG DirectoryTableBase) -{ - // - // Share the directory base with the idle process - // - DirectoryTableBase[0] = PsGetCurrentProcess()->Pcb.DirectoryTableBase[0]; - DirectoryTableBase[1] = PsGetCurrentProcess()->Pcb.DirectoryTableBase[1]; - - // - // Initialize the Addresss Space - // - KeInitializeGuardedMutex(&Process->AddressCreationLock); - Process->VadRoot.BalancedRoot.u1.Parent = NULL; - - // - // The process now has an address space - // - Process->HasAddressSpace = TRUE; - return STATUS_SUCCESS; } PULONG Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=49… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Wed Nov 24 17:26:30 2010 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ +#include "initguid.h" #include <ntoskrnl.h> #define NDEBUG #include <debug.h>

14 years, 11 months

[pschweitzer] 49779: [NTOSKRNL] That's not because ARM will rule the world on a day that you're obliged to break x86 build. Fixed build. Will it work? Only God knows.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Nov 24 17:24:54 2010 New Revision: 49779 URL: http://svn.reactos.org/svn/reactos?rev=49779&view=rev Log: [NTOSKRNL] That's not because ARM will rule the world on a day that you're obliged to break x86 build. Fixed build. Will it work? Only God knows. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Wed Nov 24 17:24:54 2010 @@ -39,6 +39,7 @@ // Convert a PTE into a corresponding address // #define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) +#define MiPdeToAddress(PDE) ((PVOID)((ULONG)(PDE) << 18)) #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) #define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) @@ -55,7 +56,7 @@ #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) -#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.Large == 1) +#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.LargePage == 1) #if !defined(CONFIG_SMP) #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) #else @@ -81,6 +82,18 @@ #define TEB_BASE 0x7FFDE000 +#define MI_HYPERSPACE_PTES (256 - 1) +#define MI_ZERO_PTES (32) +#define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE +#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ + MI_HYPERSPACE_PTES * PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ + PAGE_SIZE) + /* On x86, these two are the same */ #define MMPDE MMPTE #define PMMPDE PMMPTE

14 years, 11 months

[sir_richard] 49778: [NTOS]: Add MiGetPteOffset for ARM. All of the kernel compiles, but does not link yet.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 16:09:19 2010 New Revision: 49778 URL: http://svn.reactos.org/svn/reactos?rev=49778&view=rev Log: [NTOS]: Add MiGetPteOffset for ARM. All of the kernel compiles, but does not link yet. Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Wed Nov 24 16:09:19 2010 @@ -150,8 +150,9 @@ #define MiAddressToPte(x) MiGetPteAddress(x) /* Retrives the PDE offset for the given VA */ -#define MiGetPdeOffset(x) (((ULONG)(x)) >> 20) -//#define MiGetPteOffset(x) (((ULONG)(x)) >> 12) +#define MiGetPdeOffset(x) (((ULONG)(x)) >> 20) +#define MiGetPteOffset(x) ((((ULONG)(x)) << 12) >> 24) +#define MiAddressToPteOffset(x) MiGetPteOffset(x) /* Convert a PTE into a corresponding address */ #define MiPteToAddress(x) ((PVOID)((ULONG)(x) << 10))

14 years, 11 months

[sir_richard] 49777: [CONFIG]: Instead of having 4 template rbuild configuration files that must be kept in-sync, maybe there should be a generic one that they all inherit from? [CONFIG]: Add new p...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 16:08:54 2010 New Revision: 49777 URL: http://svn.reactos.org/svn/reactos?rev=49777&view=rev Log: [CONFIG]: Instead of having 4 template rbuild configuration files that must be kept in-sync, maybe there should be a generic one that they all inherit from? [CONFIG]: Add new property settings that exist in x86, but not ARM because nobody added them there. For example, nor cc, nor cache were being built on ARM, because NEWCC was undefined (which isn't treated as 0 by rbuild). How I long for CMAKE. Modified: trunk/reactos/config-arm.template.rbuild Modified: trunk/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild… ============================================================================== --- trunk/reactos/config-arm.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-arm.template.rbuild [iso-8859-1] Wed Nov 24 16:08:54 2010 @@ -90,4 +90,19 @@ --> <property name="_ELF_" value="0" /> + +<property name="BUILD_MP" value="1" /> + + +<property name="NEWCC" value="0" /> + + +<property name="NEWSPRINTF" value="0" /> + </group>

14 years, 11 months

[tkreuzer] 49776: [TASKMGR] - add #pragma code_page(1252) at the end of some resource files to help msvc's resource compiler - "Untranslate" a few Japanese strings, as they contain illegal characte...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 24 15:59:23 2010 New Revision: 49776 URL: http://svn.reactos.org/svn/reactos?rev=49776&view=rev Log: [TASKMGR] - add #pragma code_page(1252) at the end of some resource files to help msvc's resource compiler - "Untranslate" a few Japanese strings, as they contain illegal characters. Someone speaking Japanese should retranslate them using proper escape sequences where neccessary. - Don't include headers twice Modified: branches/cmake-bringup/base/applications/taskmgr/lang/ja-JP.rc branches/cmake-bringup/base/applications/taskmgr/lang/ko-KR.rc branches/cmake-bringup/base/applications/taskmgr/lang/ro-RO.rc branches/cmake-bringup/base/applications/taskmgr/resource.h branches/cmake-bringup/base/applications/taskmgr/rsrc.rc Modified: branches/cmake-bringup/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Wed Nov 24 15:59:23 2010 @@ -14,85 +14,85 @@ IDR_TASKMANAGER MENU DISCARDABLE BEGIN - POPUP "t@C(&F)" - BEGIN - MENUITEM "Vµ¢^XNÌÀs(&N)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "^XN }l[WÌI¹(&X)", ID_FILE_EXIT - END - POPUP "IvV(&O)" - BEGIN - MENUITEM "íÉèOÉ\\¦(&A)", ID_OPTIONS_ALWAYSONTOP + POPUP "ÆtÆ@ÆCÆâ¹(&F)" + BEGIN + MENUITEM "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÅ½ÃÂs(&N)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃÂIâÂ¹(&X)", ID_FILE_EXIT + END + POPUP "ÆIÆvÆVÆâ¡Æâ(&O)" + BEGIN + MENUITEM "ÂÃâÃÅ½Ã¨âOâÃâ¢\\Å½Â¦(&A)", ID_OPTIONS_ALWAYSONTOP , CHECKED - MENUITEM "¢gpÉÅ¬»(&M)", ID_OPTIONS_MINIMIZEONUSE + MENUITEM "âÂ¢Å½gâpÅ½Å¾âÃÂÃÂÂ¬â°Â»(&M)", ID_OPTIONS_MINIMIZEONUSE , CHECKED - MENUITEM "Å¬»ÉB·(&H)", ID_OPTIONS_HIDEWHENMINIMIZED + MENUITEM "ÂÃÂÂ¬â°Â»Å½Å¾âÃâ°BâÂ·(&H)", ID_OPTIONS_HIDEWHENMINIMIZED , CHECKED - MENUITEM "16 rbg ^XNÌ\\¦(&S)", ID_OPTIONS_SHOW16BITTASKS + MENUITEM "16 ÆrÆbÆg Æ^ÆXÆNâÃâ¢\\Å½Â¦(&S)", ID_OPTIONS_SHOW16BITTASKS , CHECKED END - POPUP "\\¦(&V)" - BEGIN - MENUITEM "ÅVÌóÔÉXV(&R)", ID_VIEW_REFRESH - POPUP "XVÌpx(&U)" + POPUP "â¢\\Å½Â¦(&V)" + BEGIN + MENUITEM "ÂÃÂVâÃÂÃ³âÃâÃÂXÂV(&R)", ID_VIEW_REFRESH + POPUP "ÂXÂVâÃâ¢pâx(&U)" BEGIN - MENUITEM "(&H)", ID_VIEW_UPDATESPEED_HIGH - MENUITEM "Êí(&N)", ID_VIEW_UPDATESPEED_NORMAL + MENUITEM "Ââ(&H)", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "âÃÂÃ(&N)", ID_VIEW_UPDATESPEED_NORMAL , CHECKED - MENUITEM "á(&L)", ID_VIEW_UPDATESPEED_LOW - MENUITEM "êâ~(&P)", ID_VIEW_UPDATESPEED_PAUSED + MENUITEM "âÃ¡(&L)", ID_VIEW_UPDATESPEED_LOW + MENUITEM "ËÃªÅ½Å¾âÃ¢Å½~(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "å«¢ACR(&G)", ID_VIEW_LARGE - MENUITEM "¬³¢ACR(&M)", ID_VIEW_SMALL - MENUITEM "Ú×(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "ñÌIð(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU Ìð(&C)" + MENUITEM "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)", ID_VIEW_LARGE + MENUITEM "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)", ID_VIEW_SMALL + MENUITEM "ÂÃÂÃ(&D)", ID_VIEW_DETAILS, CHECKED + MENUITEM "âÃ±âÃâIâÃ°(&S)...", ID_VIEW_SELECTCOLUMNS + POPUP "CPU âÃâÅ¡âÃ°(&C)" BEGIN - MENUITEM "·×ÄÌ CPU Å 1 Ot(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL - - MENUITEM "CPU ²ÆÉ 1 Ot(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + MENUITEM "âÂ·âÃâÃâÃ CPU âÃ 1 ÆOÆâ°Æt(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "CPU âÂ²âÃâÃ 1 ÆOÆâ°Æt(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "J[lÔð\\¦·é(&S)", ID_VIEW_SHOWKERNELTIMES - END - POPUP "EBhE(&W)" - BEGIN - MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE - MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT - END - POPUP "wv(&H)" - BEGIN - MENUITEM "gsbNÌõ(&H)", ID_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "o[Wîñ(&A)", ID_HELP_ABOUT + MENUITEM "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)", ID_VIEW_SHOWKERNELTIMES + END + POPUP "ÆEÆBÆâÆhÆE(&W)" + BEGIN + MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE + MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT + END + POPUP "ÆwÆâ¹Æv(&H)" + BEGIN + MENUITEM "ÆgÆsÆbÆNâÃÅÅ¸ÂÃµ(&H)", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "ÆoÂ[ÆWÆâ¡ÆâÂÃ®â¢Ã±(&A)", ID_HELP_ABOUT END END IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE - MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE + MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT END IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE BEGIN POPUP "DUMMY" BEGIN - MENUITEM "Vµ¢^XNÌÀs(&N)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "å«¢ACR(&G)", ID_VIEW_LARGE - MENUITEM "¬³¢ACR(&M)", ID_VIEW_SMALL - MENUITEM "Ú×(&D)", ID_VIEW_DETAILS, CHECKED + MENUITEM "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÅ½ÃÂs(&N)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)", ID_VIEW_LARGE + MENUITEM "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)", ID_VIEW_SMALL + MENUITEM "ÂÃÂÃ(&D)", ID_VIEW_DETAILS, CHECKED END END @@ -100,17 +100,17 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ØèÖ¦(&S)", ID_APPLICATION_PAGE_SWITCHTO - MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT - MENUITEM SEPARATOR - MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE - MENUITEM SEPARATOR - MENUITEM "^XNÌI¹(&E)", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "vZXÌ\\¦(&G)", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "ÂÃâÃ¨âÃâÂ¦(&S)", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "Æ^ÆXÆNâÃÂIâÂ¹(&E)", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "ÆvÆÂÆZÆXâÃâ¢\\Å½Â¦(&G)", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -119,10 +119,10 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "³ÌTCYÉß·(&R)", ID_RESTORE - MENUITEM "Â¶é(&C)", ID_FILE_EXIT - MENUITEM SEPARATOR - MENUITEM "íÉèOÉ\\¦(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "ÅÂ³âÃÆTÆCÆYâÃâÃâÂ·(&R)", ID_RESTORE + MENUITEM "â¢ÃâÂ¶âÃ©(&C)", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "ÂÃâÃÅ½Ã¨âOâÃâ¢\\Å½Â¦(&A)", ID_OPTIONS_ALWAYSONTOP END END @@ -130,28 +130,28 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "vZXÌI¹(&E)", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "vZX c[ÌI¹(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE - - MENUITEM "fobO(&D)", ID_PROCESS_PAGE_DEBUG - MENUITEM SEPARATOR - POPUP "DæxÌÝè(&P)" + MENUITEM "ÆvÆÂÆZÆXâÃÂIâÂ¹(&E)", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "ÆvÆÂÆZÆX ÆcÆÅ Â[âÃÂIâÂ¹(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "ÆfÆoÆbÆO(&D)", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "âDÂÃ¦âxâÃÂÃâÃ¨(&P)" BEGIN - MENUITEM "A^C(&R)", ID_PROCESS_PAGE_SETPRIORITY_REALTIME - - MENUITEM "(&H)", ID_PROCESS_PAGE_SETPRIORITY_HIGH - - MENUITEM "ÊíÈã(&A)", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - - MENUITEM "Êí(&N)", ID_PROCESS_PAGE_SETPRIORITY_NORMAL - - MENUITEM "ÊíÈº(&B)", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - - MENUITEM "á(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW + MENUITEM "ÆÅ ÆAÆâ¹Æ^ÆCÆâ¬(&R)", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "Ââ(&H)", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "âÃÂÃËÃÂÃ£(&A)", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "âÃÂÃ(&N)", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "âÃÂÃËÃâ°Âº(&B)", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "âÃ¡(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW END - MENUITEM "ÖWÌÝè(&A)...", ID_PROCESS_PAGE_SETAFFINITY - MENUITEM "fobO `lÌÏX(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS + MENUITEM "Å ÃÅWâÃÂÃâÃ¨(&A)...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "ÆfÆoÆbÆO Æ`ÆÆÆâÆlÆâ¹âÃâ¢ÃÂX(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS END END @@ -166,7 +166,7 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "^XN }l[W" +CAPTION "Task Manager" MENU IDR_TASKMANAGER FONT 9, "MS UI Gothic" BEGIN @@ -179,9 +179,9 @@ BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "Vµ¢^XN(&N)...",IDC_NEWTASK,187,189,53,14 - PUSHBUTTON "ØèÖ¦(&S)",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "^XNÌI¹(&E)",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "ÂVâÂµâÂ¢Æ^ÆXÆN(&N)...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "ÂÃâÃ¨âÃâÂ¦(&S)",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "Æ^ÆXÆNâÃÂIâÂ¹(&E)",IDC_ENDTASK,75,189,53,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 @@ -191,8 +191,8 @@ CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "vZXÌI¹(&E)",IDC_ENDPROCESS,171,189,69,14 - CONTROL "S[U[ÌvZXð\\¦·é(&S)",IDC_SHOWALLPROCESSES, + PUSHBUTTON "ÆvÆÂÆZÆXâÃÂIâÂ¹(&E)",IDC_ENDPROCESS,171,189,69,14 + CONTROL "âSÆâ Â[ÆUÂ[âÃÆvÆÂÆZÆXâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END @@ -201,77 +201,77 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "CPU gp¦",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT - GROUPBOX "gpÊ",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT - GROUPBOX "v",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "R~bg `[W (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "¨ (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "J[l (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "nh",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 - LTEXT "Xbh",IDS_TOTALS_THREAD_COUNT,12,140,27,8 - LTEXT "vZX",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + GROUPBOX "CPU Å½gâpâÂ¦",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT + GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT + GROUPBOX "Ââ¡Åv",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "ÆRÆ~ÆbÆg Æ`ÆÆÂ[ÆW (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "â¢Â¨âÂÆÂÆâÆÅ (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "ÆJÂ[ÆlÆâ¹ ÆÂÆâÆÅ (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "ÆnÆâÆhÆâ¹",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "ÆXÆÅÆbÆh",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "ÆvÆÂÆZÆX",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "v",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "§Àl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER - LTEXT "Åål",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + LTEXT "Ââ¡Åv",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "ÂÂ§ÅÃâl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER + LTEXT "ÂÃâÃ¥âl",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "v",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "pÂ\\",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "VXe LbV",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + LTEXT "Ââ¡Åv",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "Available",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "ÆVÆXÆeÆâ¬ ÆLÆÆÆbÆVÆâ¦",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "v",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "y[W",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "ñy[W",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + LTEXT "Ââ¡Åv",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "ÆyÂ[ÆW",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "âÃ±ÆyÂ[ÆW",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - GROUPBOX "CPU gp¦Ìð",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT - GROUPBOX "gpÊÌð",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "CPU gp¦Ì\\¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "gpÊÌ\\¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "CPU gp¦Ìð",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + GROUPBOX "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "ÆÂÆâÆÅ Å½gâpâÃâÃâÅ¡âÃ°",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "CPU Å½gâpâÂ¦âÃâ¢\\Å½Â¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "ÆÂÆâÆÅ Å½gâpâÃâÃâ¢\\Å½Â¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "gpÊÌð",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "ÆÂÆâÆÅ Å½gâpâÃâÃâÅ¡âÃ°",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "fobO `l" +CAPTION "ÆfÆoÆbÆO Æ`ÆÆÆâÆlÆâ¹" FONT 9, "MS UI Gothic" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING,7,7,233,177 - PUSHBUTTON "Â¶é",IDOK,171,189,69,14 + PUSHBUTTON "â¢ÃâÂ¶âÃ©",IDOK,171,189,69,14 END IDD_AFFINITY_DIALOG DIALOGEX DISCARDABLE 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "vZbTÌÖW" +CAPTION "ÆvÆÂÆZÆbÆTâÃÅ ÃÅW" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 - PUSHBUTTON "LZ",IDCANCEL,174,133,50,14 - LTEXT "vZbTÌÖWÌÝèÍAÇÌ CPU ÅvZXðÀs·é©ð§äµÜ·B", + PUSHBUTTON "ÆLÆÆÆâÆZÆâ¹",IDCANCEL,174,133,50,14 + LTEXT "ÆvÆÂÆZÆbÆTâÃÅ ÃÅWâÃÂÃâÃ¨âÃÂAâÃâÃ CPU âÃÆvÆÂÆZÆXâÃ°Å½ÃÂsâÂ·âÃ©âÂ©âÃ°ÂÂ§ÅÃ¤âÂµâÃâÂ·ÂB", IDC_STATIC,5,5,220,16 CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 11,28,37,10 @@ -341,62 +341,62 @@ IDD_COLUMNS_DIALOG DIALOGEX DISCARDABLE 0, 0, 195, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ñÌIð" +CAPTION "âÃ±âÃâIâÃ°" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 - PUSHBUTTON "LZ",IDCANCEL,138,178,50,14 - LTEXT "^XN }l[WÌ [vZX] y[WÉ\\¦·éñðIðµÜ·B", + PUSHBUTTON "ÆLÆÆÆâÆZÆâ¹",IDCANCEL,138,178,50,14 + LTEXT "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ [ÆvÆÂÆZÆX] ÆyÂ[ÆWâÃâ¢\\Å½Â¦âÂ·âÃ©âÃ±âÃ°âIâÃ°âÂµâÃâÂ·ÂB", IDC_STATIC,7,7,181,17 - CONTROL "C[W¼(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + CONTROL "ÆCÆÂÂ[ÆWâÂ¼(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 - CONTROL "PID (vZX ID)(&P)",IDC_PID,"Button", + CONTROL "PID (ÆvÆÂÆZÆX ID)(&P)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 - CONTROL "CPU gp¦(&C)",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "CPU Å½gâpâÂ¦(&C)",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 - CONTROL "CPU Ô(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + CONTROL "CPU Å½Å¾Å Ã(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,48,10 - CONTROL "gpÊ(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "ÆÂÆâÆÅ Å½gâpâÃ(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,63,10 - CONTROL "gpÊf^(&D)",IDC_MEMORYUSAGEDELTA,"Button", + CONTROL "ÆÂÆâÆÅ Å½gâpâÃÆfÆâ¹Æ^(&D)",IDC_MEMORYUSAGEDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 - CONTROL "ÅågpÊ(&K)",IDC_PEAKMEMORYUSAGE,"Button", + CONTROL "ÂÃâÃ¥ÆÂÆâÆÅ Å½gâpâÃ(&K)",IDC_PEAKMEMORYUSAGE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 - CONTROL "y[W tHg(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + CONTROL "ÆyÂ[ÆW ÆtÆHÆâ¹Æg(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,105,53,10 - CONTROL "USER IuWFNg(&U)",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "USER ÆIÆuÆWÆFÆNÆg(&U)",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,62,10 - CONTROL "I/O ÇÝæè",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O âÃâÃÅ½Ã¦âÃ¨",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,49,10 - CONTROL "I/O ÇÝæèoCg",IDC_IOREADBYTES,"Button", + CONTROL "I/O Read Bytes",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 - CONTROL "ZbV ID(&S)",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + CONTROL "ÆZÆbÆVÆâ¡Æâ ID(&S)",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,50,10 - CONTROL "[U[¼(&N)",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + CONTROL "Æâ Â[ÆUÂ[âÂ¼(&N)",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,51,10 - CONTROL "y[W tHg f^(&A)",IDC_PAGEFAULTSDELTA,"Button", + CONTROL "ÆyÂ[ÆW ÆtÆHÆâ¹Æg ÆfÆâ¹Æ^(&A)",IDC_PAGEFAULTSDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 - CONTROL "¼z TCY(&V)",IDC_VIRTUALMEMORYSIZE,"Button", + CONTROL "â°Â¼âzÆÂÆâÆÅ ÆTÆCÆY(&V)",IDC_VIRTUALMEMORYSIZE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 - CONTROL "y[W v[(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + CONTROL "ÆyÂ[ÆW ÆvÂ[Æâ¹(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,50,53,10 - CONTROL "ñy[W v[(&O)",IDC_NONPAGEDPOOL,"Button", + CONTROL "âÃ±ÆyÂ[ÆW ÆvÂ[Æâ¹(&O)",IDC_NONPAGEDPOOL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 - CONTROL "î{Dæx(&R)",IDC_BASEPRIORITY,"Button", + CONTROL "Å Ã®â{âDÂÃ¦âx(&R)",IDC_BASEPRIORITY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 - CONTROL "nhÌ(&H)",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "ÆnÆâÆhÆâ¹âÃÂâ(&H)",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,83,59,10 - CONTROL "XbhÌ(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "ÆXÆÅÆbÆhâÃÂâ(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,94,59,10 - CONTROL "GDI IuWFNg",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "GDI ÆIÆuÆWÆFÆNÆg",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,105,55,10 - CONTROL "I/O «Ý",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O Writes",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,116,49,10 - CONTROL "I/O «ÝoCg",IDC_IOWRITEBYTES,"Button", + CONTROL "I/O Write Bytes",IDC_IOWRITEBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 - CONTROL "I/O »Ì¼",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O âÂ»âÃâÂ¼",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,138,46,10 - CONTROL "I/O »Ì¼ÌoCg",IDC_IOOTHERBYTES,"Button", + CONTROL "I/O Other Bytes",IDC_IOOTHERBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 END @@ -521,135 +521,135 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "^XN }l[W" - IDC_TASKMGR "^XN }l[W" + IDS_APP_TITLE "Task Manager" + IDC_TASKMGR "Task Manager" IDS_IDLE_PROCESS "System Idle Process" END STRINGTABLE DISCARDABLE BEGIN - ID_FILE_NEW "Vµ¢vOðÀsµÜ·" - ID_OPTIONS_ALWAYSONTOP "Å¬»³êÈ¢ÀèAíÉ^XN }l[WªÙ©Ì·×ÄÌEBhEæèàèOÉ\\¦³êÜ·" + ID_FILE_NEW "ÂVâÂµâÂ¢ÆvÆÂÆOÆâ°Æâ¬âÃ°Å½ÃÂsâÂµâÃâÂ·" + ID_OPTIONS_ALWAYSONTOP "ÂÃÂÂ¬â°Â»âÂ³âÃªâÃâÂ¢ÅÃâÃ¨ÂAÂÃâÃÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÂªâÃâÂ©âÃâÂ·âÃâÃâÃÆEÆBÆâÆhÆEâÃ¦âÃ¨âÃ Å½Ã¨âOâÃâ¢\\Å½Â¦âÂ³âÃªâÃâÂ·" ID_OPTIONS_MINIMIZEONUSE - "[ØèÖ¦] ìðÀs·éÆA^XN }l[WªÅ¬»³êÜ·" - ID_OPTIONS_HIDEWHENMINIMIZED "Å¬»³ê½Æ«ÉA^XN }l[WðBµÜ·" - ID_VIEW_REFRESH "[XVÌpx] ÌÝèÉ©©íç¸A¡·®^XN }l[WðXVµÜ·" - ID_VIEW_LARGE "å«¢ACRðgÁÄ^XNð\\¦µÜ·" - ID_VIEW_SMALL "¬³¢ACRðgÁÄ^XNð\\¦µÜ·" - ID_VIEW_DETAILS "e^XNÌîñð\\¦µÜ·" - ID_VIEW_UPDATESPEED_HIGH "b 2 ñ\\¦ðXVµÜ·" - ID_VIEW_UPDATESPEED_NORMAL "2 bÉ 1 ñ\\¦ðXVµÜ·" - ID_VIEW_UPDATESPEED_LOW "4 bÉ 1 ñ\\¦ðXVµÜ·" + "[ÂÃâÃ¨âÃâÂ¦] ââ¬ÂÃ¬âÃ°Å½ÃÂsâÂ·âÃ©âÃÂAÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÂªÂÃÂÂ¬â°Â»âÂ³âÃªâÃâÂ·" + ID_OPTIONS_HIDEWHENMINIMIZED "ÂÃÂÂ¬â°Â»âÂ³âÃªâÂ½âÃâÂ«âÃÂAÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°â°BâÂµâÃâÂ·" + ID_VIEW_REFRESH "[ÂXÂVâÃâ¢pâx] âÃÂÃâÃ¨âÃâÂ©âÂ©âÃâÃ§âÂ¸ÂAÂÂ¡âÂ·âÂ®Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°ÂXÂVâÂµâÃâÂ·" + ID_VIEW_LARGE "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆââÃ°Å½gâÃâÃÆ^ÆXÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" + ID_VIEW_SMALL "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆââÃ°Å½gâÃâÃÆ^ÆXÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" + ID_VIEW_DETAILS "Å eÆ^ÆXÆNâÃÂÃ®â¢Ã±âÃ°â¢\\Å½Â¦âÂµâÃâÂ·" + ID_VIEW_UPDATESPEED_HIGH "âËâ¢b 2 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" + ID_VIEW_UPDATESPEED_NORMAL "2 â¢bâÃ 1 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" + ID_VIEW_UPDATESPEED_LOW "4 â¢bâÃ 1 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" END STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "\\¦ð©®IÉXVµÜ¹ñ" + ID_VIEW_UPDATESPEED_PAUSED "â¢\\Å½Â¦âÃ°Å½Â©âÂ®âIâÃÂXÂVâÂµâÃâÂ¹âÃ±" ID_WINDOWS_TILEHORIZONTALLY - "fXNgbvãÅEBhEðdÈçÈ¢æ¤ÉãºÉÀ×Ä\\¦µÜ·" - ID_WINDOWS_TILEVERTICALLY "fXNgbvãÅEBhEðdÈçÈ¢æ¤É¶EÉÀ×Ä\\¦µÜ·" - ID_WINDOWS_MINIMIZE "EBhEðÅ¬»µÜ·" - ID_WINDOWS_MAXIMIZE "EBhEðÅå»µÜ·" - ID_WINDOWS_CASCADE "fXNgbvãÅEBhEðdËÄ\\¦µÜ·" - ID_WINDOWS_BRINGTOFRONT "EBhEðèOÉ\\¦µÜ·ªAØèÖ¦Ü¹ñB" - ID_HELP_TOPICS "^XN }l[WÌwv gsbNð\\¦µÜ·" - ID_HELP_ABOUT "vOîñAo[WÔAì ð\\¦µÜ·" - ID_FILE_EXIT "^XN }l[W AvP[VðI¹µÜ·" + "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃ§âÃâÂ¢âÃ¦âÂ¤âÃÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" + ID_WINDOWS_TILEVERTICALLY "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃ§âÃâÂ¢âÃ¦âÂ¤âÃÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" + ID_WINDOWS_MINIMIZE "ÆEÆBÆâÆhÆEâÃ°ÂÃÂÂ¬â°Â»âÂµâÃâÂ·" + ID_WINDOWS_MAXIMIZE "ÆEÆBÆâÆhÆEâÃ°ÂÃâÃ¥â°Â»âÂµâÃâÂ·" + ID_WINDOWS_CASCADE "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" + ID_WINDOWS_BRINGTOFRONT "ÆEÆBÆâÆhÆEâÃ°Å½Ã¨âOâÃâ¢\\Å½Â¦âÂµâÃâÂ·âÂªÂAÂÃâÃ¨âÃâÂ¦âÃâÂ¹âÃ±ÂB" + ID_HELP_TOPICS "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃÆwÆâ¹Æv ÆgÆsÆbÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" + ID_HELP_ABOUT "ÆvÆÂÆOÆâ°Æâ¬ÂÃ®â¢Ã±ÂAÆoÂ[ÆWÆâ¡ÆââÃÂâ ÂAâËÂÃ¬ÅÂ âÃ°â¢\\Å½Â¦âÂµâÃâÂ·" + ID_FILE_EXIT "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆ ÆAÆvÆÅ ÆPÂ[ÆVÆâ¡ÆââÃ°ÂIâÂ¹âÂµâÃâÂ·" ID_OPTIONS_SHOW16BITTASKS - "16 rbg ^XNðAÖAt¯çê½ ntvdm.exe ÌºÉ\\¦µÜ·" - ID_VIEW_SELECTCOLUMNS "[vZX] y[WÉ\\¦·éñðIðµÜ·" - ID_VIEW_SHOWKERNELTIMES "J[lÔðptH[}X OtãÉ\\¦µÜ·" + "16 ÆrÆbÆg Æ^ÆXÆNâÃ°ÂAÅ ÃËAâ¢tâÂ¯âÃ§âÃªâÂ½ ntvdm.exe âÃâ°ÂºâÃâ¢\\Å½Â¦âÂµâÃâÂ·" + ID_VIEW_SELECTCOLUMNS "[ÆvÆÂÆZÆX] ÆyÂ[ÆWâÃâ¢\\Å½Â¦âÂ·âÃ©âÃ±âÃ°âIâÃ°âÂµâÃâÂ·" + ID_VIEW_SHOWKERNELTIMES "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°ÆpÆtÆHÂ[Æ}ÆâÆX ÆOÆâ°ÆtÂÃ£âÃâ¢\\Å½Â¦âÂµâÃâÂ·" ID_VIEW_CPUHISTORY_ONEGRAPHALL - "1 ÂÌðOtÅ CPU gp¦Ìvð\\¦µÜ·" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU gp¦Ìðð CPU ²ÆÉOtÅ\\¦µÜ·" + "1 âÃâÃâÅ¡âÃ°ÆOÆâ°ÆtâÃ CPU Å½gâpâÂ¦âÃÂâ¡ÅvâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°âÃ° CPU âÂ²âÃâÃÆOÆâ°ÆtâÃâ¢\\Å½Â¦âÂµâÃâÂ·" ID_APPLICATION_PAGE_SWITCHTO - "^XNðèOÉ\\¦µAtH[JXðØèÖ¦Ü·" + "Æ^ÆXÆNâÃ°Å½Ã¨âOâÃâ¢\\Å½Â¦âÂµÂAÆtÆHÂ[ÆJÆXâÃ°ÂÃâÃ¨âÃâÂ¦âÃâÂ·" END STRINGTABLE DISCARDABLE BEGIN - ID_ENDTASK "Ið³êÄ¢é^XNÉI¹·éæ¤w¦µÜ·" - ID_GOTOPROCESS "Ið³êÄ¢é^XNÌvZXÉtH[JXðØèÖ¦Ü·" - ID_RESTORE "BêÄ¢½^XN }l[Wð³ÉßµÜ·" - ID_PROCESS_PAGE_ENDPROCESS "VXe©çvZXðíµÜ·" + ID_ENDTASK "âIâÃ°âÂ³âÃªâÃâÂ¢âÃ©Æ^ÆXÆNâÃÂIâÂ¹âÂ·âÃ©âÃ¦âÂ¤Å½wÅ½Â¦âÂµâÃâÂ·" + ID_GOTOPROCESS "âIâÃ°âÂ³âÃªâÃâÂ¢âÃ©Æ^ÆXÆNâÃÆvÆÂÆZÆXâÃÆtÆHÂ[ÆJÆXâÃ°ÂÃâÃ¨âÃâÂ¦âÃâÂ·" + ID_RESTORE "â°BâÃªâÃâÂ¢âÂ½Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°ÅÂ³âÃâÃâÂµâÃâÂ·" + ID_PROCESS_PAGE_ENDPROCESS "ÆVÆXÆeÆâ¬âÂ©âÃ§ÆvÆÂÆZÆXâÃ°ÂÃÂÅâÂµâÃâÂ·" ID_PROCESS_PAGE_ENDPROCESSTREE - "±ÌvZXÆqvZXð·×ÄíµÜ·" - ID_PROCESS_PAGE_DEBUG "±ÌvZXÉfobKðYtµÜ·" + "âÂ±âÃÆvÆÂÆZÆXâÃÅ½qÆvÆÂÆZÆXâÃ°âÂ·âÃâÃÂÃÂÅâÂµâÃâÂ·" + ID_PROCESS_PAGE_DEBUG "âÂ±âÃÆvÆÂÆZÆXâÃÆfÆoÆbÆKâÃ°âYâ¢tâÂµâÃâÂ·" ID_PROCESS_PAGE_SETAFFINITY - "ÇÌvZbTÅvZXðÀs·é©ð§äµÜ·" + "âÃâÃÆvÆÂÆZÆbÆTâÃÆvÆÂÆZÆXâÃ°Å½ÃÂsâÂ·âÃ©âÂ©âÃ°ÂÂ§ÅÃ¤âÂµâÃâÂ·" ID_PROCESS_PAGE_SETPRIORITY_REALTIME - "vZXðA^CDæxNXÉÝèµÜ·" - ID_PROCESS_PAGE_SETPRIORITY_HIGH "vZXðDæxNXÉÝèµÜ·" + "ÆvÆÂÆZÆXâÃ°ÆÅ ÆAÆâ¹Æ^ÆCÆâ¬âDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "ÆvÆÂÆZÆXâÃ°ÂââDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - "vZXðÊíÈãÌDæxNXÉÝèµÜ·" + "ÆvÆÂÆZÆXâÃ°âÃÂÃËÃÂÃ£âÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" ID_PROCESS_PAGE_SETPRIORITY_NORMAL - "vZXðÊíDæxNXÉÝèµÜ·" + "ÆvÆÂÆZÆXâÃ°âÃÂÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - "vZXðÊíÈºÌDæxNXÉÝèµÜ·" - ID_PROCESS_PAGE_SETPRIORITY_LOW "vZXðáDæxNXÉÝèµÜ·" + "ÆvÆÂÆZÆXâÃ°âÃÂÃËÃâ°ÂºâÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + ID_PROCESS_PAGE_SETPRIORITY_LOW "ÆvÆÂÆZÆXâÃ°âÃ¡âDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" END STRINGTABLE DISCARDABLE BEGIN - IDS_TAB_APPS "AvP[V" - IDS_TAB_PROCESSES "vZX" - IDS_TAB_PERFORMANCE "ptH[}X" - IDS_TAB_TASK "^XN" - IDS_TAB_STATUS "óÔ" - IDS_TAB_IMAGENAME "C[W¼" + IDS_TAB_APPS "Applications" + IDS_TAB_PROCESSES "ÆvÆÂÆZÆX" + IDS_TAB_PERFORMANCE "ÆpÆtÆHÂ[Æ}ÆâÆX" + IDS_TAB_TASK "Æ^ÆXÆN" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "ÆCÆÂÂ[ÆWâÂ¼" IDS_TAB_PID "PID" - IDS_TAB_USERNAME "[U[¼" - IDS_TAB_SESSIONID "ZbV ID" + IDS_TAB_USERNAME "Æâ Â[ÆUÂ[âÂ¼" + IDS_TAB_SESSIONID "ÆZÆbÆVÆâ¡Æâ ID" IDS_TAB_CPU "CPU" - IDS_TAB_CPUTIME "CPU Ô" - IDS_TAB_MEMUSAGE "gpÊ" - IDS_TAB_PEAKMEMUSAGE "ÅågpÊ" - IDS_TAB_MEMDELTA " f^" - IDS_TAB_PAGEFAULT "y[W tHg" - IDS_TAB_PFDELTA "y[W tHg f^" - IDS_TAB_VMSIZE "¼z TCY" - IDS_TAB_PAGEDPOOL "y[W v[" - IDS_TAB_NPPOOL "ñy[W v[" - IDS_TAB_BASEPRI "î{Dæx" - IDS_TAB_HANDLES "nh" - IDS_TAB_THREADS "Xbh" - IDS_TAB_USERPBJECTS "USER IuWFNg" - IDS_TAB_GDIOBJECTS "GDI IuWFNg" - IDS_TAB_IOREADS "I/O ÇÝæè" - IDS_TAB_IOWRITES "I/O «Ý" - IDS_TAB_IOOTHER "I/O »Ì¼" - IDS_TAB_IOREADBYTES "I/O ÇÝæèoCg" - IDS_TAB_IOWRITESBYTES "I/O «ÝoCg" - IDS_TAB_IOOTHERBYTES "I/O »Ì¼ÌoCg" - IDS_MENU_SELECTCOLUMNS "ñÌIð(&S)..." - IDS_MENU_16BITTASK "16 rbg ^XNÌ\\¦(&S)" - IDS_MENU_WINDOWS "EBhE(&W)" - IDS_MENU_LARGEICONS "å«¢ACR(&G)" - IDS_MENU_SMALLICONS "¬³¢ACR(&M)" - IDS_MENU_DETAILS "Ú×(&D)" - IDS_MENU_ONEGRAPHALLCPUS "·×ÄÌ CPU Å 1 Ot(&O)" - IDS_MENU_ONEGRAPHPERCPU "CPU ²ÆÉ 1 Ot(&P)" - IDS_MENU_CPUHISTORY "CPU ð(&C)" - IDS_MENU_SHOWKERNELTIMES "J[lÔð\\¦·é(&S)" - IDS_CREATENEWTASK "Vµ¢^XNÌì¬" - IDS_CREATENEWTASK_DESC "Às·évO¼AÜ½ÍJtH_âhLg¼AC^[lbg \\[X¼ðüÍµÄ¾³¢B" - IDS_MSG_ACCESSPROCESSAFF "vZXÌÖWÖÌANZXÜ½ÍÝèªÅ«Ü¹ñ" - IDS_MSG_PROCESSONEPRO "vZXÍAÈÆà 1 ÂÌvZbTÆÖWð½È¯êÎÈèÜ¹ñB" - IDS_MSG_INVALIDOPTION "³øÈIvV" - IDS_MSG_UNABLEDEBUGPROCESS "fobKðYtÅ«Ü¹ñ" - IDS_MSG_WARNINGDEBUG "x: ±ÌvZXðfobO·éÆAf[^ª¸íêéÂ\\«ª èÜ·B\nfobKðYtµÜ·©?" - IDS_MSG_TASKMGRWARNING "^XN }l[WÌx" - IDS_MSG_WARNINGTERMINATING "x: vZXðI¹·éÆAf[^ª¸íê½èAVXeª\nsÀèÉÈÁ½è·éÈÇÌA\\úµÈ¢ÊÉÈé±Æª èÜ·B\nvZXðI¹·éOÉAóÔÜ½Íf[^ðÛ¶·é©Ç¤©Ì\nmFbZ[WÍ\\¦³êÜ¹ñBvZXðI¹µÜ·©?" - IDS_MSG_UNABLETERMINATEPRO "vZXðI¹Å«Ü¹ñ" - IDS_MSG_UNABLECHANGEPRIORITY "DæxðÏXÅ«Ü¹ñ" - IDS_MSG_WARNINGCHANGEPRIORITY "x: ±ÌvZXÌDæxNXðÏX·éÆAVXeªsÀèÉ\nÈéÈÇA\\úµÈ¢ÊÉÈé±Æª èÜ·B\nDæxNXðÏXµÜ·©?" - IDS_MSG_TRAYICONCPUUSAGE "CPU gp¦: %d%%" - IDS_STATUS_MEMUSAGE "gpÊ: %dKB / %dKB" - IDS_STATUS_CPUUSAGE "CPU gp¦: %3d%%" - IDS_STATUS_PROCESSES "vZX: %d" - IDS_Not_Responding "Èµ" - IDS_Running "Às" + IDS_TAB_CPUTIME "CPU Time" + IDS_TAB_MEMUSAGE "Mem Usage" + IDS_TAB_PEAKMEMUSAGE "Peak Mem Usage" + IDS_TAB_MEMDELTA "ÆÂÆâÆÅ ÆfÆâ¹Æ^" + IDS_TAB_PAGEFAULT "ÆyÂ[ÆW ÆtÆHÆâ¹Æg" + IDS_TAB_PFDELTA "ÆyÂ[ÆW ÆtÆHÆâ¹Æg ÆfÆâ¹Æ^" + IDS_TAB_VMSIZE "â°Â¼âzÆÂÆâÆÅ ÆTÆCÆY" + IDS_TAB_PAGEDPOOL "ÆyÂ[ÆW ÆvÂ[Æâ¹" + IDS_TAB_NPPOOL "âÃ±ÆyÂ[ÆW ÆvÂ[Æâ¹" + IDS_TAB_BASEPRI "Å Ã®â{âDÂÃ¦âx" + IDS_TAB_HANDLES "ÆnÆâÆhÆâ¹" + IDS_TAB_THREADS "ÆXÆÅÆbÆh" + IDS_TAB_USERPBJECTS "USER ÆIÆuÆWÆFÆNÆg" + IDS_TAB_GDIOBJECTS "GDI ÆIÆuÆWÆFÆNÆg" + IDS_TAB_IOREADS "I/O âÃâÃÅ½Ã¦âÃ¨" + IDS_TAB_IOWRITES "I/O Writes" + IDS_TAB_IOOTHER "I/O âÂ»âÃâÂ¼" + IDS_TAB_IOREADBYTES "I/O Read Bytes" + IDS_TAB_IOWRITESBYTES "I/O Write Bytes" + IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_MENU_SELECTCOLUMNS "âÃ±âÃâIâÃ°(&S)..." + IDS_MENU_16BITTASK "16 ÆrÆbÆg Æ^ÆXÆNâÃâ¢\\Å½Â¦(&S)" + IDS_MENU_WINDOWS "ÆEÆBÆâÆhÆE(&W)" + IDS_MENU_LARGEICONS "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)" + IDS_MENU_SMALLICONS "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)" + IDS_MENU_DETAILS "ÂÃÂÃ(&D)" + IDS_MENU_ONEGRAPHALLCPUS "âÂ·âÃâÃâÃ CPU âÃ 1 ÆOÆâ°Æt(&O)" + IDS_MENU_ONEGRAPHPERCPU "CPU âÂ²âÃâÃ 1 ÆOÆâ°Æt(&P)" + IDS_MENU_CPUHISTORY "CPU âÅ¡âÃ°(&C)" + IDS_MENU_SHOWKERNELTIMES "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)" + IDS_CREATENEWTASK "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÂÃ¬ÂÂ¬" + IDS_CREATENEWTASK_DESC "Å½ÃÂsâÂ·âÃ©ÆvÆÂÆOÆâ°Æâ¬âÂ¼ÂAâÃâÂ½âÃÅ JâÂÆtÆHÆâ¹Æ_âÃ¢ÆhÆLÆâ¦ÆÂÆâÆgâÂ¼ÂAÆCÆâÆ^Â[ÆlÆbÆg ÆÅ Æ\\Â[ÆXâÂ¼âÃ°âÃ¼âÃâÂµâÃâÂâÂ¾âÂ³âÂ¢ÂB" + IDS_MSG_ACCESSPROCESSAFF "ÆvÆÂÆZÆXâÃÅ ÃÅWâÃâÃÆAÆNÆZÆXâÃâÂ½âÃÂÃâÃ¨âÂªâÃâÂ«âÃâÂ¹âÃ±" + IDS_MSG_PROCESSONEPRO "ÆvÆÂÆZÆXâÃÂAÂÂâÃâÂâÃâÃ 1 âÃâÃÆvÆÂÆZÆbÆTâÃÅ ÃÅWâÃ°Å½ÂâÂ½âÃâÂ¯âÃªâÃâÃâÃ¨âÃâÂ¹âÃ±ÂB" + IDS_MSG_INVALIDOPTION "Invalid Option" + IDS_MSG_UNABLEDEBUGPROCESS "ÆfÆoÆbÆKâÃ°âYâ¢tâÃâÂ«âÃâÂ¹âÃ±" + IDS_MSG_WARNINGDEBUG "ÅxÂÂ: âÂ±âÃÆvÆÂÆZÆXâÃ°ÆfÆoÆbÆOâÂ·âÃ©âÃÂAÆfÂ[Æ^âÂªÅ½Â¸âÃâÃªâÃ©â°Ãâ\\ÂÂ«âÂªâÂ âÃ¨âÃâÂ·ÂB\nÆfÆoÆbÆKâÃ°âYâ¢tâÂµâÃâÂ·âÂ©?" + IDS_MSG_TASKMGRWARNING "Task Manager Warning" + IDS_MSG_WARNINGTERMINATING "ÅxÂÂ: ÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂ·âÃ©âÃÂAÆfÂ[Æ^âÂªÅ½Â¸âÃâÃªâÂ½âÃ¨ÂAÆVÆXÆeÆâ¬âÂª\nâ¢sËÃâÃ¨âÃâÃâÃâÂ½âÃ¨âÂ·âÃ©âÃâÃâÃÂAâ\\Å ÃºâÂµâÃâÂ¢Åâ¹â°ÃâÃâÃâÃ©âÂ±âÃâÂªâÂ âÃ¨âÃâÂ·ÂB\nÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂ·âÃ©âOâÃÂAÂÃ³âÃâÃâÂ½âÃÆfÂ[Æ^âÃ°â¢ÃâÂ¶âÂ·âÃ©âÂ©âÃâÂ¤âÂ©âÃ\nÅ mâFÆÂÆbÆZÂ[ÆWâÃâ¢\\Å½Â¦âÂ³âÃªâÃâÂ¹âÃ±ÂBÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂµâÃâÂ·âÂ©?" + IDS_MSG_UNABLETERMINATEPRO "ÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÃâÂ«âÃâÂ¹âÃ±" + IDS_MSG_UNABLECHANGEPRIORITY "âDÂÃ¦âxâÃ°â¢ÃÂXâÃâÂ«âÃâÂ¹âÃ±" + IDS_MSG_WARNINGCHANGEPRIORITY "ÅxÂÂ: âÂ±âÃÆvÆÂÆZÆXâÃâDÂÃ¦âxÆNÆâ°ÆXâÃ°â¢ÃÂXâÂ·âÃ©âÃÂAÆVÆXÆeÆâ¬âÂªâ¢sËÃâÃ¨âÃ\nâÃâÃ©âÃâÃÂAâ\\Å ÃºâÂµâÃâÂ¢Åâ¹â°ÃâÃâÃâÃ©âÂ±âÃâÂªâÂ âÃ¨âÃâÂ·ÂB\nâDÂÃ¦âxÆNÆâ°ÆXâÃ°â¢ÃÂXâÂµâÃâÂ·âÂ©?" + IDS_MSG_TRAYICONCPUUSAGE "CPU Å½gâpâÂ¦: %d%%" + IDS_STATUS_MEMUSAGE "ÆÂÆâÆÅ Å½gâpâÃ: %dKB / %dKB" + IDS_STATUS_CPUUSAGE "CPU Å½gâpâÂ¦: %3d%%" + IDS_STATUS_PROCESSES "ÆvÆÂÆZÆX: %d" + IDS_Not_Responding "â°Å¾âÅ¡âÃâÂµ" + IDS_Running "Å½ÃÂsââ " END Modified: branches/cmake-bringup/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Wed Nov 24 15:59:23 2010 @@ -655,7 +655,7 @@ IDS_Running "½ÇÇà Áß" END - +#pragma code_page(1252) #endif // Korean resources ///////////////////////////////////////////////////////////////////////////// Modified: branches/cmake-bringup/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Wed Nov 24 15:59:23 2010 @@ -653,6 +653,7 @@ END +#pragma code_page(1252) #endif // Romanian resources ///////////////////////////////////////////////////////////////////////////// Modified: branches/cmake-bringup/base/applications/taskmgr/resource.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/resource.h [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/resource.h [iso-8859-1] Wed Nov 24 15:59:23 2010 @@ -251,3 +251,4 @@ #define _APS_NEXT_SYMED_VALUE 110 #endif #endif + Modified: branches/cmake-bringup/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/rsrc.rc [iso-8859-1] Wed Nov 24 15:59:23 2010 @@ -1,5 +1,3 @@ -#include <windows.h> -#include "resource.h" #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc"

14 years, 11 months

[sir_richard] 49775: [ARMDDK]: Oh, right, forgot how this was laid out. should fix ARM build.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 15:41:28 2010 New Revision: 49775 URL: http://svn.reactos.org/svn/reactos?rev=49775&view=rev Log: [ARMDDK]: Oh, right, forgot how this was laid out. should fix ARM build. Modified: trunk/reactos/include/reactos/arm/armddk.h Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Wed Nov 24 15:41:28 2010 @@ -264,7 +264,6 @@ HalSweepIcache( VOID ); -#endif FORCEINLINE VOID @@ -285,6 +284,7 @@ } } #define KeQueryTickCount(CurrentCount) _KeQueryTickCount(CurrentCount) +#endif // // Intrinsics

14 years, 11 months

[sir_richard] 49774: [NTOS]: Fix incorrect assumptions that a PDE == PTE which have crept up throughout new ARM3 code. [NTOS]: Fix a couple more unportable directly "Hard" PTE field accesses, inste...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 15:21:45 2010 New Revision: 49774 URL: http://svn.reactos.org/svn/reactos?rev=49774&view=rev Log: [NTOS]: Fix incorrect assumptions that a PDE == PTE which have crept up throughout new ARM3 code. [NTOS]: Fix a couple more unportable directly "Hard" PTE field accesses, instead of using portable MI macros. [NTOS]: Cleanup some of the pool code that had really messed up PDE vs PTE. [NTOS]: Define the number of page directoty levels for ARM. [NTOS]: Comment out some ARM3 code that won't be needed now that most of the x86 code is in C. Fixes all but one build error. Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/amd64/init.c Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -1,4 +1,6 @@ #pragma once + +#define _MI_PAGING_LEVELS 2 #define PDE_SHIFT 20 @@ -116,6 +118,7 @@ #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.ReadOnly == 0) #define MI_IS_PAGE_COPY_ON_WRITE(x)FALSE #define MI_IS_PAGE_DIRTY(x) TRUE +#define MI_IS_PAGE_LARGE(x) FALSE /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) @@ -131,6 +134,12 @@ MI_HYPERSPACE_PTES * PAGE_SIZE) #define MI_ZERO_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ + PAGE_SIZE) /* Retrives the PDE entry for the given VA */ #define MiGetPdeAddress(x) ((PMMPDE)(PDE_BASE + (((ULONG)(x) >> 20) << 2))) @@ -142,7 +151,8 @@ /* Retrives the PDE offset for the given VA */ #define MiGetPdeOffset(x) (((ULONG)(x)) >> 20) - +//#define MiGetPteOffset(x) (((ULONG)(x)) >> 12) + /* Convert a PTE into a corresponding address */ #define MiPteToAddress(x) ((PVOID)((ULONG)(x) << 10)) #define MiPdeToAddress(x) ((PVOID)((ULONG)(x) << 18)) Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -55,6 +55,7 @@ #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) +#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.Large == 1) #if !defined(CONFIG_SMP) #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) #else @@ -80,18 +81,6 @@ #define TEB_BASE 0x7FFDE000 -#define MI_HYPERSPACE_PTES (256 - 1) -#define MI_ZERO_PTES (32) -#define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE -#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ - MI_HYPERSPACE_PTES * PAGE_SIZE) -#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ - PAGE_SIZE) -#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ - PAGE_SIZE) -#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ - PAGE_SIZE) - /* On x86, these two are the same */ #define MMPDE MMPTE #define PMMPDE PMMPTE Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -486,7 +486,7 @@ PRTL_BITMAP EndOfPagedPoolBitmap; PMMPTE FirstPteForPagedPool; PMMPTE LastPteForPagedPool; - PMMPTE NextPdeForPagedPoolExpansion; + PMMPDE NextPdeForPagedPoolExpansion; ULONG PagedPoolHint; SIZE_T PagedPoolCommit; SIZE_T AllocatedPagedPool; Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -15,6 +15,7 @@ /* FUNCTIONS ******************************************************************/ +#if 0 VOID KiIdleLoop(VOID) { @@ -89,6 +90,7 @@ } } } +#endif VOID NTAPI @@ -116,6 +118,7 @@ while (TRUE); } +#if 0 BOOLEAN KiSwapContextInternal(IN PKTHREAD OldThread, IN PKTHREAD NewThread) @@ -220,6 +223,7 @@ // return FALSE; } +#endif VOID KiApcInterrupt(VOID) @@ -262,6 +266,7 @@ KiDeliverApc(PreviousMode, &ExceptionFrame, TrapFrame); } +#if 0 VOID KiDispatchInterrupt(VOID) { @@ -343,6 +348,7 @@ KiSwapContext(OldThread, NewThread); } } +#endif VOID KiInterruptHandler(IN PKTRAP_FRAME TrapFrame, Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -42,7 +42,7 @@ PVOID MiSystemViewStart; ULONG MmSystemViewSize; PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; -PMMPTE MmSystemPagePtes; +PMMPDE MmSystemPagePtes; ULONG MmNumberOfSystemPtes; ULONG MxPfnAllocation; RTL_BITMAP MiPfnBitMap; @@ -61,7 +61,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -NTSTATUS +BOOLEAN NTAPI MmArmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -71,7 +71,7 @@ // DPRINT1("NEVER TELL ME THE ODDS!\n"); while (TRUE); - return STATUS_SUCCESS; + return TRUE; } /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -235,7 +235,7 @@ #define MI_GET_NEXT_COLOR(x) (MI_GET_PAGE_COLOR(++MmSystemPageColor)) #define MI_GET_NEXT_PROCESS_COLOR(x) (MI_GET_PAGE_COLOR(++(x)->NextPageColor)) -#ifdef _M_IX86 +#ifndef _M_AMD64 // // Decodes a Prototype PTE into the underlying PTE // @@ -462,7 +462,7 @@ extern PMMPTE MiSessionBasePte; extern PMMPTE MiSessionLastPte; extern SIZE_T MmSizeOfPagedPoolInBytes; -extern PMMPTE MmSystemPagePtes; +extern PMMPDE MmSystemPagePtes; extern PVOID MmSystemCacheStart; extern PVOID MmSystemCacheEnd; extern MMSUPPORT MmSystemCacheWs; @@ -607,7 +607,7 @@ NewPte->u.Long |= MmProtectToPteMask[ProtectionMask]; } -#ifdef _M_IX86 +#ifndef _M_AMD64 // // Builds a Prototype PTE for the address of the PTE // @@ -675,6 +675,33 @@ /* Write the invalid PTE */ ASSERT(InvalidPte.u.Hard.Valid == 0); *PointerPte = InvalidPte; +} + +// +// Writes a valid PDE +// +VOID +FORCEINLINE +MI_WRITE_VALID_PDE(IN PMMPDE PointerPde, + IN MMPDE TempPde) +{ + /* Write the valid PDE */ + ASSERT(PointerPde->u.Hard.Valid == 0); + ASSERT(TempPde.u.Hard.Valid == 1); + *PointerPde = TempPde; +} + +// +// Writes an invalid PDE +// +VOID +FORCEINLINE +MI_WRITE_INVALID_PDE(IN PMMPDE PointerPde, + IN MMPDE InvalidPde) +{ + /* Write the invalid PDE */ + ASSERT(InvalidPde.u.Hard.Valid == 0); + *PointerPde = InvalidPde; } // 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] Wed Nov 24 15:21:45 2010 @@ -161,7 +161,7 @@ // address. // PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; -PMMPTE MmSystemPagePtes; +PMMPDE MmSystemPagePtes; #endif // @@ -679,7 +679,7 @@ /* Yes we do, set it up */ Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1->u4.PteFrame = StartupPdIndex; - Pfn1->PteAddress = PointerPde; + Pfn1->PteAddress = (PMMPTE)PointerPde; Pfn1->u2.ShareCount++; Pfn1->u3.e2.ReferenceCount = 1; Pfn1->u3.e1.PageLocation = ActiveAndValid; @@ -771,7 +771,7 @@ /* Make it a bogus page to catch errors */ PointerPde = MiAddressToPde(0xFFFFFFFF); Pfn1->u4.PteFrame = PFN_FROM_PTE(PointerPde); - Pfn1->PteAddress = PointerPde; + Pfn1->PteAddress = (PMMPTE)PointerPde; Pfn1->u2.ShareCount++; Pfn1->u3.e2.ReferenceCount = 0xFFF0; Pfn1->u3.e1.PageLocation = ActiveAndValid; @@ -1192,7 +1192,7 @@ MiAddHalIoMappings(VOID) { PVOID BaseAddress; - PMMPTE PointerPde; + PMMPDE PointerPde; PMMPTE PointerPte; ULONG i, j, PdeCount; PFN_NUMBER PageFrameIndex; @@ -1203,12 +1203,12 @@ /* Check how many PDEs the heap has */ PointerPde = MiAddressToPde(BaseAddress); - PdeCount = PDE_COUNT - ADDR_TO_PDE_OFFSET(BaseAddress); + PdeCount = PDE_COUNT - MiGetPdeOffset(BaseAddress); for (i = 0; i < PdeCount; i++) { /* Does the HAL own this mapping? */ if ((PointerPde->u.Hard.Valid == 1) && - (PointerPde->u.Hard.LargePage == 0)) + (MI_IS_PAGE_LARGE(PointerPde) == FALSE)) { /* Get the PTE for it and scan each page */ PointerPte = MiAddressToPte(BaseAddress); @@ -1556,8 +1556,10 @@ INIT_FUNCTION MiBuildPagedPool(VOID) { - PMMPTE PointerPte, PointerPde; + PMMPTE PointerPte; + PMMPDE PointerPde; MMPTE TempPte = ValidKernelPte; + MMPDE TempPde = ValidKernelPde; PFN_NUMBER PageFrameIndex; KIRQL OldIrql; ULONG Size, BitMapSize; @@ -1648,7 +1650,7 @@ #endif RtlZeroMemory(PointerPde, - (1 + MiAddressToPde(MmPagedPoolEnd) - PointerPde) * sizeof(MMPTE)); + (1 + MiAddressToPde(MmPagedPoolEnd) - PointerPde) * sizeof(MMPDE)); // // Next, get the first and last PTE @@ -1666,8 +1668,8 @@ MI_SET_USAGE(MI_USAGE_PAGED_POOL); MI_SET_PROCESS2("Kernel"); PageFrameIndex = MiRemoveZeroPage(0); - TempPte.u.Hard.PageFrameNumber = PageFrameIndex; - MI_WRITE_VALID_PTE(PointerPde, TempPte); + TempPde.u.Hard.PageFrameNumber = PageFrameIndex; + MI_WRITE_VALID_PDE(PointerPde, TempPde); #if (_MI_PAGING_LEVELS >= 3) /* Use the PPE of MmPagedPoolStart that was setup above */ // Bla = PFN_FROM_PTE(PpeAddress(MmPagedPool...)); @@ -1678,8 +1680,8 @@ /* Initialize the PFN entry for it */ MiInitializePfnForOtherProcess(PageFrameIndex, - PointerPde, - MmSystemPageDirectory[(PointerPde - (PMMPTE)PDE_BASE) / PDE_COUNT]); + (PMMPTE)PointerPde, + MmSystemPageDirectory[(PointerPde - (PMMPDE)PDE_BASE) / PDE_COUNT]); #endif // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -325,7 +325,7 @@ } /* Set it dirty if it's a writable page */ - if (TempPte.u.Hard.Write) TempPte.u.Hard.Dirty = TRUE; + if (MI_IS_PAGE_WRITEABLE(&TempPte)) MI_MAKE_DIRTY_PAGE(&TempPte); /* Write it */ MI_WRITE_VALID_PTE(PointerPte, TempPte); @@ -899,7 +899,7 @@ ASSERT(ProtectionCode != MM_NOACCESS); /* Make the PDE demand-zero */ - MI_WRITE_INVALID_PTE(PointerPde, DemandZeroPde); + MI_WRITE_INVALID_PDE(PointerPde, DemandZeroPde); /* And go dispatch the fault on the PDE. This should handle the demand-zero */ #if MI_TRACE_PFNS @@ -907,7 +907,7 @@ #endif Status = MiDispatchFault(TRUE, PointerPte, - PointerPde, + (PMMPTE)PointerPde, NULL, FALSE, PsGetCurrentProcess(), @@ -1058,7 +1058,7 @@ } /* Write the dirty bit for writeable pages */ - if (TempPte.u.Hard.Write) TempPte.u.Hard.Dirty = TRUE; + if (MI_IS_PAGE_WRITEABLE(&TempPte)) MI_MAKE_DIRTY_PAGE(&TempPte); /* And now write down the PTE, making the address valid */ MI_WRITE_VALID_PTE(PointerPte, TempPte); Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -375,7 +375,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, IN SIZE_T SizeInBytes) { - PFN_NUMBER SizeInPages, PageFrameNumber; + PFN_NUMBER SizeInPages, PageFrameNumber, PageTableCount; ULONG i; KIRQL OldIrql; PLIST_ENTRY NextEntry, NextHead, LastHead; @@ -422,7 +422,7 @@ // Check if there is enougn paged pool expansion space left // if (MmPagedPoolInfo.NextPdeForPagedPoolExpansion > - MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool)) + (PMMPDE)MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool)) { // // Out of memory! @@ -436,23 +436,23 @@ // Check if we'll have to expand past the last PTE we have available // if (((i - 1) + MmPagedPoolInfo.NextPdeForPagedPoolExpansion) > - MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool)) + (PMMPDE)MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool)) { // // We can only support this much then // - SizeInPages = MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool) - - MmPagedPoolInfo.NextPdeForPagedPoolExpansion + - 1; - ASSERT(SizeInPages < i); - i = SizeInPages; + PageTableCount = (PMMPDE)MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool) - + MmPagedPoolInfo.NextPdeForPagedPoolExpansion + + 1; + ASSERT(PageTableCount < i); + i = PageTableCount; } else { // // Otherwise, there is plenty of space left for this expansion // - SizeInPages = i; + PageTableCount = i; } // @@ -464,7 +464,7 @@ // Get the first PTE in expansion space // PointerPde = MmPagedPoolInfo.NextPdeForPagedPoolExpansion; - BaseVa = MiPteToAddress(PointerPde); + BaseVa = MiPdeToAddress(PointerPde); BaseVaStart = BaseVa; // @@ -494,11 +494,11 @@ /* Initialize the PFN */ MiInitializePfnForOtherProcess(PageFrameNumber, - PointerPde, + (PMMPTE)PointerPde, MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]); /* Write the actual PDE now */ - MI_WRITE_VALID_PTE(PointerPde, TempPde); + MI_WRITE_VALID_PDE(PointerPde, TempPde); #endif // // Move on to the next expansion address @@ -517,26 +517,25 @@ // These pages are now available, clear their availablity bits // EndAllocation = (MmPagedPoolInfo.NextPdeForPagedPoolExpansion - - MiAddressToPte(MmPagedPoolInfo.FirstPteForPagedPool)) * + (PMMPDE)MiAddressToPte(MmPagedPoolInfo.FirstPteForPagedPool)) * PTE_COUNT; RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, EndAllocation, - SizeInPages * PTE_COUNT); + PageTableCount * PTE_COUNT); // // Update the next expansion location // - MmPagedPoolInfo.NextPdeForPagedPoolExpansion += SizeInPages; + MmPagedPoolInfo.NextPdeForPagedPoolExpansion += PageTableCount; // // Zero out the newly available memory // - RtlZeroMemory(BaseVaStart, SizeInPages * PAGE_SIZE); + RtlZeroMemory(BaseVaStart, PageTableCount * PAGE_SIZE); // // Now try consuming the pages again // - SizeInPages = BYTES_TO_PAGES(SizeInBytes); i = RtlFindClearBitsAndSet(MmPagedPoolInfo.PagedPoolAllocationMap, SizeInPages, 0); Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -971,7 +971,7 @@ /* Do the same for hyperspace */ PointerPde = MiAddressToPde(HYPER_SPACE); PageFrameNumber = PFN_FROM_PTE(PointerPde); - MiInitializePfn(PageFrameNumber, PointerPde, TRUE); + MiInitializePfn(PageFrameNumber, (PMMPTE)PointerPde, TRUE); /* Setup the PFN for the PTE for the working set */ PointerPte = MiAddressToPte(MI_WORKING_SET_LIST); @@ -1195,7 +1195,7 @@ HyperIndex); /* Set it dirty and map it */ - PdePte.u.Hard.Dirty = TRUE; + MI_MAKE_DIRTY_PAGE(&PdePte); MI_WRITE_VALID_PTE(PointerPte, PdePte); /* Now get hyperspace's page table */ @@ -1228,7 +1228,7 @@ PdeIndex); /* Set it dirty and map it */ - PdePte.u.Hard.Dirty = TRUE; + MI_MAKE_DIRTY_PAGE(&PdePte); MI_WRITE_VALID_PTE(PointerPte, PdePte); /* Now get the page directory (which we'll double map, so call it a page table */ 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] Wed Nov 24 15:21:45 2010 @@ -347,17 +347,17 @@ /* Initialize its PFN entry, with the parent system page directory page table */ MiInitializePfnForOtherProcess(PageFrameIndex, - PointerPde, + (PMMPTE)PointerPde, MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]); /* Make the system PDE entry valid */ - MI_WRITE_VALID_PTE(SystemMapPde, TempPde); + MI_WRITE_VALID_PDE(SystemMapPde, TempPde); /* The system PDE entry might be the PDE itself, so check for this */ if (PointerPde->u.Hard.Valid == 0) { /* It's different, so make the real PDE valid too */ - MI_WRITE_VALID_PTE(PointerPde, TempPde); + MI_WRITE_VALID_PDE(PointerPde, TempPde); } } Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Nov 24 15:21:45 2010 @@ -752,9 +752,7 @@ /* Save the first and last paged pool PTE */ MmPagedPoolInfo.FirstPteForPagedPool = MiAddressToPte(MmPagedPoolStart); MmPagedPoolInfo.LastPteForPagedPool = MiAddressToPte(MmPagedPoolEnd); - - MmPagedPoolInfo.NextPdeForPagedPoolExpansion = - MiAddressToPde(MmPagedPoolStart) + 1; + MmPagedPoolInfo.NextPdeForPagedPoolExpansion = MiAddressToPde(MmPagedPoolStart) + 1; // We keep track of each page via a bit, so check how big the bitmap will // have to be (make sure to align our page count such that it fits nicely

14 years, 11 months

[sir_richard] 49773: [PSDK/NDK]: Fix KPCR/KIPCR for ARM to match x86 more closely. Add KeGetTickCount for ARM.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Nov 24 15:18:24 2010 New Revision: 49773 URL: http://svn.reactos.org/svn/reactos?rev=49773&view=rev Log: [PSDK/NDK]: Fix KPCR/KIPCR for ARM to match x86 more closely. Add KeGetTickCount for ARM. Modified: trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/reactos/arm/armddk.h Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/ketypes.h [iso-8859-1] Wed Nov 24 15:18:24 2010 @@ -473,8 +473,13 @@ ULONG StallScaleFactor; UCHAR SpareUnused; UCHAR Number; + UCHAR Spare0; + UCHAR SecondLevelCacheAssociativity; + ULONG VdmAlert; + ULONG KernelReserved[14]; + ULONG SecondLevelCacheSize; + ULONG HalReserved[16]; // arm part - UCHAR Spare0[2]; UCHAR IrqlMask[32]; ULONG IrqlTable[32]; PKINTERRUPT_ROUTINE InterruptRoutine[32]; Modified: trunk/reactos/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arm/armddk… ============================================================================== --- trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arm/armddk.h [iso-8859-1] Wed Nov 24 15:18:24 2010 @@ -173,6 +173,12 @@ ULONG StallScaleFactor; UCHAR SpareUnused; UCHAR Number; + UCHAR Spare0; + UCHAR SecondLevelCacheAssociativity; + ULONG VdmAlert; + ULONG KernelReserved[14]; + ULONG SecondLevelCacheSize; + ULONG HalReserved[16]; } KPCR, *PKPCR; // @@ -260,6 +266,26 @@ ); #endif +FORCEINLINE +VOID +_KeQueryTickCount( + OUT PLARGE_INTEGER CurrentCount) +{ + for (;;) { +#ifdef NONAMELESSUNION + CurrentCount->s.HighPart = KeTickCount.High1Time; + CurrentCount->s.LowPart = KeTickCount.LowPart; + if (CurrentCount->s.HighPart == KeTickCount.High2Time) break; +#else + CurrentCount->HighPart = KeTickCount.High1Time; + CurrentCount->LowPart = KeTickCount.LowPart; + if (CurrentCount->HighPart == KeTickCount.High2Time) break; +#endif + YieldProcessor(); + } +} +#define KeQueryTickCount(CurrentCount) _KeQueryTickCount(CurrentCount) + // // Intrinsics //

14 years, 11 months

[gadamopoulos] 49772: [win32k] -move several user stubs in ntstubs.c

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Nov 24 14:52:23 2010 New Revision: 49772 URL: http://svn.reactos.org/svn/reactos?rev=49772&view=rev Log: [win32k] -move several user stubs in ntstubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Wed Nov 24 14:52:23 2010 @@ -1198,33 +1198,4 @@ return sn; } - -/**************** VISTA FUNCTIONS******************/ - -BOOL APIENTRY NtUserAddClipboardFormatListener( - HWND hwnd -) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL APIENTRY NtUserRemoveClipboardFormatListener( - HWND hwnd -) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL APIENTRY NtUserGetUpdatedClipboardFormats( - PUINT lpuiFormats, - UINT cFormats, - PUINT pcFormatsOut -) -{ - UNIMPLEMENTED; - return FALSE; -} - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Nov 24 14:52:23 2010 @@ -619,23 +619,6 @@ /* - * @unimplemented - */ -DWORD -APIENTRY -NtUserGetCursorFrameInfo( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; -} - - -/* * @implemented */ BOOL @@ -1175,18 +1158,6 @@ END_CLEANUP; } #endif - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserSetSystemCursor( - HCURSOR hcur, - DWORD id) -{ - return FALSE; -} /* Mostly inspired from wine code */ BOOL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Nov 24 14:52:23 2010 @@ -1686,20 +1686,6 @@ } /* - * NtUserResolveDesktopForWOW - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserResolveDesktopForWOW(DWORD Unknown0) -{ - UNIMPLEMENTED - return 0; -} - -/* * NtUserGetThreadDesktop * * Status Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Wed Nov 24 14:52:23 2010 @@ -1010,16 +1010,6 @@ CleanupInputImp(VOID) { return(STATUS_SUCCESS); -} - -BOOL -APIENTRY -NtUserDragDetect( - HWND hWnd, - POINT pt) // Just like the User call. -{ - UNIMPLEMENTED - return 0; } BOOL FASTCALL 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] Wed Nov 24 14:52:23 2010 @@ -1711,17 +1711,6 @@ DPRINT("Leave NtUserEnableMenuItem, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserEndMenu(VOID) -{ - UNIMPLEMENTED - - return 0; } /* @@ -2455,25 +2444,6 @@ END_CLEANUP; } -/* - * @implemented - */ -/* NOTE: unused function */ -BOOL APIENTRY -NtUserTrackPopupMenuEx( - HMENU hMenu, - UINT fuFlags, - int x, - int y, - HWND hWnd, - LPTPMPARAMS lptpm) -{ - UNIMPLEMENTED - - return FALSE; -} - - ////// ReactOS NtUserBad /* * @implemented 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] Wed Nov 24 14:52:23 2010 @@ -1615,15 +1615,6 @@ return ret; } - -DWORD APIENTRY -NtUserQuerySendMessage(DWORD Unknown0) -{ - UNIMPLEMENTED; - - return 0; -} - ////////// API on the way out! LRESULT APIENTRY 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] Wed Nov 24 14:52:23 2010 @@ -1151,5 +1151,335 @@ return 0; } +/* + * @unimplemented + */ +DWORD +APIENTRY +NtUserDrawMenuBarTemp( + HWND hWnd, + HDC hDC, + PRECT hRect, + HMENU hMenu, + HFONT hFont) +{ + /* we'll use this function just for caching the menu bar */ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +DWORD APIENTRY +NtUserEndDeferWindowPosEx(DWORD Unknown0, + DWORD Unknown1) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND. + */ +/* + * @unimplemented + */ +BOOL APIENTRY +NtUserFillWindow(HWND hWndPaint, + HWND hWndPaint1, + HDC hDC, + HBRUSH hBrush) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +BOOL APIENTRY +NtUserFlashWindowEx(IN PFLASHWINFO pfwi) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +BOOL APIENTRY +NtUserLockWindowUpdate(HWND hWnd) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +DWORD APIENTRY +NtUserRealChildWindowFromPoint(DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +DWORD APIENTRY +NtUserSetImeOwnerWindow(DWORD Unknown0, + DWORD Unknown1) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +DWORD APIENTRY +NtUserSetInternalWindowPos( + HWND hwnd, + UINT showCmd, + LPRECT rect, + LPPOINT pt) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +BOOL APIENTRY +NtUserSetLayeredWindowAttributes(HWND hwnd, + COLORREF crKey, + BYTE bAlpha, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL APIENTRY +NtUserSetLogonNotifyWindow(HWND hWnd) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +BOOL +APIENTRY +NtUserUpdateLayeredWindow( + HWND hwnd, + HDC hdcDst, + POINT *pptDst, + SIZE *psize, + HDC hdcSrc, + POINT *pptSrc, + COLORREF crKey, + BLENDFUNCTION *pblend, + DWORD dwFlags, + RECT *prcDirty) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +HWND APIENTRY +NtUserWindowFromPhysicalPoint(POINT Point) +{ + UNIMPLEMENTED + + return NULL; +} + +/* + * @unimplemented + */ +HDWP APIENTRY +NtUserDeferWindowPos(HDWP WinPosInfo, + HWND Wnd, + HWND WndInsertAfter, + int x, + int y, + int cx, + int cy, + UINT Flags) +{ + UNIMPLEMENTED + + return 0; +} + + +/* + * NtUserResolveDesktopForWOW + * + * Status + * @unimplemented + */ + +DWORD APIENTRY +NtUserResolveDesktopForWOW(DWORD Unknown0) +{ + UNIMPLEMENTED + return 0; +} + +BOOL +APIENTRY +NtUserDragDetect( + HWND hWnd, + POINT pt) // Just like the User call. +{ + UNIMPLEMENTED + return 0; +} + +/* + * @unimplemented + */ +BOOL APIENTRY +NtUserEndMenu(VOID) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @implemented + */ +/* NOTE: unused function */ +BOOL APIENTRY +NtUserTrackPopupMenuEx( + HMENU hMenu, + UINT fuFlags, + int x, + int y, + HWND hWnd, + LPTPMPARAMS lptpm) +{ + UNIMPLEMENTED + + return FALSE; +} + +DWORD APIENTRY +NtUserQuerySendMessage(DWORD Unknown0) +{ + UNIMPLEMENTED; + + return 0; +} + +/* + * @unimplemented + */ +DWORD APIENTRY +NtUserAlterWindowStyle(DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2) +{ + UNIMPLEMENTED + + return(0); +} + +/* + * NtUserSetWindowStationUser + * + * Status + * @unimplemented + */ + +DWORD APIENTRY +NtUserSetWindowStationUser( + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3) +{ + UNIMPLEMENTED + + return 0; +} + +BOOL APIENTRY NtUserAddClipboardFormatListener( + HWND hwnd +) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL APIENTRY NtUserRemoveClipboardFormatListener( + HWND hwnd +) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL APIENTRY NtUserGetUpdatedClipboardFormats( + PUINT lpuiFormats, + UINT cFormats, + PUINT pcFormatsOut +) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +DWORD +APIENTRY +NtUserGetCursorFrameInfo( + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +BOOL +APIENTRY +NtUserSetSystemCursor( + HCURSOR hcur, + DWORD id) +{ + return FALSE; +} /* EOF */ 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] Wed Nov 24 14:52:23 2010 @@ -1238,19 +1238,6 @@ /* FUNCTIONS *****************************************************************/ - -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserAlterWindowStyle(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return(0); -} /* * As best as I can figure, this function is used by EnumWindows, @@ -2367,25 +2354,7 @@ return hwnd; } - -/* - * @unimplemented - */ -HDWP APIENTRY -NtUserDeferWindowPos(HDWP WinPosInfo, - HWND Wnd, - HWND WndInsertAfter, - int x, - int y, - int cx, - int cy, - UINT Flags) -{ - UNIMPLEMENTED - - return 0; -} - + BOOLEAN FASTCALL co_UserDestroyWindow(PWND Window) { @@ -2566,56 +2535,6 @@ DPRINT("Leave NtUserDestroyWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; -} - - - -/* - * @unimplemented - */ -DWORD -APIENTRY -NtUserDrawMenuBarTemp( - HWND hWnd, - HDC hDC, - PRECT hRect, - HMENU hMenu, - HFONT hFont) -{ - /* we'll use this function just for caching the menu bar */ - UNIMPLEMENTED - return 0; -} - - -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserEndDeferWindowPosEx(DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND. - */ -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserFillWindow(HWND hWndPaint, - HWND hWndPaint1, - HDC hDC, - HBRUSH hBrush) -{ - UNIMPLEMENTED - - return 0; } @@ -2899,18 +2818,6 @@ /* - * @unimplemented - */ -BOOL APIENTRY -NtUserFlashWindowEx(IN PFLASHWINFO pfwi) -{ - UNIMPLEMENTED - - return 0; -} - - -/* * @implemented */ PWND FASTCALL UserGetAncestor(PWND Wnd, UINT Type) @@ -3756,19 +3663,6 @@ END_CLEANUP; } - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserLockWindowUpdate(HWND hWnd) -{ - UNIMPLEMENTED - - return 0; -} - - /* * @implemented */ @@ -3858,20 +3752,6 @@ /* - * @unimplemented - */ -DWORD APIENTRY -NtUserRealChildWindowFromPoint(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - UNIMPLEMENTED - - return 0; -} - - -/* * @implemented */ UINT APIENTRY @@ -3907,62 +3787,6 @@ DPRINT("Leave NtUserRegisterWindowMessage, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; -} - - -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserSetImeOwnerWindow(DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserSetInternalWindowPos( - HWND hwnd, - UINT showCmd, - LPRECT rect, - LPPOINT pt) -{ - UNIMPLEMENTED - - return 0; - -} - - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserSetLayeredWindowAttributes(HWND hwnd, - COLORREF crKey, - BYTE bAlpha, - DWORD dwFlags) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserSetLogonNotifyWindow(HWND hWnd) -{ - UNIMPLEMENTED - - return 0; } @@ -4344,40 +4168,6 @@ #else return NtUserShowWindow(hWnd, nCmdShow); #endif -} - - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserUpdateLayeredWindow( - HWND hwnd, - HDC hdcDst, - POINT *pptDst, - SIZE *psize, - HDC hdcSrc, - POINT *pptSrc, - COLORREF crKey, - BLENDFUNCTION *pblend, - DWORD dwFlags, - RECT *prcDirty) -{ - UNIMPLEMENTED - - return 0; -} - -/* - * @unimplemented - */ -HWND APIENTRY -NtUserWindowFromPhysicalPoint(POINT Point) -{ - UNIMPLEMENTED - - return NULL; } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Wed Nov 24 14:52:23 2010 @@ -1125,25 +1125,6 @@ ObDereferenceObject(Object); return Ret; -} - -/* - * NtUserSetWindowStationUser - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserSetWindowStationUser( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; } static NTSTATUS FASTCALL

14 years, 11 months

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