Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[ion] 22232: - Rename ObpCreateTypeObject to ObCreateObjectType and fix definition. The latter is actually exported in NT, and there's no reason not to export it while having our own internally renamed version. - Added stub exports for ObCloseHandle, ObReferenceSecurityDesciptor, ObSetHandleAttributes, ObSetSecurityObjectByPointer so that someday someone can know what needs to be implemented. - Removed ObGetObjectPointerCount. It is not exported in newer OSes and was always undocumented. - Move
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 10:31:42 2006 New Revision: 22232 URL: http://svn.reactos.ru/svn/reactos?rev=22232&view=rev Log: - Rename ObpCreateTypeObject to ObCreateObjectType and fix definition. The latter is actually exported in NT, and there's no reason not to export it while having our own internally renamed version. - Added stub exports for ObCloseHandle, ObReferenceSecurityDesciptor, ObSetHandleAttributes, ObSetSecurityObjectByPointer so that someday someone can know what needs to be implemented. - Removed ObGetObjectPointerCount. It is not exported in newer OSes and was always undocumented. - Move ObQueryObjecctAuditingByHandle to security.c and optimized it not to attach to the system process, as well as to cache the handle table instead of dereferencing the owner process all the time. Modified: trunk/reactos/include/ndk/obfuncs.h trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/driver.c trunk/reactos/ntoskrnl/io/iocomp.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/security.c trunk/reactos/ntoskrnl/ob/symlink.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h (original) +++ trunk/reactos/include/ndk/obfuncs.h Mon Jun 5 10:31:42 2006 @@ -44,6 +44,15 @@ OUT PVOID *Object ); +NTSTATUS +NTAPI +ObCreateObjectType( + IN PUNICODE_STRING TypeName, + IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, + IN PVOID Reserved, + OUT POBJECT_TYPE *ObjectType +); + NTKERNELAPI ULONG NTAPI Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Mon Jun 5 10:31:42 2006 @@ -22,6 +22,7 @@ #pragma alloc_text(INIT, CmInit2) #endif +#define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount /* GLOBALS ******************************************************************/ @@ -373,7 +374,7 @@ ObjectTypeInitializer.SecurityProcedure = CmiObjectSecurity; ObjectTypeInitializer.QueryNameProcedure = CmiObjectQueryName; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &CmiKeyType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmiKeyType); /* Initialize the hive list */ InitializeListHead(&CmiHiveListHead); Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c (original) +++ trunk/reactos/ntoskrnl/ex/callback.c Mon Jun 5 10:31:42 2006 @@ -97,7 +97,7 @@ ObjectTypeInitializer.GenericMapping = ExpCallbackMapping; ObjectTypeInitializer.PoolType = NonPagedPool; - Status = ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExCallbackObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExCallbackObjectType); /* Fail if it wasn't created successfully */ if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c (original) +++ trunk/reactos/ntoskrnl/ex/event.c Mon Jun 5 10:31:42 2006 @@ -53,7 +53,7 @@ ObjectTypeInitializer.GenericMapping = ExpEventMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExEventObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); } /* Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c Mon Jun 5 10:31:42 2006 @@ -49,7 +49,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_PAIR_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExEventPairObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c Mon Jun 5 10:31:42 2006 @@ -68,7 +68,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteMutant; ObjectTypeInitializer.ValidAccessMask = MUTANT_ALL_ACCESS; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExMutantObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExMutantObjectType); } /* Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c (original) +++ trunk/reactos/ntoskrnl/ex/profile.c Mon Jun 5 10:31:42 2006 @@ -82,7 +82,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExProfileObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=22232… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c (original) +++ trunk/reactos/ntoskrnl/ex/sem.c Mon Jun 5 10:31:42 2006 @@ -55,7 +55,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObjectTypeInitializer.ValidAccessMask = SEMAPHORE_ALL_ACCESS; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExSemaphoreObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExSemaphoreObjectType); } /* Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c (original) +++ trunk/reactos/ntoskrnl/ex/timer.c Mon Jun 5 10:31:42 2006 @@ -249,7 +249,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = TIMER_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = ExpDeleteTimer; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExTimerType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExTimerType); /* Initialize the Wait List and Lock */ KeInitializeSpinLock(&ExpWakeListLock); Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c Mon Jun 5 10:31:42 2006 @@ -137,9 +137,10 @@ ObjectTypeInitializer.OpenProcedure = ExpWinStaObjectOpen; ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; - ObpCreateTypeObject(&ObjectTypeInitializer, - &Name, - &ExWindowStationObjectType); + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &ExWindowStationObjectType); /* Create desktop object type */ RtlInitUnicodeString(&Name, L"Desktop"); @@ -147,7 +148,10 @@ ObjectTypeInitializer.OpenProcedure = NULL; ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; ObjectTypeInitializer.ParseProcedure = NULL; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExDesktopObjectType); + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &ExDesktopObjectType); } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Mon Jun 5 10:31:42 2006 @@ -114,14 +114,6 @@ IN PVOID Context ); -NTSTATUS -STDCALL -ObpCreateTypeObject( - struct _OBJECT_TYPE_INITIALIZER *ObjectTypeInitializer, - PUNICODE_STRING TypeName, - POBJECT_TYPE *ObjectType -); - ULONG NTAPI ObGetObjectHandleCount(PVOID Object); Modified: trunk/reactos/ntoskrnl/io/driver.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/driver.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/driver.c (original) +++ trunk/reactos/ntoskrnl/io/driver.c Mon Jun 5 10:31:42 2006 @@ -129,7 +129,7 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = IopDeleteDriver; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoDriverObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoDriverObjectType); InitializeListHead(&DriverReinitListHead); KeInitializeSpinLock(&DriverReinitListLock); Modified: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iocomp.c Mon Jun 5 10:31:42 2006 @@ -216,7 +216,7 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = IopCompletionMapping; ObjectTypeInitializer.DeleteProcedure = IopDeleteIoCompletion; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoCompletionType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoCompletionType); } NTSTATUS Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr.c Mon Jun 5 10:31:42 2006 @@ -210,16 +210,16 @@ ObjectTypeInitializer.ValidAccessMask = FILE_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = IopFileMapping; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoDeviceObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoDeviceObjectType); /* Do the Adapter Type */ RtlInitUnicodeString(&Name, L"Adapter"); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoAdapterObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoAdapterObjectType); /* Do the Controller Type */ RtlInitUnicodeString(&Name, L"Controller"); ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(CONTROLLER_OBJECT); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoControllerObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoControllerObjectType); /* Initialize the File object type */ RtlInitUnicodeString(&Name, L"File"); @@ -230,7 +230,7 @@ ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; ObjectTypeInitializer.QueryNameProcedure = IopQueryNameFile; ObjectTypeInitializer.UseDefaultObject = FALSE; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoFileObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoFileObjectType); /* * Create the '\Driver' object directory Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c (original) +++ trunk/reactos/ntoskrnl/lpc/port.c Mon Jun 5 10:31:42 2006 @@ -56,8 +56,8 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = LpcpClosePort; ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &LpcPortObjectType); - + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &LpcPortObjectType); + LpcpNextMessageId = 0; ExInitializeFastMutex (& LpcpLock); 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 Mon Jun 5 10:31:42 2006 @@ -2202,7 +2202,7 @@ ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &MmSectionObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); return(STATUS_SUCCESS); } Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Mon Jun 5 10:31:42 2006 @@ -830,13 +830,20 @@ NtW32Call@20 NtWaitForSingleObject@12 NtWriteFile@36 + +; +; Object Manager ObAssignSecurity@16 ;ObCheckCreateObjectAccess@28 ;ObCheckObjectAccess@20 +;ObCloseHandle@4 ObCreateObject@36 +ObCreateObjectType@16 +ObDereferenceObject@4 ObDereferenceSecurityDescriptor@8 +@ObfDereferenceObject@4 ObFindHandleForObject@20 -ObGetObjectPointerCount@4 +@ObfReferenceObject@4 ObGetObjectSecurity@12 ObInsertObject@24 ObLogSecurityDescriptor@12 @@ -845,14 +852,18 @@ ObOpenObjectByPointer@28 ObQueryNameString@16 ObQueryObjectAuditingByHandle@8 -@ObfDereferenceObject@4 -@ObfReferenceObject@4 ObReferenceObjectByHandle@24 ObReferenceObjectByName@32 ObReferenceObjectByPointer@16 +;ObReferenceSecurityDescriptor@8 ObReleaseObjectSecurity@8 -ObDereferenceObject@4 +;ObSetHandleAttributes@12 ;ObSetSecurityDescriptorInfo@24 +;ObSetSecurityObjectByPointer@12 + +; +; +; ;PfxFindPrefix ;PfxInitialize ;PfxInsertPrefix Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Jun 5 10:31:42 2006 @@ -592,64 +592,6 @@ return STATUS_UNSUCCESSFUL; } - -/* -* @implemented -*/ -NTSTATUS STDCALL -ObQueryObjectAuditingByHandle(IN HANDLE Handle, - OUT PBOOLEAN GenerateOnClose) -{ - PHANDLE_TABLE_ENTRY HandleEntry; - PEPROCESS Process, CurrentProcess; - KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("ObQueryObjectAuditingByHandle(Handle %p)\n", Handle); - - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if(ObIsKernelHandle(Handle, ExGetPreviousMode())) - { - Process = PsInitialSystemProcess; - Handle = ObKernelHandleToHandle(Handle); - - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - Process = CurrentProcess; - - HandleEntry = ExMapHandleToPointer(Process->ObjectTable, - Handle); - if(HandleEntry != NULL) - { - *GenerateOnClose = (HandleEntry->ObAttributes & EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - } - else - Status = STATUS_INVALID_HANDLE; - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - return Status; -} /* PUBLIC FUNCTIONS *********************************************************/ ULONG Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Mon Jun 5 10:31:42 2006 @@ -158,7 +158,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.GenericMapping = ObpTypeMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_TYPE); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObTypeObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObTypeObjectType); /* Create the Directory Type */ DPRINT("Creating Directory Type\n"); @@ -170,7 +170,7 @@ ObjectTypeInitializer.MaintainTypeList = FALSE; ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObDirectoryType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); /* Create security descriptor */ RtlCreateSecurityDescriptor(&SecurityDescriptor, Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon Jun 5 10:31:42 2006 @@ -549,132 +549,6 @@ return STATUS_SUCCESS; } -NTSTATUS -NTAPI -ObpCreateTypeObject(IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, - IN PUNICODE_STRING TypeName, - OUT POBJECT_TYPE *ObjectType) -{ - POBJECT_HEADER Header; - POBJECT_TYPE LocalObjectType; - ULONG HeaderSize; - NTSTATUS Status; - CHAR Tag[4]; - OBP_LOOKUP_CONTEXT Context; - - /* Allocate the Object */ - Status = ObpAllocateObject(NULL, - TypeName, - ObTypeObjectType, - sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), - KernelMode, - (POBJECT_HEADER*)&Header); - if (!NT_SUCCESS(Status)) return Status; - LocalObjectType = (POBJECT_TYPE)&Header->Body; - - /* Check if this is the first Object Type */ - if (!ObTypeObjectType) - { - ObTypeObjectType = LocalObjectType; - Header->Type = ObTypeObjectType; - LocalObjectType->TotalNumberOfObjects = 1; - LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); - } - else - { - /* Set Tag */ - Tag[0] = TypeName->Buffer[0]; - Tag[1] = TypeName->Buffer[1]; - Tag[2] = TypeName->Buffer[2]; - Tag[3] = TypeName->Buffer[3]; - LocalObjectType->Key = *(PULONG)Tag; - } - - /* Set it up */ - LocalObjectType->TypeInfo = *ObjectTypeInitializer; - LocalObjectType->Name = *TypeName; - LocalObjectType->TypeInfo.PoolType = ObjectTypeInitializer->PoolType; - - /* These two flags need to be manually set up */ - Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; - - /* Check if we have to maintain a type list */ - if (NtGlobalFlag & FLG_MAINTAIN_OBJECT_TYPELIST) - { - /* Enable support */ - LocalObjectType->TypeInfo.MaintainTypeList = TRUE; - } - - /* Calculate how much space our header'll take up */ - HeaderSize = sizeof(OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + - (ObjectTypeInitializer->MaintainHandleCount ? - sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); - - /* Check the pool type */ - if (ObjectTypeInitializer->PoolType == NonPagedPool) - { - /* Update the NonPaged Pool charge */ - LocalObjectType->TypeInfo.DefaultNonPagedPoolCharge += HeaderSize; - } - else - { - /* Update the Paged Pool charge */ - LocalObjectType->TypeInfo.DefaultPagedPoolCharge += HeaderSize; - } - - /* All objects types need a security procedure */ - if (!ObjectTypeInitializer->SecurityProcedure) - { - LocalObjectType->TypeInfo.SecurityProcedure = SeDefaultObjectMethod; - } - - /* Select the Wait Object */ - if (LocalObjectType->TypeInfo.UseDefaultObject) - { - /* Add the SYNCHRONIZE access mask since it's waitable */ - LocalObjectType->TypeInfo.ValidAccessMask |= SYNCHRONIZE; - - /* Use the "Default Object", a simple event */ - LocalObjectType->DefaultObject = &ObpDefaultObject; - } - /* The File Object gets an optimized hack so it can be waited on */ - else if ((TypeName->Length == 8) && !(wcscmp(TypeName->Buffer, L"File"))) - { - /* Wait on the File Object's event directly */ - LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, - Event); - } - /* FIXME: When LPC stops sucking, add a hack for Waitable Ports */ - else - { - /* No default Object */ - LocalObjectType->DefaultObject = NULL; - } - - /* Initialize Object Type components */ - ExInitializeResourceLite(&LocalObjectType->Mutex); - InitializeListHead(&LocalObjectType->TypeList); - - /* Check if we're actually creating the directory object itself */ - if (ObpTypeDirectoryObject) - { - /* Insert it into the Object Directory */ - Context.Directory = ObpTypeDirectoryObject; - Context.DirectoryLocked = TRUE; - ObpLookupEntryDirectory(ObpTypeDirectoryObject, - TypeName, - OBJ_CASE_INSENSITIVE, - FALSE, - &Context); - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header); - ObReferenceObject(ObpTypeDirectoryObject); - } - - /* Return the object type and creations tatus */ - *ObjectType = LocalObjectType; - return Status; -} - /* PUBLIC FUNCTIONS **********************************************************/ NTSTATUS @@ -761,6 +635,133 @@ return Status; } +NTSTATUS +NTAPI +ObCreateObjectType(IN PUNICODE_STRING TypeName, + IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, + IN PVOID Reserved, + OUT POBJECT_TYPE *ObjectType) +{ + POBJECT_HEADER Header; + POBJECT_TYPE LocalObjectType; + ULONG HeaderSize; + NTSTATUS Status; + CHAR Tag[4]; + OBP_LOOKUP_CONTEXT Context; + + /* Allocate the Object */ + Status = ObpAllocateObject(NULL, + TypeName, + ObTypeObjectType, + sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), + KernelMode, + (POBJECT_HEADER*)&Header); + if (!NT_SUCCESS(Status)) return Status; + LocalObjectType = (POBJECT_TYPE)&Header->Body; + + /* Check if this is the first Object Type */ + if (!ObTypeObjectType) + { + ObTypeObjectType = LocalObjectType; + Header->Type = ObTypeObjectType; + LocalObjectType->TotalNumberOfObjects = 1; + LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); + } + else + { + /* Set Tag */ + Tag[0] = TypeName->Buffer[0]; + Tag[1] = TypeName->Buffer[1]; + Tag[2] = TypeName->Buffer[2]; + Tag[3] = TypeName->Buffer[3]; + LocalObjectType->Key = *(PULONG)Tag; + } + + /* Set it up */ + LocalObjectType->TypeInfo = *ObjectTypeInitializer; + LocalObjectType->Name = *TypeName; + LocalObjectType->TypeInfo.PoolType = ObjectTypeInitializer->PoolType; + + /* These two flags need to be manually set up */ + Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; + + /* Check if we have to maintain a type list */ + if (NtGlobalFlag & FLG_MAINTAIN_OBJECT_TYPELIST) + { + /* Enable support */ + LocalObjectType->TypeInfo.MaintainTypeList = TRUE; + } + + /* Calculate how much space our header'll take up */ + HeaderSize = sizeof(OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + + (ObjectTypeInitializer->MaintainHandleCount ? + sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); + + /* Check the pool type */ + if (ObjectTypeInitializer->PoolType == NonPagedPool) + { + /* Update the NonPaged Pool charge */ + LocalObjectType->TypeInfo.DefaultNonPagedPoolCharge += HeaderSize; + } + else + { + /* Update the Paged Pool charge */ + LocalObjectType->TypeInfo.DefaultPagedPoolCharge += HeaderSize; + } + + /* All objects types need a security procedure */ + if (!ObjectTypeInitializer->SecurityProcedure) + { + LocalObjectType->TypeInfo.SecurityProcedure = SeDefaultObjectMethod; + } + + /* Select the Wait Object */ + if (LocalObjectType->TypeInfo.UseDefaultObject) + { + /* Add the SYNCHRONIZE access mask since it's waitable */ + LocalObjectType->TypeInfo.ValidAccessMask |= SYNCHRONIZE; + + /* Use the "Default Object", a simple event */ + LocalObjectType->DefaultObject = &ObpDefaultObject; + } + /* The File Object gets an optimized hack so it can be waited on */ + else if ((TypeName->Length == 8) && !(wcscmp(TypeName->Buffer, L"File"))) + { + /* Wait on the File Object's event directly */ + LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, + Event); + } + /* FIXME: When LPC stops sucking, add a hack for Waitable Ports */ + else + { + /* No default Object */ + LocalObjectType->DefaultObject = NULL; + } + + /* Initialize Object Type components */ + ExInitializeResourceLite(&LocalObjectType->Mutex); + InitializeListHead(&LocalObjectType->TypeList); + + /* Check if we're actually creating the directory object itself */ + if (ObpTypeDirectoryObject) + { + /* Insert it into the Object Directory */ + Context.Directory = ObpTypeDirectoryObject; + Context.DirectoryLocked = TRUE; + ObpLookupEntryDirectory(ObpTypeDirectoryObject, + TypeName, + OBJ_CASE_INSENSITIVE, + FALSE, + &Context); + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header); + ObReferenceObject(ObpTypeDirectoryObject); + } + + /* Return the object type and creations tatus */ + *ObjectType = LocalObjectType; + return Status; +} + /*++ * @name NtQueryObject * @implemented NT4 Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jun 5 10:31:42 2006 @@ -329,7 +329,7 @@ /* PUBLIC FUNCTIONS *********************************************************/ -NTSTATUS +NTSTATUS STDCALL ObQueryNameString(IN PVOID Object, OUT POBJECT_NAME_INFORMATION ObjectNameInfo, Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jun 5 10:31:42 2006 @@ -68,17 +68,6 @@ } /* PUBLIC FUNCTIONS *********************************************************/ - -ULONG -NTAPI -ObGetObjectPointerCount(PVOID Object) -{ - PAGED_CODE(); - ASSERT(Object); - - /* Get the header and return the pointer count */ - return OBJECT_TO_OBJECT_HEADER(Object)->PointerCount; -} VOID FASTCALL Modified: trunk/reactos/ntoskrnl/ob/security.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/security.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/security.c (original) +++ trunk/reactos/ntoskrnl/ob/security.c Mon Jun 5 10:31:42 2006 @@ -463,4 +463,69 @@ DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); } +/*++ +* @name ObQueryObjectAuditingByHandle +* @implemented NT5 +* +* The ObDereferenceSecurityDescriptor routine <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param Count +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +ObQueryObjectAuditingByHandle(IN HANDLE Handle, + OUT PBOOLEAN GenerateOnClose) +{ + PHANDLE_TABLE_ENTRY HandleEntry; + PVOID HandleTable; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Check if we're dealing with a kernel handle */ + if (ObIsKernelHandle(Handle, ExGetPreviousMode())) + { + /* Use the kernel table and convert the handle */ + HandleTable = ObpKernelHandleTable; + Handle = ObKernelHandleToHandle(Handle); + } + else + { + /* Use the process's handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Enter a critical region while we touch the handle table */ + KeEnterCriticalRegion(); + + /* Map the handle */ + HandleEntry = ExMapHandleToPointer(HandleTable, Handle); + if(HandleEntry) + { + /* Check if the flag is set */ + *GenerateOnClose = (HandleEntry->ObAttributes & + EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; + + /* Unlock the entry */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + } + else + { + /* Otherwise, fail */ + Status = STATUS_INVALID_HANDLE; + } + + /* Leave the critical region and return the status */ + KeLeaveCriticalRegion(); + return Status; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/symlink.c (original) +++ trunk/reactos/ntoskrnl/ob/symlink.c Mon Jun 5 10:31:42 2006 @@ -194,7 +194,7 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObSymbolicLinkType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=22232… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c (original) +++ trunk/reactos/ntoskrnl/ps/job.c Mon Jun 5 10:31:42 2006 @@ -81,7 +81,7 @@ ObjectTypeInitializer.ValidAccessMask = JOB_OBJECT_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = PiDeleteJob; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &PsJobType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsJobType); InitializeListHead(&PsJobListHead); ExInitializeFastMutex(&PsJobListLock); Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Mon Jun 5 10:31:42 2006 @@ -122,7 +122,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = THREAD_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = PspDeleteThread; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &PsThreadType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsThreadType); PsInitializeIdleOrFirstThread(PsInitialSystemProcess, &FirstThread, NULL, KernelMode, TRUE); FirstThread->Tcb.State = Running; @@ -163,7 +163,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = PROCESS_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = PspDeleteProcess; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &PsProcessType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsProcessType); InitializeListHead(&PsActiveProcessHead); ExInitializeFastMutex(&PspActiveProcessMutex); Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Mon Jun 5 10:31:42 2006 @@ -591,7 +591,7 @@ ObjectTypeInitializer.ValidAccessMask = TOKEN_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = SepDeleteToken; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &SepTokenObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &SepTokenObjectType); }

1 0

[ion] 22231: - Fixed formatting/commented/annotated ObReferenceObjectByHandle. - Bug fixes: * Remove MAXIMUM_ALLOWED<->GENERIC_ALL conversion, I could find no mention of this in the docs. * Remove GENERIC_ACCESS <-> RtlMapGenericMask conversion, I could find no mention of this in the docs, and this mapping is only required when creating handles, not when referencing pointers. - Optimizations: * Restructure code and remove code which was sometimes duplicated up to 5 times. * Do not attach/detach
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 09:07:44 2006 New Revision: 22231 URL: http://svn.reactos.ru/svn/reactos?rev=22231&view=rev Log: - Fixed formatting/commented/annotated ObReferenceObjectByHandle. - Bug fixes: * Remove MAXIMUM_ALLOWED<->GENERIC_ALL conversion, I could find no mention of this in the docs. * Remove GENERIC_ACCESS <-> RtlMapGenericMask conversion, I could find no mention of this in the docs, and this mapping is only required when creating handles, not when referencing pointers. - Optimizations: * Restructure code and remove code which was sometimes duplicated up to 5 times. * Do not attach/detach from the system process, this isn't required since we're merely getting a kernel pointer from the handle netry. * Directly increase the pointer count instead of calling ObReferenceObject, since we already have the object header in a variable. * Cache ObpKernelHandleTable/Process->ObjectTable and use those directly instead of always de-referencing the process. Modified: trunk/reactos/base/system/smss/client.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/base/system/smss/client.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/smss/client.c?r… ============================================================================== --- trunk/reactos/base/system/smss/client.c (original) +++ trunk/reactos/base/system/smss/client.c Mon Jun 5 09:07:44 2006 @@ -194,6 +194,14 @@ SmpClientDirectory.CandidateClient->ServerProcessId = (ULONG) pbi.UniqueProcessId; } + else + { + LARGE_INTEGER Fixme; + Fixme.QuadPart = -50000000; + DPRINT1("WARNING! UniqueProcess IS A THREAD HANDLE!!!\n"); + NtDelayExecution(FALSE, &Fixme); + DPRINT1("FIXME!\n"); + } } else { Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jun 5 09:07:44 2006 @@ -127,6 +127,18 @@ ExQueueWorkItem(&ObpReaperWorkItem, DelayedWorkQueue); } } +} + +#ifdef ObDereferenceObject +#undef ObDereferenceObject +#endif + +VOID +NTAPI +ObDereferenceObject(IN PVOID Object) +{ + /* Call the fastcall function */ + ObfDereferenceObject(Object); } NTSTATUS @@ -228,206 +240,165 @@ return Status; } -NTSTATUS STDCALL -ObReferenceObjectByHandle(HANDLE Handle, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID* Object, - POBJECT_HANDLE_INFORMATION HandleInformation) +NTSTATUS +NTAPI +ObReferenceObjectByHandle(IN HANDLE Handle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_TYPE ObjectType, + IN KPROCESSOR_MODE AccessMode, + OUT PVOID* Object, + OUT POBJECT_HANDLE_INFORMATION HandleInformation OPTIONAL) { PHANDLE_TABLE_ENTRY HandleEntry; POBJECT_HEADER ObjectHeader; - PVOID ObjectBody; ACCESS_MASK GrantedAccess; ULONG Attributes; - PEPROCESS CurrentProcess, Process; - BOOLEAN AttachedToProcess = FALSE; - KAPC_STATE ApcState; - + PEPROCESS CurrentProcess; + PVOID HandleTable; + PETHREAD CurrentThread; + NTSTATUS Status; PAGED_CODE(); - DPRINT("ObReferenceObjectByHandle(Handle %p, DesiredAccess %x, " - "ObjectType %p, AccessMode %d, Object %p)\n",Handle,DesiredAccess, - ObjectType,AccessMode,Object); - - if (Handle == NULL) - { - return STATUS_INVALID_HANDLE; - } - - CurrentProcess = PsGetCurrentProcess(); - - /* - * Handle special handle names - */ - if (Handle == NtCurrentProcess() && - (ObjectType == PsProcessType || ObjectType == NULL)) - { + /* Fail immediately if the handle is NULL */ + if (!Handle) return STATUS_INVALID_HANDLE; + + /* Check if the caller wants the current process */ + if ((Handle == NtCurrentProcess()) && + ((ObjectType == PsProcessType) || !(ObjectType))) + { + /* Get the current process */ + CurrentProcess = PsGetCurrentProcess(); + + /* Reference ourselves */ ObReferenceObject(CurrentProcess); - if (HandleInformation != NULL) - { + /* Check if the caller wanted handle information */ + if (HandleInformation) + { + /* Return it */ HandleInformation->HandleAttributes = 0; HandleInformation->GrantedAccess = PROCESS_ALL_ACCESS; } + /* Return the pointer */ *Object = CurrentProcess; - DPRINT("Referencing current process %p\n", CurrentProcess); return STATUS_SUCCESS; } else if (Handle == NtCurrentProcess()) { - CHECKPOINT; - return(STATUS_OBJECT_TYPE_MISMATCH); - } - - if (Handle == NtCurrentThread() && - (ObjectType == PsThreadType || ObjectType == NULL)) - { - PETHREAD CurrentThread = PsGetCurrentThread(); - + /* The caller used this special handle value with a non-process type */ + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Check if the caller wants the current thread */ + if ((Handle == NtCurrentThread()) && + ((ObjectType == PsThreadType) || !(ObjectType))) + { + /* Get the current thread */ + CurrentThread = PsGetCurrentThread(); + + /* Reference ourselves */ ObReferenceObject(CurrentThread); - if (HandleInformation != NULL) - { + /* Check if the caller wanted handle information */ + if (HandleInformation) + { + /* Return it */ HandleInformation->HandleAttributes = 0; HandleInformation->GrantedAccess = THREAD_ALL_ACCESS; } + /* Return the pointer */ *Object = CurrentThread; - CHECKPOINT; return STATUS_SUCCESS; } else if (Handle == NtCurrentThread()) { - CHECKPOINT; - return(STATUS_OBJECT_TYPE_MISMATCH); - } - - /* desire as much access rights as possible */ - if (DesiredAccess & MAXIMUM_ALLOWED) - { - DesiredAccess &= ~MAXIMUM_ALLOWED; - DesiredAccess |= GENERIC_ALL; - } - - if(ObIsKernelHandle(Handle, AccessMode)) - { - Process = PsInitialSystemProcess; + /* The caller used this special handle value with a non-thread type */ + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Check if this is a kernel handle */ + if (ObIsKernelHandle(Handle, AccessMode)) + { + /* Use the kernel handle table and get the actual handle value */ Handle = ObKernelHandleToHandle(Handle); + HandleTable = ObpKernelHandleTable; } else { - Process = CurrentProcess; - } - + /* Otherwise use this process's handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Enter a critical region while we touch the handle table */ KeEnterCriticalRegion(); - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - HandleEntry = ExMapHandleToPointer(Process->ObjectTable, - Handle); - if (HandleEntry == NULL) - { - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - KeLeaveCriticalRegion(); - DPRINT("ExMapHandleToPointer() failed for handle 0x%p\n", Handle); - return(STATUS_INVALID_HANDLE); - } - - ObjectHeader = EX_HTE_TO_HDR(HandleEntry); - ObjectBody = &ObjectHeader->Body; - - DPRINT("locked1: ObjectHeader: 0x%p [HT:0x%p]\n", ObjectHeader, Process->ObjectTable); - - if (ObjectType != NULL && ObjectType != ObjectHeader->Type) - { - DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%p)\n", &ObjectType->Name, ObjectHeader->Type ? &ObjectHeader->Type->Name : NULL, Handle); - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - return(STATUS_OBJECT_TYPE_MISMATCH); - } - - /* map the generic access masks if the caller asks for generic access */ - if (DesiredAccess & GENERIC_ACCESS) - { - RtlMapGenericMask(&DesiredAccess, - &OBJECT_TO_OBJECT_HEADER(ObjectBody)->Type->TypeInfo.GenericMapping); - } - - GrantedAccess = HandleEntry->GrantedAccess; - - /* Unless running as KernelMode, deny access if caller desires more access - rights than the handle can grant */ - if(AccessMode != KernelMode && (~GrantedAccess & DesiredAccess)) - { - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - DPRINT1("GrantedAccess: 0x%x, ~GrantedAccess: 0x%x, DesiredAccess: 0x%x, denied: 0x%x\n", GrantedAccess, ~GrantedAccess, DesiredAccess, ~GrantedAccess & DesiredAccess); - - return(STATUS_ACCESS_DENIED); - } - - ObReferenceObject(ObjectBody); - - Attributes = HandleEntry->ObAttributes & (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | - EX_HANDLE_ENTRY_INHERITABLE | - EX_HANDLE_ENTRY_AUDITONCLOSE); - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - + /* Get the handle entry */ + HandleEntry = ExMapHandleToPointer(HandleTable, Handle); + if (HandleEntry) + { + /* Get the object header and validate the type*/ + ObjectHeader = EX_HTE_TO_HDR(HandleEntry); + if (!(ObjectType) || (ObjectType == ObjectHeader->Type)) + { + /* Get the granted access and validate it */ + GrantedAccess = HandleEntry->GrantedAccess; + if ((AccessMode == KernelMode) || + !(~GrantedAccess & DesiredAccess)) + { + /* Reference the object directly since we have its header */ + InterlockedIncrement(&ObjectHeader->PointerCount); + + /* Mask out the internal attributes */ + Attributes = HandleEntry->ObAttributes & + (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | + EX_HANDLE_ENTRY_INHERITABLE | + EX_HANDLE_ENTRY_AUDITONCLOSE); + + /* Check if the caller wants handle information */ + if (HandleInformation) + { + /* Fill out the information */ + HandleInformation->HandleAttributes = Attributes; + HandleInformation->GrantedAccess = GrantedAccess; + } + + /* Return the pointer */ + *Object = &ObjectHeader->Body; + + /* Unlock the handle */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + + /* Return success */ + KeLeaveCriticalRegion(); + return STATUS_SUCCESS; + } + else + { + /* Requested access failed */ + Status = STATUS_ACCESS_DENIED; + } + } + else + { + /* Invalid object type */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Unlock the entry */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + } + else + { + /* Invalid handle */ + Status = STATUS_INVALID_HANDLE; + } + + /* Return failure status */ KeLeaveCriticalRegion(); - - if (HandleInformation != NULL) - { - HandleInformation->HandleAttributes = Attributes; - HandleInformation->GrantedAccess = GrantedAccess; - } - - *Object = ObjectBody; - - return(STATUS_SUCCESS); -} - -#ifdef ObDereferenceObject -#undef ObDereferenceObject -#endif - -VOID STDCALL -ObDereferenceObject(IN PVOID Object) -{ - ObfDereferenceObject(Object); -} + *Object = NULL; + return Status; +} + /* EOF */

1 0

[ion] 22230: - Simplify ObGetObjectPointerCode and ObfReferenceObject. - Fix ObReferenceObjectByPointer to actually work like documented instead of doing random incorrect checks. Also add special case for Symbolic Link objects as documented by Caz Yokoyama at Microsoft.
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 04:32:26 2006 New Revision: 22230 URL: http://svn.reactos.ru/svn/reactos?rev=22230&view=rev Log: - Simplify ObGetObjectPointerCode and ObfReferenceObject. - Fix ObReferenceObjectByPointer to actually work like documented instead of doing random incorrect checks. Also add special case for Symbolic Link objects as documented by Caz Yokoyama at Microsoft. Modified: trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jun 5 04:32:26 2006 @@ -69,34 +69,25 @@ /* PUBLIC FUNCTIONS *********************************************************/ -ULONG STDCALL +ULONG +NTAPI ObGetObjectPointerCount(PVOID Object) { - POBJECT_HEADER Header; - PAGED_CODE(); - ASSERT(Object); - Header = OBJECT_TO_OBJECT_HEADER(Object); - - return Header->PointerCount; -} - -VOID FASTCALL + + /* Get the header and return the pointer count */ + return OBJECT_TO_OBJECT_HEADER(Object)->PointerCount; +} + +VOID +FASTCALL ObfReferenceObject(IN PVOID Object) { - POBJECT_HEADER Header; - ASSERT(Object); - Header = OBJECT_TO_OBJECT_HEADER(Object); - - /* No one should be referencing an object once we are deleting it. */ - if (InterlockedIncrement(&Header->PointerCount) == 1 && !(Header->Flags & OB_FLAG_PERMANENT)) - { - KEBUGCHECK(0); - } - + /* Get the header and increment the reference count */ + InterlockedIncrement(&OBJECT_TO_OBJECT_HEADER(Object)->PointerCount); } VOID @@ -138,7 +129,8 @@ } } -NTSTATUS STDCALL +NTSTATUS +NTAPI ObReferenceObjectByPointer(IN PVOID Object, IN ACCESS_MASK DesiredAccess, IN POBJECT_TYPE ObjectType, @@ -146,55 +138,23 @@ { POBJECT_HEADER Header; - /* NOTE: should be possible to reference an object above APC_LEVEL! */ - - DPRINT("ObReferenceObjectByPointer(Object %x, ObjectType %x)\n", - Object,ObjectType); - + /* Get the header */ Header = OBJECT_TO_OBJECT_HEADER(Object); - if (ObjectType != NULL && Header->Type != ObjectType) - { - DPRINT("Failed %p (type was %x %wZ) should be %x %wZ\n", - Header, - Header->Type, - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(Header->Type))->Name, - ObjectType, - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObjectType))->Name); - return(STATUS_UNSUCCESSFUL); - } - if (Header->Type == PsProcessType) - { - DPRINT("Ref p 0x%x PointerCount %d type %x ", - Object, Header->PointerCount, PsProcessType); - DPRINT("eip %x\n", ((PULONG)&Object)[-1]); - } - if (Header->Type == PsThreadType) - { - DPRINT("Deref t 0x%x with PointerCount %d type %x ", - Object, Header->PointerCount, PsThreadType); - DPRINT("eip %x\n", ((PULONG)&Object)[-1]); - } - - if (Header->PointerCount == 0 && !(Header->Flags & OB_FLAG_PERMANENT)) - { - if (Header->Type == PsProcessType) - { - return STATUS_PROCESS_IS_TERMINATING; - } - if (Header->Type == PsThreadType) - { - return STATUS_THREAD_IS_TERMINATING; - } - return(STATUS_UNSUCCESSFUL); - } - - if (1 == InterlockedIncrement(&Header->PointerCount) && !(Header->Flags & OB_FLAG_PERMANENT)) - { - KEBUGCHECK(0); - } - - return(STATUS_SUCCESS); + /* + * Validate object type if the call is for UserMode. + * NOTE: Unless it's a symbolic link (Caz Yokoyama [MSFT]) + */ + if ((Header->Type != ObjectType) && ((AccessMode != KernelMode) || + (ObjectType == ObSymbolicLinkType))) + { + /* Invalid type */ + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Oncrement the reference count and return success */ + InterlockedIncrement(&Header->PointerCount); + return STATUS_SUCCESS; } NTSTATUS

1 0

[ion] 22229: - Formatting/comment fixes.
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 04:16:14 2006 New Revision: 22229 URL: http://svn.reactos.ru/svn/reactos?rev=22229&view=rev Log: - Formatting/comment fixes. Modified: trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon Jun 5 04:16:14 2006 @@ -431,7 +431,7 @@ ULONG FinalSize = ObjectSize; ULONG Tag; PAGED_CODE(); - + /* If we don't have an Object Type yet, force NonPaged */ if (!ObjectType) { @@ -443,14 +443,14 @@ PoolType = ObjectType->TypeInfo.PoolType; Tag = ObjectType->Key; } - + /* Check if the Object has a name */ if (ObjectName->Buffer) { FinalSize += sizeof(OBJECT_HEADER_NAME_INFO); HasNameInfo = TRUE; } - + if (ObjectType) { /* Check if the Object maintains handle counts */ @@ -471,7 +471,7 @@ /* Allocate memory for the Object and Header */ Header = ExAllocatePoolWithTag(PoolType, FinalSize, Tag); if (!Header) return STATUS_INSUFFICIENT_RESOURCES; - + /* Initialize Handle Info */ if (HasHandleInfo) { @@ -479,7 +479,7 @@ HandleInfo->SingleEntry.HandleCount = 0; Header = (POBJECT_HEADER)(HandleInfo + 1); } - + /* Initialize the Object Name Info */ if (HasNameInfo) { @@ -488,7 +488,7 @@ NameInfo->Directory = NULL; Header = (POBJECT_HEADER)(NameInfo + 1); } - + /* Initialize Creator Info */ if (HasCreatorInfo) { @@ -498,14 +498,14 @@ InitializeListHead(&CreatorInfo->TypeList); Header = (POBJECT_HEADER)(CreatorInfo + 1); } - + /* Initialize the object header */ RtlZeroMemory(Header, ObjectSize); Header->PointerCount = 1; Header->Type = ObjectType; Header->Flags = OB_FLAG_CREATE_INFO; Header->ObjectCreateInfo = ObjectCreateInfo; - + /* Set the Offsets for the Info */ if (HasHandleInfo) { @@ -540,10 +540,10 @@ /* Set the kernel flag */ Header->Flags |= OB_FLAG_KERNEL_MODE; } - + /* Increase the number of objects of this type */ if (ObjectType) ObjectType->TotalNumberOfObjects++; - + /* Return Header */ *ObjectHeader = Header; return STATUS_SUCCESS; @@ -551,9 +551,9 @@ NTSTATUS NTAPI -ObpCreateTypeObject(POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, - PUNICODE_STRING TypeName, - POBJECT_TYPE *ObjectType) +ObpCreateTypeObject(IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, + IN PUNICODE_STRING TypeName, + OUT POBJECT_TYPE *ObjectType) { POBJECT_HEADER Header; POBJECT_TYPE LocalObjectType; @@ -563,15 +563,15 @@ OBP_LOOKUP_CONTEXT Context; /* Allocate the Object */ - Status = ObpAllocateObject(NULL, + Status = ObpAllocateObject(NULL, TypeName, - ObTypeObjectType, + ObTypeObjectType, sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), KernelMode, (POBJECT_HEADER*)&Header); if (!NT_SUCCESS(Status)) return Status; LocalObjectType = (POBJECT_TYPE)&Header->Body; - + /* Check if this is the first Object Type */ if (!ObTypeObjectType) { @@ -581,7 +581,7 @@ LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); } else - { + { /* Set Tag */ Tag[0] = TypeName->Buffer[0]; Tag[1] = TypeName->Buffer[1]; @@ -589,7 +589,7 @@ Tag[3] = TypeName->Buffer[3]; LocalObjectType->Key = *(PULONG)Tag; } - + /* Set it up */ LocalObjectType->TypeInfo = *ObjectTypeInitializer; LocalObjectType->Name = *TypeName; @@ -610,16 +610,18 @@ (ObjectTypeInitializer->MaintainHandleCount ? sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); - /* Update the Pool Charges */ + /* Check the pool type */ if (ObjectTypeInitializer->PoolType == NonPagedPool) { + /* Update the NonPaged Pool charge */ LocalObjectType->TypeInfo.DefaultNonPagedPoolCharge += HeaderSize; } else { + /* Update the Paged Pool charge */ LocalObjectType->TypeInfo.DefaultPagedPoolCharge += HeaderSize; } - + /* All objects types need a security procedure */ if (!ObjectTypeInitializer->SecurityProcedure) { @@ -635,10 +637,12 @@ /* Use the "Default Object", a simple event */ LocalObjectType->DefaultObject = &ObpDefaultObject; } - /* Special system objects get an optimized hack so they can be waited on */ - else if (TypeName->Length == 8 && !wcscmp(TypeName->Buffer, L"File")) - { - LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, Event); + /* The File Object gets an optimized hack so it can be waited on */ + else if ((TypeName->Length == 8) && !(wcscmp(TypeName->Buffer, L"File"))) + { + /* Wait on the File Object's event directly */ + LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, + Event); } /* FIXME: When LPC stops sucking, add a hack for Waitable Ports */ else @@ -651,9 +655,10 @@ ExInitializeResourceLite(&LocalObjectType->Mutex); InitializeListHead(&LocalObjectType->TypeList); - /* Insert it into the Object Directory */ + /* Check if we're actually creating the directory object itself */ if (ObpTypeDirectoryObject) { + /* Insert it into the Object Directory */ Context.Directory = ObpTypeDirectoryObject; Context.DirectoryLocked = TRUE; ObpLookupEntryDirectory(ObpTypeDirectoryObject, @@ -665,6 +670,7 @@ ObReferenceObject(ObpTypeDirectoryObject); } + /* Return the object type and creations tatus */ *ObjectType = LocalObjectType; return Status; } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jun 5 04:16:14 2006 @@ -180,12 +180,12 @@ Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, CurrentHeader->Type, AccessState, - ExGetPreviousMode(), // fixme: should be a parameter, since caller decides. + PreviousMode, Attributes, &PathString, &CurrentUs, ParseContext, - NULL, // fixme: where do we get this from? captured OBP? + SecurityQos, &NextObject); current = CurrentUs.Buffer; if (Status == STATUS_REPARSE) @@ -341,89 +341,74 @@ POBJECT_DIRECTORY ParentDirectory; ULONG NameSize; PWCH ObjectName; - NTSTATUS Status; - - DPRINT("ObQueryNameString: %x, %x\n", Object, ObjectNameInfo); /* Get the Kernel Meta-Structures */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); /* Check if a Query Name Procedure is available */ - if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) - { + if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) + { /* Call the procedure */ - DPRINT("Calling Object's Procedure\n"); - Status = ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, - TRUE, //fixme - ObjectNameInfo, - Length, - ReturnLength); - - /* Return the status */ - return Status; + return ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, + TRUE, //fixme + ObjectNameInfo, + Length, + ReturnLength); } /* Check if the object doesn't even have a name */ - if (!LocalInfo || !LocalInfo->Name.Buffer) + if (!LocalInfo || !LocalInfo->Name.Buffer) { /* We're returning the name structure */ - DPRINT("Nameless Object\n"); *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); /* Check if we were given enough space */ - if (*ReturnLength > Length) - { - DPRINT1("Not enough buffer space\n"); - return STATUS_INFO_LENGTH_MISMATCH; - } + if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; /* Return an empty buffer */ - ObjectNameInfo->Name.Length = 0; - ObjectNameInfo->Name.MaximumLength = 0; - ObjectNameInfo->Name.Buffer = NULL; - + RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); return STATUS_SUCCESS; } - /* + /* * Find the size needed for the name. We won't do * this during the Name Creation loop because we want * to let the caller know that the buffer isn't big * enough right at the beginning, not work our way through * and find out at the end */ - if (Object == NameSpaceRoot) + if (Object == NameSpaceRoot) { /* Size of the '\' string */ - DPRINT("Object is Root\n"); NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); - } - else + } + else { /* Get the Object Directory and add name of Object */ ParentDirectory = LocalInfo->Directory; NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; /* Loop inside the directory to get the top-most one (meaning root) */ - while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) + while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) { /* Get the Name Information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); /* Add the size of the Directory Name */ - if (LocalInfo && LocalInfo->Directory) + if (LocalInfo && LocalInfo->Directory) { /* Size of the '\' string + Directory Name */ - NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; + NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + + LocalInfo->Name.Length; /* Move to next parent Directory */ ParentDirectory = LocalInfo->Directory; - } - else + } + else { /* Directory with no name. We append "...\" */ - DPRINT("Nameless Directory\n"); NameSize += sizeof(L"...") + sizeof(OBJ_NAME_PATH_SEPARATOR); break; } @@ -431,17 +416,14 @@ } /* Finally, add the name of the structure and the null char */ - *ReturnLength = NameSize + sizeof(OBJECT_NAME_INFORMATION) + sizeof(UNICODE_NULL); - DPRINT("Final Length: %x\n", *ReturnLength); + *ReturnLength = NameSize + + sizeof(OBJECT_NAME_INFORMATION) + + sizeof(UNICODE_NULL); /* Check if we were given enough space */ - if (*ReturnLength > Length) - { - DPRINT1("Not enough buffer space\n"); - return STATUS_INFO_LENGTH_MISMATCH; - } - - /* + if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; + + /* * Now we will actually create the name. We work backwards because * it's easier to start off from the Name we have and walk up the * parent directories. We use the same logic as Name Length calculation. @@ -450,44 +432,51 @@ ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); *--ObjectName = UNICODE_NULL; - if (Object == NameSpaceRoot) + /* Check if the object is actually the Root directory */ + if (Object == NameSpaceRoot) { /* This is already the Root Directory, return "\\" */ - DPRINT("Returning Root Dir\n"); *--ObjectName = OBJ_NAME_PATH_SEPARATOR; ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + + sizeof(UNICODE_NULL)); ObjectNameInfo->Name.Buffer = ObjectName; - return STATUS_SUCCESS; - } - else + } + else { /* Start by adding the Object's Name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - LocalInfo->Name.Length); - RtlMoveMemory(ObjectName, LocalInfo->Name.Buffer, LocalInfo->Name.Length); + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlMoveMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); /* Now parse the Parent directories until we reach the top */ ParentDirectory = LocalInfo->Directory; - while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) + while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) { /* Get the name information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); /* Add the "\" */ *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; /* Add the Parent Directory's Name */ - if (LocalInfo && LocalInfo->Name.Buffer) + if (LocalInfo && LocalInfo->Name.Buffer) { /* Add the name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - LocalInfo->Name.Length); - RtlMoveMemory(ObjectName, LocalInfo->Name.Buffer, LocalInfo->Name.Length); + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlMoveMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); /* Move to next parent */ ParentDirectory = LocalInfo->Directory; - } - else + } + else { /* Directory without a name, we add "..." */ DPRINT("Nameless Directory\n"); @@ -499,13 +488,13 @@ /* Add Root Directory Name */ *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; - DPRINT("Current Buffer: %S\n", ObjectName); ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + + sizeof(UNICODE_NULL)); ObjectNameInfo->Name.Buffer = ObjectName; - DPRINT("Complete: %wZ\n", ObjectNameInfo); - } - + } + + /* Return success */ return STATUS_SUCCESS; }

1 0

[ion] 22228: - Fix ExChangeHandle not to send NULL but the actual context to the callback function (fix by Thomas Weidenmueller <w3seek@reactos.org>) - Re-implement NtSetInformationObject based on ExChangeHandle and using ObpSetHandleAttributes as a callback. - Re-implement NtQueryObject's ObjectHandleInformation case to simply return the information that's already in HandleAttributes; there is no point in querying for it all over again. - Fix NtSetInformationObject not to allow a user-mode call
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 04:04:36 2006 New Revision: 22228 URL: http://svn.reactos.ru/svn/reactos?rev=22228&view=rev Log: - Fix ExChangeHandle not to send NULL but the actual context to the callback function (fix by Thomas Weidenmueller <w3seek(a)reactos.org>) - Re-implement NtSetInformationObject based on ExChangeHandle and using ObpSetHandleAttributes as a callback. - Re-implement NtQueryObject's ObjectHandleInformation case to simply return the information that's already in HandleAttributes; there is no point in querying for it all over again. - Fix NtSetInformationObject not to allow a user-mode call to modify kernel-mdoe handle attributes. Add FIXME for Inheritance permissions check. - Fix NtQueryObject to properly return OBJ_PERMANENT and OBJ_EXCLUSIVE; these flags are not stored in Handle Attributes. - Fix NtQueryObject not to attempt referencing the handle if the caller specified AllTypesInformation, because then a handle is not needed. Modified: trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Mon Jun 5 04:04:36 2006 @@ -916,7 +916,7 @@ { Ret = ChangeHandleCallback(HandleTable, HandleTableEntry, - NULL); + Context); ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Mon Jun 5 04:04:36 2006 @@ -8,6 +8,12 @@ #ifndef __INCLUDE_INTERNAL_OBJMGR_H #define __INCLUDE_INTERNAL_OBJMGR_H + +typedef struct _OBP_SET_HANDLE_ATTRIBUTES_CONTEXT +{ + KPROCESSOR_MODE PreviousMode; + OBJECT_HANDLE_ATTRIBUTE_INFORMATION Information; +} OBP_SET_HANDLE_ATTRIBUTES_CONTEXT, *POBP_SET_HANDLE_ATTRIBUTES_CONTEXT; #define GENERIC_ACCESS (GENERIC_READ | \ GENERIC_WRITE | \ @@ -100,18 +106,12 @@ IN PVOID Insert ); -NTSTATUS -NTAPI -ObpQueryHandleAttributes( - HANDLE Handle, - POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo -); - -NTSTATUS +BOOLEAN NTAPI ObpSetHandleAttributes( - HANDLE Handle, - POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo + IN PHANDLE_TABLE HandleTable, + IN OUT PHANDLE_TABLE_ENTRY HandleTableEntry, + IN PVOID Context ); NTSTATUS Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Jun 5 04:04:36 2006 @@ -154,129 +154,51 @@ } } -NTSTATUS +BOOLEAN NTAPI -ObpQueryHandleAttributes(HANDLE Handle, - POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo) -{ - PHANDLE_TABLE_ENTRY HandleTableEntry; - PEPROCESS Process, CurrentProcess; - KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("ObpQueryHandleAttributes(Handle %p)\n", Handle); - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if(ObIsKernelHandle(Handle, ExGetPreviousMode())) - { - Process = PsInitialSystemProcess; - Handle = ObKernelHandleToHandle(Handle); - - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - { - Process = CurrentProcess; - } - - HandleTableEntry = ExMapHandleToPointer(Process->ObjectTable, - Handle); - if (HandleTableEntry != NULL) - { - HandleInfo->Inherit = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - HandleInfo->ProtectFromClose = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleTableEntry); - } - else - Status = STATUS_INVALID_HANDLE; - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - return Status; -} - -NTSTATUS -NTAPI -ObpSetHandleAttributes(HANDLE Handle, - POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo) -{ - PHANDLE_TABLE_ENTRY HandleTableEntry; - PEPROCESS Process, CurrentProcess; - KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("ObpSetHandleAttributes(Handle %p)\n", Handle); - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if(ObIsKernelHandle(Handle, ExGetPreviousMode())) - { - Process = PsInitialSystemProcess; - Handle = ObKernelHandleToHandle(Handle); - - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - { - Process = CurrentProcess; - } - - HandleTableEntry = ExMapHandleToPointer(Process->ObjectTable, - Handle); - if (HandleTableEntry != NULL) - { - if (HandleInfo->Inherit) - HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; - else - HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - - if (HandleInfo->ProtectFromClose) - HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; - else - HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; - - /* FIXME: Do we need to set anything in the object header??? */ - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleTableEntry); - } - else - Status = STATUS_INVALID_HANDLE; - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - return Status; +ObpSetHandleAttributes(IN PHANDLE_TABLE HandleTable, + IN OUT PHANDLE_TABLE_ENTRY HandleTableEntry, + IN PVOID Context) +{ + POBP_SET_HANDLE_ATTRIBUTES_CONTEXT SetHandleInfo = + (POBP_SET_HANDLE_ATTRIBUTES_CONTEXT)Context; + POBJECT_HEADER ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); + PAGED_CODE(); + + /* Don't allow operations on kernel objects */ + if ((ObjectHeader->Flags & OB_FLAG_KERNEL_MODE) && + (SetHandleInfo->PreviousMode != KernelMode)) + { + /* Fail */ + return FALSE; + } + + /* Check if making the handle inheritable */ + if (SetHandleInfo->Information.Inherit) + { + /* Set the flag. FIXME: Need to check if this is allowed */ + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + } + else + { + /* Otherwise this implies we're removing the flag */ + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + } + + /* Check if making the handle protected */ + if (SetHandleInfo->Information.ProtectFromClose) + { + /* Set the flag */ + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + } + else + { + /* Otherwise, remove it */ + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + } + + /* Return success */ + return TRUE; } static NTSTATUS Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon Jun 5 04:04:36 2006 @@ -790,95 +790,157 @@ OUT PULONG ResultLength OPTIONAL) { OBJECT_HANDLE_INFORMATION HandleInfo; - POBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader = NULL; + POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleFlags; + POBJECT_BASIC_INFORMATION BasicInfo; ULONG InfoLength; - PVOID Object; + PVOID Object = NULL; NTSTATUS Status; PAGED_CODE(); - Status = ObReferenceObjectByHandle(ObjectHandle, - 0, - NULL, - KeGetPreviousMode(), - &Object, - &HandleInfo); - if (!NT_SUCCESS (Status)) return Status; - - ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - + /* FIXME: Needs SEH */ + + /* + * Make sure this isn't a generic type query, since the caller doesn't + * have to give a handle for it + */ + if (ObjectInformationClass != ObjectAllTypesInformation) + { + /* Reference the object */ + Status = ObReferenceObjectByHandle(ObjectHandle, + 0, + NULL, + KeGetPreviousMode(), + &Object, + &HandleInfo); + if (!NT_SUCCESS (Status)) return Status; + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + } + + /* Check the information class */ switch (ObjectInformationClass) { - case ObjectBasicInformation: - InfoLength = sizeof(OBJECT_BASIC_INFORMATION); - if (Length != sizeof(OBJECT_BASIC_INFORMATION)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - POBJECT_BASIC_INFORMATION BasicInfo; - + /* Basic info */ + case ObjectBasicInformation: + + /* Validate length */ + InfoLength = sizeof(OBJECT_BASIC_INFORMATION); + if (Length != sizeof(OBJECT_BASIC_INFORMATION)) + { + /* Fail */ + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Fill out the basic information */ BasicInfo = (POBJECT_BASIC_INFORMATION)ObjectInformation; BasicInfo->Attributes = HandleInfo.HandleAttributes; BasicInfo->GrantedAccess = HandleInfo.GrantedAccess; BasicInfo->HandleCount = ObjectHeader->HandleCount; BasicInfo->PointerCount = ObjectHeader->PointerCount; + + /* Permanent/Exclusive Flags are NOT in Handle attributes! */ + if (ObjectHeader->Flags & OB_FLAG_EXCLUSIVE) + { + /* Set the flag */ + BasicInfo->Attributes |= OBJ_EXCLUSIVE; + } + if (ObjectHeader->Flags & OB_FLAG_PERMANENT) + { + /* Set the flag */ + BasicInfo->Attributes |= OBJ_PERMANENT; + } + + /* Copy quota information */ BasicInfo->PagedPoolUsage = 0; /* FIXME*/ BasicInfo->NonPagedPoolUsage = 0; /* FIXME*/ + + /* Copy name information */ BasicInfo->NameInformationLength = 0; /* FIXME*/ BasicInfo->TypeInformationLength = 0; /* FIXME*/ + + /* Copy security information */ BasicInfo->SecurityDescriptorLength = 0; /* FIXME*/ + + /* Check if this is a symlink */ if (ObjectHeader->Type == ObSymbolicLinkType) { + /* Return the creation time */ BasicInfo->CreateTime.QuadPart = ((POBJECT_SYMBOLIC_LINK)Object)->CreationTime.QuadPart; } else { + /* Otherwise return 0 */ BasicInfo->CreateTime.QuadPart = (ULONGLONG)0; } + + /* Break out with success */ Status = STATUS_SUCCESS; - } - break; - - case ObjectNameInformation: - Status = ObQueryNameString(Object, - (POBJECT_NAME_INFORMATION)ObjectInformation, - Length, - &InfoLength); - break; - - case ObjectTypeInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ObjectAllTypesInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ObjectHandleInformation: - InfoLength = sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION); - if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - Status = ObpQueryHandleAttributes( - ObjectHandle, - (POBJECT_HANDLE_ATTRIBUTE_INFORMATION)ObjectInformation); - } - break; - - default: - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - ObDereferenceObject (Object); - - if (ResultLength != NULL) *ResultLength = InfoLength; - + break; + + /* Name information */ + case ObjectNameInformation: + + /* Call the helper and break out */ + Status = ObQueryNameString(Object, + (POBJECT_NAME_INFORMATION) + ObjectInformation, + Length, + &InfoLength); + break; + + /* Information about this type */ + case ObjectTypeInformation: + DPRINT1("NOT IMPLEMENTED!\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Information about all types */ + case ObjectAllTypesInformation: + DPRINT1("NOT IMPLEMENTED!\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Information about the handle flags */ + case ObjectHandleInformation: + + /* Validate length */ + InfoLength = sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION); + if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Get the structure */ + HandleFlags = (POBJECT_HANDLE_ATTRIBUTE_INFORMATION) + ObjectInformation; + + /* Set the flags */ + HandleFlags->Inherit = (HandleInfo.HandleAttributes & + EX_HANDLE_ENTRY_INHERITABLE) != 0; + HandleFlags->ProtectFromClose = (HandleInfo.HandleAttributes & + EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; + + /* Break out with success */ + Status = STATUS_SUCCESS; + break; + + /* Anything else */ + default: + /* Fail it */ + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + /* Derefernece the object if we had referenced it */ + if (Object) ObDereferenceObject (Object); + + /* Return the length and status */ + if (ResultLength) *ResultLength = InfoLength; return Status; } @@ -912,29 +974,66 @@ IN PVOID ObjectInformation, IN ULONG Length) { - PVOID Object; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + OBP_SET_HANDLE_ATTRIBUTES_CONTEXT Context; + PVOID ObjectTable; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; PAGED_CODE(); + /* Validate the information class */ if (ObjectInformationClass != ObjectHandleInformation) + { + /* Invalid class */ return STATUS_INVALID_INFO_CLASS; - + } + + /* Validate the length */ if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) + { + /* Invalid length */ return STATUS_INFO_LENGTH_MISMATCH; - - Status = ObReferenceObjectByHandle(ObjectHandle, - 0, - NULL, - KeGetPreviousMode(), - &Object, - NULL); - if (!NT_SUCCESS (Status)) return Status; - - Status = ObpSetHandleAttributes(ObjectHandle, - (POBJECT_HANDLE_ATTRIBUTE_INFORMATION) - ObjectInformation); - - ObDereferenceObject (Object); + } + + /* Save the previous mode and actual information */ + Context.PreviousMode = ExGetPreviousMode(); + Context.Information = *(POBJECT_HANDLE_ATTRIBUTE_INFORMATION) + ObjectInformation; + + /* Check if this is a kernel handle */ + if (ObIsKernelHandle(ObjectHandle, Context.PreviousMode)) + { + /* Get the actual handle */ + ObjectHandle = ObKernelHandleToHandle(ObjectHandle); + ObjectTable = ObpKernelHandleTable; + + /* Check if we're not in the system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + /* Attach to it */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + /* Use the current table */ + ObjectTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Change the handle attributes */ + if (!ExChangeHandle(ObjectTable, + ObjectHandle, + ObpSetHandleAttributes, + &Context)) + { + /* Some failure */ + Status = STATUS_ACCESS_DENIED; + } + + /* De-attach if we were attached, and return status */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); return Status; } + /* EOF */

1 0

[arty] 22227: Sorry reverted. GreatLord says this is fixed in the wrong place.
by arty＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: arty Date: Mon Jun 5 03:33:27 2006 New Revision: 22227 URL: http://svn.reactos.ru/svn/reactos?rev=22227&view=rev Log: Sorry reverted. GreatLord says this is fixed in the wrong place. Modified: trunk/reactos/lib/crt/misc/environ.c Modified: trunk/reactos/lib/crt/misc/environ.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/misc/environ.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/misc/environ.c (original) +++ trunk/reactos/lib/crt/misc/environ.c Mon Jun 5 03:33:27 2006 @@ -220,11 +220,8 @@ char *mboption; int remove, index, count, size, result = 0, found = 0; - if (option == NULL || - ((epos = wcschr(option, L'=')) == NULL) || - (epos == option)) - return -1; - + if (option == NULL || (epos = wcschr(option, L'=')) == NULL) + return -1; remove = (epos[1] == 0); /* Duplicate environment if needed. */

1 0

[arty] 22226: Fix one wine test. Don't accept an option string that starts with =.
by arty＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: arty Date: Mon Jun 5 03:30:29 2006 New Revision: 22226 URL: http://svn.reactos.ru/svn/reactos?rev=22226&view=rev Log: Fix one wine test. Don't accept an option string that starts with =. Modified: trunk/reactos/lib/crt/misc/environ.c Modified: trunk/reactos/lib/crt/misc/environ.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/misc/environ.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/misc/environ.c (original) +++ trunk/reactos/lib/crt/misc/environ.c Mon Jun 5 03:30:29 2006 @@ -220,8 +220,11 @@ char *mboption; int remove, index, count, size, result = 0, found = 0; - if (option == NULL || (epos = wcschr(option, L'=')) == NULL) - return -1; + if (option == NULL || + ((epos = wcschr(option, L'=')) == NULL) || + (epos == option)) + return -1; + remove = (epos[1] == 0); /* Duplicate environment if needed. */

1 0

[ekohl] 22225: Fix indentation
by ekohl＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: ekohl Date: Mon Jun 5 01:34:02 2006 New Revision: 22225 URL: http://svn.reactos.ru/svn/reactos?rev=22225&view=rev Log: Fix indentation Modified: trunk/reactos/drivers/usb/usbstor/usbstor.c Modified: trunk/reactos/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbstor… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.c (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.c Mon Jun 5 01:34:02 2006 @@ -17,19 +17,19 @@ NTSTATUS STDCALL IrpStub(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp) { - NTSTATUS Status = STATUS_NOT_SUPPORTED; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + NTSTATUS Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } NTSTATUS STDCALL AddDevice(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT pdo) { -return STATUS_SUCCESS; + return STATUS_SUCCESS; } VOID STDCALL @@ -39,64 +39,64 @@ VOID STDCALL StartIo(PUSBSTOR_DEVICE_EXTENSION DeviceExtension, - PIRP Irp) + PIRP Irp) { } - + static NTSTATUS STDCALL DispatchClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } static NTSTATUS STDCALL DispatchCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { -return STATUS_SUCCESS; + return STATUS_SUCCESS; } static NTSTATUS STDCALL DispatchDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { -return STATUS_SUCCESS; + return STATUS_SUCCESS; } static NTSTATUS STDCALL DispatchScsi(PDEVICE_OBJECT DeviceObject, PIRP Irp) { -return STATUS_SUCCESS; + return STATUS_SUCCESS; } static NTSTATUS STDCALL DispatchReadWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { -return STATUS_SUCCESS; + return STATUS_SUCCESS; } static NTSTATUS STDCALL DispatchSystemControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { -return STATUS_SUCCESS; + return STATUS_SUCCESS; } static NTSTATUS STDCALL DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp) { -return STATUS_SUCCESS; + return STATUS_SUCCESS; } -static NTSTATUS STDCALL +static NTSTATUS STDCALL DispatchPower(PDEVICE_OBJECT fido, PIRP Irp) { - DPRINT1("USBSTOR: IRP_MJ_POWER unimplemented\n"); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + DPRINT1("USBSTOR: IRP_MJ_POWER unimplemented\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } @@ -107,31 +107,32 @@ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) { - ULONG i; - DPRINT("********* USB Storage *********\n"); + ULONG i; - DriverObject->DriverUnload = DriverUnload; - DriverObject->DriverExtension->AddDevice = AddDevice; + DPRINT("********* USB Storage *********\n"); - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - DriverObject->MajorFunction[i] = IrpStub; + DriverObject->DriverUnload = DriverUnload; + DriverObject->DriverExtension->AddDevice = AddDevice; - DriverObject->DriverStartIo = (PVOID)StartIo; + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverObject->MajorFunction[i] = IrpStub; - DriverObject->MajorFunction[IRP_MJ_CREATE] = DispatchClose; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = DispatchClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DispatchCleanup; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; - DriverObject->MajorFunction[IRP_MJ_READ] = DispatchReadWrite; - DriverObject->MajorFunction[IRP_MJ_WRITE] = DispatchReadWrite; + DriverObject->DriverStartIo = (PVOID)StartIo; -/* Scsi Miniport support */ - DriverObject->MajorFunction[IRP_MJ_SCSI] = DispatchScsi; - DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = DispatchSystemControl; + DriverObject->MajorFunction[IRP_MJ_CREATE] = DispatchClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = DispatchClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DispatchCleanup; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_READ] = DispatchReadWrite; + DriverObject->MajorFunction[IRP_MJ_WRITE] = DispatchReadWrite; - DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; - DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; + /* Scsi Miniport support */ + DriverObject->MajorFunction[IRP_MJ_SCSI] = DispatchScsi; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = DispatchSystemControl; - return STATUS_SUCCESS; + DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; + + return STATUS_SUCCESS; }

1 0

[martinf] 22224: fix language constant to LANG_BENGALI
by martinf＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: martinf Date: Mon Jun 5 01:07:01 2006 New Revision: 22224 URL: http://svn.reactos.ru/svn/reactos?rev=22224&view=rev Log: fix language constant to LANG_BENGALI Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/explore… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc Mon Jun 5 01:07:01 2006 @@ -17,7 +17,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_BENGALI, LANG_NEUTRAL #pragma code_page(1252) #endif //_WIN32

1 0

[martinf] 22223: set eol-style to native
by martinf＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: martinf Date: Mon Jun 5 00:57:51 2006 New Revision: 22223 URL: http://svn.reactos.ru/svn/reactos?rev=22223&view=rev Log: set eol-style to native Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc (contents, props changed) trunk/reactos/base/shell/explorer/explorer-hu.rc (props changed) trunk/reactos/base/shell/explorer/explorer-it.rc (props changed) Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/explore… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc Mon Jun 5 00:57:51 2006 @@ -1,396 +1,396 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include <windows.h> - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Execute...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "E&xit", ID_FILE_EXIT - END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR - MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Refresh\tF5", ID_REFRESH - MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "SDI", ID_VIEW_SDI - END - POPUP "&Window" - BEGIN - MENUITEM "New &Window", ID_WINDOW_NEW - MENUITEM "Cascading\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT - MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE - END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "&Help" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - MENUITEM "About &OS...", ID_ABOUT_WINDOWS - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Settings...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Task Manager...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Open Volume Control", ID_TRAY_VOLUME - MENUITEM "Adjust Audio Properties", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Show hidden icons", ID_SHOW_HIDDEN_ICONS - MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA - MENUITEM "Adjust Date/&Time...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&ev·" - BEGIN - MENUITEM "&cwiPvjbv...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "&eÜ Kiv", ID_FILE_EXIT - END - POPUP "&cÖ`k©b" - BEGIN - MENUITEM "&mnvqK ev·", ID_VIEW_TOOL_BAR - MENUITEM "cvk¦© ev·", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Ae¯v wb`©kK ev·", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&cyY:mZR Kiv", ID_REFRESH - MENUITEM "m¤ú~Y© c`©vq", ID_VIEW_FULLSCREEN - MENUITEM "&eûgyLx Kg©¶Î", ID_VIEW_MDI - END - POPUP "&mnvqK" - BEGIN - MENUITEM "&wba©vib", ID_TOOLS_OPTIONS - END - POPUP "&mvnvh¨" - BEGIN - MENUITEM "&we¯viK m¤ú©K...", ID_ABOUT_EXPLORER - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Execute" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 - CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "&OK",1,158,6,47,14 - PUSHBUTTON "&Cancel",2,158,23,47,14 - PUSHBUTTON "&Help",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Search Program in Startmenu" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "&Filter:",IDC_STATIC,7,9,18,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | - WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 -END - -IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Desktop Properties" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "Please select your prefered icon alignment algorithm:", - IDC_STATIC,7,7,166,8 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,121,46,44 - CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | - WS_TABSTOP,159,121,46,44 - CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Taskbar Properties" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "show &clock",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 - CONTROL "&hide inactive notification icons", - ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,111,10 - PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 -END - -IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Startmenu Properties" -FONT 8, "MS Sans Serif" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Configure Notification Icons" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Tooltip Text:",IDC_LABEL1,7,44,40,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL - LTEXT "W&indow Title:",IDC_LABEL2,7,63,44,8 - EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL - LTEXT "&Module Path:",IDC_LABEL3,7,81,43,8 - EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL - GROUPBOX "&Display Mode",IDC_LABEL4,7,96,157,28 - CONTROL "&show",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,33,10 - CONTROL "&hide",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, - 108,29,10 - CONTROL "a&utohide",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,43,10 - ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | - ES_READONLY - CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 - DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&Cancel",IDCANCEL,151,153,50,14 -END - -IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "cQ`gZ Kg©¶Î wbq¿b" -FONT 12, "SutonnyMJ", 0, 0, 0x1 -BEGIN - LTEXT "Avcbvi cQ`gZ Kg©¶Î wba©vib Kib :-",IDC_STATIC,23,7, - 160,8 - CONTROL "&eûgyLx Kg©¶Î",IDC_MDI,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,23,31,124,10 - CONTROL "&GKgyLx Kg©¶Î",IDC_SDI,"Button",BS_AUTORADIOBUTTON,23, - 61,118,10 - CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 - CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 - CONTROL "GKwU Kg©¶Î Dcev· Lvjv",IDC_SEPARATE_SUBFOLDERS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,90,135,10 - LTEXT "GB wbqgvejx mKj Kg©¶Îi Rb¨ wbw`©ó ne",IDC_STATIC,23, - 118,174,22 - DEFPUSHBUTTON "&OK",IDOK,48,140,50,10,WS_GROUP - PUSHBUTTON "&evwZj",IDCANCEL,106,140,50,10 -END - -IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Explorer" -FONT 10, "MS Sans Serif" -BEGIN - LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 - LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 - LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 - LTEXT "",IDC_WIN_VERSION,91,58,98,22 - LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, - 8 - CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, - 154,90,38,12 -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE MOVEABLE PURE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#include <windows.h>\r\n" - "\0" -END - -3 TEXTINCLUDE MOVEABLE PURE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "we¯viK" - IDS_START "Kvh©Kvix ZvwjKv" - IDS_LOGOFF "Log Off..." - IDS_SHUTDOWN "eÜ Kiv..." - IDS_LAUNCH "cwiPvjbv..." - IDS_START_HELP "mvnvh¨" - IDS_SEARCH_FILES "AbymÜvb..." - IDS_DOCUMENTS "Z_¨ fvÛvi" - IDS_FAVORITES "fvj jvMv" - IDS_PROGRAMS "Kg©" - IDS_SETTINGS "wbq¿b" - IDS_EXPLORE "we¯vi Kiv" - IDS_EMPTY "(Empty)" - IDS_RECENT "mgmvgwqK Z_¨" - IDS_ADMIN "cÖkvmwbK" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Kvh©Kvix ZvwjKv" - IDS_MINIMIZE_ALL "mKj ev· A`k¨ Kiv" - IDS_DESKTOP_NUM "W¯Uc %d" - IDS_VOLUME "AvIqvR" - IDS_ITEMS_CUR "Pjgvb ch©vq" - IDS_ITEMS_CONFIGURED "MVb kwj" - IDS_ITEMS_VISIBLE "m`k" - IDS_ITEMS_HIDDEN "A`k¨" - IDS_NOTIFY_SHOW "`Lvbv" - IDS_NOTIFY_HIDE "jyKvbv" - IDS_NOTIFY_AUTOHIDE "Avcbv Avcwb jywKq hvIqv" - IDS_SHOW_HIDDEN_ICONS "A`k¨ cÖwZK `Lvbv" - IDS_HIDE_ICONS "cÖwZK jyKvbv " - IDS_TERMINATE "ivm we¯viK eÜ Kiv" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "RvjK" - IDS_CONNECTIONS "RvjKi m¤ú©K" - IDS_DRIVES "wefvM" - IDS_SEARCH_COMPUTER "Kw¤úDUvi AbymÜvb..." - IDS_SETTINGS_MENU "ZvwjKv wba©vib" - IDS_CONTROL_PANEL "wbq¿b K`ª" - IDS_PRINTERS "wcÖUvi (Qvcv h¿)" - IDS_BROWSE "dvBj wbq bvovPvov Kiv" - IDS_SEARCH_PRG "Kg© AbymÜvb...." - IDS_ALL_USERS "mKj e¨enviKvix\\" - IDS_SEARCH "AbymÜvb\n" - IDS_ABOUT_EXPLORER "&we¯viK m¤ú©K..." - IDS_LAUNCH_MANY_PROGRAMS - "You have selected more than one program.\nAre you sure you want to launch all of them?" - IDS_DESKTOPBAR_SETTINGS "W¯Uc wbq¿b" - IDS_DESKTOP "W¯Uc" - IDS_TASKBAR "Kvh©Kvix `Û" -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Execute...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_FILE_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Refresh\tF5", ID_REFRESH + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Window" + BEGIN + MENUITEM "New &Window", ID_WINDOW_NEW + MENUITEM "Cascading\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ + MENUITEM "Tile &Vertically\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT + MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + END + POPUP "&Tools" + BEGIN + MENUITEM "&Options", ID_TOOLS_OPTIONS + END + POPUP "&Help" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + MENUITEM "About &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Settings...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Task Manager...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Open Volume Control", ID_TRAY_VOLUME + MENUITEM "Adjust Audio Properties", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Show hidden icons", ID_SHOW_HIDDEN_ICONS + MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON + MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA + MENUITEM "Adjust Date/&Time...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&ev·" + BEGIN + MENUITEM "&cwiPvjbv...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&eÜ Kiv", ID_FILE_EXIT + END + POPUP "&cÖ`k©b" + BEGIN + MENUITEM "&mnvqK ev·", ID_VIEW_TOOL_BAR + MENUITEM "cvk¦© ev·", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Ae¯v wb`©kK ev·", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&cyY:mZR Kiv", ID_REFRESH + MENUITEM "m¤ú~Y© c`©vq", ID_VIEW_FULLSCREEN + MENUITEM "&eûgyLx Kg©¶Î", ID_VIEW_MDI + END + POPUP "&mnvqK" + BEGIN + MENUITEM "&wba©vib", ID_TOOLS_OPTIONS + END + POPUP "&mvnvh¨" + BEGIN + MENUITEM "&we¯viK m¤ú©K...", ID_ABOUT_EXPLORER + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Execute" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Cancel",2,158,23,47,14 + PUSHBUTTON "&Help",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Search Program in Startmenu" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Desktop Properties" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Please select your prefered icon alignment algorithm:", + IDC_STATIC,7,7,166,8 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Taskbar Properties" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "show &clock",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&hide inactive notification icons", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Startmenu Properties" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Configure Notification Icons" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Tooltip Text:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "W&indow Title:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Module Path:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Display Mode",IDC_LABEL4,7,96,157,28 + CONTROL "&show",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&hide",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "a&utohide",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Cancel",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "cQ`gZ Kg©¶Î wbq¿b" +FONT 12, "SutonnyMJ", 0, 0, 0x1 +BEGIN + LTEXT "Avcbvi cQ`gZ Kg©¶Î wba©vib Kib :-",IDC_STATIC,23,7, + 160,8 + CONTROL "&eûgyLx Kg©¶Î",IDC_MDI,"Button",BS_AUTORADIOBUTTON | + WS_GROUP | WS_TABSTOP,23,31,124,10 + CONTROL "&GKgyLx Kg©¶Î",IDC_SDI,"Button",BS_AUTORADIOBUTTON,23, + 61,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "GKwU Kg©¶Î Dcev· Lvjv",IDC_SEPARATE_SUBFOLDERS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,90,135,10 + LTEXT "GB wbqgvejx mKj Kg©¶Îi Rb¨ wbw`©ó ne",IDC_STATIC,23, + 118,174,22 + DEFPUSHBUTTON "&OK",IDOK,48,140,50,10,WS_GROUP + PUSHBUTTON "&evwZj",IDCANCEL,106,140,50,10 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "we¯viK" + IDS_START "Kvh©Kvix ZvwjKv" + IDS_LOGOFF "Log Off..." + IDS_SHUTDOWN "eÜ Kiv..." + IDS_LAUNCH "cwiPvjbv..." + IDS_START_HELP "mvnvh¨" + IDS_SEARCH_FILES "AbymÜvb..." + IDS_DOCUMENTS "Z_¨ fvÛvi" + IDS_FAVORITES "fvj jvMv" + IDS_PROGRAMS "Kg©" + IDS_SETTINGS "wbq¿b" + IDS_EXPLORE "we¯vi Kiv" + IDS_EMPTY "(Empty)" + IDS_RECENT "mgmvgwqK Z_¨" + IDS_ADMIN "cÖkvmwbK" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Kvh©Kvix ZvwjKv" + IDS_MINIMIZE_ALL "mKj ev· A`k¨ Kiv" + IDS_DESKTOP_NUM "W¯Uc %d" + IDS_VOLUME "AvIqvR" + IDS_ITEMS_CUR "Pjgvb ch©vq" + IDS_ITEMS_CONFIGURED "MVb kwj" + IDS_ITEMS_VISIBLE "m`k" + IDS_ITEMS_HIDDEN "A`k¨" + IDS_NOTIFY_SHOW "`Lvbv" + IDS_NOTIFY_HIDE "jyKvbv" + IDS_NOTIFY_AUTOHIDE "Avcbv Avcwb jywKq hvIqv" + IDS_SHOW_HIDDEN_ICONS "A`k¨ cÖwZK `Lvbv" + IDS_HIDE_ICONS "cÖwZK jyKvbv " + IDS_TERMINATE "ivm we¯viK eÜ Kiv" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "RvjK" + IDS_CONNECTIONS "RvjKi m¤ú©K" + IDS_DRIVES "wefvM" + IDS_SEARCH_COMPUTER "Kw¤úDUvi AbymÜvb..." + IDS_SETTINGS_MENU "ZvwjKv wba©vib" + IDS_CONTROL_PANEL "wbq¿b K`ª" + IDS_PRINTERS "wcÖUvi (Qvcv h¿)" + IDS_BROWSE "dvBj wbq bvovPvov Kiv" + IDS_SEARCH_PRG "Kg© AbymÜvb...." + IDS_ALL_USERS "mKj e¨enviKvix\\" + IDS_SEARCH "AbymÜvb\n" + IDS_ABOUT_EXPLORER "&we¯viK m¤ú©K..." + IDS_LAUNCH_MANY_PROGRAMS + "You have selected more than one program.\nAre you sure you want to launch all of them?" + IDS_DESKTOPBAR_SETTINGS "W¯Uc wbq¿b" + IDS_DESKTOP "W¯Uc" + IDS_TASKBAR "Kvh©Kvix `Û" +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/shell/explorer/explorer-bn.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/shell/explorer/explorer-hu.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/shell/explorer/explorer-it.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
60
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006