Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[greatlrd] 21936: [AUDIT] after looking through code no signs of reverse engineering were found.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri May 19 03:03:27 2006 New Revision: 21936 URL: http://svn.reactos.ru/svn/reactos?rev=21936&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Modified: trunk/reactos/lib/crt/math/fmod.c (props changed) trunk/reactos/lib/crt/math/math.c (props changed) Propchange: trunk/reactos/lib/crt/math/fmod.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/math/math.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

[ion] 21935: - Get rid of ROS_EPROCESS and all the ugly type-casting that was being done, now that the last two hacks make us able to compatibly use EPROCESS.

by ion＠svn.reactos.org

Author: ion Date: Fri May 19 00:32:17 2006 New Revision: 21935 URL: http://svn.reactos.ru/svn/reactos?rev=21935&view=rev Log: - Get rid of ROS_EPROCESS and all the ugly type-casting that was being done, now that the last two hacks make us able to compatibly use EPROCESS. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/aspace.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mdl.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/process.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Fri May 19 00:32:17 2006 @@ -1074,7 +1074,7 @@ EX_PUSH_LOCK AddressCreationLock; PETHREAD RotateInProgress; #else - KGUARDED_MUTEX AddressCreationLock; + FAST_MUTEX AddressCreationLock; // FIXME: FAST_MUTEX for XP, KGUARDED_MUTEX for 2K3 KSPIN_LOCK HyperSpaceLock; #endif PETHREAD ForkInProgress; Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/m… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri May 19 00:32:17 2006 @@ -5,7 +5,7 @@ /* TYPES *********************************************************************/ -struct _ROS_EPROCESS; +struct _EPROCESS; extern ULONG MiFreeSwapPages; extern ULONG MiUsedSwapPages; @@ -242,7 +242,7 @@ { PMEMORY_AREA MemoryAreaRoot; PVOID LowestAddress; - struct _ROS_EPROCESS* Process; + struct _EPROCESS* Process; PUSHORT PageTableRefCountTable; ULONG PageTableRefCountTableSize; } MADDRESS_SPACE, *PMADDRESS_SPACE; @@ -360,7 +360,7 @@ NTSTATUS NTAPI MmInitializeAddressSpace( - struct _ROS_EPROCESS* Process, + struct _EPROCESS* Process, PMADDRESS_SPACE AddressSpace); NTSTATUS @@ -443,7 +443,7 @@ VOID STDCALL MmReleaseMemoryAreaIfDecommitted( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PMADDRESS_SPACE AddressSpace, PVOID BaseAddress ); @@ -619,18 +619,18 @@ NTSTATUS STDCALL MmCreateProcessAddressSpace( - IN struct _ROS_EPROCESS* Process, + IN struct _EPROCESS* Process, IN PROS_SECTION_OBJECT Section OPTIONAL ); NTSTATUS STDCALL -MmCreatePeb(struct _ROS_EPROCESS *Process); +MmCreatePeb(struct _EPROCESS *Process); struct _TEB* STDCALL MmCreateTeb( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PCLIENT_ID ClientId, PINITIAL_TEB InitialTeb ); @@ -638,7 +638,7 @@ VOID STDCALL MmDeleteTeb( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, struct _TEB* Teb ); @@ -704,7 +704,7 @@ VOID NTAPI MmFreeVirtualMemory( - struct _ROS_EPROCESS* Process, + struct _EPROCESS* Process, PMEMORY_AREA MemoryArea ); @@ -858,7 +858,7 @@ NTAPI MmInsertRmap( PFN_TYPE Page, - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); @@ -867,14 +867,14 @@ MmDeleteAllRmaps( PFN_TYPE Page, PVOID Context, - VOID (*DeleteMapping)(PVOID Context, struct _ROS_EPROCESS *Process, PVOID Address) + VOID (*DeleteMapping)(PVOID Context, struct _EPROCESS *Process, PVOID Address) ); VOID NTAPI MmDeleteRmap( PFN_TYPE Page, - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); @@ -992,7 +992,7 @@ NTSTATUS NTAPI MmCreateVirtualMapping( - struct _ROS_EPROCESS* Process, + struct _EPROCESS* Process, PVOID Address, ULONG flProtect, PPFN_TYPE Pages, @@ -1002,7 +1002,7 @@ NTSTATUS NTAPI MmCreateVirtualMappingUnsafe( - struct _ROS_EPROCESS* Process, + struct _EPROCESS* Process, PVOID Address, ULONG flProtect, PPFN_TYPE Pages, @@ -1012,13 +1012,13 @@ ULONG NTAPI MmGetPageProtect( - struct _ROS_EPROCESS* Process, + struct _EPROCESS* Process, PVOID Address); VOID NTAPI MmSetPageProtect( - struct _ROS_EPROCESS* Process, + struct _EPROCESS* Process, PVOID Address, ULONG flProtect ); @@ -1026,7 +1026,7 @@ BOOLEAN NTAPI MmIsPagePresent( - struct _ROS_EPROCESS* Process, + struct _EPROCESS* Process, PVOID Address ); @@ -1037,7 +1037,7 @@ VOID NTAPI MmDisableVirtualMapping( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page @@ -1046,7 +1046,7 @@ VOID NTAPI MmEnableVirtualMapping( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); @@ -1057,7 +1057,7 @@ VOID NTAPI MmDeletePageFileMapping( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address, SWAPENTRY* SwapEntry ); @@ -1065,7 +1065,7 @@ NTSTATUS NTAPI MmCreatePageFileMapping( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address, SWAPENTRY SwapEntry ); @@ -1073,7 +1073,7 @@ BOOLEAN NTAPI MmIsPageSwapEntry( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); @@ -1087,7 +1087,7 @@ VOID NTAPI MmSetDirtyPage( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); @@ -1123,7 +1123,7 @@ BOOLEAN NTAPI MmIsAccessedAndResetAccessPage( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); @@ -1158,7 +1158,7 @@ VOID NTAPI MmSetCleanPage( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); @@ -1169,37 +1169,37 @@ VOID NTAPI MmDeletePageTable( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); PFN_TYPE NTAPI MmGetPfnForProcess( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); NTSTATUS STDCALL MmCopyMmInfo( - struct _ROS_EPROCESS *Src, - struct _ROS_EPROCESS *Dest, + struct _EPROCESS *Src, + struct _EPROCESS *Dest, PPHYSICAL_ADDRESS DirectoryTableBase ); NTSTATUS NTAPI -MmReleaseMmInfo(struct _ROS_EPROCESS *Process); - -NTSTATUS -NTAPI -Mmi386ReleaseMmInfo(struct _ROS_EPROCESS *Process); +MmReleaseMmInfo(struct _EPROCESS *Process); + +NTSTATUS +NTAPI +Mmi386ReleaseMmInfo(struct _EPROCESS *Process); VOID NTAPI MmDeleteVirtualMapping( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address, BOOLEAN FreePage, BOOLEAN* WasDirty, @@ -1209,7 +1209,7 @@ BOOLEAN NTAPI MmIsDirtyPage( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address ); @@ -1224,7 +1224,7 @@ VOID NTAPI MmUpdatePageDir( - struct _ROS_EPROCESS *Process, + struct _EPROCESS *Process, PVOID Address, ULONG Size ); Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/p… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Fri May 19 00:32:17 2006 @@ -7,201 +7,6 @@ struct _EJOB; #include <internal/arch/ps.h> - -// -// ROS Process -// -#include <pshpack4.h> -typedef struct _ROS_EPROCESS -{ - KPROCESS Pcb; - EX_PUSH_LOCK ProcessLock; - LARGE_INTEGER CreateTime; - LARGE_INTEGER ExitTime; - EX_RUNDOWN_REF RundownProtect; - HANDLE UniqueProcessId; - LIST_ENTRY ActiveProcessLinks; - ULONG QuotaUsage[3]; - ULONG QuotaPeak[3]; - ULONG CommitCharge; - ULONG PeakVirtualSize; - ULONG VirtualSize; - LIST_ENTRY SessionProcessLinks; - PVOID DebugPort; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - union - { - PVOID ExceptionPortData; - ULONG ExceptionPortValue; - UCHAR ExceptionPortState:3; - }; -#else - PVOID ExceptionPort; -#endif - PHANDLE_TABLE ObjectTable; - EX_FAST_REF Token; - ULONG WorkingSetPage; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - EX_PUSH_LOCK AddressCreationLock; - PETHREAD RotateInProgress; -#else - FAST_MUTEX AddressCreationLock; // FIXME: FAST_MUTEX for XP, KGUARDED_MUTEX for 2K3 - KSPIN_LOCK HyperSpaceLock; -#endif - PETHREAD ForkInProgress; - ULONG HardwareTrigger; - MM_AVL_TABLE PhysicalVadroot; - PVOID CloneRoot; - ULONG NumberOfPrivatePages; - ULONG NumberOfLockedPages; - PVOID *Win32Process; - struct _EJOB *Job; - PVOID SectionObject; - PVOID SectionBaseAddress; - PEPROCESS_QUOTA_BLOCK QuotaBlock; - PPAGEFAULT_HISTORY WorkingSetWatch; - PVOID Win32WindowStation; - HANDLE InheritedFromUniqueProcessId; - PVOID LdtInformation; - PVOID VadFreeHint; - PVOID VdmObjects; - PVOID DeviceMap; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG AlpcPagedPoolQuotaCache; - PVOID EtwDataSource; - PVOID FreeTebHint; -#else - PVOID Spare0[3]; -#endif - union - { - HARDWARE_PTE_X86 PagedirectoryPte; - ULONGLONG Filler; - }; - ULONG Session; - CHAR ImageFileName[16]; - LIST_ENTRY JobLinks; - PVOID LockedPagesList; - LIST_ENTRY ThreadListHead; - PVOID SecurityPort; - PVOID PaeTop; - ULONG ActiveThreads; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG ImagePathHash; -#else - ACCESS_MASK GrantedAccess; -#endif - ULONG DefaultHardErrorProcessing; - NTSTATUS LastThreadExitStatus; - struct _PEB* Peb; - EX_FAST_REF PrefetchTrace; - LARGE_INTEGER ReadOperationCount; - LARGE_INTEGER WriteOperationCount; - LARGE_INTEGER OtherOperationCount; - LARGE_INTEGER ReadTransferCount; - LARGE_INTEGER WriteTransferCount; - LARGE_INTEGER OtherTransferCount; - ULONG CommitChargeLimit; - ULONG CommitChargePeak; - PVOID AweInfo; - SE_AUDIT_PROCESS_CREATION_INFO SeAuditProcessCreationInfo; - MMSUPPORT Vm; - LIST_ENTRY MmProcessLinks; - ULONG ModifiedPageCount; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - union - { - struct - { - ULONG JobNotReallyActive:1; - ULONG AccountingFolded:1; - ULONG NewProcessReported:1; - ULONG ExitProcessReported:1; - ULONG ReportCommitChanges:1; - ULONG LastReportMemory:1; - ULONG ReportPhysicalPageChanges:1; - ULONG HandleTableRundown:1; - ULONG NeedsHandleRundown:1; - ULONG RefTraceEnabled:1; - ULONG NumaAware:1; - ULONG ProtectedProcess:1; - ULONG DefaultPagePriority:3; - ULONG ProcessDeleteSelf:1; - ULONG ProcessVerifierTarget:1; - }; - ULONG Flags2; - }; -#else - ULONG JobStatus; -#endif - union - { - struct - { - ULONG CreateReported:1; - ULONG NoDebugInherit:1; - ULONG ProcessExiting:1; - ULONG ProcessDelete:1; - ULONG Wow64SplitPages:1; - ULONG VmDeleted:1; - ULONG OutswapEnabled:1; - ULONG Outswapped:1; - ULONG ForkFailed:1; - ULONG Wow64VaSpace4Gb:1; - ULONG AddressSpaceInitialized:2; - ULONG SetTimerResolution:1; - ULONG BreakOnTermination:1; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG DeprioritizeViews:1; -#else - ULONG SessionCreationUnderway:1; -#endif - ULONG WriteWatch:1; - ULONG ProcessInSession:1; - ULONG OverrideAddressSpace:1; - ULONG HasAddressSpace:1; - ULONG LaunchPrefetched:1; - ULONG InjectInpageErrors:1; - ULONG VmTopDown:1; - ULONG ImageNotifyDone:1; - ULONG PdeUpdateNeeded:1; - ULONG VdmAllowed:1; - ULONG SmapAllowed:1; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG ProcessInserted:1; -#else - ULONG CreateFailed:1; -#endif - ULONG DefaultIoPriority:3; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG SparePsFlags1:2; -#else - ULONG Spare1:1; - ULONG Spare2:1; -#endif - }; - ULONG Flags; - }; - NTSTATUS ExitStatus; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - USHORT Spare7; -#else - USHORT NextPageColor; -#endif - union - { - struct - { - UCHAR SubSystemMinorVersion; - UCHAR SubSystemMajorVersion; - }; - USHORT SubSystemVersion; - }; - UCHAR PriorityClass; - MM_AVL_TABLE VadRoot; - ULONG Cookie; -} ROS_EPROCESS, *PROS_EPROCESS; -#include <poppack.h> extern LCID PsDefaultThreadLocaleId; extern LCID PsDefaultSystemLocaleId; @@ -563,12 +368,12 @@ NTSTATUS NTAPI PsLockProcess( - PROS_EPROCESS Process, + PEPROCESS Process, BOOLEAN Timeout ); VOID NTAPI -PsUnlockProcess(PROS_EPROCESS Process); +PsUnlockProcess(PEPROCESS Process); #endif /* __INCLUDE_INTERNAL_PS_H */ Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Fri May 19 00:32:17 2006 @@ -154,7 +154,7 @@ IdleProcessorMask |= Affinity; } - MmUpdatePageDir((PROS_EPROCESS)PsGetCurrentProcess(),((PETHREAD)CurrentThread)->ThreadsProcess, sizeof(ROS_EPROCESS)); + MmUpdatePageDir((PEPROCESS)PsGetCurrentProcess(),((PETHREAD)CurrentThread)->ThreadsProcess, sizeof(EPROCESS)); /* Special note for Filip: This will release the Dispatcher DB Lock ;-) -- Alex */ DPRINT("You are : %x, swapping to: %x\n", OldThread, CurrentThread); @@ -864,8 +864,8 @@ * while handling page faults. At this point it isn't possible to call the * page fault handler for the missing pde's. */ - MmUpdatePageDir((PROS_EPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); - MmUpdatePageDir((PROS_EPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); + MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); + MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); /* Initalize the Thread Context */ DPRINT("Initializing the Context for the thread: %x\n", Thread); Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ke/process.c (original) +++ trunk/reactos/ntoskrnl/ke/process.c Fri May 19 00:32:17 2006 @@ -56,8 +56,8 @@ * To prevent this, make sure the page directory of the process we're * attaching to is up-to-date. */ - MmUpdatePageDir((PROS_EPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); - MmUpdatePageDir((PROS_EPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); + MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); + MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); } VOID Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c Fri May 19 00:32:17 2006 @@ -544,7 +544,7 @@ * RETURNS: Status */ { - PROS_EPROCESS Process; + PEPROCESS Process; MEMORY_AREA* MemoryArea; ULONG_PTR MemoryAreaLength; ULONG Type; @@ -784,7 +784,7 @@ MmFreeSwapPage(SavedSwapEntry); MmSetSavedSwapEntryPage(Page, 0); } - MmDeleteRmap(Page, (PROS_EPROCESS)Process, Address); + MmDeleteRmap(Page, Process, Address); MmReleasePageMemoryConsumer(MC_USER, Page); } else if (SwapEntry != 0) @@ -795,7 +795,7 @@ VOID NTAPI -MmFreeVirtualMemory(PROS_EPROCESS Process, +MmFreeVirtualMemory(PEPROCESS Process, PMEMORY_AREA MemoryArea) { PLIST_ENTRY current_entry; @@ -889,7 +889,7 @@ { MEMORY_AREA* MemoryArea; NTSTATUS Status; - PROS_EPROCESS Process; + PEPROCESS Process; PMADDRESS_SPACE AddressSpace; PVOID BaseAddress; ULONG RegionSize; Modified: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/mm/aspace.c (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c Fri May 19 00:32:17 2006 @@ -80,7 +80,7 @@ NTAPI MmGetCurrentAddressSpace(VOID) { - return((PMADDRESS_SPACE)&((PROS_EPROCESS)PsGetCurrentProcess())->VadRoot); + return((PMADDRESS_SPACE)&(PsGetCurrentProcess())->VadRoot); } PMADDRESS_SPACE @@ -92,7 +92,7 @@ NTSTATUS NTAPI -MmInitializeAddressSpace(PROS_EPROCESS Process, +MmInitializeAddressSpace(PEPROCESS Process, PMADDRESS_SPACE AddressSpace) { AddressSpace->MemoryAreaRoot = NULL; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Fri May 19 00:32:17 2006 @@ -203,7 +203,7 @@ NTSTATUS NTAPI -Mmi386ReleaseMmInfo(PROS_EPROCESS Process) +Mmi386ReleaseMmInfo(PEPROCESS Process) { PUSHORT LdtDescriptor; ULONG LdtBase; @@ -329,8 +329,8 @@ NTSTATUS STDCALL -MmCopyMmInfo(PROS_EPROCESS Src, - PROS_EPROCESS Dest, +MmCopyMmInfo(PEPROCESS Src, + PEPROCESS Dest, PPHYSICAL_ADDRESS DirectoryTableBase) { NTSTATUS Status; @@ -408,9 +408,9 @@ VOID NTAPI -MmDeletePageTable(PROS_EPROCESS Process, PVOID Address) -{ - PROS_EPROCESS CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); +MmDeletePageTable(PEPROCESS Process, PVOID Address) +{ + PEPROCESS CurrentProcess = PsGetCurrentProcess(); if (Process != NULL && Process != CurrentProcess) { @@ -441,9 +441,9 @@ VOID NTAPI -MmFreePageTable(PROS_EPROCESS Process, PVOID Address) -{ - PROS_EPROCESS CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); +MmFreePageTable(PEPROCESS Process, PVOID Address) +{ + PEPROCESS CurrentProcess = PsGetCurrentProcess(); ULONG i; PFN_TYPE Pfn; @@ -504,7 +504,7 @@ } static PULONGLONG -MmGetPageTableForProcessForPAE(PROS_EPROCESS Process, PVOID Address, BOOLEAN Create) +MmGetPageTableForProcessForPAE(PEPROCESS Process, PVOID Address, BOOLEAN Create) { NTSTATUS Status; PFN_TYPE Pfn; @@ -520,7 +520,7 @@ { KEBUGCHECK(0); } - if (Address < MmSystemRangeStart && Process && Process != (PROS_EPROCESS)PsGetCurrentProcess()) + if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) { PageDirTable = MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); if (PageDirTable == NULL) @@ -618,7 +618,7 @@ } static PULONG -MmGetPageTableForProcess(PROS_EPROCESS Process, PVOID Address, BOOLEAN Create) +MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) { ULONG PdeOffset = ADDR_TO_PDE_OFFSET(Address); NTSTATUS Status; @@ -626,7 +626,7 @@ ULONG Entry; PULONG Pt, PageDir; - if (Address < MmSystemRangeStart && Process && Process != (PROS_EPROCESS)PsGetCurrentProcess()) + if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) { PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); if (PageDir == NULL) @@ -736,7 +736,7 @@ return FALSE; } -static ULONGLONG MmGetPageEntryForProcessForPAE(PROS_EPROCESS Process, PVOID Address) +static ULONGLONG MmGetPageEntryForProcessForPAE(PEPROCESS Process, PVOID Address) { ULONGLONG Pte; PULONGLONG Pt; @@ -751,7 +751,7 @@ return 0; } -static ULONG MmGetPageEntryForProcess(PROS_EPROCESS Process, PVOID Address) +static ULONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) { ULONG Pte; PULONG Pt; @@ -768,7 +768,7 @@ PFN_TYPE NTAPI -MmGetPfnForProcess(PROS_EPROCESS Process, +MmGetPfnForProcess(PEPROCESS Process, PVOID Address) { @@ -796,7 +796,7 @@ VOID NTAPI -MmDisableVirtualMapping(PROS_EPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) /* * FUNCTION: Delete a virtual mapping */ @@ -916,7 +916,7 @@ VOID NTAPI -MmDeleteVirtualMapping(PROS_EPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_TYPE Page) /* * FUNCTION: Delete a virtual mapping @@ -1060,7 +1060,7 @@ VOID NTAPI -MmDeletePageFileMapping(PROS_EPROCESS Process, PVOID Address, +MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, SWAPENTRY* SwapEntry) /* * FUNCTION: Delete a virtual mapping @@ -1199,7 +1199,7 @@ BOOLEAN NTAPI -MmIsDirtyPage(PROS_EPROCESS Process, PVOID Address) +MmIsDirtyPage(PEPROCESS Process, PVOID Address) { if (Ke386Pae) { @@ -1213,7 +1213,7 @@ BOOLEAN NTAPI -MmIsAccessedAndResetAccessPage(PROS_EPROCESS Process, PVOID Address) +MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) { if (Address < MmSystemRangeStart && Process == NULL) { @@ -1280,7 +1280,7 @@ VOID NTAPI -MmSetCleanPage(PROS_EPROCESS Process, PVOID Address) +MmSetCleanPage(PEPROCESS Process, PVOID Address) { if (Address < MmSystemRangeStart && Process == NULL) { @@ -1345,7 +1345,7 @@ VOID NTAPI -MmSetDirtyPage(PROS_EPROCESS Process, PVOID Address) +MmSetDirtyPage(PEPROCESS Process, PVOID Address) { if (Address < MmSystemRangeStart && Process == NULL) { @@ -1406,7 +1406,7 @@ VOID NTAPI -MmEnableVirtualMapping(PROS_EPROCESS Process, PVOID Address) +MmEnableVirtualMapping(PEPROCESS Process, PVOID Address) { if (Ke386Pae) { @@ -1462,7 +1462,7 @@ BOOLEAN NTAPI -MmIsPagePresent(PROS_EPROCESS Process, PVOID Address) +MmIsPagePresent(PEPROCESS Process, PVOID Address) { if (Ke386Pae) { @@ -1476,7 +1476,7 @@ BOOLEAN NTAPI -MmIsPageSwapEntry(PROS_EPROCESS Process, PVOID Address) +MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) { if (Ke386Pae) { @@ -1622,7 +1622,7 @@ NTSTATUS NTAPI -MmCreatePageFileMapping(PROS_EPROCESS Process, +MmCreatePageFileMapping(PEPROCESS Process, PVOID Address, SWAPENTRY SwapEntry) { @@ -1710,7 +1710,7 @@ NTSTATUS NTAPI -MmCreateVirtualMappingUnsafe(PROS_EPROCESS Process, +MmCreateVirtualMappingUnsafe(PEPROCESS Process, PVOID Address, ULONG flProtect, PPFN_TYPE Pages, @@ -1916,7 +1916,7 @@ NTSTATUS NTAPI -MmCreateVirtualMapping(PROS_EPROCESS Process, +MmCreateVirtualMapping(PEPROCESS Process, PVOID Address, ULONG flProtect, PPFN_TYPE Pages, @@ -1942,7 +1942,7 @@ ULONG NTAPI -MmGetPageProtect(PROS_EPROCESS Process, PVOID Address) +MmGetPageProtect(PEPROCESS Process, PVOID Address) { ULONG Entry; ULONG Protect; @@ -1988,7 +1988,7 @@ VOID NTAPI -MmSetPageProtect(PROS_EPROCESS Process, PVOID Address, ULONG flProtect) +MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) { ULONG Attributes = 0; BOOLEAN NoExecute = FALSE; @@ -2273,7 +2273,7 @@ VOID NTAPI -MmUpdatePageDir(PROS_EPROCESS Process, PVOID Address, ULONG Size) +MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) { ULONG StartOffset, EndOffset, Offset; @@ -2307,7 +2307,7 @@ EndOffset = 511; } - if (Process != NULL && Process != (PROS_EPROCESS)PsGetCurrentProcess()) + if (Process != NULL && Process != PsGetCurrentProcess()) { PageDirTable = MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(Process->Pcb.DirectoryTableBase.QuadPart)); Pde = (PULONGLONG)MmCreateHyperspaceMapping(PTE_TO_PFN(PageDirTable[i])); @@ -2334,7 +2334,7 @@ StartOffset = ADDR_TO_PDE_OFFSET(Address); EndOffset = ADDR_TO_PDE_OFFSET((PVOID)((ULONG_PTR)Address + Size)); - if (Process != NULL && Process != (PROS_EPROCESS)PsGetCurrentProcess()) + if (Process != NULL && Process != PsGetCurrentProcess()) { Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.LowPart)); } Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c (original) +++ trunk/reactos/ntoskrnl/mm/marea.c Fri May 19 00:32:17 2006 @@ -747,7 +747,7 @@ PMEMORY_AREA *ParentReplace; ULONG_PTR Address; PVOID EndAddress; - PROS_EPROCESS CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); + PEPROCESS CurrentProcess = PsGetCurrentProcess(); if (AddressSpace->Process != NULL && AddressSpace->Process != CurrentProcess) @@ -1025,7 +1025,7 @@ VOID STDCALL -MmReleaseMemoryAreaIfDecommitted(PROS_EPROCESS Process, +MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process, PMADDRESS_SPACE AddressSpace, PVOID BaseAddress) { Modified: trunk/reactos/ntoskrnl/mm/mdl.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/mdl.c?rev=21935… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdl.c (original) +++ trunk/reactos/ntoskrnl/mm/mdl.c Fri May 19 00:32:17 2006 @@ -241,7 +241,7 @@ /* Unmap all the pages. */ for (i = 0; i < PageCount; i++) { - MmDeleteVirtualMapping((PROS_EPROCESS)Mdl->Process, + MmDeleteVirtualMapping(Mdl->Process, (char*)BaseAddress + (i * PAGE_SIZE), FALSE, NULL, @@ -273,14 +273,14 @@ ASSERT(Mdl->Process == PsGetCurrentProcess()); - Marea = MmLocateMemoryAreaByAddress( (PMADDRESS_SPACE)&((PROS_EPROCESS)Mdl->Process)->VadRoot, BaseAddress ); + Marea = MmLocateMemoryAreaByAddress( (PMADDRESS_SPACE)&(Mdl->Process)->VadRoot, BaseAddress ); if (Marea == NULL) { DPRINT1( "Couldn't open memory area when unmapping user-space pages!\n" ); KEBUGCHECK(0); } - MmFreeMemoryArea( (PMADDRESS_SPACE)&((PROS_EPROCESS)Mdl->Process)->VadRoot, Marea, NULL, NULL ); + MmFreeMemoryArea( (PMADDRESS_SPACE)&(Mdl->Process)->VadRoot, Marea, NULL, NULL ); Mdl->Process = NULL; } @@ -411,7 +411,7 @@ /* FIXME: why isn't AccessMode used? */ Mode = UserMode; Mdl->Process = CurrentProcess; - AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)CurrentProcess)->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(CurrentProcess)->VadRoot; } @@ -771,7 +771,7 @@ KIRQL oldIrql; ULONG PageCount; ULONG StartingOffset; - PROS_EPROCESS CurrentProcess; + PEPROCESS CurrentProcess; NTSTATUS Status; ULONG Protect; @@ -803,7 +803,7 @@ BoundaryAddressMultiple.QuadPart = 0; Base = BaseAddress; - CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); + CurrentProcess = PsGetCurrentProcess(); MmLockAddressSpace((PMADDRESS_SPACE)&CurrentProcess->VadRoot); Status = MmCreateMemoryArea((PMADDRESS_SPACE)&CurrentProcess->VadRoot, Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=21935&… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Fri May 19 00:32:17 2006 @@ -30,7 +30,7 @@ NTSTATUS NTAPI -MmReleaseMmInfo(PROS_EPROCESS Process) +MmReleaseMmInfo(PEPROCESS Process) { PVOID Address; PMEMORY_AREA MemoryArea; @@ -114,7 +114,7 @@ } else { - AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)PsGetCurrentProcess())->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(PsGetCurrentProcess())->VadRoot; } MmLockAddressSpace(AddressSpace); @@ -171,7 +171,7 @@ } else { - AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)PsGetCurrentProcess())->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(PsGetCurrentProcess())->VadRoot; } if (!FromMdl) @@ -304,7 +304,7 @@ } else { - AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)PsGetCurrentProcess())->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(PsGetCurrentProcess())->VadRoot; } if (!FromMdl) @@ -357,7 +357,7 @@ case MEMORY_AREA_SHARED_DATA: Pfn = MmSharedDataPagePhysicalAddress.QuadPart >> PAGE_SHIFT; Status = - MmCreateVirtualMapping((PROS_EPROCESS)PsGetCurrentProcess(), + MmCreateVirtualMapping(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address), PAGE_READONLY, &Pfn, Modified: trunk/reactos/ntoskrnl/mm/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/process.c (original) +++ trunk/reactos/ntoskrnl/mm/process.c Fri May 19 00:32:17 2006 @@ -25,7 +25,7 @@ PVOID STDCALL -MiCreatePebOrTeb(PROS_EPROCESS Process, +MiCreatePebOrTeb(PEPROCESS Process, PVOID BaseAddress) { NTSTATUS Status; @@ -107,7 +107,7 @@ VOID STDCALL -MmDeleteTeb(PROS_EPROCESS Process, +MmDeleteTeb(PEPROCESS Process, PTEB Teb) { PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; @@ -220,7 +220,7 @@ NTSTATUS STDCALL -MmCreatePeb(PROS_EPROCESS Process) +MmCreatePeb(PEPROCESS Process) { PPEB Peb = NULL; LARGE_INTEGER SectionOffset; @@ -370,7 +370,7 @@ PTEB STDCALL -MmCreateTeb(PROS_EPROCESS Process, +MmCreateTeb(PEPROCESS Process, PCLIENT_ID ClientId, PINITIAL_TEB InitialTeb) { @@ -379,7 +379,7 @@ /* Attach to the process */ DPRINT("MmCreateTeb\n"); - if (Process != (PROS_EPROCESS)PsGetCurrentProcess()) + if (Process != PsGetCurrentProcess()) { /* Attach to Target */ KeAttachProcess(&Process->Pcb); @@ -420,7 +420,7 @@ NTSTATUS STDCALL -MmCreateProcessAddressSpace(IN PROS_EPROCESS Process, +MmCreateProcessAddressSpace(IN PEPROCESS Process, IN PROS_SECTION_OBJECT Section OPTIONAL) { NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=2193… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c Fri May 19 00:32:17 2006 @@ -62,7 +62,7 @@ PMADDRESS_SPACE AddressSpace; ULONG Type; PVOID Address; - PROS_EPROCESS Process; + PEPROCESS Process; PMM_PAGEOP PageOp; ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -78,7 +78,7 @@ ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); } - Process = (PROS_EPROCESS)entry->Process; + Process = entry->Process; Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { @@ -196,7 +196,7 @@ PMADDRESS_SPACE AddressSpace; ULONG Type; PVOID Address; - PROS_EPROCESS Process; + PEPROCESS Process; PMM_PAGEOP PageOp; ULONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -208,7 +208,7 @@ ExReleaseFastMutex(&RmapListLock); return(STATUS_UNSUCCESSFUL); } - Process = (PROS_EPROCESS)entry->Process; + Process = entry->Process; Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { @@ -326,7 +326,7 @@ } while (current_entry != NULL) { - MmSetCleanPage((PROS_EPROCESS)current_entry->Process, current_entry->Address); + MmSetCleanPage(current_entry->Process, current_entry->Address); current_entry = current_entry->Next; } ExReleaseFastMutex(&RmapListLock); @@ -347,7 +347,7 @@ } while (current_entry != NULL) { - MmSetDirtyPage((PROS_EPROCESS)current_entry->Process, current_entry->Address); + MmSetDirtyPage(current_entry->Process, current_entry->Address); current_entry = current_entry->Next; } ExReleaseFastMutex(&RmapListLock); @@ -368,7 +368,7 @@ } while (current_entry != NULL) { - if (MmIsDirtyPage((PROS_EPROCESS)current_entry->Process, current_entry->Address)) + if (MmIsDirtyPage(current_entry->Process, current_entry->Address)) { ExReleaseFastMutex(&RmapListLock); return(TRUE); @@ -381,7 +381,7 @@ VOID NTAPI -MmInsertRmap(PFN_TYPE Page, PROS_EPROCESS Process, +MmInsertRmap(PFN_TYPE Page, PEPROCESS Process, PVOID Address) { PMM_RMAP_ENTRY current_entry; @@ -433,7 +433,7 @@ ExReleaseFastMutex(&RmapListLock); if (Process == NULL) { - Process = (PROS_EPROCESS)PsInitialSystemProcess; + Process = PsInitialSystemProcess; } if (Process) { @@ -448,7 +448,7 @@ VOID NTAPI MmDeleteAllRmaps(PFN_TYPE Page, PVOID Context, - VOID (*DeleteMapping)(PVOID Context, PROS_EPROCESS Process, + VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process, PVOID Address)) { PMM_RMAP_ENTRY current_entry; @@ -470,7 +470,7 @@ current_entry = current_entry->Next; if (DeleteMapping) { - DeleteMapping(Context, (PROS_EPROCESS)previous_entry->Process, + DeleteMapping(Context, previous_entry->Process, previous_entry->Address); } Process = previous_entry->Process; @@ -488,7 +488,7 @@ VOID NTAPI -MmDeleteRmap(PFN_TYPE Page, PROS_EPROCESS Process, +MmDeleteRmap(PFN_TYPE Page, PEPROCESS Process, PVOID Address) { PMM_RMAP_ENTRY current_entry, previous_entry; @@ -513,7 +513,7 @@ ExFreeToNPagedLookasideList(&RmapLookasideList, current_entry); if (Process == NULL) { - Process = (PROS_EPROCESS)PsInitialSystemProcess; + Process = PsInitialSystemProcess; } if (Process) { Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri May 19 00:32:17 2006 @@ -1329,7 +1329,7 @@ } VOID -MmPageOutDeleteMapping(PVOID Context, PROS_EPROCESS Process, PVOID Address) +MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process, PVOID Address) { MM_SECTION_PAGEOUT_CONTEXT* PageOutContext; BOOLEAN WasDirty; @@ -3595,7 +3595,7 @@ LARGE_INTEGER SafeSectionOffset; SIZE_T SafeViewSize; PROS_SECTION_OBJECT Section; - PROS_EPROCESS Process; + PEPROCESS Process; KPROCESSOR_MODE PreviousMode; PMADDRESS_SPACE AddressSpace; NTSTATUS Status = STATUS_SUCCESS; @@ -3911,7 +3911,7 @@ ASSERT(Process); - AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)Process)->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, @@ -4432,7 +4432,7 @@ Section = (PROS_SECTION_OBJECT)SectionObject; - AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)Process)->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; AllocationType |= (Section->AllocationAttributes & SEC_NO_CHANGE); Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c Fri May 19 00:32:17 2006 @@ -119,7 +119,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PROS_EPROCESS Process; + PEPROCESS Process; MEMORY_AREA* MemoryArea; PMADDRESS_SPACE AddressSpace; @@ -393,7 +393,7 @@ PAGE_ROUND_DOWN(*BaseAddress); *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); - AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)Process)->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=21935… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c (original) +++ trunk/reactos/ntoskrnl/ps/job.c Fri May 19 00:32:17 2006 @@ -157,7 +157,7 @@ /* lock the process so we can safely assign the process. Note that in the meanwhile another thread could have assigned this process to a job! */ - Status = PsLockProcess((PROS_EPROCESS)Process, FALSE); + Status = PsLockProcess(Process, FALSE); if(NT_SUCCESS(Status)) { if(Process->Job == NULL && Process->Session == Job->SessionId) @@ -173,7 +173,7 @@ /* process is already assigned to a job or session id differs! */ Status = STATUS_ACCESS_DENIED; } - PsUnlockProcess((PROS_EPROCESS)Process); + PsUnlockProcess(Process); if(NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=2193… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Fri May 19 00:32:17 2006 @@ -165,7 +165,7 @@ } /* Delete the process lock */ - ExFreePool(((PROS_EPROCESS)Process)->LockEvent); + ExFreePool(Process->LockEvent); /* KDB hook */ KDB_DELETEPROCESS_HOOK(Process); @@ -174,7 +174,7 @@ SeDeassignPrimaryToken(Process); /* Release Memory Information */ - MmReleaseMmInfo((PROS_EPROCESS)Process); + MmReleaseMmInfo(Process); /* Delete the W32PROCESS structure if there's one associated */ if(Process->Win32Process != NULL) ExFreePool(Process->Win32Process); @@ -248,7 +248,7 @@ KeLowerIrql(PASSIVE_LEVEL); /* Lock the Process before we modify its thread entries */ - PsLockProcess((PROS_EPROCESS)CurrentProcess, FALSE); + PsLockProcess(CurrentProcess, FALSE); /* wake up the thread so we don't deadlock on PsLockProcess */ KeForceResumeThread(&CurrentThread->Tcb); @@ -316,7 +316,7 @@ } DPRINT("Decommit teb at %p\n", Teb); - MmDeleteTeb((PROS_EPROCESS)CurrentProcess, Teb); + MmDeleteTeb(CurrentProcess, Teb); CurrentThread->Tcb.Teb = NULL; } @@ -324,7 +324,7 @@ if (Last) PspExitProcess(CurrentProcess); /* Unlock the Process */ - PsUnlockProcess((PROS_EPROCESS)CurrentProcess); + PsUnlockProcess(CurrentProcess); /* Cancel I/O for the thread. */ IoCancelThreadIo(CurrentThread); @@ -571,11 +571,11 @@ CurrentThread = PsGetCurrentThread(); - PsLockProcess((PROS_EPROCESS)Process, FALSE); + PsLockProcess(Process, FALSE); if(Process->ExitTime.QuadPart != 0) { - PsUnlockProcess((PROS_EPROCESS)Process); + PsUnlockProcess(Process); ObDereferenceObject(Process); return STATUS_PROCESS_IS_TERMINATING; } @@ -600,7 +600,7 @@ unlocking the process, fail */ CurrentThread->Terminated = TRUE; - PsUnlockProcess((PROS_EPROCESS)Process); + PsUnlockProcess(Process); /* we can safely dereference the process because the current thread holds a reference to it until it gets reaped */ @@ -618,7 +618,7 @@ } /* unlock and dereference the process so the threads can kill themselves */ - PsUnlockProcess((PROS_EPROCESS)Process); + PsUnlockProcess(Process); ObDereferenceObject(Process); return(STATUS_SUCCESS); @@ -676,7 +676,7 @@ if (Thread != PsGetCurrentThread()) { /* we need to lock the process to make sure it's not already terminating */ - PsLockProcess((PROS_EPROCESS)Thread->ThreadsProcess, FALSE); + PsLockProcess(Thread->ThreadsProcess, FALSE); /* This isn't our thread, terminate it if not already done */ if (!Thread->Terminated) { @@ -687,7 +687,7 @@ PspTerminateThreadByPointer(Thread, ExitStatus); } - PsUnlockProcess((PROS_EPROCESS)Thread->ThreadsProcess); + PsUnlockProcess(Thread->ThreadsProcess); /* Dereference the Thread and return */ ObDereferenceObject(Thread); Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Fri May 19 00:32:17 2006 @@ -35,7 +35,7 @@ NTSTATUS NTAPI -PsLockProcess(PROS_EPROCESS Process, BOOLEAN Timeout) +PsLockProcess(PEPROCESS Process, BOOLEAN Timeout) { ULONG Attempts = 0; PKTHREAD PrevLockOwner; @@ -94,7 +94,7 @@ VOID NTAPI -PsUnlockProcess(PROS_EPROCESS Process) +PsUnlockProcess(PEPROCESS Process) { PAGED_CODE(); @@ -292,7 +292,7 @@ ObjectAttributes, PreviousMode, NULL, - sizeof(ROS_EPROCESS), + sizeof(EPROCESS), 0, 0, (PVOID*)&Process); @@ -305,7 +305,7 @@ /* Clean up the Object */ DPRINT("Cleaning Process Object\n"); - RtlZeroMemory(Process, sizeof(ROS_EPROCESS)); + RtlZeroMemory(Process, sizeof(EPROCESS)); /* Inherit stuff from the Parent since we now have the object created */ if (pParentProcess) @@ -329,10 +329,10 @@ /* Setup the Lock Event */ DPRINT("Initialzing Process Lock\n"); - ((PROS_EPROCESS)Process)->LockEvent = ExAllocatePoolWithTag(PagedPool, + Process->LockEvent = ExAllocatePoolWithTag(PagedPool, sizeof(KEVENT), TAG('P', 's', 'L', 'k')); - KeInitializeEvent(((PROS_EPROCESS)Process)->LockEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(Process->LockEvent, SynchronizationEvent, FALSE); /* Setup the Thread List Head */ DPRINT("Initialzing Process ThreadListHead\n"); @@ -345,8 +345,8 @@ /* Set Process's Directory Base */ DPRINT("Initialzing Process Directory Base\n"); - MmCopyMmInfo((PROS_EPROCESS)(pParentProcess ? pParentProcess : PsInitialSystemProcess), - (PROS_EPROCESS)Process, + MmCopyMmInfo((pParentProcess ? pParentProcess : PsInitialSystemProcess), + Process, &DirectoryTableBase); /* Now initialize the Kernel Process */ @@ -367,7 +367,7 @@ /* Create the Process' Address Space */ DPRINT("Initialzing Process Address Space\n"); - Status = MmCreateProcessAddressSpace((PROS_EPROCESS)Process, (PROS_SECTION_OBJECT)SectionObject); + Status = MmCreateProcessAddressSpace(Process, (PROS_SECTION_OBJECT)SectionObject); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create Address Space\n"); @@ -400,7 +400,7 @@ if (pParentProcess) { DPRINT("Creating PEB\n"); - Status = MmCreatePeb((PROS_EPROCESS)Process); + Status = MmCreatePeb(Process); if (!NT_SUCCESS(Status)) { DbgPrint("NtCreateProcess() Peb creation failed: Status %x\n",Status); Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Fri May 19 00:32:17 2006 @@ -158,7 +158,7 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Process"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(ROS_EPROCESS); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(EPROCESS); ObjectTypeInitializer.GenericMapping = PiProcessMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = PROCESS_ALL_ACCESS; @@ -185,7 +185,7 @@ NULL, KernelMode, NULL, - sizeof(ROS_EPROCESS), + sizeof(EPROCESS), 0, 0, (PVOID*)&PsIdleProcess); @@ -196,7 +196,7 @@ return; } - RtlZeroMemory(PsIdleProcess, sizeof(ROS_EPROCESS)); + RtlZeroMemory(PsIdleProcess, sizeof(EPROCESS)); PsIdleProcess->Pcb.Affinity = 0xFFFFFFFF; PsIdleProcess->Pcb.IopmOffset = 0xffff; @@ -207,7 +207,7 @@ InitializeListHead(&PsIdleProcess->ActiveProcessLinks); KeInitializeDispatcherHeader(&PsIdleProcess->Pcb.Header, ProcessObject, - sizeof(ROS_EPROCESS) / sizeof(LONG), + sizeof(EPROCESS) / sizeof(LONG), FALSE); PsIdleProcess->Pcb.DirectoryTableBase.QuadPart = (ULONG_PTR)MmGetPageDirectory(); strcpy(PsIdleProcess->ImageFileName, "Idle"); @@ -221,7 +221,7 @@ NULL, KernelMode, NULL, - sizeof(ROS_EPROCESS), + sizeof(EPROCESS), 0, 0, (PVOID*)&PsInitialSystemProcess); @@ -233,7 +233,7 @@ } /* System threads may run on any processor. */ - RtlZeroMemory(PsInitialSystemProcess, sizeof(ROS_EPROCESS)); + RtlZeroMemory(PsInitialSystemProcess, sizeof(EPROCESS)); #ifdef CONFIG_SMP /* FIXME: * Only the boot cpu is initialized. Threads of the @@ -249,17 +249,17 @@ InitializeListHead(&PsInitialSystemProcess->Pcb.ThreadListHead); KeInitializeDispatcherHeader(&PsInitialSystemProcess->Pcb.Header, ProcessObject, - sizeof(ROS_EPROCESS) / sizeof(LONG), + sizeof(EPROCESS) / sizeof(LONG), FALSE); KProcess = &PsInitialSystemProcess->Pcb; PspInheritQuota(PsInitialSystemProcess, NULL); - MmInitializeAddressSpace((PROS_EPROCESS)PsInitialSystemProcess, - (PMADDRESS_SPACE)&((PROS_EPROCESS)PsInitialSystemProcess)->VadRoot); - - ((PROS_EPROCESS)PsInitialSystemProcess)->LockEvent = + MmInitializeAddressSpace(PsInitialSystemProcess, + (PMADDRESS_SPACE)&(PsInitialSystemProcess)->VadRoot); + + (PsInitialSystemProcess)->LockEvent = ExAllocatePoolWithTag(PagedPool, sizeof(KEVENT), TAG('P', 's', 'L', 'k')); - KeInitializeEvent(((PROS_EPROCESS)PsInitialSystemProcess)->LockEvent, SynchronizationEvent, FALSE); + KeInitializeEvent((PsInitialSystemProcess)->LockEvent, SynchronizationEvent, FALSE); #if defined(__GNUC__) KProcess->DirectoryTableBase = Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Fri May 19 00:32:17 2006 @@ -653,7 +653,7 @@ { /* lock the process to be thread-safe! */ - Status = PsLockProcess((PROS_EPROCESS)Process, FALSE); + Status = PsLockProcess(Process, FALSE); if(NT_SUCCESS(Status)) { /* @@ -671,7 +671,7 @@ ObDereferenceObject(ExceptionPort); Status = STATUS_PORT_ALREADY_SET; } - PsUnlockProcess((PROS_EPROCESS)Process); + PsUnlockProcess(Process); } else { @@ -758,7 +758,7 @@ /* FIXME - update the session id for the process token */ - Status = PsLockProcess((PROS_EPROCESS)Process, FALSE); + Status = PsLockProcess(Process, FALSE); if(NT_SUCCESS(Status)) { Process->Session = SessionInfo.SessionId; @@ -785,7 +785,7 @@ KeDetachProcess(); } - PsUnlockProcess((PROS_EPROCESS)Process); + PsUnlockProcess(Process); } } break; Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Fri May 19 00:32:17 2006 @@ -220,7 +220,7 @@ /* Create Teb */ DPRINT("Initialliazing Thread PEB\n"); - TebBase = MmCreateTeb((PROS_EPROCESS)Process, &Thread->Cid, InitialTeb); + TebBase = MmCreateTeb(Process, &Thread->Cid, InitialTeb); /* Set the Start Addresses */ DPRINT("Initialliazing Thread Start Addresses :%x, %x\n", ThreadContext->Eip, ThreadContext->Eax);

18 years, 5 months

[ion] 21934: - Use EPROCESS 's AddressCreationLock instead of the MADDRESS_SPACE Lock. - Overlay MADDRES_SPACE over MM_AVL_NODE. Even though our structures are currently incompatible, they represent the same thing (The EPROCESS's Address space).

by ion＠svn.reactos.org

Author: ion Date: Fri May 19 00:10:44 2006 New Revision: 21934 URL: http://svn.reactos.ru/svn/reactos?rev=21934&view=rev Log: - Use EPROCESS 's AddressCreationLock instead of the MADDRESS_SPACE Lock. - Overlay MADDRES_SPACE over MM_AVL_NODE. Even though our structures are currently incompatible, they represent the same thing (The EPROCESS's Address space). Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/aspace.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mdl.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/process.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/m… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri May 19 00:10:44 2006 @@ -219,7 +219,6 @@ ULONG Type; ULONG Protect; ULONG Flags; - ULONG LockCount; BOOLEAN DeleteInProgress; ULONG PageOpCount; union @@ -242,7 +241,6 @@ typedef struct _MADDRESS_SPACE { PMEMORY_AREA MemoryAreaRoot; - FAST_MUTEX Lock; PVOID LowestAddress; struct _ROS_EPROCESS* Process; PUSHORT PageTableRefCountTable; Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/p… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Fri May 19 00:10:44 2006 @@ -45,7 +45,7 @@ EX_PUSH_LOCK AddressCreationLock; PETHREAD RotateInProgress; #else - KGUARDED_MUTEX AddressCreationLock; + FAST_MUTEX AddressCreationLock; // FIXME: FAST_MUTEX for XP, KGUARDED_MUTEX for 2K3 KSPIN_LOCK HyperSpaceLock; #endif PETHREAD ForkInProgress; @@ -200,7 +200,6 @@ UCHAR PriorityClass; MM_AVL_TABLE VadRoot; ULONG Cookie; - MADDRESS_SPACE AddressSpace; } ROS_EPROCESS, *PROS_EPROCESS; #include <poppack.h> Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=21934… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Fri May 19 00:10:44 2006 @@ -26,6 +26,8 @@ HalReleaseDisplayOwnership( VOID ); + +extern FAST_MUTEX KernelAddressSpaceLock; /* GLOBALS ******************************************************************/ @@ -341,7 +343,7 @@ KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Unload the Kernel Adress Space if we own it */ - if (MmGetKernelAddressSpace()->Lock.Owner == KeGetCurrentThread()) + if (KernelAddressSpaceLock.Owner == KeGetCurrentThread()) MmUnlockAddressSpace(MmGetKernelAddressSpace()); /* FIXMEs: Use inbv to clear, fill and write to screen. */ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c Fri May 19 00:10:44 2006 @@ -679,7 +679,7 @@ Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; DPRINT("Type %x\n", Type); - AddressSpace = &Process->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; MmLockAddressSpace(AddressSpace); if (PBaseAddress != 0) @@ -833,7 +833,7 @@ if (PageOp != NULL) { NTSTATUS Status; - MmUnlockAddressSpace(&Process->AddressSpace); + MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); Status = KeWaitForSingleObject(&PageOp->CompletionEvent, 0, KernelMode, @@ -844,7 +844,7 @@ DPRINT1("Failed to wait for page op\n"); KEBUGCHECK(0); } - MmLockAddressSpace(&Process->AddressSpace); + MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); MmReleasePageOp(PageOp); } } @@ -860,7 +860,7 @@ } /* Actually free the memory area. */ - MmFreeMemoryArea(&Process->AddressSpace, + MmFreeMemoryArea((PMADDRESS_SPACE)&Process->VadRoot, MemoryArea, MmFreeVirtualMemoryPage, (PVOID)Process); @@ -913,7 +913,7 @@ return(Status); } - AddressSpace = &Process->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); Modified: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/mm/aspace.c (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c Fri May 19 00:10:44 2006 @@ -20,7 +20,8 @@ /* GLOBALS ******************************************************************/ -STATIC MADDRESS_SPACE KernelAddressSpace; +static MADDRESS_SPACE KernelAddressSpace; +FAST_MUTEX KernelAddressSpaceLock; /* FUNCTIONS *****************************************************************/ @@ -35,7 +36,15 @@ { return; } - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&AddressSpace->Lock); + + if (AddressSpace->Process) + { + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&AddressSpace->Process->AddressCreationLock); + } + else + { + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&KernelAddressSpaceLock); + } } VOID @@ -49,7 +58,14 @@ { return; } - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&AddressSpace->Lock); + if (AddressSpace->Process) + { + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&AddressSpace->Process->AddressCreationLock); + } + else + { + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&KernelAddressSpaceLock); + } } VOID @@ -64,7 +80,7 @@ NTAPI MmGetCurrentAddressSpace(VOID) { - return(&((PROS_EPROCESS)PsGetCurrentProcess())->AddressSpace); + return((PMADDRESS_SPACE)&((PROS_EPROCESS)PsGetCurrentProcess())->VadRoot); } PMADDRESS_SPACE @@ -80,7 +96,14 @@ PMADDRESS_SPACE AddressSpace) { AddressSpace->MemoryAreaRoot = NULL; - ExInitializeFastMutex(&AddressSpace->Lock); + if (Process) + { + ExInitializeFastMutex(&Process->AddressCreationLock); + } + else + { + ExInitializeFastMutex(&KernelAddressSpaceLock); + } if (Process != NULL) { AddressSpace->LowestAddress = MM_LOWEST_USER_ADDRESS; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Fri May 19 00:10:44 2006 @@ -243,7 +243,7 @@ DPRINT1("ProcessId %d, Pde for %08x - %08x is not freed, RefCount %d\n", Process->UniqueProcessId, (i * 512 + j) * 512 * PAGE_SIZE, (i * 512 + j + 1) * 512 * PAGE_SIZE - 1, - Process->AddressSpace.PageTableRefCountTable[i*512 + j]); + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable[i*512 + j]); Pde = MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(PageDir[j])); for (k = 0; k < 512; k++) { @@ -288,7 +288,7 @@ { DPRINT1("Pde for %08x - %08x is not freed, RefCount %d\n", i * 4 * 1024 * 1024, (i + 1) * 4 * 1024 * 1024 - 1, - Process->AddressSpace.PageTableRefCountTable[i]); + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable[i]); Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(PageDir[i])); for (j = 0; j < 1024; j++) { @@ -1041,13 +1041,13 @@ * Decrement the reference count for this page table. */ if (Process != NULL && WasValid && - Process->AddressSpace.PageTableRefCountTable != NULL && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && Address < MmSystemRangeStart) { PUSHORT Ptrc; ULONG Idx; - Ptrc = Process->AddressSpace.PageTableRefCountTable; + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; Idx = Ke386Pae ? PAE_ADDR_TO_PAGE_TABLE(Address) : ADDR_TO_PAGE_TABLE(Address); Ptrc[Idx]--; @@ -1090,12 +1090,12 @@ * Decrement the reference count for this page table. */ if (Process != NULL && Pte && - Process->AddressSpace.PageTableRefCountTable != NULL && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && Address < MmSystemRangeStart) { PUSHORT Ptrc; - Ptrc = Process->AddressSpace.PageTableRefCountTable; + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; Ptrc[PAE_ADDR_TO_PAGE_TABLE(Address)]--; if (Ptrc[PAE_ADDR_TO_PAGE_TABLE(Address)] == 0) @@ -1134,12 +1134,12 @@ * Decrement the reference count for this page table. */ if (Process != NULL && Pte && - Process->AddressSpace.PageTableRefCountTable != NULL && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && Address < MmSystemRangeStart) { PUSHORT Ptrc; - Ptrc = Process->AddressSpace.PageTableRefCountTable; + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; Ptrc[ADDR_TO_PAGE_TABLE(Address)]--; if (Ptrc[ADDR_TO_PAGE_TABLE(Address)] == 0) @@ -1694,13 +1694,13 @@ } } if (Process != NULL && - Process->AddressSpace.PageTableRefCountTable != NULL && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && Address < MmSystemRangeStart) { PUSHORT Ptrc; ULONG Idx; - Ptrc = Process->AddressSpace.PageTableRefCountTable; + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; Idx = Ke386Pae ? PAE_ADDR_TO_PAGE_TABLE(Address) : ADDR_TO_PAGE_TABLE(Address); Ptrc[Idx]++; } @@ -1823,12 +1823,12 @@ MmMarkPageUnmapped(PAE_PTE_TO_PFN((Pte))); } if (Address < MmSystemRangeStart && - Process->AddressSpace.PageTableRefCountTable != NULL && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && Attributes & PA_PRESENT) { PUSHORT Ptrc; - Ptrc = Process->AddressSpace.PageTableRefCountTable; + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; Ptrc[PAE_ADDR_TO_PAGE_TABLE(Addr)]++; } @@ -1888,12 +1888,12 @@ } (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); if (Address < MmSystemRangeStart && - Process->AddressSpace.PageTableRefCountTable != NULL && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable != NULL && Attributes & PA_PRESENT) { PUSHORT Ptrc; - Ptrc = Process->AddressSpace.PageTableRefCountTable; + Ptrc = ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; Ptrc[ADDR_TO_PAGE_TABLE(Addr)]++; } Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c (original) +++ trunk/reactos/ntoskrnl/mm/marea.c Fri May 19 00:10:44 2006 @@ -1011,7 +1011,7 @@ MemoryArea->EndingAddress = (PVOID)((ULONG_PTR)*BaseAddress + tmpLength); MemoryArea->Protect = Protect; MemoryArea->Flags = AllocationFlags; - MemoryArea->LockCount = 0; + //MemoryArea->LockCount = 0; MemoryArea->PageOpCount = 0; MemoryArea->DeleteInProgress = FALSE; Modified: trunk/reactos/ntoskrnl/mm/mdl.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/mdl.c?rev=21934… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdl.c (original) +++ trunk/reactos/ntoskrnl/mm/mdl.c Fri May 19 00:10:44 2006 @@ -273,14 +273,14 @@ ASSERT(Mdl->Process == PsGetCurrentProcess()); - Marea = MmLocateMemoryAreaByAddress( &((PROS_EPROCESS)Mdl->Process)->AddressSpace, BaseAddress ); + Marea = MmLocateMemoryAreaByAddress( (PMADDRESS_SPACE)&((PROS_EPROCESS)Mdl->Process)->VadRoot, BaseAddress ); if (Marea == NULL) { DPRINT1( "Couldn't open memory area when unmapping user-space pages!\n" ); KEBUGCHECK(0); } - MmFreeMemoryArea( &((PROS_EPROCESS)Mdl->Process)->AddressSpace, Marea, NULL, NULL ); + MmFreeMemoryArea( (PMADDRESS_SPACE)&((PROS_EPROCESS)Mdl->Process)->VadRoot, Marea, NULL, NULL ); Mdl->Process = NULL; } @@ -411,7 +411,7 @@ /* FIXME: why isn't AccessMode used? */ Mode = UserMode; Mdl->Process = CurrentProcess; - AddressSpace = &((PROS_EPROCESS)CurrentProcess)->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)CurrentProcess)->VadRoot; } @@ -805,8 +805,8 @@ CurrentProcess = (PROS_EPROCESS)PsGetCurrentProcess(); - MmLockAddressSpace(&CurrentProcess->AddressSpace); - Status = MmCreateMemoryArea(&CurrentProcess->AddressSpace, + MmLockAddressSpace((PMADDRESS_SPACE)&CurrentProcess->VadRoot); + Status = MmCreateMemoryArea((PMADDRESS_SPACE)&CurrentProcess->VadRoot, MEMORY_AREA_MDL_MAPPING, &Base, PageCount * PAGE_SIZE, @@ -815,7 +815,7 @@ (Base != NULL), 0, BoundaryAddressMultiple); - MmUnlockAddressSpace(&CurrentProcess->AddressSpace); + MmUnlockAddressSpace((PMADDRESS_SPACE)&CurrentProcess->VadRoot); if (!NT_SUCCESS(Status)) { if (Mdl->MdlFlags & MDL_MAPPING_CAN_FAIL) Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=21934&… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Fri May 19 00:10:44 2006 @@ -38,17 +38,17 @@ DPRINT("MmReleaseMmInfo(Process %x (%s))\n", Process, Process->ImageFileName); - MmLockAddressSpace(&Process->AddressSpace); - - while ((MemoryArea = Process->AddressSpace.MemoryAreaRoot) != NULL) + MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + + while ((MemoryArea = ((PMADDRESS_SPACE)&Process->VadRoot)->MemoryAreaRoot) != NULL) { switch (MemoryArea->Type) { case MEMORY_AREA_SECTION_VIEW: Address = (PVOID)MemoryArea->StartingAddress; - MmUnlockAddressSpace(&Process->AddressSpace); + MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); MmUnmapViewOfSection((PEPROCESS)Process, Address); - MmLockAddressSpace(&Process->AddressSpace); + MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); break; case MEMORY_AREA_VIRTUAL_MEMORY: @@ -58,7 +58,7 @@ case MEMORY_AREA_SHARED_DATA: case MEMORY_AREA_NO_ACCESS: - MmFreeMemoryArea(&Process->AddressSpace, + MmFreeMemoryArea((PMADDRESS_SPACE)&Process->VadRoot, MemoryArea, NULL, NULL); @@ -75,8 +75,8 @@ Mmi386ReleaseMmInfo(Process); - MmUnlockAddressSpace(&Process->AddressSpace); - MmDestroyAddressSpace(&Process->AddressSpace); + MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + MmDestroyAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); DPRINT("Finished MmReleaseMmInfo()\n"); return(STATUS_SUCCESS); @@ -114,7 +114,7 @@ } else { - AddressSpace = &((PROS_EPROCESS)PsGetCurrentProcess())->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)PsGetCurrentProcess())->VadRoot; } MmLockAddressSpace(AddressSpace); @@ -171,7 +171,7 @@ } else { - AddressSpace = &((PROS_EPROCESS)PsGetCurrentProcess())->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)PsGetCurrentProcess())->VadRoot; } if (!FromMdl) @@ -304,7 +304,7 @@ } else { - AddressSpace = &((PROS_EPROCESS)PsGetCurrentProcess())->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)PsGetCurrentProcess())->VadRoot; } if (!FromMdl) Modified: trunk/reactos/ntoskrnl/mm/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/process.c (original) +++ trunk/reactos/ntoskrnl/mm/process.c Fri May 19 00:10:44 2006 @@ -29,7 +29,7 @@ PVOID BaseAddress) { NTSTATUS Status; - PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; + PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID AllocatedBase = BaseAddress; @@ -110,7 +110,7 @@ MmDeleteTeb(PROS_EPROCESS Process, PTEB Teb) { - PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; + PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; PMEMORY_AREA MemoryArea; /* Lock the Address Space */ @@ -424,7 +424,7 @@ IN PROS_SECTION_OBJECT Section OPTIONAL) { NTSTATUS Status; - PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; + PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; PVOID BaseAddress; PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=2193… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c Fri May 19 00:10:44 2006 @@ -92,7 +92,7 @@ { return Status; } - AddressSpace = &Process->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; } else { @@ -223,7 +223,7 @@ { return Status; } - AddressSpace = &Process->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; } else { Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri May 19 00:10:44 2006 @@ -1338,7 +1338,7 @@ PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; if (Process) { - MmLockAddressSpace(&Process->AddressSpace); + MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); } MmDeleteVirtualMapping(Process, @@ -1362,7 +1362,7 @@ } if (Process) { - MmUnlockAddressSpace(&Process->AddressSpace); + MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); } if (PageOutContext->Private) @@ -3676,7 +3676,7 @@ return(Status); } - AddressSpace = &Process->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; Status = ObReferenceObjectByHandle(SectionHandle, SECTION_MAP_READ, @@ -3911,7 +3911,7 @@ ASSERT(Process); - AddressSpace = &((PROS_EPROCESS)Process)->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)Process)->VadRoot; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, @@ -4432,7 +4432,7 @@ Section = (PROS_SECTION_OBJECT)SectionObject; - AddressSpace = &((PROS_EPROCESS)Process)->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)Process)->VadRoot; AllocationType |= (Section->AllocationAttributes & SEC_NO_CHANGE); Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c Fri May 19 00:10:44 2006 @@ -137,7 +137,7 @@ DPRINT("NtQueryVirtualMemory() = %x\n",Status); return(Status); } - AddressSpace = &Process->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; } else { @@ -393,7 +393,7 @@ PAGE_ROUND_DOWN(*BaseAddress); *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); - AddressSpace = &((PROS_EPROCESS)Process)->AddressSpace; + AddressSpace = (PMADDRESS_SPACE)&((PROS_EPROCESS)Process)->VadRoot; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Fri May 19 00:10:44 2006 @@ -255,7 +255,7 @@ PspInheritQuota(PsInitialSystemProcess, NULL); MmInitializeAddressSpace((PROS_EPROCESS)PsInitialSystemProcess, - &((PROS_EPROCESS)PsInitialSystemProcess)->AddressSpace); + (PMADDRESS_SPACE)&((PROS_EPROCESS)PsInitialSystemProcess)->VadRoot); ((PROS_EPROCESS)PsInitialSystemProcess)->LockEvent = ExAllocatePoolWithTag(PagedPool, sizeof(KEVENT), TAG('P', 's', 'L', 'k'));

18 years, 5 months

[ion] 21933: - Use the Spare0 array, present in EPROCESS instead of ReactOS-specific members for Process Locking (temporary fix until pushlocks are used).

by ion＠svn.reactos.org

Author: ion Date: Thu May 18 22:55:38 2006 New Revision: 21933 URL: http://svn.reactos.ru/svn/reactos?rev=21933&view=rev Log: - Use the Spare0 array, present in EPROCESS instead of ReactOS-specific members for Process Locking (temporary fix until pushlocks are used). Modified: trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/p… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Thu May 18 22:55:38 2006 @@ -200,9 +200,6 @@ UCHAR PriorityClass; MM_AVL_TABLE VadRoot; ULONG Cookie; - KEVENT LockEvent; - ULONG LockCount; - struct _KTHREAD *LockOwner; MADDRESS_SPACE AddressSpace; } ROS_EPROCESS, *PROS_EPROCESS; #include <poppack.h> Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=2193… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Thu May 18 22:55:38 2006 @@ -14,6 +14,11 @@ #define NDEBUG #include <internal/debug.h> +#define LockEvent Spare0[0] +#define LockCount Spare0[1] +#define LockOwner Spare0[2] + + /* GLOBALS *******************************************************************/ PETHREAD PspReaperList = NULL; @@ -158,6 +163,9 @@ { ExDestroyHandle(PspCidTable, Process->UniqueProcessId); } + + /* Delete the process lock */ + ExFreePool(((PROS_EPROCESS)Process)->LockEvent); /* KDB hook */ KDB_DELETEPROCESS_HOOK(Process); Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu May 18 22:55:38 2006 @@ -14,6 +14,10 @@ #define NDEBUG #include <internal/debug.h> +#define LockEvent Spare0[0] +#define LockCount Spare0[1] +#define LockOwner Spare0[2] + /* GLOBALS ******************************************************************/ PEPROCESS PsInitialSystemProcess = NULL; @@ -52,7 +56,7 @@ /* we got the lock or already locked it */ if(InterlockedIncrementUL(&Process->LockCount) == 1) { - KeClearEvent(&Process->LockEvent); + KeClearEvent(Process->LockEvent); } return STATUS_SUCCESS; @@ -61,7 +65,7 @@ { if(++Attempts > 2) { - Status = KeWaitForSingleObject(&Process->LockEvent, + Status = KeWaitForSingleObject(Process->LockEvent, Executive, KernelMode, FALSE, @@ -99,7 +103,7 @@ if(InterlockedDecrementUL(&Process->LockCount) == 0) { (void)InterlockedExchangePointer(&Process->LockOwner, NULL); - KeSetEvent(&Process->LockEvent, IO_NO_INCREMENT, FALSE); + KeSetEvent(Process->LockEvent, IO_NO_INCREMENT, FALSE); } KeLeaveCriticalRegion(); @@ -325,7 +329,10 @@ /* Setup the Lock Event */ DPRINT("Initialzing Process Lock\n"); - KeInitializeEvent(&((PROS_EPROCESS)Process)->LockEvent, SynchronizationEvent, FALSE); + ((PROS_EPROCESS)Process)->LockEvent = ExAllocatePoolWithTag(PagedPool, + sizeof(KEVENT), + TAG('P', 's', 'L', 'k')); + KeInitializeEvent(((PROS_EPROCESS)Process)->LockEvent, SynchronizationEvent, FALSE); /* Setup the Thread List Head */ DPRINT("Initialzing Process ThreadListHead\n"); Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Thu May 18 22:55:38 2006 @@ -13,6 +13,10 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#define LockEvent Spare0[0] +#define LockCount Spare0[1] +#define LockOwner Spare0[2] extern LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; extern LIST_ENTRY PriorityListHead[MAXIMUM_PRIORITY]; @@ -253,7 +257,9 @@ MmInitializeAddressSpace((PROS_EPROCESS)PsInitialSystemProcess, &((PROS_EPROCESS)PsInitialSystemProcess)->AddressSpace); - KeInitializeEvent(&((PROS_EPROCESS)PsInitialSystemProcess)->LockEvent, SynchronizationEvent, FALSE); + ((PROS_EPROCESS)PsInitialSystemProcess)->LockEvent = + ExAllocatePoolWithTag(PagedPool, sizeof(KEVENT), TAG('P', 's', 'L', 'k')); + KeInitializeEvent(((PROS_EPROCESS)PsInitialSystemProcess)->LockEvent, SynchronizationEvent, FALSE); #if defined(__GNUC__) KProcess->DirectoryTableBase =

18 years, 5 months

[fireball] 21932: [AUDIT] ntoskrnl/ex/error.c - Alex Ionescu states the implementations are clean: I just re-orgznied the *harderror functions. The SEH filter is a trivial/well-known return of a single value, and __purecall is a stub.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 18 16:25:05 2006 New Revision: 21932 URL: http://svn.reactos.ru/svn/reactos?rev=21932&view=rev Log: [AUDIT] ntoskrnl/ex/error.c - Alex Ionescu states the implementations are clean: I just re-orgznied the *harderror functions. The SEH filter is a trivial/well-known return of a single value, and __purecall is a stub. Modified: trunk/reactos/ntoskrnl/ex/error.c (props changed) Propchange: trunk/reactos/ntoskrnl/ex/error.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

[fireball] 21931: [AUDIT] ntoskrnl/dbgk (according to functions_list.txt in audited branch comments by Alex Ionescu, and comments by me) - debug.c: Clean/trivial implementation based on the object's structure. I merely create it and then initailize all its members. Other functions are stubs - dbgkutil.c: Code is #if0'ed, and doesn't belong to Alex Ionescu. Author is unknown. - Unified / prettified formatting, STDCALL -> NTAPI

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 18 16:16:53 2006 New Revision: 21931 URL: http://svn.reactos.ru/svn/reactos?rev=21931&view=rev Log: [AUDIT] ntoskrnl/dbgk (according to functions_list.txt in audited branch comments by Alex Ionescu, and comments by me) - debug.c: Clean/trivial implementation based on the object's structure. I merely create it and then initailize all its members. Other functions are stubs - dbgkutil.c: Code is #if0'ed, and doesn't belong to Alex Ionescu. Author is unknown. - Unified / prettified formatting, STDCALL -> NTAPI Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (contents, props changed) trunk/reactos/ntoskrnl/dbgk/debug.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Thu May 18 16:16:53 2006 @@ -16,41 +16,41 @@ /* FUNCTIONS *****************************************************************/ VOID -STDCALL +NTAPI DbgkCreateThread(PVOID StartAddress) { #if 0 - LPC_DBG_MESSAGE Message; - LPC_DBG_MESSAGE Reply; - NTSTATUS Status; + LPC_DBG_MESSAGE Message; + LPC_DBG_MESSAGE Reply; + NTSTATUS Status; - if (PsGetCurrentThread()->ThreadsProcess->DebugPort == NULL) + if (PsGetCurrentThread()->ThreadsProcess->DebugPort == NULL) { - return; + return; } - Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); - Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - - sizeof(LPC_MESSAGE); - Message.Type = DBG_EVENT_CREATE_THREAD; - Message.Status = STATUS_SUCCESS; - Message.Data.CreateThread.Reserved = 0; - Message.Data.CreateThread.StartAddress = StartAddress; + Message.Header.MessageSize = sizeof(LPC_DBG_MESSAGE); + Message.Header.DataSize = sizeof(LPC_DBG_MESSAGE) - + sizeof(LPC_MESSAGE); + Message.Type = DBG_EVENT_CREATE_THREAD; + Message.Status = STATUS_SUCCESS; + Message.Data.CreateThread.Reserved = 0; + Message.Data.CreateThread.StartAddress = StartAddress; - /* FIXME: Freeze all threads in process */ + /* FIXME: Freeze all threads in process */ - /* Send the message to the process's debug port and wait for a reply */ - Status = - LpcSendDebugMessagePort(PsGetCurrentThread()->ThreadsProcess->DebugPort, - &Message, - &Reply); - if (!NT_SUCCESS(Status)) + /* Send the message to the process's debug port and wait for a reply */ + Status = + LpcSendDebugMessagePort(PsGetCurrentThread()->ThreadsProcess->DebugPort, + &Message, + &Reply); + if (!NT_SUCCESS(Status)) { - return; + return; } - /* FIXME: Examine reply */ - return; + /* FIXME: Examine reply */ + return; #endif } Propchange: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/debug.c (original) +++ trunk/reactos/ntoskrnl/dbgk/debug.c Thu May 18 16:16:53 2006 @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS -STDCALL +NTAPI NtCreateDebugObject(OUT PHANDLE DebugHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, @@ -103,7 +103,7 @@ } NTSTATUS -STDCALL +NTAPI NtWaitForDebugEvent(IN HANDLE DebugObject, // Debug object handle must grant DEBUG_OBJECT_WAIT_STATE_CHANGE access. IN BOOLEAN Alertable, IN PLARGE_INTEGER Timeout OPTIONAL, @@ -116,7 +116,7 @@ } NTSTATUS -STDCALL +NTAPI NtDebugContinue(IN HANDLE DebugObject, // Debug object handle must grant DEBUG_OBJECT_WAIT_STATE_CHANGE access. IN PCLIENT_ID AppClientId, IN NTSTATUS ContinueStatus) @@ -128,7 +128,7 @@ } NTSTATUS -STDCALL +NTAPI NtDebugActiveProcess(IN HANDLE Process, // Process handle must grant PROCESS_SUSPEND_RESUME access. IN HANDLE DebugObject) // Debug object handle must grant DEBUG_OBJECT_ADD_REMOVE_PROCESS access. { @@ -139,7 +139,7 @@ } NTSTATUS -STDCALL +NTAPI NtRemoveProcessDebug(IN HANDLE Process, // Process handle must grant PROCESS_SUSPEND_RESUME access. IN HANDLE DebugObject) // Debug object handle must grant DEBUG_OBJECT_ADD_REMOVE_PROCESS access. { @@ -150,7 +150,7 @@ } NTSTATUS -STDCALL +NTAPI NtSetInformationDebugObject(IN HANDLE DebugObject, // Debug object handle need not grant any particular access right. IN DEBUGOBJECTINFOCLASS DebugObjectInformationClass, IN PVOID DebugInformation, Propchange: trunk/reactos/ntoskrnl/dbgk/debug.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

[fireball] 21930: [AUDIT] ntoskrnl/ex (according to functions_list.txt in audited branch comments by Alex Ionescu, and uuid.c comments by me) - dbgctrl.c: Modified the function slightly for compatibility with some keys, still has nothing to do with Windows' - lookas.c: File is clean. I merely rewrote existing versions based on a GPLed IBM driver I found on google, OSR documentation and some DDK sample code. The implementation is trivial and only calls caller-defined functions which are the ones

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 18 16:06:28 2006 New Revision: 21930 URL: http://svn.reactos.ru/svn/reactos?rev=21930&view=rev Log: [AUDIT] ntoskrnl/ex (according to functions_list.txt in audited branch comments by Alex Ionescu, and uuid.c comments by me) - dbgctrl.c: Modified the function slightly for compatibility with some keys, still has nothing to do with Windows' - lookas.c: File is clean. I merely rewrote existing versions based on a GPLed IBM driver I found on google, OSR documentation and some DDK sample code. The implementation is trivial and only calls caller-defined functions which are the ones doing the work. - uuid.c: Added programmers, unified formatting, STDCALL->NTAPI change. Code doesn't look suspicious, plus stubbed functions - win32k.c: Alex Ionescu only changed the functions to call Win32K instead of having the code in ntoskrnl. It was a cut/paste job. Aleksey Bragin: The code looks very trivial and straightforward, certainly it's written based on clean sources of information - zone.c: Based on David Welch's code, which Alex Ionescu merely cleaned up, using clean development. He's not even sure if the Zone functions are still in Windows. Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c (props changed) trunk/reactos/ntoskrnl/ex/lookas.c (props changed) trunk/reactos/ntoskrnl/ex/uuid.c (contents, props changed) trunk/reactos/ntoskrnl/ex/win32k.c (props changed) trunk/reactos/ntoskrnl/ex/zone.c (props changed) Propchange: trunk/reactos/ntoskrnl/ex/dbgctrl.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ex/lookas.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ex/uuid.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/uuid.c?rev=2193… ============================================================================== --- trunk/reactos/ntoskrnl/ex/uuid.c (original) +++ trunk/reactos/ntoskrnl/ex/uuid.c Thu May 18 16:06:28 2006 @@ -5,7 +5,8 @@ * FILE: ntoskrnl/ex/uuid.c * PURPOSE: UUID generator * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Eric Kohl + Thomas Weidenmueller */ /* INCLUDES *****************************************************************/ @@ -47,16 +48,16 @@ VOID INIT_FUNCTION -STDCALL +NTAPI ExpInitUuids(VOID) { - ExInitializeFastMutex(&UuidMutex); - - KeQuerySystemTime((PLARGE_INTEGER)&UuidLastTime); - UuidLastTime.QuadPart += TICKS_15_OCT_1582_TO_1601; - - UuidCount = TICKS_PER_CLOCK_TICK; - RtlZeroMemory(UuidSeed, SEED_BUFFER_SIZE); + ExInitializeFastMutex(&UuidMutex); + + KeQuerySystemTime((PLARGE_INTEGER)&UuidLastTime); + UuidLastTime.QuadPart += TICKS_15_OCT_1582_TO_1601; + + UuidCount = TICKS_PER_CLOCK_TICK; + RtlZeroMemory(UuidSeed, SEED_BUFFER_SIZE); } @@ -65,52 +66,51 @@ static NTSTATUS ExpLoadUuidSequence(PULONG Sequence) { - UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name; - HANDLE KeyHandle; - ULONG ValueLength; - NTSTATUS Status; - - RtlInitUnicodeString(&Name, - L"\\Registry\\Machine\\Software\\Microsoft\\Rpc"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed (Status %lx)\n", Status); - return Status; - } - - RtlInitUnicodeString(&Name, - L"UuidSequenceNumber"); - - ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - Status = ZwQueryValueKey(KeyHandle, - &Name, - KeyValuePartialInformation, - ValueBuffer, - VALUE_BUFFER_SIZE, - &ValueLength); - ZwClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwQueryValueKey() failed (Status %lx)\n", Status); - return Status; - } - - *Sequence = *((PULONG)ValueInfo->Data); - - DPRINT("Loaded sequence %lx\n", *Sequence); - - return STATUS_SUCCESS; + UCHAR ValueBuffer[VALUE_BUFFER_SIZE]; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + HANDLE KeyHandle; + ULONG ValueLength; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + L"\\Registry\\Machine\\Software\\Microsoft\\Rpc"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed (Status %lx)\n", Status); + return Status; + } + + RtlInitUnicodeString(&Name, L"UuidSequenceNumber"); + + ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; + Status = ZwQueryValueKey(KeyHandle, + &Name, + KeyValuePartialInformation, + ValueBuffer, + VALUE_BUFFER_SIZE, + &ValueLength); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwQueryValueKey() failed (Status %lx)\n", Status); + return Status; + } + + *Sequence = *((PULONG)ValueInfo->Data); + + DPRINT("Loaded sequence %lx\n", *Sequence); + + return STATUS_SUCCESS; } #undef VALUE_BUFFER_SIZE @@ -118,192 +118,191 @@ static NTSTATUS ExpSaveUuidSequence(PULONG Sequence) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name; - HANDLE KeyHandle; - NTSTATUS Status; - - RtlInitUnicodeString(&Name, - L"\\Registry\\Machine\\Software\\Microsoft\\Rpc"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed (Status %lx)\n", Status); + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + HANDLE KeyHandle; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + L"\\Registry\\Machine\\Software\\Microsoft\\Rpc"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, + KEY_SET_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed (Status %lx)\n", Status); + return Status; + } + + RtlInitUnicodeString(&Name, L"UuidSequenceNumber"); + Status = ZwSetValueKey(KeyHandle, + &Name, + 0, + REG_DWORD, + Sequence, + sizeof(ULONG)); + ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwSetValueKey() failed (Status %lx)\n", Status); + } + return Status; - } - - RtlInitUnicodeString(&Name, - L"UuidSequenceNumber"); - Status = ZwSetValueKey(KeyHandle, - &Name, - 0, - REG_DWORD, - Sequence, - sizeof(ULONG)); - ZwClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwSetValueKey() failed (Status %lx)\n", Status); - } - - return Status; } static VOID ExpGetRandomUuidSequence(PULONG Sequence) { - LARGE_INTEGER Counter; - LARGE_INTEGER Frequency; - ULONG Value; - - Counter = KeQueryPerformanceCounter(&Frequency); - Value = Counter.u.LowPart ^ Counter.u.HighPart; - - *Sequence = *Sequence ^ Value; - - DPRINT("Sequence %lx\n", *Sequence); + LARGE_INTEGER Counter; + LARGE_INTEGER Frequency; + ULONG Value; + + Counter = KeQueryPerformanceCounter(&Frequency); + Value = Counter.u.LowPart ^ Counter.u.HighPart; + + *Sequence = *Sequence ^ Value; + + DPRINT("Sequence %lx\n", *Sequence); } static NTSTATUS ExpCreateUuids(PULARGE_INTEGER Time, - PULONG Range, - PULONG Sequence) -{ - /* - * Generate time element of the UUID. Account for going faster - * than our clock as well as the clock going backwards. - */ - while (1) - { - KeQuerySystemTime((PLARGE_INTEGER)Time); - Time->QuadPart += TICKS_15_OCT_1582_TO_1601; - - if (Time->QuadPart > UuidLastTime.QuadPart) - { - UuidCount = 0; - break; - } - - if (Time->QuadPart < UuidLastTime.QuadPart) - { - (*Sequence)++; - UuidSequenceChanged = TRUE; - UuidCount = 0; - break; - } - - if (UuidCount < TICKS_PER_CLOCK_TICK) - { - UuidCount++; - break; - } - } - - UuidLastTime.QuadPart = Time->QuadPart; - Time->QuadPart += UuidCount; - - *Range = 10000; /* What does this mean? Ticks per millisecond?*/ - - return STATUS_SUCCESS; + PULONG Range, + PULONG Sequence) +{ + /* + * Generate time element of the UUID. Account for going faster + * than our clock as well as the clock going backwards. + */ + while (1) + { + KeQuerySystemTime((PLARGE_INTEGER)Time); + Time->QuadPart += TICKS_15_OCT_1582_TO_1601; + + if (Time->QuadPart > UuidLastTime.QuadPart) + { + UuidCount = 0; + break; + } + + if (Time->QuadPart < UuidLastTime.QuadPart) + { + (*Sequence)++; + UuidSequenceChanged = TRUE; + UuidCount = 0; + break; + } + + if (UuidCount < TICKS_PER_CLOCK_TICK) + { + UuidCount++; + break; + } + } + + UuidLastTime.QuadPart = Time->QuadPart; + Time->QuadPart += UuidCount; + + *Range = 10000; /* What does this mean? Ticks per millisecond?*/ + + return STATUS_SUCCESS; } /* * @unimplemented */ NTSTATUS -STDCALL -ExUuidCreate( - OUT UUID *Uuid - ) -{ - UNIMPLEMENTED; - return FALSE; +NTAPI +ExUuidCreate(OUT UUID *Uuid) +{ + UNIMPLEMENTED; + return FALSE; } /* * @unimplemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI NtAllocateUuids(OUT PULARGE_INTEGER Time, - OUT PULONG Range, - OUT PULONG Sequence, - OUT PUCHAR Seed) -{ - ULARGE_INTEGER IntTime; - ULONG IntRange; - NTSTATUS Status; - - PAGED_CODE(); - - ExAcquireFastMutex(&UuidMutex); - - if (!UuidSequenceInitialized) - { - Status = ExpLoadUuidSequence(&UuidSequence); - if (NT_SUCCESS(Status)) - { - UuidSequence++; - } - else - { - ExpGetRandomUuidSequence(&UuidSequence); - } - - UuidSequenceInitialized = TRUE; - UuidSequenceChanged = TRUE; - } - - Status = ExpCreateUuids(&IntTime, - &IntRange, - &UuidSequence); - if (!NT_SUCCESS(Status)) - { + OUT PULONG Range, + OUT PULONG Sequence, + OUT PUCHAR Seed) +{ + ULARGE_INTEGER IntTime; + ULONG IntRange; + NTSTATUS Status; + + PAGED_CODE(); + + ExAcquireFastMutex(&UuidMutex); + + if (!UuidSequenceInitialized) + { + Status = ExpLoadUuidSequence(&UuidSequence); + if (NT_SUCCESS(Status)) + { + UuidSequence++; + } + else + { + ExpGetRandomUuidSequence(&UuidSequence); + } + + UuidSequenceInitialized = TRUE; + UuidSequenceChanged = TRUE; + } + + Status = ExpCreateUuids(&IntTime, + &IntRange, + &UuidSequence); + if (!NT_SUCCESS(Status)) + { + ExReleaseFastMutex(&UuidMutex); + return Status; + } + + if (UuidSequenceChanged) + { + Status = ExpSaveUuidSequence(&UuidSequence); + if (NT_SUCCESS(Status)) + UuidSequenceChanged = FALSE; + } + ExReleaseFastMutex(&UuidMutex); - return Status; - } - - if (UuidSequenceChanged) - { - Status = ExpSaveUuidSequence(&UuidSequence); - if (NT_SUCCESS(Status)) - UuidSequenceChanged = FALSE; - } - - ExReleaseFastMutex(&UuidMutex); - - Time->QuadPart = IntTime.QuadPart; - *Range = IntRange; - *Sequence = UuidSequence; - - RtlCopyMemory(Seed, - UuidSeed, - SEED_BUFFER_SIZE); - - return STATUS_SUCCESS; + + Time->QuadPart = IntTime.QuadPart; + *Range = IntRange; + *Sequence = UuidSequence; + + RtlCopyMemory(Seed, + UuidSeed, + SEED_BUFFER_SIZE); + + return STATUS_SUCCESS; } /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI NtSetUuidSeed(IN PUCHAR Seed) { - PAGED_CODE(); - - RtlCopyMemory(UuidSeed, - Seed, - SEED_BUFFER_SIZE); - return STATUS_SUCCESS; + PAGED_CODE(); + + RtlCopyMemory(UuidSeed, + Seed, + SEED_BUFFER_SIZE); + return STATUS_SUCCESS; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/ex/uuid.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ex/win32k.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ex/zone.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

[gedmurphy] 21929: - change the resource numbers to match Windows - up the icon quality a bit.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu May 18 01:45:49 2006 New Revision: 21929 URL: http://svn.reactos.ru/svn/reactos?rev=21929&view=rev Log: - change the resource numbers to match Windows - up the icon quality a bit. Modified: trunk/reactos/dll/cpl/access/resource.h trunk/reactos/dll/cpl/access/resources/applet.ico trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/resources/applet.ico (contents, props changed) trunk/reactos/dll/cpl/intl/resource.h trunk/reactos/dll/cpl/intl/resources/applet.ico trunk/reactos/dll/cpl/main/resource.h trunk/reactos/dll/cpl/main/resources/keyboard.ico (contents, props changed) trunk/reactos/dll/cpl/main/resources/mouse.ico (contents, props changed) trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/resources/mmsys.ico (contents, props changed) trunk/reactos/dll/cpl/ncpa/resources/applet.ico trunk/reactos/dll/cpl/sysdm/resources/applet.ico (contents, props changed) trunk/reactos/dll/cpl/sysdm/resources/devmgr.ico (contents, props changed) trunk/reactos/dll/cpl/timedate/resources/applet.ico (props changed) Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Thu May 18 01:45:49 2006 @@ -10,7 +10,7 @@ #define ICONSIZE 16 /* ids */ -#define IDI_CPLACCESS 100 +#define IDI_CPLACCESS 110 #define IDD_PROPPAGEKEYBOARD 100 #define IDD_PROPPAGESOUND 101 Modified: trunk/reactos/dll/cpl/access/resources/applet.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/access/resources/ap… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Thu May 18 01:45:49 2006 @@ -11,6 +11,7 @@ #include <reactos/version.rc> IDC_DESK_ICON ICON "resources/applet.ico" +IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" #include "en.rc" Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Thu May 18 01:45:49 2006 @@ -14,7 +14,8 @@ #define ICONSIZE 16 /* ids */ -#define IDC_DESK_ICON 1 +#define IDC_DESK_ICON 40 +#define IDC_DESK_ICON2 100 // Needed for theme compatability with Windows. #define IDC_STATIC -1 Modified: trunk/reactos/dll/cpl/desk/resources/applet.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/resources/appl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/dll/cpl/desk/resources/applet.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/cpl/intl/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl/resource.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/resource.h (original) +++ trunk/reactos/dll/cpl/intl/resource.h Thu May 18 01:45:49 2006 @@ -2,7 +2,7 @@ #define __CPL_RESOURCE_H -#define IDC_CPLICON 1 +#define IDC_CPLICON 200 #define IDC_FLAGS 2 #define IDC_ICON1 3 Modified: trunk/reactos/dll/cpl/intl/resources/applet.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/intl/resources/appl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h (original) +++ trunk/reactos/dll/cpl/main/resource.h Thu May 18 01:45:49 2006 @@ -2,8 +2,8 @@ #define __CPL_RESOURCE_H -#define IDC_CPLICON_1 1 -#define IDC_CPLICON_2 2 +#define IDC_CPLICON_1 100 +#define IDC_CPLICON_2 200 #define IDD_PAGE_BUTTON 101 #define IDD_PAGE_POINTER 102 Modified: trunk/reactos/dll/cpl/main/resources/keyboard.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/resources/keyb… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/dll/cpl/main/resources/keyboard.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/cpl/main/resources/mouse.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/resources/mous… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/dll/cpl/main/resources/mouse.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h Thu May 18 01:45:49 2006 @@ -2,7 +2,7 @@ #define __CPL_RESOURCE_H -#define IDI_CPLICON 1 +#define IDI_CPLICON 4379 #define IDD_HARDWARE 100 Modified: trunk/reactos/dll/cpl/mmsys/resources/mmsys.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/mms… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/dll/cpl/mmsys/resources/mmsys.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/cpl/ncpa/resources/applet.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/resources/appl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/sysdm/resources/applet.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/app… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/dll/cpl/sysdm/resources/applet.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/cpl/sysdm/resources/devmgr.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/dev… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/dll/cpl/sysdm/resources/devmgr.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/timedate/resources/applet.ico ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

[gedmurphy] 21928: - resize listbox. Fixes bug 1496 - change icon resource number to match Windows

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu May 18 01:40:13 2006 New Revision: 21928 URL: http://svn.reactos.ru/svn/reactos?rev=21928&view=rev Log: - resize listbox. Fixes bug 1496 - change icon resource number to match Windows Modified: trunk/reactos/dll/cpl/appwiz/Cz.rc trunk/reactos/dll/cpl/appwiz/De.rc trunk/reactos/dll/cpl/appwiz/Dk.rc trunk/reactos/dll/cpl/appwiz/En.rc trunk/reactos/dll/cpl/appwiz/Es.rc trunk/reactos/dll/cpl/appwiz/Fr.rc trunk/reactos/dll/cpl/appwiz/Gr.rc trunk/reactos/dll/cpl/appwiz/Hu.rc trunk/reactos/dll/cpl/appwiz/Ja.rc trunk/reactos/dll/cpl/appwiz/Nl.rc trunk/reactos/dll/cpl/appwiz/Pl.rc trunk/reactos/dll/cpl/appwiz/Ru.rc trunk/reactos/dll/cpl/appwiz/resource.h trunk/reactos/dll/cpl/appwiz/resources/applet.ico Modified: trunk/reactos/dll/cpl/appwiz/Cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Cz.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Cz.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Cz.rc Thu May 18 01:40:13 2006 @@ -13,8 +13,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Následující aplikace mohou být automaticky odstranìny. K odstranìní aplikace nebo k nastavení jejích komponent, ji vyberte ze seznamu a klepnìte na tlaèítko Pøidat/Odebrat.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Pøidat/&Odebrat", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Pøidat/&Odebrat", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/De.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/De.rc (original) +++ trunk/reactos/dll/cpl/appwiz/De.rc Thu May 18 01:40:13 2006 @@ -13,8 +13,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Updates anzeigen",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Die folgende Software kann automatisch entfernt werden. Um ein Programm zu entfernen oder die installierten Programmpakete zu ändern, wählen Sie das Programm in der Liste und klicken auf Ändern/Entfernen.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Ändern/Entfe&rnen", IDC_ADDREMOVE, PROPSHEETWIDTH-(82), 205, 70, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Ändern/Entfe&rnen", IDC_ADDREMOVE, PROPSHEETWIDTH-(82), 200, 70, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Dk.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Dk.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Dk.rc Thu May 18 01:40:13 2006 @@ -13,8 +13,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Følgende Software kan automatisk blive Fjernet. For at fjerne programmer eller ændre hvilken typer komponeter der skal være installeret, vælg fra listen og klik på Tilføj/Fjern.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Tilføj/&Fjern", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Tilføj/&Fjern", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/En.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/En.rc (original) +++ trunk/reactos/dll/cpl/appwiz/En.rc Thu May 18 01:40:13 2006 @@ -13,8 +13,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Modify/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Modify/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Es.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Es.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Es.rc Thu May 18 01:40:13 2006 @@ -19,8 +19,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "El siguiente software puede ser removido automaticamente. Para remover un programa o modificar sus componentes instalados, seleccionalo en la lista y pulsa Añadir/Remover.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Añadir/&Remover", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Añadir/&Remover", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Fr.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Fr.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Fr.rc Thu May 18 01:40:13 2006 @@ -15,8 +15,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Les logiciels suivant peuvent être supprimés automatiquement. Pour supprimer un programme ou modifier ses composantes installées, sélectionnez-le dans la liste et cliquez sur Ajouter/Supprimer.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Gr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Gr.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Gr.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Gr.rc Thu May 18 01:40:13 2006 @@ -13,8 +13,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Ôï áêüëïõèï ëïãéóìéêü ìðïñåß íá áðåãêáôáóôáèåß áõôïìÜôùò. Ãéá íá áðåãêáôáóôÞóåôå Ýíá ðñüãñáììá Þ íá áëëÜîåôå ôá åãêáôåóôçìÝíá ôïõ áñ÷åßá, åðéëÝîôå ôï áðü ôç ëßóôá êáé êÜíôå êëéê óôï ÐñïóèÞêç/Áöáßñåóç.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "ÐñïóèÞêç/&Áöáßñåóç", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "ÐñïóèÞêç/&Áöáßñåóç", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Hu.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Hu.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Hu.rc Thu May 18 01:40:13 2006 @@ -14,8 +14,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "A következõ szoftvereket lehet eltávolítani. A szoftver törléséhez vagy összetevõinek modosításához kattints a szoftverre a listában, majd kattints a Hozzáadás/eltávolítás gombra.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Hozzáadás/eltávolítás", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Hozzáadás/eltávolítás", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Ja.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Ja.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Ja.rc Thu May 18 01:40:13 2006 @@ -13,8 +13,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "±êçÌvOÍ©®Åí·é±ÆªÅ«Ü·BvOðÏXµ½èARs[^©çíµ½è·éÉÍAê©çÚIÌvOðIðµA[ÏXÆí] ðNbNµÄ¾³¢B",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "ÏXÆí(&R)", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "ÏXÆí(&R)", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Nl.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Nl.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Nl.rc Thu May 18 01:40:13 2006 @@ -13,8 +13,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "&De volgende software kan automatisch worden verwijderd. U verwijdert een programma of wijzigt de geïnstalleerde onderdelen door het programma te selecteren en op Toevoegen/verwijderen te klikken.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Toe&voegen/verwijderen", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Toe&voegen/verwijderen", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Pl.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Pl.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Pl.rc Thu May 18 01:40:13 2006 @@ -15,8 +15,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Nastêpuj¹ce oprogramowanie mo¿e byæ automatycznie usuniête. ¯eby usun¹c program, albo zmodyfikowaæ zainstalowane komponenty, wybierz program z listy i kliknij Dodaj/Usuñ.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Dodaj/&Usuñ", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Dodaj/&Usuñ", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Ru.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Ru.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Ru.rc Thu May 18 01:40:13 2006 @@ -13,8 +13,8 @@ ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "×òîáû óñòàíîâèòü ïðîãðàììó èëè èçìåíèòü å¸ óñòàíîâëåííûå êîìïîíåíòû, âûäåëèòå å¸ â ñïèñêå è íàæìèòå ""Çàìåíèòü/Óäàëèòü"".",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "&Çàìåíèòü/Óäàëèòü", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 198, 85, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Çàìåíèòü/Óäàëèòü", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 200, 85, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h Thu May 18 01:40:13 2006 @@ -13,7 +13,7 @@ /* ids */ -#define IDI_CPLSYSTEM 100 +#define IDI_CPLSYSTEM 1500 #define IDD_PROPPAGEINSTALL 100 #define IDD_PROPPAGEROSSETUP 101 Modified: trunk/reactos/dll/cpl/appwiz/resources/applet.ico URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/ap… ============================================================================== Binary files - no diff available.

18 years, 5 months

[fireball] 21927: [AUDIT] ntoskrnl/inbv - Functions are written mostly by dwelch and chorn, are exported and don't look like containing dirty code. They have some comments too. Filip confirmes this file is clean. - Unified formatting throughout the file

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 18 00:34:34 2006 New Revision: 21927 URL: http://svn.reactos.ru/svn/reactos?rev=21927&view=rev Log: [AUDIT] ntoskrnl/inbv - Functions are written mostly by dwelch and chorn, are exported and don't look like containing dirty code. They have some comments too. Filip confirmes this file is clean. - Unified formatting throughout the file Modified: trunk/reactos/ntoskrnl/inbv/inbv.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Thu May 18 00:34:34 2006 @@ -23,9 +23,7 @@ NTHALAPI VOID NTAPI -HalReleaseDisplayOwnership( - VOID -); +HalReleaseDisplayOwnership(VOID); /* GLOBALS *******************************************************************/ @@ -41,31 +39,31 @@ STATIC InbvCheckBootVid(VOID) { - IO_STATUS_BLOCK Iosb; - - if (BootVidDevice == NULL) - { - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING BootVidName = RTL_CONSTANT_STRING(L"\\Device\\BootVid"); - - InitializeObjectAttributes(&ObjectAttributes, - &BootVidName, - 0, - NULL, - NULL); - Status = ZwOpenFile(&BootVidDevice, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - 0, - 0); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - } - return(STATUS_SUCCESS); + IO_STATUS_BLOCK Iosb; + + if (BootVidDevice == NULL) + { + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING BootVidName = RTL_CONSTANT_STRING(L"\\Device\\BootVid"); + + InitializeObjectAttributes(&ObjectAttributes, + &BootVidName, + 0, + NULL, + NULL); + Status = ZwOpenFile(&BootVidDevice, + FILE_ALL_ACCESS, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + } + return(STATUS_SUCCESS); } @@ -79,7 +77,7 @@ STDCALL InbvCheckDisplayOwnership(VOID) { - return FALSE; + return FALSE; } BOOLEAN @@ -90,82 +88,84 @@ * vidDisplayString(String); * so instead, we'll fall-back to HAL */ - HalDisplayString(String); - - /* Call Headless (We don't support headless for now) - HeadlessDispatch(DISPLAY_STRING); - */ - - /* Return success */ - return TRUE; -} - -BOOLEAN -STDCALL -InbvResetDisplayParameters(ULONG SizeX, ULONG SizeY) -{ - return(InbvResetDisplay()); -} - - -VOID -STDCALL INIT_FUNCTION + HalDisplayString(String); + + /* Call Headless (We don't support headless for now) + HeadlessDispatch(DISPLAY_STRING); + */ + + /* Return success */ + return TRUE; +} + +BOOLEAN +STDCALL +InbvResetDisplayParameters(ULONG SizeX, + ULONG SizeY) +{ + return(InbvResetDisplay()); +} + + +VOID +STDCALL +INIT_FUNCTION InbvEnableBootDriver(IN BOOLEAN Enable) { - NTSTATUS Status; - IO_STATUS_BLOCK Iosb; - - Status = InbvCheckBootVid(); - if (!NT_SUCCESS(Status)) - { - return; - } - - if (Enable) - { - /* Notify the hal we will acquire the display. */ - HalAcquireDisplayOwnership(InbvResetDisplayParameters); - - Status = ZwDeviceIoControlFile(BootVidDevice, - NULL, - NULL, - NULL, - &Iosb, - IOCTL_BOOTVID_INITIALIZE, - NULL, - 0, - &BootVidFunctionTable, - sizeof(BootVidFunctionTable)); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - BootVidDriverInstalled = TRUE; - CHECKPOINT; - } - else - { - Status = ZwDeviceIoControlFile(BootVidDevice, - NULL, - NULL, - NULL, - &Iosb, - IOCTL_BOOTVID_CLEANUP, - NULL, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - BootVidDriverInstalled = FALSE; - /* Notify the hal we have released the display. */ - HalReleaseDisplayOwnership(); - } - - ZwClose(BootVidDevice); - BootVidDevice = NULL; + NTSTATUS Status; + IO_STATUS_BLOCK Iosb; + + Status = InbvCheckBootVid(); + if (!NT_SUCCESS(Status)) + { + return; + } + + if (Enable) + { + /* Notify the hal we will acquire the display. */ + HalAcquireDisplayOwnership(InbvResetDisplayParameters); + + Status = ZwDeviceIoControlFile(BootVidDevice, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_BOOTVID_INITIALIZE, + NULL, + 0, + &BootVidFunctionTable, + sizeof(BootVidFunctionTable)); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } + BootVidDriverInstalled = TRUE; + CHECKPOINT; + } + else + { + Status = ZwDeviceIoControlFile(BootVidDevice, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_BOOTVID_CLEANUP, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } + BootVidDriverInstalled = FALSE; + /* Notify the hal we have released the display. */ + HalReleaseDisplayOwnership(); + } + + ZwClose(BootVidDevice); + BootVidDevice = NULL; } @@ -173,7 +173,7 @@ STDCALL InbvEnableDisplayString(IN BOOLEAN Enable) { - return FALSE; + return FALSE; } @@ -188,7 +188,7 @@ STDCALL InbvIsBootDriverInstalled(VOID) { - return(BootVidDriverInstalled); + return(BootVidDriverInstalled); } @@ -203,20 +203,20 @@ STDCALL InbvResetDisplay(VOID) { - if (!BootVidDriverInstalled) - { - return(FALSE); - } - return(BootVidFunctionTable.ResetDisplay()); + if (!BootVidDriverInstalled) + { + return(FALSE); + } + return(BootVidFunctionTable.ResetDisplay()); } VOID STDCALL InbvSetScrollRegion(IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height) + IN ULONG Top, + IN ULONG Width, + IN ULONG Height) { } @@ -231,10 +231,10 @@ VOID STDCALL InbvSolidColorFill(IN ULONG Left, - IN ULONG Top, - IN ULONG Width, - IN ULONG Height, - IN ULONG Color) + IN ULONG Top, + IN ULONG Width, + IN ULONG Height, + IN ULONG Color) { } @@ -242,11 +242,11 @@ STDCALL NtDisplayString(IN PUNICODE_STRING DisplayString) { - OEM_STRING OemString; - - RtlUnicodeStringToOemString(&OemString, DisplayString, TRUE); - HalDisplayString(OemString.Buffer); - RtlFreeOemString(&OemString); - - return STATUS_SUCCESS; -} + OEM_STRING OemString; + + RtlUnicodeStringToOemString(&OemString, DisplayString, TRUE); + HalDisplayString(OemString.Buffer); + RtlFreeOemString(&OemString); + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/ntoskrnl/inbv/inbv.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/inbv/inbv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

← Newer
1
...
18
19
20
21
22
23
24
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2006