Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22016: - Wipe out PROS_OBJECT_HEADER and use OBJECT_HEADER since we are now compatible.
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Thu May 25 00:13:47 2006 New Revision: 22016 URL: http://svn.reactos.ru/svn/reactos?rev=22016&view=rev Log: - Wipe out PROS_OBJECT_HEADER and use OBJECT_HEADER since we are now compatible. Modified: trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/handle.c trunk/reactos/ntoskrnl/ob/namespc.c trunk/reactos/ntoskrnl/ob/ntobj.c trunk/reactos/ntoskrnl/ob/object.c trunk/reactos/ntoskrnl/ob/security.c trunk/reactos/ntoskrnl/ob/wait.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Thu May 25 00:13:47 2006 @@ -417,6 +417,19 @@ } OBJECT_HEADER, *POBJECT_HEADER; // +// Object Lookup Context +// +typedef struct _OBP_LOOKUP_CONTEXT +{ + POBJECT_DIRECTORY Directory; + PVOID Object; + ULONG HashValue; + USHORT HashIndex; + BOOLEAN DirectoryLocked; + ULONG LockStateSignature; +} OBP_LOOKUP_CONTEXT, *POBP_LOOKUP_CONTEXT; + +// // Device Map // typedef struct _DEVICE_MAP Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/e… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Thu May 25 00:13:47 2006 @@ -8,10 +8,10 @@ extern ULONG ExpTimeZoneId; extern POBJECT_TYPE ExEventPairObjectType; -#define EX_OBJ_TO_HDR(eob) ((PROS_OBJECT_HEADER)((ULONG_PTR)(eob) & \ +#define EX_OBJ_TO_HDR(eob) ((POBJECT_HEADER)((ULONG_PTR)(eob) & \ ~(EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | \ EX_HANDLE_ENTRY_AUDITONCLOSE))) -#define EX_HTE_TO_HDR(hte) ((PROS_OBJECT_HEADER)((ULONG_PTR)((hte)->Object) & \ +#define EX_HTE_TO_HDR(hte) ((POBJECT_HEADER)((ULONG_PTR)((hte)->Object) & \ ~(EX_HANDLE_ENTRY_PROTECTFROMCLOSE | EX_HANDLE_ENTRY_INHERITABLE | \ EX_HANDLE_ENTRY_AUDITONCLOSE))) 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 Thu May 25 00:13:47 2006 @@ -11,40 +11,8 @@ struct _EPROCESS; -typedef struct _ROS_OBJECT_HEADER -{ - LONG PointerCount; - union - { - LONG HandleCount; - PVOID NextToFree; - }; - POBJECT_TYPE Type; - UCHAR NameInfoOffset; - UCHAR HandleInfoOffset; - UCHAR QuotaInfoOffset; - UCHAR Flags; - union - { - POBJECT_CREATE_INFORMATION ObjectCreateInfo; - PVOID QuotaBlockCharged; - }; - PSECURITY_DESCRIPTOR SecurityDescriptor; - QUAD Body; -} ROS_OBJECT_HEADER, *PROS_OBJECT_HEADER; - -typedef struct _OBP_LOOKUP_CONTEXT -{ - POBJECT_DIRECTORY Directory; - PVOID Object; - ULONG HashValue; - USHORT HashIndex; - BOOLEAN DirectoryLocked; - ULONG LockStateSignature; -} OBP_LOOKUP_CONTEXT, *POBP_LOOKUP_CONTEXT; - #define BODY_TO_HEADER(objbdy) \ - CONTAINING_RECORD((objbdy), ROS_OBJECT_HEADER, Body) + CONTAINING_RECORD((objbdy), OBJECT_HEADER, Body) #define HEADER_TO_OBJECT_NAME(objhdr) ((POBJECT_HEADER_NAME_INFO) \ (!(objhdr)->NameInfoOffset ? NULL: ((PCHAR)(objhdr) - (objhdr)->NameInfoOffset))) @@ -55,7 +23,7 @@ #define HEADER_TO_CREATOR_INFO(objhdr) ((POBJECT_HEADER_CREATOR_INFO) \ (!((objhdr)->Flags & OB_FLAG_CREATOR_INFO) ? NULL: ((PCHAR)(objhdr) - sizeof(OBJECT_HEADER_CREATOR_INFO)))) -#define OBJECT_ALLOC_SIZE(ObjectSize) ((ObjectSize)+sizeof(ROS_OBJECT_HEADER)) +#define OBJECT_ALLOC_SIZE(ObjectSize) ((ObjectSize)+sizeof(OBJECT_HEADER)) #define KERNEL_HANDLE_FLAG (1 << ((sizeof(HANDLE) * 8) - 1)) #define ObIsKernelHandle(Handle, ProcessorMode) \ Modified: trunk/reactos/ntoskrnl/ob/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/handle.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/handle.c (original) +++ trunk/reactos/ntoskrnl/ob/handle.c Thu May 25 00:13:47 2006 @@ -52,7 +52,7 @@ static VOID ObpDecrementHandleCount(PVOID ObjectBody) { - PROS_OBJECT_HEADER ObjectHeader = BODY_TO_HEADER(ObjectBody); + POBJECT_HEADER ObjectHeader = BODY_TO_HEADER(ObjectBody); LONG NewHandleCount = InterlockedDecrement(&ObjectHeader->HandleCount); OBP_LOOKUP_CONTEXT Context; DPRINT("Header: %x\n", ObjectHeader); @@ -228,7 +228,7 @@ { PHANDLE_TABLE_ENTRY HandleEntry; PVOID Body; - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; PHANDLE_TABLE ObjectTable; PAGED_CODE(); @@ -286,7 +286,7 @@ HANDLE_TABLE_ENTRY NewHandleEntry; BOOLEAN AttachedToProcess = FALSE; PVOID ObjectBody; - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; ULONG NewHandleCount; HANDLE NewTargetHandle; PEPROCESS CurrentProcess; @@ -625,7 +625,7 @@ ULONG GrantedAccess, PVOID Context) { - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; PVOID ObjectBody; PAGED_CODE(); @@ -641,7 +641,7 @@ PHANDLE_TABLE_ENTRY HandleTableEntry, PVOID Context) { - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; BOOLEAN Ret = FALSE; PAGED_CODE(); @@ -721,7 +721,7 @@ { HANDLE_TABLE_ENTRY NewEntry; PEPROCESS Process, CurrentProcess; - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; HANDLE Handle; KAPC_STATE ApcState; BOOLEAN AttachedToProcess = FALSE; @@ -889,7 +889,7 @@ POBJECT_HANDLE_INFORMATION HandleInformation) { PHANDLE_TABLE_ENTRY HandleEntry; - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; PVOID ObjectBody; ACCESS_MASK GrantedAccess; ULONG Attributes; @@ -1153,10 +1153,10 @@ OUT PHANDLE Handle) { POBJECT_CREATE_INFORMATION ObjectCreateInfo; - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; POBJECT_HEADER_NAME_INFO ObjectNameInfo; PVOID FoundObject = NULL; - PROS_OBJECT_HEADER FoundHeader = NULL; + POBJECT_HEADER FoundHeader = NULL; NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING RemainingPath; BOOLEAN ObjectAttached = FALSE; @@ -1230,7 +1230,7 @@ ObjectNameInfo->Name.Buffer = NewName; ObjectNameInfo->Name.Length = RemainingPath.Length - Delta; ObjectNameInfo->Name.MaximumLength = RemainingPath.MaximumLength - Delta; - ObpInsertEntryDirectory(FoundObject, &Context, (POBJECT_HEADER)Header); + ObpInsertEntryDirectory(FoundObject, &Context, Header); ObjectAttached = TRUE; } Modified: trunk/reactos/ntoskrnl/ob/namespc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/namespc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/namespc.c (original) +++ trunk/reactos/ntoskrnl/ob/namespc.c Thu May 25 00:13:47 2006 @@ -50,7 +50,7 @@ PUNICODE_STRING ObjectName, POBJECT_TYPE ObjectType, ULONG ObjectSize, - PROS_OBJECT_HEADER *ObjectHeader); + POBJECT_HEADER *ObjectHeader); /* FUNCTIONS **************************************************************/ @@ -360,7 +360,7 @@ FALSE, &Context)) { - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, (POBJECT_HEADER)BODY_TO_HEADER(ObTypeObjectType)); + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, BODY_TO_HEADER(ObTypeObjectType)); } if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ObDirectoryType))->Name, @@ -368,7 +368,7 @@ FALSE, &Context)) { - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, (POBJECT_HEADER)BODY_TO_HEADER(ObDirectoryType)); + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, BODY_TO_HEADER(ObDirectoryType)); } /* Create 'symbolic link' object type */ @@ -385,7 +385,7 @@ PUNICODE_STRING TypeName, POBJECT_TYPE *ObjectType) { - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; POBJECT_TYPE LocalObjectType; ULONG HeaderSize; NTSTATUS Status; @@ -397,7 +397,7 @@ TypeName, ObTypeObjectType, OBJECT_ALLOC_SIZE(sizeof(OBJECT_TYPE)), - (PROS_OBJECT_HEADER*)&Header); + (POBJECT_HEADER*)&Header); if (!NT_SUCCESS(Status)) { DPRINT1("ObpAllocateObject failed!\n"); @@ -443,7 +443,7 @@ } /* Calculate how much space our header'll take up */ - HeaderSize = sizeof(ROS_OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + + HeaderSize = sizeof(OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + (ObjectTypeInitializer->MaintainHandleCount ? sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); @@ -499,7 +499,7 @@ OBJ_CASE_INSENSITIVE, FALSE, &Context); - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, (POBJECT_HEADER)Header); + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header); ObReferenceObject(ObpTypeDirectoryObject); } Modified: trunk/reactos/ntoskrnl/ob/ntobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/ntobj.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ob/ntobj.c (original) +++ trunk/reactos/ntoskrnl/ob/ntobj.c Thu May 25 00:13:47 2006 @@ -35,7 +35,7 @@ ObpSetPermanentObject(IN PVOID ObjectBody, IN BOOLEAN Permanent) { - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; OBP_LOOKUP_CONTEXT Context; ObjectHeader = BODY_TO_HEADER(ObjectBody); @@ -179,7 +179,7 @@ OUT PULONG ResultLength OPTIONAL) { OBJECT_HANDLE_INFORMATION HandleInfo; - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; ULONG InfoLength; PVOID Object; NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/ob/object.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/object.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/object.c (original) +++ trunk/reactos/ntoskrnl/ob/object.c Thu May 25 00:13:47 2006 @@ -22,7 +22,7 @@ typedef struct _RETENTION_CHECK_PARAMS { WORK_QUEUE_ITEM WorkItem; - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; } RETENTION_CHECK_PARAMS, *PRETENTION_CHECK_PARAMS; /* FUNCTIONS ************************************************************/ @@ -299,7 +299,7 @@ PVOID NextObject; PVOID CurrentObject; PVOID RootObject; - PROS_OBJECT_HEADER CurrentHeader; + POBJECT_HEADER CurrentHeader; NTSTATUS Status; PWSTR current; UNICODE_STRING PathString; @@ -443,7 +443,7 @@ OUT PULONG ReturnLength) { POBJECT_HEADER_NAME_INFO LocalInfo; - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; POBJECT_DIRECTORY ParentDirectory; ULONG NameSize; PWCH ObjectName; @@ -621,9 +621,9 @@ PUNICODE_STRING ObjectName, POBJECT_TYPE ObjectType, ULONG ObjectSize, - PROS_OBJECT_HEADER *ObjectHeader) -{ - PROS_OBJECT_HEADER Header; + POBJECT_HEADER *ObjectHeader) +{ + POBJECT_HEADER Header; BOOLEAN HasHandleInfo = FALSE; BOOLEAN HasNameInfo = FALSE; BOOLEAN HasCreatorInfo = FALSE; @@ -687,7 +687,7 @@ HandleInfo = (POBJECT_HEADER_HANDLE_INFO)Header; DPRINT("Info: %x\n", HandleInfo); HandleInfo->SingleEntry.HandleCount = 0; - Header = (PROS_OBJECT_HEADER)(HandleInfo + 1); + Header = (POBJECT_HEADER)(HandleInfo + 1); } /* Initialize the Object Name Info */ @@ -697,7 +697,7 @@ DPRINT("Info: %x %wZ\n", NameInfo, ObjectName); NameInfo->Name = *ObjectName; NameInfo->Directory = NULL; - Header = (PROS_OBJECT_HEADER)(NameInfo + 1); + Header = (POBJECT_HEADER)(NameInfo + 1); } /* Initialize Creator Info */ @@ -709,7 +709,7 @@ * CreatorInfo->CreatorUniqueProcess = PsGetCurrentProcessId(); */ InitializeListHead(&CreatorInfo->TypeList); - Header = (PROS_OBJECT_HEADER)(CreatorInfo + 1); + Header = (POBJECT_HEADER)(CreatorInfo + 1); } /* Initialize the object header */ @@ -780,7 +780,7 @@ NTSTATUS Status; POBJECT_CREATE_INFORMATION ObjectCreateInfo; UNICODE_STRING ObjectName; - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; DPRINT("ObCreateObject(Type %p ObjectAttributes %p, Object %p)\n", Type, ObjectAttributes, Object); @@ -848,7 +848,7 @@ IN POBJECT_TYPE ObjectType, IN KPROCESSOR_MODE AccessMode) { - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; /* NOTE: should be possible to reference an object above APC_LEVEL! */ @@ -941,7 +941,7 @@ static NTSTATUS -ObpDeleteObject(PROS_OBJECT_HEADER Header) +ObpDeleteObject(POBJECT_HEADER Header) { PVOID HeaderLocation = Header; POBJECT_HEADER_HANDLE_INFO HandleInfo; @@ -1018,7 +1018,7 @@ STATIC NTSTATUS -ObpDeleteObjectDpcLevel(IN PROS_OBJECT_HEADER ObjectHeader, +ObpDeleteObjectDpcLevel(IN POBJECT_HEADER ObjectHeader, IN LONG OldPointerCount) { #if 0 @@ -1097,7 +1097,7 @@ VOID FASTCALL ObfReferenceObject(IN PVOID Object) { - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; ASSERT(Object); @@ -1130,7 +1130,7 @@ VOID FASTCALL ObfDereferenceObject(IN PVOID Object) { - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; LONG NewPointerCount; BOOL Permanent; @@ -1225,7 +1225,7 @@ ULONG STDCALL ObGetObjectPointerCount(PVOID Object) { - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; PAGED_CODE(); @@ -1253,7 +1253,7 @@ NTAPI ObGetObjectHandleCount(PVOID Object) { - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; PAGED_CODE(); 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 Thu May 25 00:13:47 2006 @@ -100,7 +100,7 @@ OUT PSECURITY_DESCRIPTOR *SecurityDescriptor, OUT PBOOLEAN MemoryAllocated) { - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; ULONG Length; NTSTATUS Status; PAGED_CODE(); @@ -230,7 +230,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID Object; - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -328,7 +328,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID Object; - PROS_OBJECT_HEADER Header; + POBJECT_HEADER Header; SECURITY_DESCRIPTOR_RELATIVE *CapturedSecurityDescriptor; ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/ob/wait.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/wait.c?rev=2201… ============================================================================== --- trunk/reactos/ntoskrnl/ob/wait.c (original) +++ trunk/reactos/ntoskrnl/ob/wait.c Thu May 25 00:13:47 2006 @@ -60,7 +60,7 @@ LARGE_INTEGER SafeTimeOut; BOOLEAN LockInUse; PHANDLE_TABLE_ENTRY HandleEntry; - PROS_OBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader; PHANDLE_TABLE HandleTable; ACCESS_MASK GrantedAccess; PVOID DefaultObject; Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Thu May 25 00:13:47 2006 @@ -212,7 +212,7 @@ PISECURITY_DESCRIPTOR ObjectSd; PISECURITY_DESCRIPTOR NewSd; PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; - PROS_OBJECT_HEADER Header = BODY_TO_HEADER(Object); + POBJECT_HEADER Header = BODY_TO_HEADER(Object); PSID Owner = 0; PSID Group = 0; PACL Dacl = 0;

1 0

[ion] 22015: - Rewrote the Object Directory implementation to follow the NT Structures in the NDK. This got rid of the last remaining OBJECT_HEADER difference and switched over to OBJECT_DIRECTORY. - The low-level implementation is based on information from "Undocumented Windows 2000 Internals: A Programmer's Cookbook", with some modifications done by myself to match the updated 2003 structures. This implementation was hackishly stuck into our messed up high-level object lookup implementation, w
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Thu May 25 00:06:13 2006 New Revision: 22015 URL: http://svn.reactos.ru/svn/reactos?rev=22015&view=rev Log: - Rewrote the Object Directory implementation to follow the NT Structures in the NDK. This got rid of the last remaining OBJECT_HEADER difference and switched over to OBJECT_DIRECTORY. - The low-level implementation is based on information from "Undocumented Windows 2000 Internals: A Programmer's Cookbook", with some modifications done by myself to match the updated 2003 structures. This implementation was hackishly stuck into our messed up high-level object lookup implementation, which now has 4 more band-aids. Still needs a lot of work done to the upper echelons of object lookup, but at least this gets rid of ROS-internal stuff. Modified: trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/dirobj.c trunk/reactos/ntoskrnl/ob/handle.c trunk/reactos/ntoskrnl/ob/namespc.c trunk/reactos/ntoskrnl/ob/ntobj.c trunk/reactos/ntoskrnl/ob/object.c trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Thu May 25 00:06:13 2006 @@ -319,11 +319,43 @@ } OBJECT_TYPE; // +// Object Directory Structures +// +typedef struct _OBJECT_DIRECTORY_ENTRY +{ + struct _OBJECT_DIRECTORY_ENTRY *ChainLink; + PVOID Object; +#if (NTDDI_VERSION >= NTDDI_WS03) + ULONG HashValue; +#endif +} OBJECT_DIRECTORY_ENTRY, *POBJECT_DIRECTORY_ENTRY; + +typedef struct _OBJECT_DIRECTORY +{ + struct _OBJECT_DIRECTORY_ENTRY *HashBuckets[NUMBER_HASH_BUCKETS]; +#if (NTDDI_VERSION < NTDDI_WINXP) + ERESOURCE Lock; +#elif (NTDDI_VERSION >= NTDDI_WINXP) + ERESOURCE Lock; // FIXME: HACKHACK, SHOULD BE EX_PUSH_LOCK +#endif +#if (NTDDI_VERSION < NTDDI_WINXP) + BOOLEAN CurrentEntryValid; +#else + struct _DEVICE_MAP *DeviceMap; +#endif + ULONG SessionId; +#if (NTDDI_VERSION == NTDDI_WINXP) + USHORT Reserved; + USHORT SymbolicLinkUsageCount; +#endif +} OBJECT_DIRECTORY, *POBJECT_DIRECTORY; + +// // Object Header Addon Information // typedef struct _OBJECT_HEADER_NAME_INFO { - struct _DIRECTORY_OBJECT *Directory; + POBJECT_DIRECTORY Directory; UNICODE_STRING Name; ULONG QueryReferences; ULONG Reserved2; @@ -385,47 +417,15 @@ } OBJECT_HEADER, *POBJECT_HEADER; // -// Object Directory Structures -// -typedef struct _OBJECT_DIRECTORY_ENTRY -{ - struct _OBJECT_DIRECTORY_ENTRY *ChainLink; - PVOID Object; -#if (NTDDI_VERSION >= NTDDI_WS03) - ULONG HashValue; -#endif -} OBJECT_DIRECTORY_ENTRY, *POBJECT_DIRECTORY_ENTRY; - -typedef struct _OBJECT_DIRECTORY -{ - struct _OBJECT_DIRECTORY_ENTRY *HashBuckets[NUMBER_HASH_BUCKETS]; -#if (NTDDI_VERSION < NTDDI_WINXP) - PERESOURCE Lock; -#elif (NTDDI_VERSION >= NTDDI_WINXP) - EX_PUSH_LOCK Lock; -#endif -#if (NTDDI_VERSION < NTDDI_WINXP) - BOOLEAN CurrentEntryValid; -#else - struct _DEVICE_MAP *DeviceMap; -#endif - ULONG SessionId; -#if (NTDDI_VERSION == NTDDI_WINXP) - USHORT Reserved; - USHORT SymbolicLinkUsageCount; -#endif -} OBJECT_DIRECTORY, *POBJECT_DIRECTORY; - -// // Device Map // typedef struct _DEVICE_MAP { - POBJECT_DIRECTORY DosDevicesDirectory; - POBJECT_DIRECTORY GlobalDosDevicesDirectory; - ULONG ReferenceCount; - ULONG DriveMap; - UCHAR DriveType[32]; + POBJECT_DIRECTORY DosDevicesDirectory; + POBJECT_DIRECTORY GlobalDosDevicesDirectory; + ULONG ReferenceCount; + ULONG DriveMap; + UCHAR DriveType[32]; } DEVICE_MAP, *PDEVICE_MAP; // Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu May 25 00:06:13 2006 @@ -199,6 +199,7 @@ KPROCESSOR_MODE PreviousMode; UNICODE_STRING CapturedClass = {0}; HANDLE hKey; + OBP_LOOKUP_CONTEXT Context; PAGED_CODE(); @@ -262,7 +263,8 @@ &ObjectName, (PVOID*)&Object, &RemainingPath, - CmiKeyType); + CmiKeyType, + &Context); if (!NT_SUCCESS(Status)) { PostCreateKeyInfo.Object = NULL; @@ -1262,6 +1264,7 @@ OBJECT_CREATE_INFORMATION ObjectCreateInfo; REG_PRE_OPEN_KEY_INFORMATION PreOpenKeyInfo; REG_POST_OPEN_KEY_INFORMATION PostOpenKeyInfo; + OBP_LOOKUP_CONTEXT Context; PAGED_CODE(); @@ -1329,7 +1332,8 @@ &ObjectName, (PVOID*)&Object, &RemainingPath, - CmiKeyType); + CmiKeyType, + &Context); if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject() returned 0x%08lx\n", Status); 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 Thu May 25 00:06:13 2006 @@ -704,6 +704,7 @@ PWSTR SubName; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; + OBP_LOOKUP_CONTEXT Context; DPRINT("CmiConnectHive(%p, %p) called.\n", KeyObjectAttributes, RegistryHive); @@ -725,7 +726,8 @@ &ObjectName, (PVOID*)&ParentKey, &RemainingPath, - CmiKeyType); + CmiKeyType, + &Context); ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) 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 Thu May 25 00:06:13 2006 @@ -86,14 +86,16 @@ PVOID *NextObject, PUNICODE_STRING FullPath, PWSTR *Path, - ULONG Attributes) + ULONG Attributes, + POBP_LOOKUP_CONTEXT Context) { /* Call the Registered Callback */ return ExpWindowStationObjectParse(Object, NextObject, FullPath, Path, - Attributes); + Attributes, + Context); } NTSTATUS 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 Thu May 25 00:06:13 2006 @@ -11,21 +11,8 @@ struct _EPROCESS; -typedef struct _DIRECTORY_OBJECT -{ - CSHORT Type; - CSHORT Size; - - /* - * PURPOSE: Head of the list of our subdirectories - */ - LIST_ENTRY head; - KSPIN_LOCK Lock; -} DIRECTORY_OBJECT, *PDIRECTORY_OBJECT; - typedef struct _ROS_OBJECT_HEADER { - LIST_ENTRY Entry; LONG PointerCount; union { @@ -46,6 +33,16 @@ QUAD Body; } ROS_OBJECT_HEADER, *PROS_OBJECT_HEADER; +typedef struct _OBP_LOOKUP_CONTEXT +{ + POBJECT_DIRECTORY Directory; + PVOID Object; + ULONG HashValue; + USHORT HashIndex; + BOOLEAN DirectoryLocked; + ULONG LockStateSignature; +} OBP_LOOKUP_CONTEXT, *POBP_LOOKUP_CONTEXT; + #define BODY_TO_HEADER(objbdy) \ CONTAINING_RECORD((objbdy), ROS_OBJECT_HEADER, Body) @@ -69,7 +66,7 @@ #define ObMarkHandleAsKernelHandle(Handle) \ (HANDLE)((ULONG_PTR)(Handle) | KERNEL_HANDLE_FLAG) -extern PDIRECTORY_OBJECT NameSpaceRoot; +extern POBJECT_DIRECTORY NameSpaceRoot; extern POBJECT_TYPE ObSymbolicLinkType; extern PHANDLE_TABLE ObpKernelHandleTable; @@ -94,30 +91,27 @@ PVOID *NextObject, PUNICODE_STRING FullPath, PWSTR *Path, - ULONG Attributes -); - -VOID -NTAPI -ObpAddEntryDirectory( - PDIRECTORY_OBJECT Parent, - PROS_OBJECT_HEADER Header, - PWSTR Name -); - -NTSTATUS -NTAPI -ObpCreateDirectory( - OB_OPEN_REASON Reason, - PEPROCESS Process, - PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - ULONG HandleCount -); - -VOID -NTAPI -ObpRemoveEntryDirectory(PROS_OBJECT_HEADER Header); + ULONG Attributes, + POBP_LOOKUP_CONTEXT Context +); + +BOOLEAN +NTAPI +ObpDeleteEntryDirectory(POBP_LOOKUP_CONTEXT Context); + +BOOLEAN +NTAPI +ObpInsertEntryDirectory(IN POBJECT_DIRECTORY Parent, + IN POBP_LOOKUP_CONTEXT Context, + IN POBJECT_HEADER ObjectHeader); + +PVOID +NTAPI +ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, + IN PUNICODE_STRING Name, + IN ULONG Attributes, + IN UCHAR SearchShadow, + IN POBP_LOOKUP_CONTEXT Context); VOID NTAPI @@ -139,7 +133,8 @@ PVOID * NextObject, PUNICODE_STRING FullPath, PWSTR * Path, - ULONG Attributes + ULONG Attributes, + POBP_LOOKUP_CONTEXT Context ); VOID @@ -157,7 +152,8 @@ PUNICODE_STRING ObjectName, PVOID* ReturnedObject, PUNICODE_STRING RemainingPath, - POBJECT_TYPE ObjectType + POBJECT_TYPE ObjectType, + POBP_LOOKUP_CONTEXT Context ); NTSTATUS Modified: trunk/reactos/ntoskrnl/ob/dirobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/dirobj.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/dirobj.c (original) +++ trunk/reactos/ntoskrnl/ob/dirobj.c Thu May 25 00:06:13 2006 @@ -8,10 +8,12 @@ /* INCLUDES ***************************************************************/ +#define NTDDI_VERSION NTDDI_WS03 #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> +#define OBP_PROFILE #ifdef OBP_PROFILE LARGE_INTEGER ObpProfileTime; @@ -48,119 +50,228 @@ /* PRIVATE FUNCTIONS ******************************************************/ -VOID +BOOLEAN NTAPI -ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent, - PROS_OBJECT_HEADER Header, - PWSTR Name) +ObpInsertEntryDirectory(IN POBJECT_DIRECTORY Parent, + IN POBP_LOOKUP_CONTEXT Context, + IN POBJECT_HEADER ObjectHeader) { - KIRQL oldlvl; - - ObpStartProfile(); - ASSERT(HEADER_TO_OBJECT_NAME(Header)); - HEADER_TO_OBJECT_NAME(Header)->Directory = Parent; - - KeAcquireSpinLock(&Parent->Lock, &oldlvl); - InsertTailList(&Parent->head, &Header->Entry); - KeReleaseSpinLock(&Parent->Lock, oldlvl); - ObpEndProfile(); -} - -VOID -NTAPI -ObpRemoveEntryDirectory(PROS_OBJECT_HEADER Header) -{ - KIRQL oldlvl; - - ObpStartProfile(); - DPRINT("ObpRemoveEntryDirectory(Header %x)\n",Header); - - KeAcquireSpinLock(&(HEADER_TO_OBJECT_NAME(Header)->Directory->Lock),&oldlvl); - if (Header->Entry.Flink && Header->Entry.Blink) - { - RemoveEntryList(&(Header->Entry)); - Header->Entry.Flink = Header->Entry.Blink = NULL; - } - KeReleaseSpinLock(&(HEADER_TO_OBJECT_NAME(Header)->Directory->Lock),oldlvl); - ObpEndProfile(); -} - -NTSTATUS -NTAPI -ObpCreateDirectory(OB_OPEN_REASON Reason, - PEPROCESS Process, - PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - ULONG HandleCount) -{ - PDIRECTORY_OBJECT Directory = ObjectBody; - - ObpStartProfile(); - if (Reason == ObCreateHandle) - { - InitializeListHead(&Directory->head); - KeInitializeSpinLock(&Directory->Lock); - } - ObpEndProfile(); - - return STATUS_SUCCESS; + POBJECT_DIRECTORY_ENTRY *AllocatedEntry; + POBJECT_DIRECTORY_ENTRY NewEntry; + POBJECT_HEADER_NAME_INFO HeaderNameInfo; + + /* Make sure we have a name */ + ASSERT(ObjectHeader->NameInfoOffset != 0); + + /* Validate the context */ + if ((Context->Object) || !(Context->DirectoryLocked) || !Parent) + { + DbgPrint("OB: ObpInsertEntryDirectory - invalid context %p %ld\n", + Context, Context->DirectoryLocked); + DbgBreakPoint(); + return FALSE; + } + + /* Allocate a new Directory Entry */ + NewEntry = ExAllocatePoolWithTag(PagedPool, + sizeof(OBJECT_DIRECTORY_ENTRY), + TAG('O', 'b', 'D', 'i')); + if (!NewEntry) return FALSE; + + /* Save the hash */ + NewEntry->HashValue = Context->HashValue; + + /* Get the Object Name Information */ + HeaderNameInfo = HEADER_TO_OBJECT_NAME(ObjectHeader); + + /* Get the Allocated entry */ + AllocatedEntry = &Parent->HashBuckets[Context->HashIndex]; + DPRINT("ADD: Allocated Entry: %p. NewEntry: %p\n", AllocatedEntry, NewEntry); + DPRINT("ADD: Name: %wZ, Hash: %lx\n", &HeaderNameInfo->Name, Context->HashIndex); + DPRINT("ADD: Parent: %p. Name: %wZ\n", + Parent, + HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(Parent)) ? + &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(Parent))->Name : NULL); + + /* Set it */ + NewEntry->ChainLink = *AllocatedEntry; + *AllocatedEntry = NewEntry; + + /* Associate the Object */ + NewEntry->Object = &ObjectHeader->Body; + + /* Associate the Directory */ + HeaderNameInfo->Directory = Parent; + return TRUE; } PVOID NTAPI -ObpFindEntryDirectory(PDIRECTORY_OBJECT DirectoryObject, - PWSTR Name, - ULONG Attributes) +ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, + IN PUNICODE_STRING Name, + IN ULONG Attributes, + IN UCHAR SearchShadow, + IN POBP_LOOKUP_CONTEXT Context) { - PLIST_ENTRY current = DirectoryObject->head.Flink; - PROS_OBJECT_HEADER current_obj; - - ObpStartProfile(); - DPRINT("ObFindEntryDirectory(dir %x, name %S)\n",DirectoryObject, Name); - ObpCompleteProfile(); - - if (Name[0]==0) - { - ObpEndProfile(); - return(DirectoryObject); - } - if (Name[0]=='.' && Name[1]==0) - { - ObpEndProfile(); - return(DirectoryObject); - } - if (Name[0]=='.' && Name[1]=='.' && Name[2]==0) - { - ObpEndProfile(); - return(HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(DirectoryObject))->Directory); - } - while (current!=(&(DirectoryObject->head))) - { - current_obj = CONTAINING_RECORD(current,ROS_OBJECT_HEADER,Entry); - DPRINT(" Scanning: %S for: %S\n",HEADER_TO_OBJECT_NAME(current_obj)->Name.Buffer, Name); - if (Attributes & OBJ_CASE_INSENSITIVE) - { - if (_wcsicmp(HEADER_TO_OBJECT_NAME(current_obj)->Name.Buffer, Name)==0) + BOOLEAN CaseInsensitive = FALSE; + POBJECT_HEADER_NAME_INFO HeaderNameInfo; + ULONG HashValue; + ULONG HashIndex; + LONG TotalChars; + WCHAR CurrentChar; + POBJECT_DIRECTORY_ENTRY *AllocatedEntry; + POBJECT_DIRECTORY_ENTRY *LookupBucket; + POBJECT_DIRECTORY_ENTRY CurrentEntry; + PVOID FoundObject = NULL; + PWSTR Buffer; + PAGED_CODE(); + + /* Always disable this until we have LUID Device Maps */ + SearchShadow = FALSE; + + /* Fail the following cases */ + TotalChars = Name->Length / sizeof(WCHAR); + if (!(Directory) || !(Name) || !(Name->Buffer) || !(TotalChars)) + { + goto Quickie; + } + + /* Set up case-sensitivity */ + if (Attributes & OBJ_CASE_INSENSITIVE) CaseInsensitive = TRUE; + + /* Create the Hash */ + Buffer = Name->Buffer; + for (HashValue = 0; TotalChars; TotalChars--) + { + /* Go to the next Character */ + CurrentChar = *Buffer++; + + /* Prepare the Hash */ + HashValue += (HashValue << 1) + (HashValue >> 1); + + /* Create the rest based on the name */ + if (CurrentChar < 'a') HashValue += CurrentChar; + else if (CurrentChar > 'z') HashValue += RtlUpcaseUnicodeChar(CurrentChar); + else HashValue += (CurrentChar - ('a'-'A')); + } + + /* Merge it with our number of hash buckets */ + HashIndex = HashValue % 37; + DPRINT("LOOKUP: ObjectName: %wZ\n", Name); + DPRINT("LOOKUP: Generated Hash: 0x%x. Generated Id: 0x%x\n", HashValue, HashIndex); + + /* Save the result */ + Context->HashValue = HashValue; + Context->HashIndex = HashIndex; + + /* Get the root entry and set it as our lookup bucket */ + AllocatedEntry = &Directory->HashBuckets[HashIndex]; + LookupBucket = AllocatedEntry; + DPRINT("LOOKUP: Allocated Entry: %p. LookupBucket: %p\n", AllocatedEntry, LookupBucket); + + /* Check if the directory is already locked */ + if (!Context->DirectoryLocked) + { + /* Lock it */ + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&Directory->Lock, TRUE); + Context->LockStateSignature = 0xDDDD1234; + } + + /* Start looping */ + while ((CurrentEntry = *AllocatedEntry)) + { + /* Do the hashes match? */ + DPRINT("CurrentEntry: %p. CurrentHash: %lx\n", CurrentEntry, CurrentEntry->HashValue); + if (CurrentEntry->HashValue == HashValue) + { + /* Make sure that it has a name */ + ASSERT(BODY_TO_HEADER(CurrentEntry->Object)->NameInfoOffset != 0); + + /* Get the name information */ + HeaderNameInfo = HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(CurrentEntry->Object)); + + /* Do the names match? */ + DPRINT("NameCheck: %wZ, %wZ\n", Name, &HeaderNameInfo->Name); + if ((Name->Length == HeaderNameInfo->Name.Length) && + (RtlEqualUnicodeString(Name, &HeaderNameInfo->Name, CaseInsensitive))) { - DPRINT("Found it %x\n",&current_obj->Body); - ObpEndProfile(); - return(&current_obj->Body); + DPRINT("Found Name Match\n"); + break; } } - else - { - if ( wcscmp(HEADER_TO_OBJECT_NAME(current_obj)->Name.Buffer, Name)==0) - { - DPRINT("Found it %x\n",&current_obj->Body); - ObpEndProfile(); - return(&current_obj->Body); - } - } - current = current->Flink; - } - DPRINT(" Not Found: %s() = NULL\n",__FUNCTION__); - ObpEndProfile(); - return(NULL); + + /* Move to the next entry */ + AllocatedEntry = &CurrentEntry->ChainLink; + } + + /* Check if we still have an entry */ + if (CurrentEntry) + { + /* Set this entry as the first, to speed up incoming insertion */ + if (AllocatedEntry != LookupBucket) + { + /* Set the Current Entry */ + *AllocatedEntry = CurrentEntry->ChainLink; + + /* Link to the old Hash Entry */ + CurrentEntry->ChainLink = *LookupBucket; + + /* Set the new Hash Entry */ + *LookupBucket = CurrentEntry; + } + + /* Save the found object */ + FoundObject = CurrentEntry->Object; + if (!FoundObject) goto Quickie; + + /* Add a reference to the object */ + ObReferenceObject(FoundObject); + } + + /* Check if the directory was unlocked (which means we locked it) */ + if (!Context->DirectoryLocked) + { + /* Lock it */ + ExReleaseResourceLite(&Directory->Lock); + KeLeaveCriticalRegion(); + Context->LockStateSignature = 0xEEEE1234; + } + +Quickie: + /* Return the object we found */ + DPRINT("Object Found: %p Context: %p\n", FoundObject, Context); + Context->Object = FoundObject; + return FoundObject; +} + +BOOLEAN +NTAPI +ObpDeleteEntryDirectory(POBP_LOOKUP_CONTEXT Context) +{ + POBJECT_DIRECTORY Directory; + POBJECT_DIRECTORY_ENTRY *AllocatedEntry; + POBJECT_DIRECTORY_ENTRY CurrentEntry; + + /* Get the Directory */ + Directory = Context->Directory; + if (!Directory) return FALSE; + + /* Get the Entry */ + AllocatedEntry = &Directory->HashBuckets[Context->HashIndex]; + CurrentEntry = *AllocatedEntry; + DPRINT("DEL: Parent: %p, Hash: %lx, AllocatedEntry: %p, CurrentEntry: %p\n", + Directory, Context->HashIndex, AllocatedEntry, CurrentEntry); + + /* Unlink the Entry */ + *AllocatedEntry = CurrentEntry->ChainLink; + CurrentEntry->ChainLink = NULL; + + /* Free it */ + ExFreePool(CurrentEntry); + + /* Return */ + return TRUE; } NTSTATUS @@ -169,22 +280,19 @@ PVOID * NextObject, PUNICODE_STRING FullPath, PWSTR * Path, - ULONG Attributes) + ULONG Attributes, + POBP_LOOKUP_CONTEXT Context) { PWSTR Start; PWSTR End; PVOID FoundObject; - KIRQL oldlvl; - - ObpStartProfile(); - DPRINT("ObpParseDirectory(Object %x, Path %x, *Path %S)\n", - Object,Path,*Path); + //KIRQL oldlvl; + UNICODE_STRING StartUs; *NextObject = NULL; if ((*Path) == NULL) { - ObpEndProfile(); return STATUS_UNSUCCESSFUL; } @@ -198,16 +306,18 @@ *End = 0; } - KeAcquireSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), &oldlvl); - FoundObject = ObpFindEntryDirectory(Object, Start, Attributes); + //KeAcquireSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), &oldlvl); + RtlInitUnicodeString(&StartUs, Start); + Context->DirectoryLocked = TRUE; + Context->Directory = Object; + FoundObject = ObpLookupEntryDirectory(Object, &StartUs, Attributes, FALSE, Context); if (FoundObject == NULL) { - KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); + //KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); if (End != NULL) { *End = L'\\'; } - ObpEndProfile(); return STATUS_UNSUCCESSFUL; } @@ -215,7 +325,7 @@ STANDARD_RIGHTS_REQUIRED, NULL, UserMode); - KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); + //KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); if (End != NULL) { *End = L'\\'; @@ -228,7 +338,6 @@ *NextObject = FoundObject; - ObpEndProfile(); return STATUS_SUCCESS; } @@ -360,7 +469,7 @@ IN OUT PULONG Context, OUT PULONG ReturnLength OPTIONAL) { - PDIRECTORY_OBJECT Directory; + POBJECT_DIRECTORY Directory; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); ULONG SkipEntries = 0; NTSTATUS Status = STATUS_SUCCESS; @@ -441,7 +550,7 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) { - PDIRECTORY_OBJECT Directory; + POBJECT_DIRECTORY Directory; HANDLE hDirectory; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; @@ -475,7 +584,7 @@ ObjectAttributes, PreviousMode, NULL, - sizeof(DIRECTORY_OBJECT), + sizeof(OBJECT_DIRECTORY), 0, 0, (PVOID*)&Directory); @@ -488,12 +597,6 @@ 0, NULL, &hDirectory); - if (!NT_SUCCESS(Status)) - { - ObMakeTemporaryObject(Directory); - } - ObDereferenceObject(Directory); - if(NT_SUCCESS(Status)) { _SEH_TRY @@ -506,6 +609,8 @@ } _SEH_END; } + + ObDereferenceObject(Directory); } return Status; Modified: trunk/reactos/ntoskrnl/ob/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/handle.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/handle.c (original) +++ trunk/reactos/ntoskrnl/ob/handle.c Thu May 25 00:06:13 2006 @@ -54,6 +54,7 @@ { PROS_OBJECT_HEADER ObjectHeader = BODY_TO_HEADER(ObjectBody); LONG NewHandleCount = InterlockedDecrement(&ObjectHeader->HandleCount); + OBP_LOOKUP_CONTEXT Context; DPRINT("Header: %x\n", ObjectHeader); DPRINT("NewHandleCount: %x\n", NewHandleCount); DPRINT("HEADER_TO_OBJECT_NAME: %x\n", HEADER_TO_OBJECT_NAME(ObjectHeader)); @@ -75,7 +76,18 @@ /* delete the object from the namespace when the last handle got closed. Only do this if it's actually been inserted into the namespace and if it's not a permanent object. */ - ObpRemoveEntryDirectory((PROS_OBJECT_HEADER)ObjectHeader); + + /* Make sure it's still inserted */ + Context.Directory = HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory; + Context.DirectoryLocked = TRUE; + if (ObpLookupEntryDirectory(HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory, + &HEADER_TO_OBJECT_NAME(ObjectHeader)->Name, + 0, + FALSE, + &Context)) + { + ObpDeleteEntryDirectory(&Context); + } } /* remove the keep-alive reference */ @@ -1150,6 +1162,7 @@ BOOLEAN ObjectAttached = FALSE; PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL; SECURITY_SUBJECT_CONTEXT SubjectContext; + OBP_LOOKUP_CONTEXT Context; PAGED_CODE(); @@ -1167,7 +1180,8 @@ &ObjectNameInfo->Name, &FoundObject, &RemainingPath, - NULL); + NULL, + &Context); DPRINT("FoundObject: %x, Path: %wZ\n", FoundObject, &RemainingPath); if (!NT_SUCCESS(Status)) { @@ -1202,10 +1216,7 @@ PVOID NewName; PWSTR BufferPos = RemainingPath.Buffer; ULONG Delta = 0; - - ObpAddEntryDirectory(FoundObject, (PROS_OBJECT_HEADER)Header, NULL); - ObjectAttached = TRUE; - + ObjectNameInfo = HEADER_TO_OBJECT_NAME(Header); if (BufferPos[0] == L'\\') @@ -1219,7 +1230,8 @@ ObjectNameInfo->Name.Buffer = NewName; ObjectNameInfo->Name.Length = RemainingPath.Length - Delta; ObjectNameInfo->Name.MaximumLength = RemainingPath.MaximumLength - Delta; - DPRINT("Name: %S\n", ObjectNameInfo->Name.Buffer); + ObpInsertEntryDirectory(FoundObject, &Context, (POBJECT_HEADER)Header); + ObjectAttached = TRUE; } if ((Header->Type == IoFileObjectType) || @@ -1262,7 +1274,7 @@ DPRINT("Create Failed\n"); if (ObjectAttached == TRUE) { - ObpRemoveEntryDirectory((PROS_OBJECT_HEADER)Header); + ObpDeleteEntryDirectory(&Context); } if (FoundObject) { Modified: trunk/reactos/ntoskrnl/ob/namespc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/namespc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/namespc.c (original) +++ trunk/reactos/ntoskrnl/ob/namespc.c Thu May 25 00:06:13 2006 @@ -26,8 +26,8 @@ POBJECT_TYPE ObDirectoryType = NULL; POBJECT_TYPE ObTypeObjectType = NULL; -PDIRECTORY_OBJECT NameSpaceRoot = NULL; -PDIRECTORY_OBJECT ObpTypeDirectoryObject = NULL; +POBJECT_DIRECTORY NameSpaceRoot = NULL; +POBJECT_DIRECTORY ObpTypeDirectoryObject = NULL; /* FIXME: Move this somewhere else once devicemap support is in */ PDEVICE_MAP ObSystemDeviceMap = NULL; KEVENT ObpDefaultObject; @@ -72,6 +72,7 @@ UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; + OBP_LOOKUP_CONTEXT Context; PAGED_CODE(); @@ -95,7 +96,8 @@ &ObjectName, &Object, &RemainingPath, - ObjectType); + ObjectType, + &Context); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); @@ -160,6 +162,7 @@ UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; + OBP_LOOKUP_CONTEXT Context; PAGED_CODE(); @@ -182,7 +185,8 @@ &ObjectName, &Object, &RemainingPath, - ObjectType); + ObjectType, + &Context); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { @@ -252,6 +256,7 @@ UNICODE_STRING Name; SECURITY_DESCRIPTOR SecurityDescriptor; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + OBP_LOOKUP_CONTEXT Context; /* Initialize the security descriptor cache */ ObpInitSdCache(); @@ -279,11 +284,10 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = FALSE; - ObjectTypeInitializer.OpenProcedure = ObpCreateDirectory; ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ObpParseDirectory; ObjectTypeInitializer.MaintainTypeList = FALSE; ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping; - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DIRECTORY_OBJECT); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObDirectoryType); /* Create security descriptor */ @@ -312,7 +316,7 @@ &ObjectAttributes, KernelMode, NULL, - sizeof(DIRECTORY_OBJECT), + sizeof(OBJECT_DIRECTORY), 0, 0, (PVOID*)&NameSpaceRoot); @@ -335,7 +339,7 @@ &ObjectAttributes, KernelMode, NULL, - sizeof(DIRECTORY_OBJECT), + sizeof(OBJECT_DIRECTORY), 0, 0, (PVOID*)&ObpTypeDirectoryObject); @@ -348,8 +352,24 @@ /* Insert the two objects we already created but couldn't add */ /* NOTE: Uses TypeList & Creator Info in OB 2.0 */ - ObpAddEntryDirectory(ObpTypeDirectoryObject, (PROS_OBJECT_HEADER)BODY_TO_HEADER(ObTypeObjectType), NULL); - ObpAddEntryDirectory(ObpTypeDirectoryObject, (PROS_OBJECT_HEADER)BODY_TO_HEADER(ObDirectoryType), NULL); + Context.Directory = ObpTypeDirectoryObject; + Context.DirectoryLocked = TRUE; + if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, + &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ObTypeObjectType))->Name, + OBJ_CASE_INSENSITIVE, + FALSE, + &Context)) + { + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, (POBJECT_HEADER)BODY_TO_HEADER(ObTypeObjectType)); + } + if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, + &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ObDirectoryType))->Name, + OBJ_CASE_INSENSITIVE, + FALSE, + &Context)) + { + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, (POBJECT_HEADER)BODY_TO_HEADER(ObDirectoryType)); + } /* Create 'symbolic link' object type */ ObInitSymbolicLinkImplementation(); @@ -471,7 +491,15 @@ /* Insert it into the Object Directory */ if (ObpTypeDirectoryObject) { - ObpAddEntryDirectory(ObpTypeDirectoryObject, Header, TypeName->Buffer); + OBP_LOOKUP_CONTEXT Context; + Context.Directory = ObpTypeDirectoryObject; + Context.DirectoryLocked = TRUE; + ObpLookupEntryDirectory(ObpTypeDirectoryObject, + TypeName, + OBJ_CASE_INSENSITIVE, + FALSE, + &Context); + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, (POBJECT_HEADER)Header); ObReferenceObject(ObpTypeDirectoryObject); } Modified: trunk/reactos/ntoskrnl/ob/ntobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/ntobj.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ob/ntobj.c (original) +++ trunk/reactos/ntoskrnl/ob/ntobj.c Thu May 25 00:06:13 2006 @@ -36,6 +36,7 @@ IN BOOLEAN Permanent) { PROS_OBJECT_HEADER ObjectHeader; + OBP_LOOKUP_CONTEXT Context; ObjectHeader = BODY_TO_HEADER(ObjectBody); ASSERT (ObjectHeader->PointerCount > 0); @@ -49,8 +50,17 @@ if (ObjectHeader->HandleCount == 0 && HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory) { - /* Remove the object from the namespace */ - ObpRemoveEntryDirectory((PROS_OBJECT_HEADER)ObjectHeader); + /* Make sure it's still inserted */ + Context.Directory = HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory; + Context.DirectoryLocked = TRUE; + if (ObpLookupEntryDirectory(HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory, + &HEADER_TO_OBJECT_NAME(ObjectHeader)->Name, + 0, + FALSE, + &Context)) + { + ObpDeleteEntryDirectory(&Context); + } } } } Modified: trunk/reactos/ntoskrnl/ob/object.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/object.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/object.c (original) +++ trunk/reactos/ntoskrnl/ob/object.c Thu May 25 00:06:13 2006 @@ -293,7 +293,8 @@ PUNICODE_STRING ObjectName, PVOID* ReturnedObject, PUNICODE_STRING RemainingPath, - POBJECT_TYPE ObjectType) + POBJECT_TYPE ObjectType, + POBP_LOOKUP_CONTEXT Context) { PVOID NextObject; PVOID CurrentObject; @@ -388,7 +389,8 @@ &NextObject, &PathString, &current, - Attributes); + Attributes, + Context); if (Status == STATUS_REPARSE) { /* reparse the object path */ @@ -442,7 +444,7 @@ { POBJECT_HEADER_NAME_INFO LocalInfo; PROS_OBJECT_HEADER ObjectHeader; - PDIRECTORY_OBJECT ParentDirectory; + POBJECT_DIRECTORY ParentDirectory; ULONG NameSize; PWCH ObjectName; NTSTATUS Status; Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h Thu May 25 00:06:13 2006 @@ -74,7 +74,8 @@ PVOID *NextObject, PUNICODE_STRING FullPath, PWSTR *Path, - ULONG Attributes); + ULONG Attributes, + PVOID Context); NTSTATUS FASTCALL IntValidateWindowStationHandle( Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/mai… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Thu May 25 00:06:13 2006 @@ -382,7 +382,7 @@ * Register Object Manager Callbacks */ CalloutData.WinStaOpen = IntWinStaObjectOpen; - CalloutData.WinStaParse = IntWinStaObjectParse; + CalloutData.WinStaParse = (OB_ROS_PARSE_METHOD)IntWinStaObjectParse; CalloutData.WinStaDelete = IntWinStaObjectDelete; CalloutData.WinStaFind = IntWinStaObjectFind; CalloutData.DesktopCreate = IntDesktopObjectCreate; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Thu May 25 00:06:13 2006 @@ -190,7 +190,8 @@ PVOID *NextObject, PUNICODE_STRING FullPath, PWSTR *Path, - ULONG Attributes) + ULONG Attributes, + PVOID Context) { PVOID FoundObject; NTSTATUS Status;

1 0

[greatlrd] 22014: Do not create crash/bsod log when u logoff or shutdown of ReactOS.
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Wed May 24 23:34:53 2006 New Revision: 22014 URL: http://svn.reactos.ru/svn/reactos?rev=22014&view=rev Log: Do not create crash/bsod log when u logoff or shutdown of ReactOS. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c Wed May 24 23:34:53 2006 @@ -275,10 +275,15 @@ */ end: + if (PaletteDest != NULL) + if (PaletteDest != PaletteSource) + if (DestPalGDI != NULL) + PALETTE_UnlockPalette(DestPalGDI); + + if (PaletteSource != NULL) PALETTE_UnlockPalette(SourcePalGDI); - if (PaletteDest != NULL && PaletteDest != PaletteSource) - PALETTE_UnlockPalette(DestPalGDI); + return XlateObj; }

1 0

[greatlrd] 22013: sorry forget cleanup after me ;)
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Wed May 24 23:03:01 2006 New Revision: 22013 URL: http://svn.reactos.ru/svn/reactos?rev=22013&view=rev Log: sorry forget cleanup after me ;) Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/cprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/conio/cprintf.c?rev… ============================================================================== --- trunk/reactos/lib/crt/conio/cprintf.c (original) +++ trunk/reactos/lib/crt/conio/cprintf.c Wed May 24 23:03:01 2006 @@ -33,19 +33,4 @@ if (mem != buf) free (mem); return retval; - - -/* - va_list ap; - - va_start(ap, fmt); - while (vsprintf(buf, fmt, ap)==-1) - { - if (cnt < 0) - - va_end(ap); - - _cputs(buf); - return cnt; - */ }

1 0

[greatlrd] 22012: import cprintf from wine cvs 2006-05-23 as bug 1529 suggested, I was looking for this bug before it was reported. it make most of msvcrt string test work, only one fail left to fix.
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Wed May 24 22:56:29 2006 New Revision: 22012 URL: http://svn.reactos.ru/svn/reactos?rev=22012&view=rev Log: import cprintf from wine cvs 2006-05-23 as bug 1529 suggested, I was looking for this bug before it was reported. it make most of msvcrt string test work, only one fail left to fix. Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/cprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/conio/cprintf.c?rev… ============================================================================== --- trunk/reactos/lib/crt/conio/cprintf.c (original) +++ trunk/reactos/lib/crt/conio/cprintf.c Wed May 24 22:56:29 2006 @@ -1,27 +1,51 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * COPYRIGHT: Winehq + * PROJECT: wine * FILE: msvcrt/conio/cprintf.c * PURPOSE: C Runtime - * PROGRAMMER: Eric Kohl (Imported from DJGPP) + * PROGRAMMER: Magnus Olsen (Imported from wine cvs 2006-05-23) */ #include <precomp.h> /* - * @unimplemented + * @implemented */ int _cprintf(const char *fmt, ...) { - int cnt; - char buf[ 2048 ]; /* this is buggy, because buffer might be too small. */ + char buf[2048], *mem = buf; + int written, resize = sizeof(buf), retval; + va_list valist; + + while ((written = vsnprintf( mem, resize, fmt, valist )) == -1 || + written > resize) + { + resize = (written == -1 ? resize * 2 : written + 1); + if (mem != buf) + free (mem); + if (!(mem = (char *)malloc(resize))) + return EOF; + va_start( valist, fmt ); + } + va_end(valist); + retval = _cputs( mem ); + if (mem != buf) + free (mem); + return retval; + + +/* va_list ap; - va_start(ap, fmt); - cnt = vsprintf(buf, fmt, ap); + va_start(ap, fmt); + while (vsprintf(buf, fmt, ap)==-1) + { + if (cnt < 0) + va_end(ap); _cputs(buf); return cnt; + */ }

1 0

[greatlrd] 22011: [AUDIT] clean from DJGPP
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Wed May 24 22:48:00 2006 New Revision: 22011 URL: http://svn.reactos.ru/svn/reactos?rev=22011&view=rev Log: [AUDIT] clean from DJGPP Modified: trunk/reactos/lib/crt/conio/cprintf.c (props changed) Propchange: trunk/reactos/lib/crt/conio/cprintf.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22010: Fixing two fail from wine gdi32 test, When HDC is NULL to NtGdiCreateDIBitmap we need create a hdc and delete the hdc when we are done.
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Wed May 24 20:54:51 2006 New Revision: 22010 URL: http://svn.reactos.ru/svn/reactos?rev=22010&view=rev Log: Fixing two fail from wine gdi32 test, When HDC is NULL to NtGdiCreateDIBitmap we need create a hdc and delete the hdc when we are done. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Wed May 24 20:54:51 2006 @@ -758,17 +758,41 @@ { PDC Dc; HBITMAP Bmp; - - Dc = DC_LockDc(hDc); - if (NULL == Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - - Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse); - - DC_UnlockDc(Dc); + + + if (NULL == hDc) + { + hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); + if (hDc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + Dc = DC_LockDc(hDc); + if (Dc == NULL) + { + NtGdiDeleteObjectApp(hDc); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse); + DC_UnlockDc(Dc); + NtGdiDeleteObjectApp(hDc); + } + else + { + Dc = DC_LockDc(hDc); + if (Dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + Bmp = IntCreateDIBitmap(Dc, Header, Init, Bits, Data, ColorUse); + DC_UnlockDc(Dc); + } + + return Bmp; }

1 0

[greatlrd] 22009: revert my change from bootvid.c now, after w3seek patch it works again for bootcd
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Wed May 24 19:07:28 2006 New Revision: 22009 URL: http://svn.reactos.ru/svn/reactos?rev=22009&view=rev Log: revert my change from bootvid.c now, after w3seek patch it works again for bootcd Modified: trunk/reactos/drivers/base/bootvid/bootvid.c Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/base/bootvid/bootvi… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.c (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.c Wed May 24 19:07:28 2006 @@ -313,7 +313,7 @@ } } } - if ((x>=0) && (x<640) && (479-y>=0) && (479-y<480) && (c>=0) && (c<256)) + InbvPutPixels(x, 479 - y, c); x += 8 * 4; }

1 0

[greatlrd] 22008: Patch from w3seek: patch to fix a couple of argument probing bugs in NtQuerySymbolicLinkObject and NtCreateSymbolicLinkObject:
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Wed May 24 18:41:53 2006 New Revision: 22008 URL: http://svn.reactos.ru/svn/reactos?rev=22008&view=rev Log: Patch from w3seek: patch to fix a couple of argument probing bugs in NtQuerySymbolicLinkObject and NtCreateSymbolicLinkObject: Modified: trunk/reactos/ntoskrnl/ob/symlink.c 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 Wed May 24 18:41:53 2006 @@ -236,8 +236,7 @@ _SEH_TRY { /* Probe the target */ - ProbeForRead(LinkTarget, sizeof(UNICODE_STRING), sizeof(WCHAR)); - CapturedLinkTarget = *LinkTarget; + CapturedLinkTarget = ProbeForReadUnicodeString(LinkTarget); ProbeForRead(CapturedLinkTarget.Buffer, CapturedLinkTarget.MaximumLength, sizeof(WCHAR)); @@ -329,7 +328,7 @@ /* Return the handle to caller */ *LinkHandle = hLink; } - _SEH_HANDLE + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { /* Get exception code */ Status = _SEH_GetExceptionCode(); @@ -410,7 +409,7 @@ /* Return the handle to caller */ *LinkHandle = hLink; } - _SEH_HANDLE + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { /* Get exception code */ Status = _SEH_GetExceptionCode(); @@ -448,7 +447,7 @@ OUT PUNICODE_STRING LinkTarget, OUT PULONG ResultLength OPTIONAL) { - UNICODE_STRING SafeLinkTarget; + UNICODE_STRING SafeLinkTarget = {0}; POBJECT_SYMBOLIC_LINK SymlinkObject; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; @@ -460,15 +459,13 @@ _SEH_TRY { /* Probe the unicode string for read and write */ - ProbeForRead(LinkTarget, sizeof(UNICODE_STRING), sizeof(WCHAR)); - ProbeForWriteUshort(&LinkTarget->Length); - ProbeForWriteUshort(&LinkTarget->MaximumLength); + ProbeForWriteUnicodeString(LinkTarget); /* Probe the unicode string's buffer for write */ SafeLinkTarget = *LinkTarget; ProbeForWrite(SafeLinkTarget.Buffer, SafeLinkTarget.MaximumLength, - sizeof(CHAR)); + sizeof(WCHAR)); /* Probe the return length */ if(ResultLength) ProbeForWriteUlong(ResultLength); @@ -517,7 +514,7 @@ if (LengthUsed <= SafeLinkTarget.MaximumLength) { /* Copy the buffer */ - RtlMoveMemory(SafeLinkTarget.Buffer, + RtlCopyMemory(SafeLinkTarget.Buffer, SymlinkObject->LinkTarget.Buffer, LengthUsed); @@ -537,7 +534,7 @@ *ResultLength = SymlinkObject->LinkTarget.MaximumLength; } } - _SEH_HANDLE + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { /* Get the error code */ Status = _SEH_GetExceptionCode();

1 0

[janderwald] 22007: fix a few typos and display issuses in german resource file patch by ThePhysicist (bug 1518) and a few additional fixes by me
by janderwald＠svn.reactos.org 24 May '06

24 May '06

Author: janderwald Date: Wed May 24 16:17:49 2006 New Revision: 22007 URL: http://svn.reactos.ru/svn/reactos?rev=22007&view=rev Log: fix a few typos and display issuses in german resource file patch by ThePhysicist (bug 1518) and a few additional fixes by me Modified: trunk/reactos/dll/cpl/sysdm/de.rc Modified: trunk/reactos/dll/cpl/sysdm/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/sysdm/de.rc?rev=220… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/de.rc (original) +++ trunk/reactos/dll/cpl/sysdm/de.rc Wed May 24 16:17:49 2006 @@ -7,7 +7,7 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Betriebsystem",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Betriebssystem",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 LTEXT "Version " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 @@ -26,12 +26,12 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "ReactOS benutzt folgende Informationen im Sie im Netzwerk zu erkennen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "ReactOS benutzt folgende Informationen, um Sie im Netzwerk zu identifizieren.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) LTEXT "Vollständiger Computername:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LABELLINE(4)-4 LTEXT "(Default)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,60,LABELLINE(4)-5 LTEXT "Arbeitsgruppe:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROPSHEETPADDING,LABELLINE(6)-6 LTEXT "(leer)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60,LABELLINE(6)-6 - LTEXT "Klicken Sie auf Netzwerkkennung um sich einer Domaine anzuschließen und einen lokalen Benutzer zu erstellen",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(8)+5 + LTEXT "Klicken Sie auf Netzwerkkennung um sich einer Domäne anzuschließen und einen lokalen Benutzer zu erstellen",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(8)+5 PUSHBUTTON "&Netzwerkkennung...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 LTEXT "Klicken Sie auf Eigenschaften, um den Computer umzubennen oder einer Domäne anzuschließen.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROPSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 PUSHBUTTON "&Eigenschaften...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1)+4 @@ -43,19 +43,19 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Hardware Assistent",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING - LTEXT "Der Hardware Assistent hilft ihnen Hardware zu installieren, zu enfernen, zu reparieren und zu konfigurieren.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Der Hardware Assistent hilft Ihnen Hardware zu installieren, zu enfernen, zu reparieren und zu konfigurieren.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON PUSHBUTTON "&Hardware Assistent..",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14 GROUPBOX "Geräte Manager",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2 ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Der Gerätemanager zeigt alle installierte Hardware auf Ihren Comuter an. Benutzen Sie den Gerätemanger um die Eigenschaften aller Geräte zu ändern.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Der Gerätemanager zeigt alle installierte Hardware auf Ihrem Computer an. Benutzen Sie den Gerätemanager, um die Eigenschaften aller Geräte zu ändern.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) PUSHBUTTON "&Geräte Manager...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 GROUPBOX "Hardware Profile",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Hardwareprofile können zur Speicherung mehrere Hardwareprofile verwendet werden.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Hardwareprofile können zur Speicherung mehrerer Hardwareprofile verwendet werden.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) PUSHBUTTON "Hard&wareprofile...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14 END @@ -65,7 +65,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Benutzerprofile enthalten Desptokeinstellungen und andere Daten um sich einzulogen. Sie können auf jeden Copmuter, den Sie verwenden ein anderes Profil erstellen, oder ein Serverprofil, das auf jeden benutzten Computer gleich ist.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) + LTEXT "Benutzerprofile enthalten Desktopeinstellungen und andere Daten, um sich einzuloggen. Sie können auf jedem Computer, den Sie verwenden ein anderes Profil erstellen, oder ein Serverprofil, das auf jedem benutzten Computer gleich ist.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) LTEXT "Auf diesem Computer gespeicherte Profile:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1) CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABELLINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTEDGE @@ -85,18 +85,18 @@ PUSHBUTTON "&Systemleistungseinstellungen...",IDC_PERFOR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(5)+2,(18*PROPSHEETPADDING),14 GROUPBOX "Umgebungsvariablen",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Über Umgebungvariablen wird festgelegt, wo bestimmte Informationen zu finden sind.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Über Umgebungsvariablen wird festgelegt, wo bestimmte Informationen zu finden sind.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) PUSHBUTTON "&Umgebungsvariablen..",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(12)+2,(18*PROPSHEETPADDING),14 GROUPBOX "&Start und Wiederherstellung",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Diese Optionen legen fest, was beim Starten des Computer passiert und was passieren soll, wenn der Computer wegen eines Fehlers anhält.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Diese Optionen legen fest, was beim Starten des Computers passiert und was passieren soll, wenn der Computer wegen eines Fehlers anhält.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) PUSHBUTTON "&Start und Wiederherstellung...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(19)+2,(18*PROPSHEETPADDING),14 END IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Virtueller " +CAPTION "Virtueller Speicher" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN CONTROL "",IDC_PAGEFILELIST,"ListBox",0x50010141,10,16,204,52,0x00000200 @@ -105,13 +105,13 @@ CONTROL "Größe der Auslagerungsdatei für das Laufwerk",IDC_DRIVEGROUP,"Button",0x50000007,10,70,204,104 LTEXT "", IDC_DRIVE, 20, 84, 100, 9 LTEXT "", IDC_SPACEAVAIL, 20, 94, 112, 8 - CONTROL "Benutzerdefinierte Größe",IDC_CUSTOM,"Button",0x50010009,20,105,54,9 + CONTROL "Benutzerdefinierte Größe",IDC_CUSTOM,"Button",0x50010009,20,105,95,9 CONTROL "",IDC_INITIALSIZE,"Edit",0x50010000,100,114,44,13,0x00000200 CONTROL "",IDC_MAXSIZE,"Edit",0x50010000,100,129,44,13,0x00000200 LTEXT "Anfangsgröße (MB):", -1 ,22,118,54,9 LTEXT "Maximale Größe (MB):", -1 ,22,131,64,9 - CONTROL "System verwaltet die Größe",IDC_SYSMANSIZE,"Button",0x50010009,20,145,88,9 - CONTROL "Keine Auslagerungsdatei",IDC_NOPAGEFILE,"Button",0x50010009,20,158,78,9 + CONTROL "System verwaltet die Größe",IDC_SYSMANSIZE,"Button",0x50010009,20,145,110,9 + CONTROL "Keine Auslagerungsdatei",IDC_NOPAGEFILE,"Button",0x50010009,20,158,110,9 PUSHBUTTON "Festlegen",IDC_SET, 158, 155, 50, 13 CONTROL "Gesamtgröße der Auslagerungsdatei für alle Laufwerke", IDC_TOTALGROUP, "Button", 0x50000007, 10, 179, 204, 46 PUSHBUTTON "OK", IDOK, 114, 232, 48, 13 @@ -150,9 +150,9 @@ CAPTION "Variable editieren" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Variable &Name:",-1,7,14,50,8 + LTEXT "Variablen&name:",-1,7,14,50,8 EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL - LTEXT "Variable &Wert:",-1,7,32,50,8 + LTEXT "Variablen&wert:",-1,7,32,50,8 EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs