Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[greatlrd] 22006: Fix the regress of livecd, it works now again, some how the palette color are being bigger that 256 color and then the bootvid.sys crash
by greatlrd＠svn.reactos.org 24 May '06

24 May '06

Author: greatlrd Date: Wed May 24 10:35:59 2006 New Revision: 22006 URL: http://svn.reactos.ru/svn/reactos?rev=22006&view=rev Log: Fix the regress of livecd, it works now again, some how the palette color are being bigger that 256 color and then the bootvid.sys crash 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 10:35:59 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

[ion] 22005: [AUDIT] ntobj.c : The Temporary/Permanent object routines are 5-line generic wrappers which call an internal kernel function, which in itself is only a wrapper to set an internal, documented flag. The implementation is therefore trivial. NtQueryObject is only 10% complete. wait.c: These are simple wrapper routines around the KeWaitForXxx functions which reference the objects and get their pointers, just like any other Nt* function does. Some parts are non-trivial, such as: various f
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Wed May 24 08:43:50 2006 New Revision: 22005 URL: http://svn.reactos.ru/svn/reactos?rev=22005&view=rev Log: [AUDIT] ntobj.c : The Temporary/Permanent object routines are 5-line generic wrappers which call an internal kernel function, which in itself is only a wrapper to set an internal, documented flag. The implementation is therefore trivial. NtQueryObject is only 10% complete. wait.c: These are simple wrapper routines around the KeWaitForXxx functions which reference the objects and get their pointers, just like any other Nt* function does. Some parts are non-trivial, such as: various failures: these can be tested with the wait regression test however; The usage of THREAD_WAIT_OBJECTS is documented in the DDK; The failure for WaitAll with duplicated objects is documented on MSDN; The check for SYNCHRONIZE object is documented on MSDN. Modified: trunk/reactos/ntoskrnl/ob/ntobj.c (props changed) trunk/reactos/ntoskrnl/ob/wait.c (props changed) Propchange: trunk/reactos/ntoskrnl/ob/ntobj.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ob/wait.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22004: [AUDIT] symlink.c : The symbolic link implementation was generic, used different structures from NT (which meant some large NT features of symlinks were unimplemented) and had several bugs which gave different results from NT, so it was most certainly cleanly developed. The most recent update added the NT structure (which is documented) but did not add any functionality, except for fixing bugs which were revealed through a test app called SymlLinkTest. dirobj.c: The directory object
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Wed May 24 08:33:18 2006 New Revision: 22004 URL: http://svn.reactos.ru/svn/reactos?rev=22004&view=rev Log: [AUDIT] symlink.c : The symbolic link implementation was generic, used different structures from NT (which meant some large NT features of symlinks were unimplemented) and had several bugs which gave different results from NT, so it was most certainly cleanly developed. The most recent update added the NT structure (which is documented) but did not add any functionality, except for fixing bugs which were revealed through a test app called SymlLinkTest. dirobj.c: The directory object implementation is also generic and currently uses different structures from NT. Object lookup/parsing is entirely different and has nothing in common with NT. The actual Nt* APIs which expose the interface are ultra-generic and trivial. Modified: trunk/reactos/ntoskrnl/ob/dirobj.c (props changed) trunk/reactos/ntoskrnl/ob/symlink.c (props changed) Propchange: trunk/reactos/ntoskrnl/ob/dirobj.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ob/symlink.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22003: - Move all object directory stuff in dirobj.c and implement a simple profiler to measure the time spent in those functions until the desktop appears. Enable with #define OBP_PROFILE.
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Wed May 24 08:28:57 2006 New Revision: 22003 URL: http://svn.reactos.ru/svn/reactos?rev=22003&view=rev Log: - Move all object directory stuff in dirobj.c and implement a simple profiler to measure the time spent in those functions until the desktop appears. Enable with #define OBP_PROFILE. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/dirobj.c trunk/reactos/ntoskrnl/ob/namespc.c 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 Wed May 24 08:28:57 2006 @@ -105,6 +105,16 @@ 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); @@ -120,6 +130,16 @@ ACCESS_MASK GrantedAccess, ULONG HandleAttributes, PHANDLE Handle +); + +NTSTATUS +NTAPI +ObpParseDirectory( + PVOID Object, + PVOID * NextObject, + PUNICODE_STRING FullPath, + PWSTR * Path, + ULONG Attributes ); VOID 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 Wed May 24 08:28:57 2006 @@ -11,6 +11,226 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#ifdef OBP_PROFILE + +LARGE_INTEGER ObpProfileTime; +BOOLEAN ObpProfileComplete; + +#define ObpStartProfile() \ + LARGE_INTEGER StartTime; \ + LARGE_INTEGER EndTime; \ + StartTime = KeQueryPerformanceCounter(NULL); + +#define ObpEndProfile() \ + EndTime = KeQueryPerformanceCounter(NULL); \ + ObpProfileTime.QuadPart += (EndTime.QuadPart - \ + StartTime.QuadPart); + +#define ObpCompleteProfile() \ + if (!wcscmp(Name, L"NlsSectionCP1252") && \ + !ObpProfileComplete) \ + { \ + DPRINT1("******************************\n");\ + DPRINT1("Obp Profiling1 Complete: %I64d\n", \ + ObpProfileTime.QuadPart); \ + DPRINT1("******************************\n");\ + ObpProfileComplete = TRUE; \ + } + +#else + +#define ObpStartProfile() +#define ObpEndProfile() +#define ObpCompleteProfile() + +#endif + +/* PRIVATE FUNCTIONS ******************************************************/ + +VOID +NTAPI +ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent, + PROS_OBJECT_HEADER Header, + PWSTR Name) +{ + 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; +} + +PVOID +NTAPI +ObpFindEntryDirectory(PDIRECTORY_OBJECT DirectoryObject, + PWSTR Name, + ULONG Attributes) +{ + 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) + { + DPRINT("Found it %x\n",&current_obj->Body); + ObpEndProfile(); + return(&current_obj->Body); + } + } + 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); +} + +NTSTATUS +NTAPI +ObpParseDirectory(PVOID Object, + PVOID * NextObject, + PUNICODE_STRING FullPath, + PWSTR * Path, + ULONG Attributes) +{ + PWSTR Start; + PWSTR End; + PVOID FoundObject; + KIRQL oldlvl; + + ObpStartProfile(); + DPRINT("ObpParseDirectory(Object %x, Path %x, *Path %S)\n", + Object,Path,*Path); + + *NextObject = NULL; + + if ((*Path) == NULL) + { + ObpEndProfile(); + return STATUS_UNSUCCESSFUL; + } + + Start = *Path; + if (*Start == L'\\') + Start++; + + End = wcschr(Start, L'\\'); + if (End != NULL) + { + *End = 0; + } + + KeAcquireSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), &oldlvl); + FoundObject = ObpFindEntryDirectory(Object, Start, Attributes); + if (FoundObject == NULL) + { + KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); + if (End != NULL) + { + *End = L'\\'; + } + ObpEndProfile(); + return STATUS_UNSUCCESSFUL; + } + + ObReferenceObjectByPointer(FoundObject, + STANDARD_RIGHTS_REQUIRED, + NULL, + UserMode); + KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); + if (End != NULL) + { + *End = L'\\'; + *Path = End; + } + else + { + *Path = NULL; + } + + *NextObject = FoundObject; + + ObpEndProfile(); + return STATUS_SUCCESS; +} /* FUNCTIONS **************************************************************/ @@ -143,8 +363,6 @@ PDIRECTORY_OBJECT Directory; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); ULONG SkipEntries = 0; - ULONG NextEntry = 0; - ULONG CopyBytes = 0; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -191,201 +409,7 @@ NULL); if(NT_SUCCESS(Status)) { - PVOID TemporaryBuffer = ExAllocatePool(NonPagedPool, BufferLength); - if(TemporaryBuffer != NULL) - { - PROS_OBJECT_HEADER EntryHeader; - PLIST_ENTRY ListEntry; - KIRQL OldLevel; - ULONG RequiredSize = sizeof(OBJECT_DIRECTORY_INFORMATION); - ULONG nDirectories = 0; - POBJECT_DIRECTORY_INFORMATION DirInfo = - (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; - - Status = STATUS_NO_MORE_ENTRIES; - - KeAcquireSpinLock(&Directory->Lock, &OldLevel); - - for(ListEntry = Directory->head.Flink; - ListEntry != &Directory->head; - ListEntry = ListEntry->Flink) - { - NextEntry++; - if(SkipEntries == 0) - { - PUNICODE_STRING Name, Type; - ULONG EntrySize; - - EntryHeader = CONTAINING_RECORD(ListEntry, - ROS_OBJECT_HEADER, - Entry); - - /* calculate the size of the required buffer space for this entry */ - Name = (HEADER_TO_OBJECT_NAME(EntryHeader)->Name.Length != 0 ? - &HEADER_TO_OBJECT_NAME(EntryHeader)->Name : NULL); - Type = &EntryHeader->Type->Name; - EntrySize = sizeof(OBJECT_DIRECTORY_INFORMATION) + - ((Name != NULL) ? - ((ULONG)Name->Length + sizeof(WCHAR)) : 0) + - (ULONG)EntryHeader->Type->Name.Length + - sizeof(WCHAR); - - if(RequiredSize + EntrySize <= BufferLength) - { - /* the buffer is large enough to receive this entry. It would've - been much easier if the strings were directly appended to the - OBJECT_DIRECTORY_INFORMATION structured written into the buffer */ - if(Name != NULL) - DirInfo->ObjectName = *Name; - else - { - DirInfo->ObjectName.Length = - DirInfo->ObjectName.MaximumLength = 0; - DirInfo->ObjectName.Buffer = NULL; - } - DirInfo->ObjectTypeName = *Type; - - nDirectories++; - RequiredSize += EntrySize; - - Status = STATUS_SUCCESS; - - if(ReturnSingleEntry) - { - /* we're only supposed to query one entry, so bail and copy the - strings to the buffer */ - break; - } - DirInfo++; - } - else - { - if(ReturnSingleEntry) - { - /* the buffer is too small, so return the number of bytes that - would've been required for this query */ - RequiredSize += EntrySize; - Status = STATUS_BUFFER_TOO_SMALL; - } - - /* we couldn't query this entry, so leave the index that will be stored - in Context to this entry so the caller can query it the next time - he queries (hopefully with a buffer that is large enough then...) */ - NextEntry--; - - /* just copy the entries that fit into the buffer */ - break; - } - } - else - { - /* skip the entry */ - SkipEntries--; - } - } - - if(!ReturnSingleEntry && ListEntry != &Directory->head) - { - /* there are more entries to enumerate but the buffer is already full. - only tell this to the user if he queries multiple entries */ - Status = STATUS_MORE_ENTRIES; - } - - if(NT_SUCCESS(Status) && nDirectories > 0) - { - PWSTR strbuf = - (PWSTR)((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + - nDirectories + 1); - PWSTR deststrbuf = - (PWSTR)((POBJECT_DIRECTORY_INFORMATION)Buffer + - nDirectories + 1); - - memset((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + - nDirectories, - 0, - sizeof(OBJECT_DIRECTORY_INFORMATION)); - - CopyBytes = (nDirectories + 1) * - sizeof(OBJECT_DIRECTORY_INFORMATION); - - /* copy the names from the objects and append them to the list of the - objects. copy to the temporary buffer only because the directory - lock can't be released and the buffer might be pagable memory! */ - for(DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; - nDirectories > 0; - nDirectories--, DirInfo++) - { - ULONG NameLength; - - if(DirInfo->ObjectName.Length > 0) - { - RtlCopyMemory(strbuf, - DirInfo->ObjectName.Buffer, - DirInfo->ObjectName.Length); - - /* change the buffer pointer to the buffer */ - DirInfo->ObjectName.Buffer = deststrbuf; - NameLength = DirInfo->ObjectName.Length / - sizeof(WCHAR); - - /* NULL-terminate the string */ - strbuf[NameLength] = L'\0'; - strbuf += NameLength + 1; - deststrbuf += NameLength + 1; - - CopyBytes += (NameLength + 1) * sizeof(WCHAR); - } - - RtlCopyMemory(strbuf, - DirInfo->ObjectTypeName.Buffer, - DirInfo->ObjectTypeName.Length); - - /* change the buffer pointer to the buffer */ - DirInfo->ObjectTypeName.Buffer = deststrbuf; - NameLength = DirInfo->ObjectTypeName.Length / - sizeof(WCHAR); - - /* NULL-terminate the string */ - strbuf[NameLength] = L'\0'; - strbuf += NameLength + 1; - deststrbuf += NameLength + 1; - - CopyBytes += (NameLength + 1) * sizeof(WCHAR); - } - } - - KeReleaseSpinLock(&Directory->Lock, OldLevel); - ObDereferenceObject(Directory); - - if(NT_SUCCESS(Status) || ReturnSingleEntry) - { - _SEH_TRY - { - if(CopyBytes != 0) - { - RtlCopyMemory(Buffer, TemporaryBuffer, CopyBytes); - } - - *Context = NextEntry; - - if(ReturnLength != NULL) - { - *ReturnLength = RequiredSize; - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - ExFreePool(TemporaryBuffer); - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } + Status = STATUS_INSUFFICIENT_RESOURCES; } return Status; 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 Wed May 24 08:28:57 2006 @@ -242,184 +242,6 @@ /* FIXME: Release the DeviceMap Spinlock */ // KeReleasepinLock(DeviceMap->Lock, OldIrql); -} - -VOID -NTAPI -ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent, - PROS_OBJECT_HEADER Header, - PWSTR Name) -/* - * FUNCTION: Add an entry to a namespace directory - * ARGUMENTS: - * Parent = directory to add in - * Header = Header of the object to add the entry for - * Name = Name to give the entry - */ -{ - KIRQL oldlvl; - - 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); -} - - -VOID -NTAPI -ObpRemoveEntryDirectory(PROS_OBJECT_HEADER Header) -/* - * FUNCTION: Remove an entry from a namespace directory - * ARGUMENTS: - * Header = Header of the object to remove - */ -{ - KIRQL oldlvl; - - 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); -} - -NTSTATUS -STDCALL -ObpCreateDirectory(OB_OPEN_REASON Reason, - PEPROCESS Process, - PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - ULONG HandleCount) -{ - PDIRECTORY_OBJECT Directory = ObjectBody; - - if (Reason == ObCreateHandle) - { - InitializeListHead(&Directory->head); - KeInitializeSpinLock(&Directory->Lock); - } - - return STATUS_SUCCESS; -} - -PVOID -ObpFindEntryDirectory(PDIRECTORY_OBJECT DirectoryObject, - PWSTR Name, - ULONG Attributes) -{ - PLIST_ENTRY current = DirectoryObject->head.Flink; - PROS_OBJECT_HEADER current_obj; - - DPRINT("ObFindEntryDirectory(dir %x, name %S)\n",DirectoryObject, Name); - - if (Name[0]==0) - { - return(DirectoryObject); - } - if (Name[0]=='.' && Name[1]==0) - { - return(DirectoryObject); - } - if (Name[0]=='.' && Name[1]=='.' && Name[2]==0) - { - 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) - { - DPRINT("Found it %x\n",&current_obj->Body); - return(&current_obj->Body); - } - } - else - { - if ( wcscmp(HEADER_TO_OBJECT_NAME(current_obj)->Name.Buffer, Name)==0) - { - DPRINT("Found it %x\n",&current_obj->Body); - return(&current_obj->Body); - } - } - current = current->Flink; - } - DPRINT(" Not Found: %s() = NULL\n",__FUNCTION__); - return(NULL); -} - - -NTSTATUS STDCALL -ObpParseDirectory(PVOID Object, - PVOID * NextObject, - PUNICODE_STRING FullPath, - PWSTR * Path, - ULONG Attributes) -{ - PWSTR Start; - PWSTR End; - PVOID FoundObject; - KIRQL oldlvl; - - DPRINT("ObpParseDirectory(Object %x, Path %x, *Path %S)\n", - Object,Path,*Path); - - *NextObject = NULL; - - if ((*Path) == NULL) - { - return STATUS_UNSUCCESSFUL; - } - - Start = *Path; - if (*Start == L'\\') - Start++; - - End = wcschr(Start, L'\\'); - if (End != NULL) - { - *End = 0; - } - - KeAcquireSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), &oldlvl); - FoundObject = ObpFindEntryDirectory(Object, Start, Attributes); - if (FoundObject == NULL) - { - KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); - if (End != NULL) - { - *End = L'\\'; - } - return STATUS_UNSUCCESSFUL; - } - - ObReferenceObjectByPointer(FoundObject, - STANDARD_RIGHTS_REQUIRED, - NULL, - UserMode); - KeReleaseSpinLock(&(((PDIRECTORY_OBJECT)Object)->Lock), oldlvl); - if (End != NULL) - { - *End = L'\\'; - *Path = End; - } - else - { - *Path = NULL; - } - - *NextObject = FoundObject; - - return STATUS_SUCCESS; } VOID

1 0

[ion] 22002: This should fix the build.
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Wed May 24 08:19:04 2006 New Revision: 22002 URL: http://svn.reactos.ru/svn/reactos?rev=22002&view=rev Log: This should fix the build. Modified: trunk/reactos/include/ndk/obtypes.h 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 Wed May 24 08:19:04 2006 @@ -23,6 +23,13 @@ // Dependencies // #include <umtypes.h> + +// +// If the IFS wasn't included, define this here +// +#ifndef EX_PUSH_LOCK +#define EX_PUSH_LOCK ULONG_PTR +#endif #ifdef NTOS_MODE_USER

1 0

[ion] 22001: - Thomas Weidenmueller (w3seek@reactos.org) - Use SEH in Atom functions - Only use result length if the caller gave one, in NtQuerySecurityObject.
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Wed May 24 06:48:51 2006 New Revision: 22001 URL: http://svn.reactos.ru/svn/reactos?rev=22001&view=rev Log: - Thomas Weidenmueller (w3seek(a)reactos.org) - Use SEH in Atom functions - Only use result length if the caller gave one, in NtQuerySecurityObject. Modified: trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=2200… ============================================================================== --- trunk/reactos/ntoskrnl/ex/atom.c (original) +++ trunk/reactos/ntoskrnl/ex/atom.c Wed May 24 06:48:51 2006 @@ -284,83 +284,115 @@ PRTL_ATOM_TABLE AtomTable = ExpGetGlobalAtomTable(); PATOM_BASIC_INFORMATION BasicInformation = AtomInformation; PATOM_TABLE_INFORMATION TableInformation = AtomInformation; - NTSTATUS Status; - ULONG Flags, UsageCount, NameLength; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Flags, UsageCount, NameLength, RequiredLength = 0; + KPROCESSOR_MODE PreviousMode; + + PAGED_CODE(); /* Check for valid table */ if (AtomTable == NULL) return STATUS_ACCESS_DENIED; - /* FIXME: SEH! */ - - /* Choose class */ - switch (AtomInformationClass) - { - /* Caller requested info about an atom */ - case AtomBasicInformation: - - /* Size check */ - *ReturnLength = FIELD_OFFSET(ATOM_BASIC_INFORMATION, Name); - if (*ReturnLength > AtomInformationLength) - { - /* Fail */ - DPRINT1("Buffer too small\n"); - return STATUS_INFO_LENGTH_MISMATCH; - } - - /* Prepare query */ - UsageCount = 0; - NameLength = AtomInformationLength - *ReturnLength; - BasicInformation->Name[0] = UNICODE_NULL; - - /* Query the data */ - Status = RtlQueryAtomInAtomTable(AtomTable, - Atom, - &UsageCount, - &Flags, - BasicInformation->Name, - &NameLength); - if (NT_SUCCESS(Status)) - { - /* Return data */ - BasicInformation->UsageCount = (USHORT)UsageCount; - BasicInformation->Flags = (USHORT)Flags; - BasicInformation->NameLength = (USHORT)NameLength; - *ReturnLength += NameLength + sizeof(WCHAR); - } - break; - - /* Caller requested info about an Atom Table */ - case AtomTableInformation: - - /* Size check */ - *ReturnLength = FIELD_OFFSET(ATOM_TABLE_INFORMATION, Atoms); - if (*ReturnLength > AtomInformationLength) - { - /* Fail */ - DPRINT1("Buffer too small\n"); - return STATUS_INFO_LENGTH_MISMATCH; - } - - /* Query the data */ - Status = RtlQueryAtomListInAtomTable(AtomTable, - (AtomInformationLength - *ReturnLength) / - sizeof(RTL_ATOM), - &TableInformation->NumberOfAtoms, - TableInformation->Atoms); - if (NT_SUCCESS(Status)) - { - /* Update the return length */ - *ReturnLength += TableInformation->NumberOfAtoms * - sizeof(RTL_ATOM); - } - break; - - /* Caller was on crack */ - default: - - /* Unrecognized class */ - Status = STATUS_INVALID_INFO_CLASS; - } + PreviousMode = ExGetPreviousMode(); + + _SEH_TRY + { + /* Probe the parameters */ + if (PreviousMode != KernelMode) + { + ProbeForWrite(AtomInformation, + AtomInformationLength, + sizeof(ULONG)); + + if (ReturnLength != NULL) + { + ProbeForWriteUlong(ReturnLength); + } + } + + /* Choose class */ + switch (AtomInformationClass) + { + /* Caller requested info about an atom */ + case AtomBasicInformation: + + /* Size check */ + RequiredLength = FIELD_OFFSET(ATOM_BASIC_INFORMATION, Name); + if (RequiredLength > AtomInformationLength) + { + /* Fail */ + DPRINT1("Buffer too small\n"); + Status = STATUS_INFO_LENGTH_MISMATCH; + _SEH_LEAVE; + } + + /* Prepare query */ + UsageCount = 0; + NameLength = AtomInformationLength - RequiredLength; + BasicInformation->Name[0] = UNICODE_NULL; + + /* Query the data */ + Status = RtlQueryAtomInAtomTable(AtomTable, + Atom, + &UsageCount, + &Flags, + BasicInformation->Name, + &NameLength); + if (NT_SUCCESS(Status)) + { + /* Return data */ + BasicInformation->UsageCount = (USHORT)UsageCount; + BasicInformation->Flags = (USHORT)Flags; + BasicInformation->NameLength = (USHORT)NameLength; + RequiredLength += NameLength + sizeof(WCHAR); + } + break; + + /* Caller requested info about an Atom Table */ + case AtomTableInformation: + + /* Size check */ + RequiredLength = FIELD_OFFSET(ATOM_TABLE_INFORMATION, Atoms); + if (RequiredLength > AtomInformationLength) + { + /* Fail */ + DPRINT1("Buffer too small\n"); + Status = STATUS_INFO_LENGTH_MISMATCH; + _SEH_LEAVE; + } + + /* Query the data */ + Status = RtlQueryAtomListInAtomTable(AtomTable, + (AtomInformationLength - RequiredLength) / + sizeof(RTL_ATOM), + &TableInformation->NumberOfAtoms, + TableInformation->Atoms); + if (NT_SUCCESS(Status)) + { + /* Update the return length */ + RequiredLength += TableInformation->NumberOfAtoms * sizeof(RTL_ATOM); + } + break; + + /* Caller was on crack */ + default: + + /* Unrecognized class */ + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + /* Return the required size */ + if (ReturnLength != NULL) + { + *ReturnLength = RequiredLength; + } + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; /* Return to caller */ return Status; 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 Wed May 24 06:48:51 2006 @@ -240,7 +240,10 @@ _SEH_TRY { ProbeForWrite(SecurityDescriptor, Length, sizeof(ULONG)); + if (ResultLength != NULL) + { ProbeForWriteUlong(ResultLength); + } } _SEH_HANDLE { @@ -280,15 +283,18 @@ ObDereferenceObject(Object); /* return the required length */ + if (ResultLength != NULL) + { _SEH_TRY { *ResultLength = Length; } - _SEH_HANDLE + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { Status = _SEH_GetExceptionCode(); } _SEH_END; + } } return Status;

1 0

[ion] 22000: - Fix Symbolic Link implementation: - Use OBJECT_SYMBOLIC_LINK structure as used by Windows NT (and added the structure to the NDK) - Changed code to use the new names in the structure - Only free the symlink's name if it has one, to avoid a bugcheck. - Optimize parsing: if the new name is actually shorter then the target name, then don't allocate from pool, but re-use the buffer. This improves symlink parsing speed. Also fix a bug which made it depend on the incorrect implementatio
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Wed May 24 06:45:06 2006 New Revision: 22000 URL: http://svn.reactos.ru/svn/reactos?rev=22000&view=rev Log: - Fix Symbolic Link implementation: - Use OBJECT_SYMBOLIC_LINK structure as used by Windows NT (and added the structure to the NDK) - Changed code to use the new names in the structure - Only free the symlink's name if it has one, to avoid a bugcheck. - Optimize parsing: if the new name is actually shorter then the target name, then don't allocate from pool, but re-use the buffer. This improves symlink parsing speed. Also fix a bug which made it depend on the incorrect implementation of NtCreateSymbolicLinkObject - Re-align the link target maximum length in NtCreateSymbolicLinkObject if it's odd, and fail if the length is odd, smaller then the maximum, or if the maximum is zero. - Originally allocate the symlink name in Paged Pool. - Initialize new members of the structure. - Fail in no-memory case, instead of continuing. - Properly probe the LinkTarget in NtQuerySymbolicLinkObject. - Properly handle which length is chosen for the copy and for the return in NtQuerySymbolicObject. - Lock the symbolic link object type while querying it. Eventually many more parts of Ob need to do this kind of locking. - SymLinkTest now only gives 2 failures. - Fix some NDK bugs Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/obtypes.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/ntobj.c trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h (original) +++ trunk/reactos/include/ndk/exfuncs.h Wed May 24 06:45:06 2006 @@ -859,7 +859,6 @@ ); NTSYSAPI -NTSYSAPI NTSTATUS NTAPI ZwSetEvent( 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 Wed May 24 06:45:06 2006 @@ -384,15 +384,29 @@ { 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]; - struct _EX_PUSH_LOCK *Lock; +#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; // @@ -408,6 +422,18 @@ } DEVICE_MAP, *PDEVICE_MAP; // +// Symbolic Link Object +// +typedef struct _OBJECT_SYMBOLIC_LINK +{ + LARGE_INTEGER CreationTime; + UNICODE_STRING LinkTarget; + UNICODE_STRING LinkTargetRemaining; + PVOID LinkTargetObject; + ULONG DosDeviceDriveIndex; +} OBJECT_SYMBOLIC_LINK, *POBJECT_SYMBOLIC_LINK; + +// // Kernel Exports // extern POBJECT_TYPE NTSYSAPI ObDirectoryType; Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h (original) +++ trunk/reactos/include/ndk/psfuncs.h Wed May 24 06:45:06 2006 @@ -298,7 +298,6 @@ ); NTSYSCALLAPI -NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationThread( Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h (original) +++ trunk/reactos/include/ndk/rtltypes.h Wed May 24 06:45:06 2006 @@ -171,6 +171,42 @@ #define NLS_MB_CODE_PAGE_TAG NlsMbCodePageTag #define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo + +// +// C++ CONST casting +// +#if defined(__cplusplus) +#define RTL_CONST_CAST(type) const_cast<type> +#else +#define RTL_CONST_CAST(type) (type) +#endif + +// +// Constant String Macro +// +#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \ +{ \ + sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ + sizeof(__SOURCE_STRING__), \ + (__SOURCE_STRING__) \ +} + +// +// Constant Object Attributes Macro +// +#define RTL_CONSTANT_OBJECT_ATTRIBUTES(n, a) \ +{ \ + sizeof(OBJECT_ATTRIBUTES), \ + NULL, \ + RTL_CONST_CAST(PUNICODE_STRING)(n), \ + a, \ + NULL, \ + NULL \ +} + +#define RTL_INIT_OBJECT_ATTRIBUTES(n, a) \ + RTL_CONSTANT_OBJECT_ATTRIBUTES(n, a) + #else // // Message Resource Flag 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 Wed May 24 06:45:06 2006 @@ -22,14 +22,6 @@ LIST_ENTRY head; KSPIN_LOCK Lock; } DIRECTORY_OBJECT, *PDIRECTORY_OBJECT; - -typedef struct _SYMLINK_OBJECT -{ - CSHORT Type; - CSHORT Size; - UNICODE_STRING TargetName; - LARGE_INTEGER CreateTime; -} SYMLINK_OBJECT, *PSYMLINK_OBJECT; typedef struct _ROS_OBJECT_HEADER { 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 Wed May 24 06:45:06 2006 @@ -210,7 +210,7 @@ if (ObjectHeader->Type == ObSymbolicLinkType) { BasicInfo->CreateTime.QuadPart = - ((PSYMLINK_OBJECT)Object)->CreateTime.QuadPart; + ((POBJECT_SYMBOLIC_LINK)Object)->CreationTime.QuadPart; } else { 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 06:45:06 2006 @@ -48,8 +48,15 @@ NTAPI ObpDeleteSymbolicLink(PVOID ObjectBody) { - PSYMLINK_OBJECT SymlinkObject = (PSYMLINK_OBJECT)ObjectBody; - ExFreePool(SymlinkObject->TargetName.Buffer); + POBJECT_SYMBOLIC_LINK SymlinkObject = (POBJECT_SYMBOLIC_LINK)ObjectBody; + + /* Make sure that the symbolic link has a name */ + if (SymlinkObject->LinkTarget.Buffer) + { + /* Free the name */ + ExFreePool(SymlinkObject->LinkTarget.Buffer); + SymlinkObject->LinkTarget.Buffer = NULL; + } } /*++ @@ -85,10 +92,10 @@ PWSTR * RemainingPath, ULONG Attributes) { - PSYMLINK_OBJECT SymlinkObject = (PSYMLINK_OBJECT) Object; - UNICODE_STRING TargetPath; - - DPRINT("ObpParseSymbolicLink (RemainingPath %S)\n", *RemainingPath); + POBJECT_SYMBOLIC_LINK SymlinkObject = (POBJECT_SYMBOLIC_LINK)Object; + PUNICODE_STRING TargetPath; + PWSTR NewTargetPath; + ULONG LengthUsed, MaximumLength, RemainLength; /* * Stop parsing if the entire path has been parsed and @@ -97,33 +104,51 @@ if (((*RemainingPath == NULL) || (**RemainingPath == 0)) && (Attributes & OBJ_OPENLINK)) { - DPRINT("Parsing stopped!\n"); *NextObject = NULL; return(STATUS_SUCCESS); } - /* Build the expanded path */ - TargetPath.MaximumLength = SymlinkObject->TargetName.Length + - sizeof(WCHAR); - if (RemainingPath && *RemainingPath) - { - TargetPath.MaximumLength += (wcslen(*RemainingPath) * sizeof(WCHAR)); - } - TargetPath.Length = TargetPath.MaximumLength - sizeof(WCHAR); - TargetPath.Buffer = ExAllocatePoolWithTag(NonPagedPool, - TargetPath.MaximumLength, + /* Set the target path and length */ + TargetPath = &SymlinkObject->LinkTarget; + RemainLength = *RemainingPath ? wcslen(*RemainingPath) * sizeof(WCHAR) : 0; + LengthUsed = TargetPath->Length + RemainLength; + + /* Optimization: check if the new name is shorter */ + if (FullPath->MaximumLength <= LengthUsed) + { + /* It's not, allocate a new one */ + MaximumLength = LengthUsed + sizeof(WCHAR); + NewTargetPath = ExAllocatePoolWithTag(NonPagedPool, + MaximumLength, TAG_SYMLINK_TTARGET); - wcscpy(TargetPath.Buffer, SymlinkObject->TargetName.Buffer); - if (RemainingPath && *RemainingPath) - { - wcscat(TargetPath.Buffer, *RemainingPath); - } - - /* Transfer target path buffer into FullPath */ - ExFreePool(FullPath->Buffer); - FullPath->Length = TargetPath.Length; - FullPath->MaximumLength = TargetPath.MaximumLength; - FullPath->Buffer = TargetPath.Buffer; + } + else + { + /* It is! Reuse the name... */ + MaximumLength = FullPath->MaximumLength; + NewTargetPath = FullPath->Buffer; + } + + /* Make sure we have a length */ + if (RemainLength) + { + /* Copy the new path */ + RtlMoveMemory((PVOID)((ULONG_PTR)NewTargetPath + TargetPath->Length), + *RemainingPath, + RemainLength); + } + + /* Copy the target path and null-terminate it */ + RtlMoveMemory(NewTargetPath, TargetPath->Buffer, TargetPath->Length); + NewTargetPath[LengthUsed / sizeof(WCHAR)] = UNICODE_NULL; + + /* If the optimization didn't work, free the old buffer */ + if (NewTargetPath != FullPath->Buffer) ExFreePool(FullPath->Buffer); + + /* Update the path values */ + FullPath->Length = LengthUsed; + FullPath->MaximumLength = MaximumLength; + FullPath->Buffer = NewTargetPath; /* Reinitialize RemainingPath for reparsing */ *RemainingPath = FullPath->Buffer; @@ -152,13 +177,11 @@ UNICODE_STRING Name; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - DPRINT("Creating SymLink Object Type\n"); - /* Initialize the Directory type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"SymbolicLink"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(SYMLINK_OBJECT); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_SYMBOLIC_LINK); ObjectTypeInitializer.GenericMapping = ObpSymbolicLinkMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; @@ -201,72 +224,99 @@ IN PUNICODE_STRING LinkTarget) { HANDLE hLink; - PSYMLINK_OBJECT SymbolicLink; + POBJECT_SYMBOLIC_LINK SymbolicLink; UNICODE_STRING CapturedLinkTarget; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCreateSymbolicLinkObject(LinkHandle %p, DesiredAccess %ul" - ", ObjectAttributes %p, LinkTarget %wZ)\n", - LinkHandle, - DesiredAccess, - ObjectAttributes, - LinkTarget); - + /* Check if we need to probe parameters */ if(PreviousMode != KernelMode) { _SEH_TRY { + /* Probe the target */ + ProbeForRead(LinkTarget, sizeof(UNICODE_STRING), sizeof(WCHAR)); + CapturedLinkTarget = *LinkTarget; + ProbeForRead(CapturedLinkTarget.Buffer, + CapturedLinkTarget.MaximumLength, + sizeof(WCHAR)); + + /* Probe the return handle */ ProbeForWriteHandle(LinkHandle); } _SEH_HANDLE { + /* Exception, get the error code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - Status = ProbeAndCaptureUnicodeString(&CapturedLinkTarget, - PreviousMode, - LinkTarget); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateSymbolicLinkObject: Capturing the target link failed!\n"); - return Status; - } - + /* Probing failed, return the error code */ + if(!NT_SUCCESS(Status)) return Status; + } + else + { + /* No need to capture */ + CapturedLinkTarget = *LinkTarget; + } + + /* Check if the maximum length is odd */ + if (CapturedLinkTarget.MaximumLength % sizeof(WCHAR)) + { + /* Round it down */ + CapturedLinkTarget.MaximumLength = + ALIGN_DOWN(CapturedLinkTarget.MaximumLength, WCHAR); + } + + /* Fail if the length is odd, or if the maximum is smaller or 0 */ + if ((CapturedLinkTarget.Length % sizeof(WCHAR)) || + (CapturedLinkTarget.MaximumLength < CapturedLinkTarget.Length) || + !(CapturedLinkTarget.MaximumLength)) + { + /* This message is displayed on the debugger in Windows */ + DbgPrint("OB: Invalid symbolic link target - %wZ\n", + &CapturedLinkTarget); + return STATUS_INVALID_PARAMETER; + } + + /* Create the object */ Status = ObCreateObject(PreviousMode, ObSymbolicLinkType, ObjectAttributes, PreviousMode, NULL, - sizeof(SYMLINK_OBJECT), + sizeof(OBJECT_SYMBOLIC_LINK), 0, 0, (PVOID*)&SymbolicLink); if (NT_SUCCESS(Status)) { - SymbolicLink->TargetName.Length = 0; - SymbolicLink->TargetName.MaximumLength = CapturedLinkTarget.Length + + /* Success! Fill in the creation time immediately */ + KeQuerySystemTime(&SymbolicLink->CreationTime); + + /* Setup the target name */ + SymbolicLink->LinkTarget.Length = CapturedLinkTarget.Length; + SymbolicLink->LinkTarget.MaximumLength = CapturedLinkTarget.Length + sizeof(WCHAR); - SymbolicLink->TargetName.Buffer = - ExAllocatePoolWithTag(NonPagedPool, - SymbolicLink->TargetName.MaximumLength, + SymbolicLink->LinkTarget.Buffer = + ExAllocatePoolWithTag(PagedPool, + CapturedLinkTarget.MaximumLength, TAG_SYMLINK_TARGET); - - RtlCopyUnicodeString(&SymbolicLink->TargetName, &CapturedLinkTarget); - - DPRINT("DeviceName %S\n", SymbolicLink->TargetName.Buffer); - - ZwQuerySystemTime (&SymbolicLink->CreateTime); - - Status = ObInsertObject((PVOID)SymbolicLink, + if (!SymbolicLink->LinkTarget.Buffer) return STATUS_NO_MEMORY; + + /* Copy it */ + RtlMoveMemory(SymbolicLink->LinkTarget.Buffer, + CapturedLinkTarget.Buffer, + CapturedLinkTarget.MaximumLength); + + /* Initialize the remaining name, dos drive index and target object */ + SymbolicLink->LinkTargetObject = NULL; + SymbolicLink->DosDeviceDriveIndex = 0; + RtlInitUnicodeString(&SymbolicLink->LinkTargetRemaining, NULL); + + /* Insert it into the object tree */ + Status = ObInsertObject(SymbolicLink, NULL, DesiredAccess, 0, @@ -276,18 +326,22 @@ { _SEH_TRY { + /* Return the handle to caller */ *LinkHandle = hLink; } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; } + + /* ReactOS Hack: Our ObInsertObject references an object twice */ ObDereferenceObject(SymbolicLink); } - ReleaseCapturedUnicodeString(&CapturedLinkTarget, PreviousMode); + /* Return status to caller */ return Status; } @@ -322,27 +376,26 @@ NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + /* Check if we need to probe parameters */ if(PreviousMode != KernelMode) { _SEH_TRY { + /* Probe the return handle */ ProbeForWriteHandle(LinkHandle); } _SEH_HANDLE { + /* Exception, get the error code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - DPRINT("NtOpenSymbolicLinkObject (Name %wZ)\n", - ObjectAttributes->ObjectName); - + /* Probing failed, return the error code */ + if(!NT_SUCCESS(Status)) return Status; + } + + /* Open the object */ Status = ObOpenObjectByName(ObjectAttributes, ObSymbolicLinkType, NULL, @@ -350,19 +403,22 @@ DesiredAccess, NULL, &hLink); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { _SEH_TRY { + /* Return the handle to caller */ *LinkHandle = hLink; } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; } + /* Return status to caller */ return Status; } @@ -393,46 +449,47 @@ OUT PULONG ResultLength OPTIONAL) { UNICODE_STRING SafeLinkTarget; - PSYMLINK_OBJECT SymlinkObject; + POBJECT_SYMBOLIC_LINK SymlinkObject; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - ULONG LengthRequired; + ULONG LengthUsed; PAGED_CODE(); if(PreviousMode != KernelMode) { _SEH_TRY { - /* probe the unicode string and buffers supplied */ - ProbeForWrite(LinkTarget, sizeof(UNICODE_STRING), sizeof(ULONG)); - + /* Probe the unicode string for read and write */ + ProbeForRead(LinkTarget, sizeof(UNICODE_STRING), sizeof(WCHAR)); + ProbeForWriteUshort(&LinkTarget->Length); + ProbeForWriteUshort(&LinkTarget->MaximumLength); + + /* Probe the unicode string's buffer for write */ SafeLinkTarget = *LinkTarget; - ProbeForWrite(SafeLinkTarget.Buffer, SafeLinkTarget.MaximumLength, - sizeof(WCHAR)); - - if(ResultLength != NULL) - { - ProbeForWriteUlong(ResultLength); - } + sizeof(CHAR)); + + /* Probe the return length */ + if(ResultLength) ProbeForWriteUlong(ResultLength); } _SEH_HANDLE { + /* Probe failure: get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; - } + /* Probe failed, return status */ + if(!NT_SUCCESS(Status)) return Status; } else { + /* No need to probe */ SafeLinkTarget = *LinkTarget; } + /* Reference the object */ Status = ObReferenceObjectByHandle(LinkHandle, SYMBOLIC_LINK_QUERY, ObSymbolicLinkType, @@ -441,44 +498,59 @@ NULL); if (NT_SUCCESS(Status)) { - LengthRequired = SymlinkObject->TargetName.Length + sizeof(WCHAR); - + /* Lock the object type */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&ObSymbolicLinkType->Mutex, TRUE); + + /* + * So here's the thing: If you specify a return length, then the + * implementation will use the maximum length. If you don't, then + * it will use the length. + */ + LengthUsed = ResultLength ? SymlinkObject->LinkTarget.MaximumLength : + SymlinkObject->LinkTarget.Length; + + /* Enter SEH so we can safely copy */ _SEH_TRY { - if(SafeLinkTarget.MaximumLength >= LengthRequired) + /* Make sure our buffer will fit */ + if (LengthUsed <= SafeLinkTarget.MaximumLength) { - /* - * Don't pass TargetLink to RtlCopyUnicodeString here because - * the caller might have modified the structure which could - * lead to a copy into kernel memory! - */ - RtlCopyUnicodeString(&SafeLinkTarget, - &SymlinkObject->TargetName); - SafeLinkTarget.Buffer[SafeLinkTarget.Length / - sizeof(WCHAR)] = UNICODE_NULL; - - /* Copy back the new UNICODE_STRING structure */ - *LinkTarget = SafeLinkTarget; + /* Copy the buffer */ + RtlMoveMemory(SafeLinkTarget.Buffer, + SymlinkObject->LinkTarget.Buffer, + LengthUsed); + + /* Copy the new length */ + LinkTarget->Length = SymlinkObject->LinkTarget.Length; } else { + /* Otherwise set the failure status */ Status = STATUS_BUFFER_TOO_SMALL; } - if(ResultLength != NULL) + /* In both cases, check if the required length was requested */ + if (ResultLength) { - *ResultLength = LengthRequired; + /* Then return it */ + *ResultLength = SymlinkObject->LinkTarget.MaximumLength; } } _SEH_HANDLE { + /* Get the error code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Unlock the object type and reference the object */ + ExReleaseResourceLite(&ObSymbolicLinkType->Mutex); + KeLeaveCriticalRegion(); ObDereferenceObject(SymlinkObject); } + /* Return query status */ return Status; }

1 0

[ion] 21999: - SymTest: The Symbolic Link kernel implementation tester. Tests for really wacky symlink API properties. 8 failures on ROS.
by ion＠svn.reactos.org 24 May '06

24 May '06

Author: ion Date: Wed May 24 06:01:32 2006 New Revision: 21999 URL: http://svn.reactos.ru/svn/reactos?rev=21999&view=rev Log: - SymTest: The Symbolic Link kernel implementation tester. Tests for really wacky symlink API properties. 8 failures on ROS. Added: trunk/reactos/ntoskrnl/tests/symtest.c Added: trunk/reactos/ntoskrnl/tests/symtest.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/tests/symtest.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/tests/symtest.c (added) +++ trunk/reactos/ntoskrnl/tests/symtest.c Wed May 24 06:01:32 2006 @@ -1,0 +1,256 @@ +// ntest.cpp : Defines the entry point for the console application. +// +#include "stdafx.h" +#include "windows.h" +#include "ntndk.h" + +ULONG Runs; +ULONG Failures; + +#define TEST_ASSERT( exp ) \ + ((!(exp)) ? \ + (printf("%s, %s, %d\n", #exp, __FILE__, __LINE__), Failures++, FALSE) : \ + TRUE), Runs++ + +HANDLE +SymlinkCreateTests(OUT PHANDLE OddLink) +{ + NTSTATUS Status; + HANDLE LinkHandle; + UNICODE_STRING TargetName = RTL_CONSTANT_STRING(L"\\"); + UNICODE_STRING TargetName2 = RTL_CONSTANT_STRING(L"\\"); + UNICODE_STRING TargetName3 = RTL_CONSTANT_STRING(L"\\"); + UNICODE_STRING TargetName4 = RTL_CONSTANT_STRING(L"\\"); + UNICODE_STRING TargetName5 = RTL_CONSTANT_STRING(L"\\"); + UNICODE_STRING OkName = RTL_CONSTANT_STRING(L"\\OddLink"); + UNICODE_STRING OkName2 = RTL_CONSTANT_STRING(L"\\TestLink"); + + // + // Test1: Empty Attributes + // + { + OBJECT_ATTRIBUTES Test1 = RTL_INIT_OBJECT_ATTRIBUTES(NULL, 0); + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test1, + &TargetName); + TEST_ASSERT(NT_SUCCESS(Status)); + } + + // + // Test2: No Attributes + // + { + POBJECT_ATTRIBUTES Test2 = NULL; + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + Test2, + &TargetName); + TEST_ASSERT(NT_SUCCESS(Status)); + } + + // + // Test3: Attributes with an empty name + // + { + UNICODE_STRING TestName1 = {0, 0, NULL}; + OBJECT_ATTRIBUTES Test3 = RTL_INIT_OBJECT_ATTRIBUTES(&TestName1, 0); + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test3, + &TargetName); + TEST_ASSERT(NT_SUCCESS(Status)); + } + + // + // Test4: Attributes with an invalid name + // + { + UNICODE_STRING TestName2 = {10, 12, UlongToPtr(0x81000000)}; + OBJECT_ATTRIBUTES Test4 = RTL_INIT_OBJECT_ATTRIBUTES(&TestName2, 0); + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test4, + &TargetName); + TEST_ASSERT(Status == STATUS_ACCESS_VIOLATION); + } + + // + // Test5: Target with an odd name len + // + { + UNICODE_STRING OddName = RTL_CONSTANT_STRING(L"\\TestLink"); + OBJECT_ATTRIBUTES Test5 = RTL_INIT_OBJECT_ATTRIBUTES(&OkName, 0); + TargetName3.Length--; + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test5, + &TargetName3); + TEST_ASSERT(Status == STATUS_INVALID_PARAMETER); + } + + // + // Test6: Target with an emtpy name len + // + { + OBJECT_ATTRIBUTES Test5 = RTL_INIT_OBJECT_ATTRIBUTES(&OkName, 0); + TargetName4.MaximumLength = 0; + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test5, + &TargetName4); + TEST_ASSERT(Status == STATUS_INVALID_PARAMETER); + } + + // + // Test7: Target with an name len larger then maxlen + // + { + OBJECT_ATTRIBUTES Test6 = RTL_INIT_OBJECT_ATTRIBUTES(&OkName, 0); + TargetName5.Length = TargetName5.MaximumLength + 2; + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test6, + &TargetName5); + TEST_ASSERT(Status == STATUS_INVALID_PARAMETER); + } + + // + // Test5: Target with an odd name maxlen + // + { + OBJECT_ATTRIBUTES Test5 = RTL_INIT_OBJECT_ATTRIBUTES(&OkName, 0); + TargetName2.MaximumLength--; + TEST_ASSERT(TargetName2.MaximumLength % sizeof(WCHAR)); + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test5, + &TargetName2); + *OddLink = LinkHandle; + TEST_ASSERT(NT_SUCCESS(Status)); + TEST_ASSERT(TargetName2.MaximumLength % sizeof(WCHAR)); + } + + // + // Test6: collission + // + { + OBJECT_ATTRIBUTES Test6 = RTL_INIT_OBJECT_ATTRIBUTES(&OkName, 0); + TargetName2.MaximumLength++; + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test6, + &TargetName2); + TEST_ASSERT(Status == STATUS_OBJECT_NAME_COLLISION); + } + + // + // Test7: OK! + // + { + OBJECT_ATTRIBUTES Test7 = RTL_INIT_OBJECT_ATTRIBUTES(&OkName2, 0); + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &Test7, + &TargetName2); + TEST_ASSERT(NT_SUCCESS(Status)); + } + + // + // Return the last valid handle + // + return LinkHandle; +}; + + +int _tmain(int argc, _TCHAR* argv[]) +{ + NTSTATUS Status; + HANDLE LinkHandle, OddHandle; + WCHAR TargetBuffer[MAX_PATH] = {0}; + WCHAR TargetBuffer2[MAX_PATH] = {0}; + UNICODE_STRING TargetName; + UNICODE_STRING TargetName2; + UNICODE_STRING OkName = RTL_CONSTANT_STRING(L"\\TestLink"); + ULONG NameSize; + + // + // Start with the create tests + // + LinkHandle = SymlinkCreateTests(&OddHandle); + + // + // Setup the two empty strings. One will have a magic-char at the end + // + RtlInitEmptyUnicodeString(&TargetName, TargetBuffer, sizeof(TargetBuffer)); + RtlInitEmptyUnicodeString(&TargetName2, TargetBuffer2, sizeof(TargetBuffer2)); + + // + // Now query the odd link + // + Status = NtQuerySymbolicLinkObject(OddHandle, + &TargetName, + &NameSize); + TEST_ASSERT(NT_SUCCESS(Status)); + TEST_ASSERT(NameSize == sizeof(WCHAR)); + TEST_ASSERT(TargetName.Length == NameSize); + TEST_ASSERT(TargetName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR); + NtClose(OddHandle); + + // + // Now query the test link + // + Status = NtQuerySymbolicLinkObject(LinkHandle, + &TargetName, + &NameSize); + TEST_ASSERT(NT_SUCCESS(Status)); + TEST_ASSERT(NameSize == 2 * sizeof(WCHAR)); + TEST_ASSERT(TargetName.Length == NameSize - sizeof(WCHAR)); + TEST_ASSERT(TargetName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR); + + // + // Corrupt the characters + // + TargetName.Buffer[(NameSize - 2) / sizeof(WCHAR)] = 'v'; + TargetName.Buffer[(NameSize - 3) / sizeof(WCHAR)] = 'v'; + + // + // Now query the test link + // + Status = NtQuerySymbolicLinkObject(LinkHandle, + &TargetName, + &NameSize); + TEST_ASSERT(NT_SUCCESS(Status)); + TEST_ASSERT(TargetName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR); + TEST_ASSERT(TargetName.Buffer[1] == UNICODE_NULL); + + // + // Corrupt the characters + // + TargetName.Buffer[(NameSize - 2) / sizeof(WCHAR)] = 'v'; + TargetName.Buffer[(NameSize - 3) / sizeof(WCHAR)] = 'v'; + + // + // Now query the test link + // + Status = NtQuerySymbolicLinkObject(LinkHandle, + &TargetName, + NULL); + TEST_ASSERT(NT_SUCCESS(Status)); + TEST_ASSERT(TargetName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR); + TEST_ASSERT(TargetName.Buffer[1] == 'v'); + + // + // Print out results + // + { + RTL_OSVERSIONINFOW VersionInfo; + VersionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOW); + RtlGetVersion(&VersionInfo); + printf("Test complete on: %d\n", VersionInfo.dwBuildNumber); + printf("Number of Failures: %d\n", Failures); + printf("Number of Runs: %d\n", Runs); + } + return 0; +} +

1 0

[ion] 21998: - Cleanup the formatting, code and function headers of most of the Object Manager interfaces.
by ion＠svn.reactos.org 23 May '06

23 May '06

Author: ion Date: Wed May 24 01:42:28 2006 New Revision: 21998 URL: http://svn.reactos.ru/svn/reactos?rev=21998&view=rev Log: - Cleanup the formatting, code and function headers of most of the Object Manager interfaces. Modified: trunk/reactos/ntoskrnl/ob/dirobj.c trunk/reactos/ntoskrnl/ob/ntobj.c trunk/reactos/ntoskrnl/ob/security.c trunk/reactos/ntoskrnl/ob/symlink.c trunk/reactos/ntoskrnl/ob/wait.c Modified: trunk/reactos/ntoskrnl/ob/dirobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/dirobj.c?rev=21… ============================================================================== --- trunk/reactos/ntoskrnl/ob/dirobj.c (original) +++ trunk/reactos/ntoskrnl/ob/dirobj.c Wed May 24 01:42:28 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ob/dirobj.c - * PURPOSE: Interface functions to directory object - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ob/dirobj.c + * PURPOSE: Directory Object Implementation + * PROGRAMMER: David Welch (welch(a)mcmail.com) */ /* INCLUDES ***************************************************************/ @@ -14,490 +12,479 @@ #define NDEBUG #include <internal/debug.h> - /* FUNCTIONS **************************************************************/ - -/********************************************************************** - * NAME EXPORTED - * NtOpenDirectoryObject - * - * DESCRIPTION - * Opens a namespace directory object. - * - * ARGUMENTS - * DirectoryHandle (OUT) - * Variable which receives the directory handle. - * - * DesiredAccess - * Desired access to the directory. - * - * ObjectAttributes - * Structure describing the directory. - * - * RETURN VALUE - * Status. - * - * NOTES - * Undocumented. - */ -NTSTATUS STDCALL +/*++ +* @name NtOpenDirectoryObject +* @implemented NT4 +* +* The NtOpenDirectoryObject opens a namespace directory object. +* +* @param DirectoryHandle +* Variable which receives the directory handle. +* +* @param DesiredAccess +* Desired access to the directory. +* +* @param ObjectAttributes +* Structure describing the directory. +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI NtOpenDirectoryObject (OUT PHANDLE DirectoryHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) { - HANDLE hDirectory; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWriteHandle(DirectoryHandle); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenDirectoryObject failed, Status: 0x%x\n", Status); - return Status; - } - } - - Status = ObOpenObjectByName(ObjectAttributes, - ObDirectoryType, - NULL, - PreviousMode, - DesiredAccess, - NULL, - &hDirectory); - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *DirectoryHandle = hDirectory; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - return Status; + HANDLE hDirectory; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWriteHandle(DirectoryHandle); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenDirectoryObject failed, Status: 0x%x\n", Status); + return Status; + } + } + + Status = ObOpenObjectByName(ObjectAttributes, + ObDirectoryType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hDirectory); + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *DirectoryHandle = hDirectory; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; } - -/********************************************************************** - * NAME EXPORTED - * NtQueryDirectoryObject - * - * DESCRIPTION - * Reads information from a directory in the system namespace. - * - * ARGUMENTS - * DirectoryHandle - * Handle, obtained with NtOpenDirectoryObject(), which - * must grant DIRECTORY_QUERY access to the directory - * object. - * - * Buffer (OUT) - * Buffer to hold the data read. - * - * BufferLength - * Size of the buffer in bytes. - * - * ReturnSingleEntry - * When TRUE, only 1 entry is written in DirObjInformation; - * otherwise as many as will fit in the buffer. - * - * RestartScan - * If TRUE start reading at index 0. - * If FALSE start reading at the index specified - * by object index *ObjectIndex. - * - * Context - * Zero based index into the directory, interpretation - * depends on RestartScan. - * - * ReturnLength (OUT) - * Caller supplied storage for the number of bytes - * written (or NULL). - * - * RETURN VALUE - * STATUS_SUCCESS - At least one (possibly more, depending on - * parameters and buffer size) dir entry is - * returned. - * STATUS_NO_MORE_ENTRIES - Directory is exhausted - * STATUS_BUFFER_TOO_SMALL - There isn't enough room in the - * buffer to return even 1 entry. - * ReturnLength will hold the required - * buffer size to return all remaining - * dir entries - * Other - Status code - * - * - * NOTES - * Although you can iterate over the directory by calling this - * function multiple times, the directory is unlocked between - * calls. This means that another thread can change the directory - * and so iterating doesn't guarantee a consistent picture of the - * directory. Best thing is to retrieve all directory entries in - * one call. - */ -NTSTATUS STDCALL -NtQueryDirectoryObject (IN HANDLE DirectoryHandle, - OUT PVOID Buffer, - IN ULONG BufferLength, - IN BOOLEAN ReturnSingleEntry, - IN BOOLEAN RestartScan, - IN OUT PULONG Context, - OUT PULONG ReturnLength OPTIONAL) +/*++ +* @name NtQueryDirectoryObject +* @implemented NT4 +* +* The NtQueryDirectoryObject Reads information from a directory in +* the system namespace. +* +* @param DirectoryHandle +* Handle obtained with NtOpenDirectoryObject which +* must grant DIRECTORY_QUERY access to the directory object. +* +* @param Buffer +* Buffer to hold the data read. +* +* @param BufferLength +* Size of the buffer in bytes. +* +* @param ReturnSingleEntry +* When TRUE, only 1 entry is written in DirObjInformation; +* otherwise as many as will fit in the buffer. +* +* @param RestartScan +* If TRUE start reading at index 0. +* If FALSE start reading at the index specified by *ObjectIndex. +* +* @param Context +* Zero based index into the directory, interpretation +* depends on RestartScan. +* +* @param ReturnLength +* Caller supplied storage for the number of bytes +* written (or NULL). +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks Although you can iterate over the directory by calling this +* function multiple times, the directory is unlocked between +* calls. This means that another thread can change the directory +* and so iterating doesn't guarantee a consistent picture of the +* directory. Best thing is to retrieve all directory entries in +* one call. +* +*--*/ +NTSTATUS +NTAPI +NtQueryDirectoryObject(IN HANDLE DirectoryHandle, + OUT PVOID Buffer, + IN ULONG BufferLength, + IN BOOLEAN ReturnSingleEntry, + IN BOOLEAN RestartScan, + IN OUT PULONG Context, + OUT PULONG ReturnLength OPTIONAL) { - PDIRECTORY_OBJECT Directory; - KPROCESSOR_MODE PreviousMode; - ULONG SkipEntries = 0; - ULONG NextEntry = 0; - ULONG CopyBytes = 0; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - /* a test showed that the Buffer pointer just has to be 16 bit aligned, - propably due to the fact that most information that needs to be copied - is unicode strings */ - ProbeForWrite(Buffer, - BufferLength, - sizeof(WCHAR)); - ProbeForWriteUlong(Context); - if(!RestartScan) - { + PDIRECTORY_OBJECT Directory; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ULONG SkipEntries = 0; + ULONG NextEntry = 0; + ULONG CopyBytes = 0; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + /* a test showed that the Buffer pointer just has to be 16 bit aligned, + propably due to the fact that most information that needs to be copied + is unicode strings */ + ProbeForWrite(Buffer, BufferLength, sizeof(WCHAR)); + ProbeForWriteUlong(Context); + if(!RestartScan) + { + SkipEntries = *Context; + } + if(ReturnLength != NULL) + { + ProbeForWriteUlong(ReturnLength); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryDirectoryObject failed, Status: 0x%x\n", Status); + return Status; + } + } + else if(!RestartScan) + { SkipEntries = *Context; - } - if(ReturnLength != NULL) - { - ProbeForWriteUlong(ReturnLength); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryDirectoryObject failed, Status: 0x%x\n", Status); - return Status; - } - } - else if(!RestartScan) - { - SkipEntries = *Context; - } - - Status = ObReferenceObjectByHandle(DirectoryHandle, - DIRECTORY_QUERY, - ObDirectoryType, - PreviousMode, - (PVOID*)&Directory, - NULL); - if(NT_SUCCESS(Status)) - { - PVOID TemporaryBuffer = ExAllocatePool(NonPagedPool, - BufferLength); - if(TemporaryBuffer != NULL) - { - PROS_OBJECT_HEADER EntryHeader; - PLIST_ENTRY ListEntry; - KIRQL OldLevel; - ULONG RequiredSize = sizeof(OBJECT_DIRECTORY_INFORMATION); - ULONG nDirectories = 0; - POBJECT_DIRECTORY_INFORMATION DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; - - Status = STATUS_NO_MORE_ENTRIES; - - KeAcquireSpinLock(&Directory->Lock, &OldLevel); - - for(ListEntry = Directory->head.Flink; - ListEntry != &Directory->head; - ListEntry = ListEntry->Flink) - { - NextEntry++; - if(SkipEntries == 0) - { - PUNICODE_STRING Name, Type; - ULONG EntrySize; - - EntryHeader = CONTAINING_RECORD(ListEntry, ROS_OBJECT_HEADER, Entry); - - /* calculate the size of the required buffer space for this entry */ - Name = (HEADER_TO_OBJECT_NAME(EntryHeader)->Name.Length != 0 ? &HEADER_TO_OBJECT_NAME(EntryHeader)->Name : NULL); - Type = &EntryHeader->Type->Name; - EntrySize = sizeof(OBJECT_DIRECTORY_INFORMATION) + - ((Name != NULL) ? ((ULONG)Name->Length + sizeof(WCHAR)) : 0) + - (ULONG)EntryHeader->Type->Name.Length + sizeof(WCHAR); - - if(RequiredSize + EntrySize <= BufferLength) - { - /* the buffer is large enough to receive this entry. It would've - been much easier if the strings were directly appended to the - OBJECT_DIRECTORY_INFORMATION structured written into the buffer */ - if(Name != NULL) - DirInfo->ObjectName = *Name; - else - { - DirInfo->ObjectName.Length = DirInfo->ObjectName.MaximumLength = 0; - DirInfo->ObjectName.Buffer = NULL; - } - DirInfo->ObjectTypeName = *Type; - - nDirectories++; - RequiredSize += EntrySize; - - Status = STATUS_SUCCESS; - - if(ReturnSingleEntry) - { - /* we're only supposed to query one entry, so bail and copy the - strings to the buffer */ - break; - } - DirInfo++; - } - else - { - if(ReturnSingleEntry) - { - /* the buffer is too small, so return the number of bytes that - would've been required for this query */ - RequiredSize += EntrySize; - Status = STATUS_BUFFER_TOO_SMALL; - } - - /* we couldn't query this entry, so leave the index that will be stored - in Context to this entry so the caller can query it the next time - he queries (hopefully with a buffer that is large enough then...) */ - NextEntry--; - - /* just copy the entries that fit into the buffer */ - break; - } + } + + Status = ObReferenceObjectByHandle(DirectoryHandle, + DIRECTORY_QUERY, + ObDirectoryType, + PreviousMode, + (PVOID*)&Directory, + NULL); + if(NT_SUCCESS(Status)) + { + PVOID TemporaryBuffer = ExAllocatePool(NonPagedPool, BufferLength); + if(TemporaryBuffer != NULL) + { + PROS_OBJECT_HEADER EntryHeader; + PLIST_ENTRY ListEntry; + KIRQL OldLevel; + ULONG RequiredSize = sizeof(OBJECT_DIRECTORY_INFORMATION); + ULONG nDirectories = 0; + POBJECT_DIRECTORY_INFORMATION DirInfo = + (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; + + Status = STATUS_NO_MORE_ENTRIES; + + KeAcquireSpinLock(&Directory->Lock, &OldLevel); + + for(ListEntry = Directory->head.Flink; + ListEntry != &Directory->head; + ListEntry = ListEntry->Flink) + { + NextEntry++; + if(SkipEntries == 0) + { + PUNICODE_STRING Name, Type; + ULONG EntrySize; + + EntryHeader = CONTAINING_RECORD(ListEntry, + ROS_OBJECT_HEADER, + Entry); + + /* calculate the size of the required buffer space for this entry */ + Name = (HEADER_TO_OBJECT_NAME(EntryHeader)->Name.Length != 0 ? + &HEADER_TO_OBJECT_NAME(EntryHeader)->Name : NULL); + Type = &EntryHeader->Type->Name; + EntrySize = sizeof(OBJECT_DIRECTORY_INFORMATION) + + ((Name != NULL) ? + ((ULONG)Name->Length + sizeof(WCHAR)) : 0) + + (ULONG)EntryHeader->Type->Name.Length + + sizeof(WCHAR); + + if(RequiredSize + EntrySize <= BufferLength) + { + /* the buffer is large enough to receive this entry. It would've + been much easier if the strings were directly appended to the + OBJECT_DIRECTORY_INFORMATION structured written into the buffer */ + if(Name != NULL) + DirInfo->ObjectName = *Name; + else + { + DirInfo->ObjectName.Length = + DirInfo->ObjectName.MaximumLength = 0; + DirInfo->ObjectName.Buffer = NULL; + } + DirInfo->ObjectTypeName = *Type; + + nDirectories++; + RequiredSize += EntrySize; + + Status = STATUS_SUCCESS; + + if(ReturnSingleEntry) + { + /* we're only supposed to query one entry, so bail and copy the + strings to the buffer */ + break; + } + DirInfo++; + } + else + { + if(ReturnSingleEntry) + { + /* the buffer is too small, so return the number of bytes that + would've been required for this query */ + RequiredSize += EntrySize; + Status = STATUS_BUFFER_TOO_SMALL; + } + + /* we couldn't query this entry, so leave the index that will be stored + in Context to this entry so the caller can query it the next time + he queries (hopefully with a buffer that is large enough then...) */ + NextEntry--; + + /* just copy the entries that fit into the buffer */ + break; + } + } + else + { + /* skip the entry */ + SkipEntries--; + } + } + + if(!ReturnSingleEntry && ListEntry != &Directory->head) + { + /* there are more entries to enumerate but the buffer is already full. + only tell this to the user if he queries multiple entries */ + Status = STATUS_MORE_ENTRIES; + } + + if(NT_SUCCESS(Status) && nDirectories > 0) + { + PWSTR strbuf = + (PWSTR)((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + + nDirectories + 1); + PWSTR deststrbuf = + (PWSTR)((POBJECT_DIRECTORY_INFORMATION)Buffer + + nDirectories + 1); + + memset((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + + nDirectories, + 0, + sizeof(OBJECT_DIRECTORY_INFORMATION)); + + CopyBytes = (nDirectories + 1) * + sizeof(OBJECT_DIRECTORY_INFORMATION); + + /* copy the names from the objects and append them to the list of the + objects. copy to the temporary buffer only because the directory + lock can't be released and the buffer might be pagable memory! */ + for(DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; + nDirectories > 0; + nDirectories--, DirInfo++) + { + ULONG NameLength; + + if(DirInfo->ObjectName.Length > 0) + { + RtlCopyMemory(strbuf, + DirInfo->ObjectName.Buffer, + DirInfo->ObjectName.Length); + + /* change the buffer pointer to the buffer */ + DirInfo->ObjectName.Buffer = deststrbuf; + NameLength = DirInfo->ObjectName.Length / + sizeof(WCHAR); + + /* NULL-terminate the string */ + strbuf[NameLength] = L'\0'; + strbuf += NameLength + 1; + deststrbuf += NameLength + 1; + + CopyBytes += (NameLength + 1) * sizeof(WCHAR); + } + + RtlCopyMemory(strbuf, + DirInfo->ObjectTypeName.Buffer, + DirInfo->ObjectTypeName.Length); + + /* change the buffer pointer to the buffer */ + DirInfo->ObjectTypeName.Buffer = deststrbuf; + NameLength = DirInfo->ObjectTypeName.Length / + sizeof(WCHAR); + + /* NULL-terminate the string */ + strbuf[NameLength] = L'\0'; + strbuf += NameLength + 1; + deststrbuf += NameLength + 1; + + CopyBytes += (NameLength + 1) * sizeof(WCHAR); + } + } + + KeReleaseSpinLock(&Directory->Lock, OldLevel); + ObDereferenceObject(Directory); + + if(NT_SUCCESS(Status) || ReturnSingleEntry) + { + _SEH_TRY + { + if(CopyBytes != 0) + { + RtlCopyMemory(Buffer, TemporaryBuffer, CopyBytes); + } + + *Context = NextEntry; + + if(ReturnLength != NULL) + { + *ReturnLength = RequiredSize; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + ExFreePool(TemporaryBuffer); } else { - /* skip the entry */ - SkipEntries--; - } - } - - if(!ReturnSingleEntry && ListEntry != &Directory->head) - { - /* there are more entries to enumerate but the buffer is already full. - only tell this to the user if he queries multiple entries */ - Status = STATUS_MORE_ENTRIES; - } - - if(NT_SUCCESS(Status) && nDirectories > 0) - { - PWSTR strbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories + 1); - PWSTR deststrbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)Buffer + nDirectories + 1); - memset((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories, 0, sizeof(OBJECT_DIRECTORY_INFORMATION)); - - CopyBytes = (nDirectories + 1) * sizeof(OBJECT_DIRECTORY_INFORMATION); - - /* copy the names from the objects and append them to the list of the - objects. copy to the temporary buffer only because the directory - lock can't be released and the buffer might be pagable memory! */ - for(DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; - nDirectories > 0; - nDirectories--, DirInfo++) - { - ULONG NameLength; - - if(DirInfo->ObjectName.Length > 0) - { - RtlCopyMemory(strbuf, - DirInfo->ObjectName.Buffer, - DirInfo->ObjectName.Length); - /* change the buffer pointer to the buffer */ - DirInfo->ObjectName.Buffer = deststrbuf; - NameLength = DirInfo->ObjectName.Length / sizeof(WCHAR); - /* NULL-terminate the string */ - strbuf[NameLength] = L'\0'; - strbuf += NameLength + 1; - deststrbuf += NameLength + 1; - - CopyBytes += (NameLength + 1) * sizeof(WCHAR); - } - - RtlCopyMemory(strbuf, - DirInfo->ObjectTypeName.Buffer, - DirInfo->ObjectTypeName.Length); - /* change the buffer pointer to the buffer */ - DirInfo->ObjectTypeName.Buffer = deststrbuf; - NameLength = DirInfo->ObjectTypeName.Length / sizeof(WCHAR); - /* NULL-terminate the string */ - strbuf[NameLength] = L'\0'; - strbuf += NameLength + 1; - deststrbuf += NameLength + 1; - - CopyBytes += (NameLength + 1) * sizeof(WCHAR); - } - } - - KeReleaseSpinLock(&Directory->Lock, OldLevel); - ObDereferenceObject(Directory); - - if(NT_SUCCESS(Status) || ReturnSingleEntry) - { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + return Status; +} + +/*++ +* @name NtCreateDirectoryObject +* @implemented NT4 +* +* The NtOpenDirectoryObject creates or opens a directory object. +* +* @param DirectoryHandle +* Variable which receives the directory handle. +* +* @param DesiredAccess +* Desired access to the directory. +* +* @param ObjectAttributes +* Structure describing the directory. +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +NtCreateDirectoryObject(OUT PHANDLE DirectoryHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) +{ + PDIRECTORY_OBJECT Directory; + HANDLE hDirectory; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + DPRINT("NtCreateDirectoryObject(DirectoryHandle %x, " + "DesiredAccess %x, ObjectAttributes %x\n", + DirectoryHandle, DesiredAccess, ObjectAttributes); + + if(PreviousMode != KernelMode) + { _SEH_TRY { - if(CopyBytes != 0) - { - RtlCopyMemory(Buffer, - TemporaryBuffer, - CopyBytes); - } - *Context = NextEntry; - if(ReturnLength != NULL) - { - *ReturnLength = RequiredSize; - } + ProbeForWriteHandle(DirectoryHandle); } _SEH_HANDLE { - Status = _SEH_GetExceptionCode(); + Status = _SEH_GetExceptionCode(); } _SEH_END; - } - - ExFreePool(TemporaryBuffer); - } - else - { - Status = STATUS_INSUFFICIENT_RESOURCES; - } - } - - return Status; + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateDirectoryObject failed, Status: 0x%x\n", Status); + return Status; + } + } + + Status = ObCreateObject(PreviousMode, + ObDirectoryType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(DIRECTORY_OBJECT), + 0, + 0, + (PVOID*)&Directory); + + if(NT_SUCCESS(Status)) + { + Status = ObInsertObject((PVOID)Directory, + NULL, + DesiredAccess, + 0, + NULL, + &hDirectory); + if (!NT_SUCCESS(Status)) + { + ObMakeTemporaryObject(Directory); + } + ObDereferenceObject(Directory); + + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *DirectoryHandle = hDirectory; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + + return Status; } - -/********************************************************************** - * NAME (EXPORTED as Zw) - * NtCreateDirectoryObject - * - * DESCRIPTION - * Creates or opens a directory object (a container for other - * objects). - * - * ARGUMENTS - * DirectoryHandle (OUT) - * Caller supplied storage for the handle of the - * directory. - * - * DesiredAccess - * Access desired to the directory. - * - * ObjectAttributes - * Object attributes initialized with - * InitializeObjectAttributes. - * - * RETURN VALUE - * Status. - */ -NTSTATUS STDCALL -NtCreateDirectoryObject (OUT PHANDLE DirectoryHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) -{ - PDIRECTORY_OBJECT Directory; - HANDLE hDirectory; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("NtCreateDirectoryObject(DirectoryHandle %x, " - "DesiredAccess %x, ObjectAttributes %x\n", - DirectoryHandle, DesiredAccess, ObjectAttributes); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWriteHandle(DirectoryHandle); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateDirectoryObject failed, Status: 0x%x\n", Status); - return Status; - } - } - - Status = ObCreateObject(PreviousMode, - ObDirectoryType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(DIRECTORY_OBJECT), - 0, - 0, - (PVOID*)&Directory); - - if(NT_SUCCESS(Status)) - { - Status = ObInsertObject((PVOID)Directory, - NULL, - DesiredAccess, - 0, - NULL, - &hDirectory); - if (!NT_SUCCESS(Status)) - { - ObMakeTemporaryObject(Directory); - } - ObDereferenceObject(Directory); - - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *DirectoryHandle = hDirectory; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - - return Status; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/ntobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/ntobj.c?rev=219… ============================================================================== --- trunk/reactos/ntoskrnl/ob/ntobj.c (original) +++ trunk/reactos/ntoskrnl/ob/ntobj.c Wed May 24 01:42:28 2006 @@ -1,12 +1,10 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ob/ntobj.c - * PURPOSE: User mode interface to object manager - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/ob/ntobj.c +* PURPOSE: Bunch of random functions that got stuck here without purpose. FIXME. +* PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) +*/ /* INCLUDES *****************************************************************/ @@ -14,329 +12,327 @@ #define NDEBUG #include <internal/debug.h> - -/* FUNCTIONS ************************************************************/ - -/********************************************************************** - * NAME EXPORTED - * NtSetInformationObject - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ -NTSTATUS STDCALL -NtSetInformationObject (IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - IN PVOID ObjectInformation, - IN ULONG Length) -{ - PVOID Object; - NTSTATUS Status; - - PAGED_CODE(); - - if (ObjectInformationClass != ObjectHandleInformation) - return STATUS_INVALID_INFO_CLASS; - - if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) - return STATUS_INFO_LENGTH_MISMATCH; - - Status = ObReferenceObjectByHandle (ObjectHandle, - 0, - NULL, - (KPROCESSOR_MODE)KeGetPreviousMode (), - &Object, - NULL); - if (!NT_SUCCESS (Status)) +/* PRIVATE FUNCTIONS *********************************************************/ + +/*++ +* @name ObpSetPermanentObject +* +* The ObpSetPermanentObject routine <FILLMEIN> +* +* @param ObjectBody +* <FILLMEIN> +* +* @param Permanent +* <FILLMEIN> +* +* @return None. +* +* @remarks None. +* +*--*/ +VOID +FASTCALL +ObpSetPermanentObject(IN PVOID ObjectBody, + IN BOOLEAN Permanent) +{ + PROS_OBJECT_HEADER ObjectHeader; + + ObjectHeader = BODY_TO_HEADER(ObjectBody); + ASSERT (ObjectHeader->PointerCount > 0); + if (Permanent) { - return Status; + ObjectHeader->Flags |= OB_FLAG_PERMANENT; } - - Status = ObpSetHandleAttributes (ObjectHandle, - (POBJECT_HANDLE_ATTRIBUTE_INFORMATION)ObjectInformation); - - ObDereferenceObject (Object); - - return Status; -} - - -/********************************************************************** - * NAME EXPORTED - * NtQueryObject - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ -NTSTATUS STDCALL -NtQueryObject (IN HANDLE ObjectHandle, - IN OBJECT_INFORMATION_CLASS ObjectInformationClass, - OUT PVOID ObjectInformation, - IN ULONG Length, - OUT PULONG ResultLength OPTIONAL) -{ - OBJECT_HANDLE_INFORMATION HandleInfo; - PROS_OBJECT_HEADER ObjectHeader; - ULONG InfoLength; - PVOID Object; - NTSTATUS Status; - - PAGED_CODE(); - - Status = ObReferenceObjectByHandle (ObjectHandle, - 0, - NULL, - (KPROCESSOR_MODE)KeGetPreviousMode(), - &Object, - &HandleInfo); - if (!NT_SUCCESS (Status)) + else { - return Status; + ObjectHeader->Flags &= ~OB_FLAG_PERMANENT; + if (ObjectHeader->HandleCount == 0 && + HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory) + { + /* Remove the object from the namespace */ + ObpRemoveEntryDirectory((PROS_OBJECT_HEADER)ObjectHeader); + } } - - ObjectHeader = BODY_TO_HEADER(Object); - - switch (ObjectInformationClass) +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/*++ +* @name ObMakeTemporaryObject +* @implemented NT4 +* +* The ObMakeTemporaryObject routine <FILLMEIN> +* +* @param ObjectBody +* <FILLMEIN> +* +* @return None. +* +* @remarks None. +* +*--*/ +VOID +NTAPI +ObMakeTemporaryObject(IN PVOID ObjectBody) +{ + ObpSetPermanentObject (ObjectBody, FALSE); +} + +/*++ +* @name NtSetInformationObject +* @implemented NT4 +* +* The NtSetInformationObject routine <FILLMEIN> +* +* @param ObjectHandle +* <FILLMEIN> +* +* @param ObjectInformationClass +* <FILLMEIN> +* +* @param ObjectInformation +* <FILLMEIN> +* +* @param Length +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +NtSetInformationObject(IN HANDLE ObjectHandle, + IN OBJECT_INFORMATION_CLASS ObjectInformationClass, + IN PVOID ObjectInformation, + IN ULONG Length) +{ + PVOID Object; + NTSTATUS Status; + PAGED_CODE(); + + if (ObjectInformationClass != ObjectHandleInformation) + return STATUS_INVALID_INFO_CLASS; + + if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) + 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); + return Status; +} + +/*++ +* @name NtQueryObject +* @implemented NT4 +* +* The NtQueryObject routine <FILLMEIN> +* +* @param ObjectHandle +* <FILLMEIN> +* +* @param ObjectInformationClass +* <FILLMEIN> +* +* @param ObjectInformation +* <FILLMEIN> +* +* @param Length +* <FILLMEIN> +* +* @param ResultLength +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +NtQueryObject(IN HANDLE ObjectHandle, + IN OBJECT_INFORMATION_CLASS ObjectInformationClass, + OUT PVOID ObjectInformation, + IN ULONG Length, + OUT PULONG ResultLength OPTIONAL) +{ + OBJECT_HANDLE_INFORMATION HandleInfo; + PROS_OBJECT_HEADER ObjectHeader; + ULONG InfoLength; + PVOID Object; + NTSTATUS Status; + PAGED_CODE(); + + Status = ObReferenceObjectByHandle(ObjectHandle, + 0, + NULL, + KeGetPreviousMode(), + &Object, + &HandleInfo); + if (!NT_SUCCESS (Status)) return Status; + + ObjectHeader = BODY_TO_HEADER(Object); + + 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; - - BasicInfo = (POBJECT_BASIC_INFORMATION)ObjectInformation; - BasicInfo->Attributes = HandleInfo.HandleAttributes; - BasicInfo->GrantedAccess = HandleInfo.GrantedAccess; - BasicInfo->HandleCount = ObjectHeader->HandleCount; - BasicInfo->PointerCount = ObjectHeader->PointerCount; - BasicInfo->PagedPoolUsage = 0; /* FIXME*/ - BasicInfo->NonPagedPoolUsage = 0; /* FIXME*/ - BasicInfo->NameInformationLength = 0; /* FIXME*/ - BasicInfo->TypeInformationLength = 0; /* FIXME*/ - BasicInfo->SecurityDescriptorLength = 0; /* FIXME*/ - if (ObjectHeader->Type == ObSymbolicLinkType) - { - BasicInfo->CreateTime.QuadPart = - ((PSYMLINK_OBJECT)Object)->CreateTime.QuadPart; - } - else - { - BasicInfo->CreateTime.QuadPart = (ULONGLONG)0; - } - Status = STATUS_SUCCESS; - } - break; - - case ObjectNameInformation: - Status = ObQueryNameString (Object, - (POBJECT_NAME_INFORMATION)ObjectInformation, - Length, - &InfoLength); - break; - - case ObjectTypeInformation: -#if 0 -// InfoLength = - if (Length != sizeof(OBJECT_TYPE_INFORMATION)) - { - Status = STATUS_INVALID_BUFFER_SIZE; - } - else - { - POBJECT_TYPE_INFORMATION TypeInfo; - - TypeInfo = (POBJECT_TYPE_INFORMATION)ObjectInformation; - // FIXME: Is this supposed to only be the header's Name field? - // Can somebody check/verify this? - RtlCopyUnicodeString(&typeinfo->Name,&ObjectHeader->Name); - - if (Status != STATUS_SUCCESS) - { - break; - } - - RtlCopyUnicodeString(&typeinfo->Type,&ObjectHeader->Type->TypeName); - //This should be info from the object header, not the object type, right? - typeinfo->TotalHandles = ObjectHeader-> HandleCount; - typeinfo->ReferenceCount = ObjectHeader -> PointerCount; - } -#endif - 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; + case ObjectBasicInformation: + InfoLength = sizeof(OBJECT_BASIC_INFORMATION); + if (Length != sizeof(OBJECT_BASIC_INFORMATION)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + POBJECT_BASIC_INFORMATION BasicInfo; + + BasicInfo = (POBJECT_BASIC_INFORMATION)ObjectInformation; + BasicInfo->Attributes = HandleInfo.HandleAttributes; + BasicInfo->GrantedAccess = HandleInfo.GrantedAccess; + BasicInfo->HandleCount = ObjectHeader->HandleCount; + BasicInfo->PointerCount = ObjectHeader->PointerCount; + BasicInfo->PagedPoolUsage = 0; /* FIXME*/ + BasicInfo->NonPagedPoolUsage = 0; /* FIXME*/ + BasicInfo->NameInformationLength = 0; /* FIXME*/ + BasicInfo->TypeInformationLength = 0; /* FIXME*/ + BasicInfo->SecurityDescriptorLength = 0; /* FIXME*/ + if (ObjectHeader->Type == ObSymbolicLinkType) + { + BasicInfo->CreateTime.QuadPart = + ((PSYMLINK_OBJECT)Object)->CreateTime.QuadPart; + } + else + { + BasicInfo->CreateTime.QuadPart = (ULONGLONG)0; + } + 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; - - return Status; -} - - -/********************************************************************** - * NAME PRIVATE - * ObpSetPermanentObject/2 - * - * DESCRIPTION - * Fast general purpose routine to set an object's permanent - * attribute, given a pointer to the object's body. - */ -VOID FASTCALL -ObpSetPermanentObject (IN PVOID ObjectBody, IN BOOLEAN Permanent) -{ - PROS_OBJECT_HEADER ObjectHeader; - - ObjectHeader = BODY_TO_HEADER(ObjectBody); - ASSERT (ObjectHeader->PointerCount > 0); - if (Permanent) - { - ObjectHeader->Flags |= OB_FLAG_PERMANENT; - } - else - { - ObjectHeader->Flags &= ~OB_FLAG_PERMANENT; - if (ObjectHeader->HandleCount == 0 && HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory) - { - /* Remove the object from the namespace */ - ObpRemoveEntryDirectory((PROS_OBJECT_HEADER)ObjectHeader); - } - } -} - -/********************************************************************** - * NAME EXPORTED - * ObMakeTemporaryObject/1 - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * - * @implemented - */ -VOID STDCALL -ObMakeTemporaryObject(IN PVOID ObjectBody) -{ - ObpSetPermanentObject (ObjectBody, FALSE); -} - - -/********************************************************************** - * NAME EXPORTED - * NtMakeTemporaryObject - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ -NTSTATUS STDCALL + ObDereferenceObject (Object); + + if (ResultLength != NULL) *ResultLength = InfoLength; + + return Status; +} + +/*++ +* @name NtMakeTemporaryObject +* @implemented NT4 +* +* The NtMakeTemporaryObject routine <FILLMEIN> +* +* @param ObjectHandle +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI NtMakeTemporaryObject(IN HANDLE ObjectHandle) { - PVOID ObjectBody; - NTSTATUS Status; - - PAGED_CODE(); - - Status = ObReferenceObjectByHandle(ObjectHandle, - 0, - NULL, - (KPROCESSOR_MODE)KeGetPreviousMode(), - &ObjectBody, - NULL); - if (Status != STATUS_SUCCESS) - { - return Status; - } - - ObpSetPermanentObject (ObjectBody, FALSE); - - ObDereferenceObject(ObjectBody); - - return STATUS_SUCCESS; -} - - -/********************************************************************** - * NAME EXPORTED - * NtMakePermanentObject/1 - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * - * @implemented - */ -NTSTATUS STDCALL + PVOID ObjectBody; + NTSTATUS Status; + PAGED_CODE(); + + Status = ObReferenceObjectByHandle(ObjectHandle, + 0, + NULL, + KeGetPreviousMode(), + &ObjectBody, + NULL); + if (Status != STATUS_SUCCESS) return Status; + + ObpSetPermanentObject (ObjectBody, FALSE); + + ObDereferenceObject(ObjectBody); + + return STATUS_SUCCESS; +} + +/*++ +* @name NtMakePermanentObject +* @implemented NT4 +* +* The NtMakePermanentObject routine <FILLMEIN> +* +* @param ObjectHandle +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI NtMakePermanentObject(IN HANDLE ObjectHandle) { - PVOID ObjectBody; - NTSTATUS Status; - - PAGED_CODE(); - - Status = ObReferenceObjectByHandle(ObjectHandle, - 0, - NULL, - (KPROCESSOR_MODE)KeGetPreviousMode(), - &ObjectBody, - NULL); - if (Status != STATUS_SUCCESS) - { - return Status; - } - - ObpSetPermanentObject (ObjectBody, TRUE); - - ObDereferenceObject(ObjectBody); - - return STATUS_SUCCESS; + PVOID ObjectBody; + NTSTATUS Status; + PAGED_CODE(); + + Status = ObReferenceObjectByHandle(ObjectHandle, + 0, + NULL, + KeGetPreviousMode(), + &ObjectBody, + NULL); + if (Status != STATUS_SUCCESS) return Status; + + ObpSetPermanentObject (ObjectBody, TRUE); + + ObDereferenceObject(ObjectBody); + + return STATUS_SUCCESS; } /* EOF */ 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 Wed May 24 01:42:28 2006 @@ -1,12 +1,10 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ob/security.c - * PURPOSE: Security manager - * - * PROGRAMERS: No programmer listed. - */ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/ob/security.c +* PURPOSE: SRM Interface of the Object Manager +* PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) +*/ /* INCLUDES *****************************************************************/ @@ -16,166 +14,232 @@ /* FUNCTIONS ***************************************************************/ -/* - * @implemented - */ -NTSTATUS STDCALL +/*++ +* @name ObAssignSecurity +* @implemented NT4 +* +* The ObAssignSecurity routine <FILLMEIN> +* +* @param AccessState +* <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param Object +* <FILLMEIN> +* +* @param Type +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI ObAssignSecurity(IN PACCESS_STATE AccessState, - IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PVOID Object, - IN POBJECT_TYPE Type) -{ - PSECURITY_DESCRIPTOR NewDescriptor; - NTSTATUS Status; - - PAGED_CODE(); - - /* Build the new security descriptor */ - Status = SeAssignSecurity(SecurityDescriptor, - AccessState->SecurityDescriptor, - &NewDescriptor, - (Type == ObDirectoryType), - &AccessState->SubjectSecurityContext, - &Type->TypeInfo.GenericMapping, - PagedPool); - if (!NT_SUCCESS(Status)) + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PVOID Object, + IN POBJECT_TYPE Type) +{ + PSECURITY_DESCRIPTOR NewDescriptor; + NTSTATUS Status; + PAGED_CODE(); + + /* Build the new security descriptor */ + Status = SeAssignSecurity(SecurityDescriptor, + AccessState->SecurityDescriptor, + &NewDescriptor, + (Type == ObDirectoryType), + &AccessState->SubjectSecurityContext, + &Type->TypeInfo.GenericMapping, + PagedPool); + if (!NT_SUCCESS(Status)) return Status; + + /* Call the security method */ + Status = Type->TypeInfo.SecurityProcedure(Object, + AssignSecurityDescriptor, + 0, + NewDescriptor, + NULL, + NULL, + NonPagedPool, + NULL); + + /* Release the new security descriptor */ + SeDeassignSecurity(&NewDescriptor); + return Status; - - /* Call the security method */ - Status = Type->TypeInfo.SecurityProcedure(Object, - AssignSecurityDescriptor, - 0, - NewDescriptor, - NULL, - NULL, - NonPagedPool, - NULL); - - /* Release the new security descriptor */ - SeDeassignSecurity(&NewDescriptor); - - return Status; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL +} + +/*++ +* @name ObGetObjectSecurity +* @implemented NT4 +* +* The ObGetObjectSecurity routine <FILLMEIN> +* +* @param Object +* <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param MemoryAllocated +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI ObGetObjectSecurity(IN PVOID Object, - OUT PSECURITY_DESCRIPTOR *SecurityDescriptor, - OUT PBOOLEAN MemoryAllocated) -{ - PROS_OBJECT_HEADER Header; - ULONG Length; - NTSTATUS Status; - - PAGED_CODE(); - - Header = BODY_TO_HEADER(Object); - if (Header->Type == NULL) - return STATUS_UNSUCCESSFUL; - - if (Header->Type->TypeInfo.SecurityProcedure == NULL) - { - ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); - *SecurityDescriptor = Header->SecurityDescriptor; - *MemoryAllocated = FALSE; - return STATUS_SUCCESS; - } - - /* Get the security descriptor size */ - Length = 0; - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION, - NULL, - &Length, - NULL, - NonPagedPool, - NULL); - if (Status != STATUS_BUFFER_TOO_SMALL) - return Status; - - /* Allocate security descriptor */ - *SecurityDescriptor = ExAllocatePool(NonPagedPool, - Length); - if (*SecurityDescriptor == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - /* Query security descriptor */ - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION, - *SecurityDescriptor, - &Length, - NULL, - NonPagedPool, - NULL); - if (!NT_SUCCESS(Status)) - { - ExFreePool(*SecurityDescriptor); - return Status; - } - - *MemoryAllocated = TRUE; - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -VOID STDCALL + OUT PSECURITY_DESCRIPTOR *SecurityDescriptor, + OUT PBOOLEAN MemoryAllocated) +{ + PROS_OBJECT_HEADER Header; + ULONG Length; + NTSTATUS Status; + PAGED_CODE(); + + Header = BODY_TO_HEADER(Object); + if (Header->Type == NULL) return STATUS_UNSUCCESSFUL; + + if (Header->Type->TypeInfo.SecurityProcedure == NULL) + { + ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); + *SecurityDescriptor = Header->SecurityDescriptor; + *MemoryAllocated = FALSE; + return STATUS_SUCCESS; + } + + /* Get the security descriptor size */ + Length = 0; + Status = Header->Type->TypeInfo.SecurityProcedure(Object, + QuerySecurityDescriptor, + OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION, + NULL, + &Length, + NULL, + NonPagedPool, + NULL); + if (Status != STATUS_BUFFER_TOO_SMALL) return Status; + + /* Allocate security descriptor */ + *SecurityDescriptor = ExAllocatePool(NonPagedPool, Length); + if (*SecurityDescriptor == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Query security descriptor */ + Status = Header->Type->TypeInfo.SecurityProcedure(Object, + QuerySecurityDescriptor, + OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION, + *SecurityDescriptor, + &Length, + NULL, + NonPagedPool, + NULL); + if (!NT_SUCCESS(Status)) + { + ExFreePool(*SecurityDescriptor); + return Status; + } + + *MemoryAllocated = TRUE; + + return STATUS_SUCCESS; +} + +/*++ +* @name ObReleaseObjectSecurity +* @implemented NT4 +* +* The ObReleaseObjectSecurity routine <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param MemoryAllocated +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +VOID +NTAPI ObReleaseObjectSecurity(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN BOOLEAN MemoryAllocated) -{ - PAGED_CODE(); - - if (SecurityDescriptor == NULL) - return; - - if (MemoryAllocated) - { - ExFreePool(SecurityDescriptor); - } - else - { - ObpDereferenceCachedSecurityDescriptor(SecurityDescriptor); - } -} - - -/* - * @implemented - */ -NTSTATUS STDCALL + IN BOOLEAN MemoryAllocated) +{ + PAGED_CODE(); + + if (SecurityDescriptor == NULL) return; + + if (MemoryAllocated) + { + ExFreePool(SecurityDescriptor); + } + else + { + ObpDereferenceCachedSecurityDescriptor(SecurityDescriptor); + } +} + +/*++ +* @name NtQuerySecurityObject +* @implemented NT4 +* +* The NtQuerySecurityObject routine <FILLMEIN> +* +* @param Handle +* <FILLMEIN> +* +* @param SecurityInformation +* <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param Length +* <FILLMEIN> +* +* @param ResultLength +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI NtQuerySecurityObject(IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN ULONG Length, - OUT PULONG ResultLength) -{ - KPROCESSOR_MODE PreviousMode; + IN SECURITY_INFORMATION SecurityInformation, + OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN ULONG Length, + OUT PULONG ResultLength) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID Object; PROS_OBJECT_HEADER Header; ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); if (PreviousMode != KernelMode) { _SEH_TRY { - ProbeForWrite(SecurityDescriptor, - Length, - sizeof(ULONG)); + ProbeForWrite(SecurityDescriptor, Length, sizeof(ULONG)); ProbeForWriteUlong(ResultLength); } _SEH_HANDLE @@ -203,14 +267,15 @@ Header = BODY_TO_HEADER(Object); ASSERT(Header->Type != NULL); - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - SecurityInformation, - SecurityDescriptor, - &Length, - &Header->SecurityDescriptor, - Header->Type->TypeInfo.PoolType, - &Header->Type->TypeInfo.GenericMapping); + Status = Header->Type->TypeInfo.SecurityProcedure( + Object, + QuerySecurityDescriptor, + SecurityInformation, + SecurityDescriptor, + &Length, + &Header->SecurityDescriptor, + Header->Type->TypeInfo.PoolType, + &Header->Type->TypeInfo.GenericMapping); ObDereferenceObject(Object); @@ -229,46 +294,60 @@ return Status; } - -/* - * @implemented - */ -NTSTATUS STDCALL +/*++ +* @name NtSetSecurityObject +* @implemented NT4 +* +* The NtSetSecurityObject routine <FILLMEIN> +* +* @param Handle +* <FILLMEIN> +* +* @param SecurityInformation +* <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI NtSetSecurityObject(IN HANDLE Handle, - IN SECURITY_INFORMATION SecurityInformation, - IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - KPROCESSOR_MODE PreviousMode; + IN SECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID Object; PROS_OBJECT_HEADER Header; SECURITY_DESCRIPTOR_RELATIVE *CapturedSecurityDescriptor; ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; NTSTATUS Status; - PAGED_CODE(); /* make sure the caller doesn't pass a NULL security descriptor! */ - if (SecurityDescriptor == NULL) - { - return STATUS_ACCESS_DENIED; - } - - PreviousMode = ExGetPreviousMode(); + if (SecurityDescriptor == NULL) return STATUS_ACCESS_DENIED; /* capture and make a copy of the security descriptor */ Status = SeCaptureSecurityDescriptor(SecurityDescriptor, PreviousMode, PagedPool, TRUE, - (PSECURITY_DESCRIPTOR*)&CapturedSecurityDescriptor); + (PSECURITY_DESCRIPTOR*) + &CapturedSecurityDescriptor); if (!NT_SUCCESS(Status)) { DPRINT1("Capturing the security descriptor failed! Status: 0x%lx\n", Status); return Status; } - /* make sure the security descriptor passed by the caller - is valid for the operation we're about to perform */ + /* + * make sure the security descriptor passed by the caller + * is valid for the operation we're about to perform + */ if (((SecurityInformation & OWNER_SECURITY_INFORMATION) && (CapturedSecurityDescriptor->Owner == 0)) || ((SecurityInformation & GROUP_SECURITY_INFORMATION) && @@ -294,14 +373,15 @@ Header = BODY_TO_HEADER(Object); ASSERT(Header->Type != NULL); - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - SetSecurityDescriptor, - SecurityInformation, - (PSECURITY_DESCRIPTOR)SecurityDescriptor, - NULL, - &Header->SecurityDescriptor, - Header->Type->TypeInfo.PoolType, - &Header->Type->TypeInfo.GenericMapping); + Status = Header->Type->TypeInfo.SecurityProcedure( + Object, + SetSecurityDescriptor, + SecurityInformation, + (PSECURITY_DESCRIPTOR)SecurityDescriptor, + NULL, + &Header->SecurityDescriptor, + Header->Type->TypeInfo.PoolType, + &Header->Type->TypeInfo.GenericMapping); ObDereferenceObject(Object); } @@ -315,18 +395,36 @@ return Status; } - -/* - * @unimplemented - */ -NTSTATUS STDCALL +/*++ +* @name ObLogSecurityDescriptor +* @unimplemented NT5.2 +* +* The ObLogSecurityDescriptor routine <FILLMEIN> +* +* @param InputSecurityDescriptor +* <FILLMEIN> +* +* @param OutputSecurityDescriptor +* <FILLMEIN> +* +* @param RefBias +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, IN ULONG RefBias) { /* HACK: Return the same descriptor back */ PISECURITY_DESCRIPTOR SdCopy; - DPRINT1("ObLogSecurityDescriptor is not implemented!\n", InputSecurityDescriptor); + DPRINT1("ObLogSecurityDescriptor is not implemented!\n", + InputSecurityDescriptor); SdCopy = ExAllocatePool(PagedPool, sizeof(*SdCopy)); RtlMoveMemory(SdCopy, InputSecurityDescriptor, sizeof(*SdCopy)); @@ -334,11 +432,25 @@ return STATUS_SUCCESS; } - -/* - * @unimplemented - */ -VOID STDCALL +/*++ +* @name ObDereferenceSecurityDescriptor +* @unimplemented NT5.2 +* +* The ObDereferenceSecurityDescriptor routine <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param Count +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +VOID +NTAPI ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN ULONG Count) { 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 01:42:28 2006 @@ -1,12 +1,11 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ob/symlink.c - * PURPOSE: Implements symbolic links - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/ob/symlink.c +* PURPOSE: Implements symbolic links +* PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) +* David Welch (welch(a)mcmail.com) +*/ /* INCLUDES *****************************************************************/ @@ -18,436 +17,469 @@ #pragma alloc_text(INIT, ObInitSymbolicLinkImplementation) #endif - /* GLOBALS ******************************************************************/ POBJECT_TYPE ObSymbolicLinkType = NULL; -static GENERIC_MAPPING ObpSymbolicLinkMapping = { - STANDARD_RIGHTS_READ|SYMBOLIC_LINK_QUERY, - STANDARD_RIGHTS_WRITE, - STANDARD_RIGHTS_EXECUTE|SYMBOLIC_LINK_QUERY, - SYMBOLIC_LINK_ALL_ACCESS}; - -/* FUNCTIONS ****************************************************************/ - -/********************************************************************** - * NAME INTERNAL - * ObpDeleteSymbolicLink - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURNN VALUE - * Status. - * - * REVISIONS - */ -VOID STDCALL +static GENERIC_MAPPING ObpSymbolicLinkMapping = +{ + STANDARD_RIGHTS_READ | SYMBOLIC_LINK_QUERY, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYMBOLIC_LINK_QUERY, + SYMBOLIC_LINK_ALL_ACCESS +}; + +/* PRIVATE FUNCTIONS *********************************************************/ + +/*++ +* @name ObpDeleteSymbolicLink +* +* The ObpDeleteSymbolicLink routine <FILLMEIN> +* +* @param ObjectBody +* <FILLMEIN> +* +* @return None. +* +* @remarks None. +* +*--*/ +VOID +NTAPI ObpDeleteSymbolicLink(PVOID ObjectBody) { - PSYMLINK_OBJECT SymlinkObject = (PSYMLINK_OBJECT)ObjectBody; - - ExFreePool(SymlinkObject->TargetName.Buffer); -} - - -/********************************************************************** - * NAME INTERNAL - * ObpParseSymbolicLink - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ -NTSTATUS STDCALL + PSYMLINK_OBJECT SymlinkObject = (PSYMLINK_OBJECT)ObjectBody; + ExFreePool(SymlinkObject->TargetName.Buffer); +} + +/*++ +* @name ObpParseSymbolicLink +* +* The ObpParseSymbolicLink routine <FILLMEIN> +* +* @param Object +* <FILLMEIN> +* +* @param NextObject +* <FILLMEIN> +* +* @param FullPath +* <FILLMEIN> +* +* @param RemainingPath +* <FILLMEIN> +* +* @param Attributes +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI ObpParseSymbolicLink(PVOID Object, - PVOID * NextObject, - PUNICODE_STRING FullPath, - PWSTR * RemainingPath, - ULONG Attributes) -{ - PSYMLINK_OBJECT SymlinkObject = (PSYMLINK_OBJECT) Object; - UNICODE_STRING TargetPath; - - DPRINT("ObpParseSymbolicLink (RemainingPath %S)\n", *RemainingPath); - - /* - * Stop parsing if the entire path has been parsed and - * the desired object is a symbolic link object. - */ - if (((*RemainingPath == NULL) || (**RemainingPath == 0)) && - (Attributes & OBJ_OPENLINK)) - { - DPRINT("Parsing stopped!\n"); - *NextObject = NULL; - return(STATUS_SUCCESS); - } - - /* build the expanded path */ - TargetPath.MaximumLength = SymlinkObject->TargetName.Length + sizeof(WCHAR); - if (RemainingPath && *RemainingPath) - { - TargetPath.MaximumLength += (wcslen(*RemainingPath) * sizeof(WCHAR)); - } - TargetPath.Length = TargetPath.MaximumLength - sizeof(WCHAR); - TargetPath.Buffer = ExAllocatePoolWithTag(NonPagedPool, - TargetPath.MaximumLength, - TAG_SYMLINK_TTARGET); - wcscpy(TargetPath.Buffer, SymlinkObject->TargetName.Buffer); - if (RemainingPath && *RemainingPath) - { - wcscat(TargetPath.Buffer, *RemainingPath); - } - - /* transfer target path buffer into FullPath */ - ExFreePool(FullPath->Buffer); - FullPath->Length = TargetPath.Length; - FullPath->MaximumLength = TargetPath.MaximumLength; - FullPath->Buffer = TargetPath.Buffer; - - /* reinitialize RemainingPath for reparsing */ - *RemainingPath = FullPath->Buffer; - - *NextObject = NULL; - return STATUS_REPARSE; -} - - -/********************************************************************** - * NAME INTERNAL - * ObInitSymbolicLinkImplementation - * - * DESCRIPTION - * - * ARGUMENTS - * None. - * - * RETURNN VALUE - * None. - * - * REVISIONS - */ -VOID + PVOID * NextObject, + PUNICODE_STRING FullPath, + PWSTR * RemainingPath, + ULONG Attributes) +{ + PSYMLINK_OBJECT SymlinkObject = (PSYMLINK_OBJECT) Object; + UNICODE_STRING TargetPath; + + DPRINT("ObpParseSymbolicLink (RemainingPath %S)\n", *RemainingPath); + + /* + * Stop parsing if the entire path has been parsed and + * the desired object is a symbolic link object. + */ + if (((*RemainingPath == NULL) || (**RemainingPath == 0)) && + (Attributes & OBJ_OPENLINK)) + { + DPRINT("Parsing stopped!\n"); + *NextObject = NULL; + return(STATUS_SUCCESS); + } + + /* Build the expanded path */ + TargetPath.MaximumLength = SymlinkObject->TargetName.Length + + sizeof(WCHAR); + if (RemainingPath && *RemainingPath) + { + TargetPath.MaximumLength += (wcslen(*RemainingPath) * sizeof(WCHAR)); + } + TargetPath.Length = TargetPath.MaximumLength - sizeof(WCHAR); + TargetPath.Buffer = ExAllocatePoolWithTag(NonPagedPool, + TargetPath.MaximumLength, + TAG_SYMLINK_TTARGET); + wcscpy(TargetPath.Buffer, SymlinkObject->TargetName.Buffer); + if (RemainingPath && *RemainingPath) + { + wcscat(TargetPath.Buffer, *RemainingPath); + } + + /* Transfer target path buffer into FullPath */ + ExFreePool(FullPath->Buffer); + FullPath->Length = TargetPath.Length; + FullPath->MaximumLength = TargetPath.MaximumLength; + FullPath->Buffer = TargetPath.Buffer; + + /* Reinitialize RemainingPath for reparsing */ + *RemainingPath = FullPath->Buffer; + + *NextObject = NULL; + return STATUS_REPARSE; +} + +/*++ +* @name ObInitSymbolicLinkImplementation +* +* The ObInitSymbolicLinkImplementation routine <FILLMEIN> +* +* @param None. +* +* @return None. +* +* @remarks None. +* +*--*/ +VOID INIT_FUNCTION NTAPI -ObInitSymbolicLinkImplementation (VOID) -{ - UNICODE_STRING Name; - OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - - DPRINT("Creating SymLink Object Type\n"); - - /* Initialize the Directory type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); - RtlInitUnicodeString(&Name, L"SymbolicLink"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(SYMLINK_OBJECT); - ObjectTypeInitializer.GenericMapping = ObpSymbolicLinkMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; - ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ObpParseSymbolicLink; - ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObSymbolicLinkType); -} - - -/********************************************************************** - * NAME EXPORTED - * NtCreateSymbolicLinkObject - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * - */ -NTSTATUS STDCALL +ObInitSymbolicLinkImplementation(VOID) +{ + UNICODE_STRING Name; + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + + DPRINT("Creating SymLink Object Type\n"); + + /* Initialize the Directory type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"SymbolicLink"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(SYMLINK_OBJECT); + ObjectTypeInitializer.GenericMapping = ObpSymbolicLinkMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ObpParseSymbolicLink; + ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObSymbolicLinkType); +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/*++ +* @name NtCreateSymbolicLinkObject +* @implemented NT4 +* +* The NtCreateSymbolicLinkObject opens or creates a symbolic link object. +* +* @param LinkHandle +* Variable which receives the symlink handle. +* +* @param DesiredAccess +* Desired access to the symlink. +* +* @param ObjectAttributes +* Structure describing the symlink. +* +* @param LinkTarget +* Unicode string defining the symlink's target +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI NtCreateSymbolicLinkObject(OUT PHANDLE LinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN PUNICODE_STRING LinkTarget) -{ - HANDLE hLink; - PSYMLINK_OBJECT SymbolicLink; - UNICODE_STRING CapturedLinkTarget; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWriteHandle(LinkHandle); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN PUNICODE_STRING LinkTarget) +{ + HANDLE hLink; + PSYMLINK_OBJECT SymbolicLink; + UNICODE_STRING CapturedLinkTarget; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + DPRINT("NtCreateSymbolicLinkObject(LinkHandle %p, DesiredAccess %ul" + ", ObjectAttributes %p, LinkTarget %wZ)\n", + LinkHandle, + DesiredAccess, + ObjectAttributes, + LinkTarget); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWriteHandle(LinkHandle); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + Status = ProbeAndCaptureUnicodeString(&CapturedLinkTarget, + PreviousMode, + LinkTarget); if(!NT_SUCCESS(Status)) { - return Status; - } - } - - Status = ProbeAndCaptureUnicodeString(&CapturedLinkTarget, - PreviousMode, - LinkTarget); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateSymbolicLinkObject: Capturing the target link failed!\n"); + DPRINT1("NtCreateSymbolicLinkObject: Capturing the target link failed!\n"); + return Status; + } + + Status = ObCreateObject(PreviousMode, + ObSymbolicLinkType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(SYMLINK_OBJECT), + 0, + 0, + (PVOID*)&SymbolicLink); + if (NT_SUCCESS(Status)) + { + SymbolicLink->TargetName.Length = 0; + SymbolicLink->TargetName.MaximumLength = CapturedLinkTarget.Length + + sizeof(WCHAR); + SymbolicLink->TargetName.Buffer = + ExAllocatePoolWithTag(NonPagedPool, + SymbolicLink->TargetName.MaximumLength, + TAG_SYMLINK_TARGET); + + RtlCopyUnicodeString(&SymbolicLink->TargetName, &CapturedLinkTarget); + + DPRINT("DeviceName %S\n", SymbolicLink->TargetName.Buffer); + + ZwQuerySystemTime (&SymbolicLink->CreateTime); + + Status = ObInsertObject((PVOID)SymbolicLink, + NULL, + DesiredAccess, + 0, + NULL, + &hLink); + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + *LinkHandle = hLink; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + ObDereferenceObject(SymbolicLink); + } + + ReleaseCapturedUnicodeString(&CapturedLinkTarget, PreviousMode); return Status; - } - - DPRINT("NtCreateSymbolicLinkObject(LinkHandle %p, DesiredAccess %ul, ObjectAttributes %p, LinkTarget %wZ)\n", - LinkHandle, - DesiredAccess, - ObjectAttributes, - &CapturedLinkTarget); - - Status = ObCreateObject(ExGetPreviousMode(), - ObSymbolicLinkType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(SYMLINK_OBJECT), - 0, - 0, - (PVOID*)&SymbolicLink); - if (NT_SUCCESS(Status)) - { - SymbolicLink->TargetName.Length = 0; - SymbolicLink->TargetName.MaximumLength = - CapturedLinkTarget.Length + sizeof(WCHAR); - SymbolicLink->TargetName.Buffer = - ExAllocatePoolWithTag(NonPagedPool, - SymbolicLink->TargetName.MaximumLength, - TAG_SYMLINK_TARGET); - RtlCopyUnicodeString(&SymbolicLink->TargetName, - &CapturedLinkTarget); - - DPRINT("DeviceName %S\n", SymbolicLink->TargetName.Buffer); - - ZwQuerySystemTime (&SymbolicLink->CreateTime); - - Status = ObInsertObject ((PVOID)SymbolicLink, - NULL, - DesiredAccess, - 0, - NULL, - &hLink); +} + +/*++ +* @name NtOpenSymbolicLinkObject +* @implemented NT4 +* +* The NtOpenSymbolicLinkObject opens a symbolic link object. +* +* @param LinkHandle +* Variable which receives the symlink handle. +* +* @param DesiredAccess +* Desired access to the symlink. +* +* @param ObjectAttributes +* Structure describing the symlink. +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +NtOpenSymbolicLinkObject(OUT PHANDLE LinkHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) +{ + HANDLE hLink; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWriteHandle(LinkHandle); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + DPRINT("NtOpenSymbolicLinkObject (Name %wZ)\n", + ObjectAttributes->ObjectName); + + Status = ObOpenObjectByName(ObjectAttributes, + ObSymbolicLinkType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hLink); + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *LinkHandle = hLink; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; +} + +/*++ +* @name NtQuerySymbolicLinkObject +* @implemented NT4 +* +* The NtQuerySymbolicLinkObject queries a symbolic link object. +* +* @param LinkHandle +* Symlink handle to query +* +* @param LinkTarget +* Unicode string defining the symlink's target +* +* @param ResultLength +* Caller supplied storage for the number of bytes written (or NULL). +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, + OUT PUNICODE_STRING LinkTarget, + OUT PULONG ResultLength OPTIONAL) +{ + UNICODE_STRING SafeLinkTarget; + PSYMLINK_OBJECT SymlinkObject; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + ULONG LengthRequired; + PAGED_CODE(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + /* probe the unicode string and buffers supplied */ + ProbeForWrite(LinkTarget, sizeof(UNICODE_STRING), sizeof(ULONG)); + + SafeLinkTarget = *LinkTarget; + + ProbeForWrite(SafeLinkTarget.Buffer, + SafeLinkTarget.MaximumLength, + sizeof(WCHAR)); + + if(ResultLength != NULL) + { + ProbeForWriteUlong(ResultLength); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + SafeLinkTarget = *LinkTarget; + } + + Status = ObReferenceObjectByHandle(LinkHandle, + SYMBOLIC_LINK_QUERY, + ObSymbolicLinkType, + PreviousMode, + (PVOID *)&SymlinkObject, + NULL); if (NT_SUCCESS(Status)) { - _SEH_TRY - { - *LinkHandle = hLink; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - ObDereferenceObject(SymbolicLink); - } - - ReleaseCapturedUnicodeString(&CapturedLinkTarget, - PreviousMode); - - return Status; -} - - -/********************************************************************** - * NAME EXPORTED - * NtOpenSymbolicLinkObject - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * - */ -NTSTATUS STDCALL -NtOpenSymbolicLinkObject(OUT PHANDLE LinkHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) -{ - HANDLE hLink; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWriteHandle(LinkHandle); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - DPRINT("NtOpenSymbolicLinkObject (Name %wZ)\n", - ObjectAttributes->ObjectName); - - Status = ObOpenObjectByName(ObjectAttributes, - ObSymbolicLinkType, - NULL, - PreviousMode, - DesiredAccess, - NULL, - &hLink); - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *LinkHandle = hLink; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - return Status; -} - - -/********************************************************************** - * NAME EXPORTED - * NtQuerySymbolicLinkObject - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * - */ -NTSTATUS STDCALL -NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, - OUT PUNICODE_STRING LinkTarget, - OUT PULONG ResultLength OPTIONAL) -{ - UNICODE_STRING SafeLinkTarget; - PSYMLINK_OBJECT SymlinkObject; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - /* probe the unicode string and buffers supplied */ - ProbeForWrite(LinkTarget, - sizeof(UNICODE_STRING), - sizeof(ULONG)); - SafeLinkTarget = *LinkTarget; - ProbeForWrite(SafeLinkTarget.Buffer, - SafeLinkTarget.MaximumLength, - sizeof(WCHAR)); - - if(ResultLength != NULL) - { - ProbeForWriteUlong(ResultLength); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - SafeLinkTarget = *LinkTarget; - } - - Status = ObReferenceObjectByHandle(LinkHandle, - SYMBOLIC_LINK_QUERY, - ObSymbolicLinkType, - PreviousMode, - (PVOID *)&SymlinkObject, - NULL); - if (NT_SUCCESS(Status)) - { - ULONG LengthRequired = SymlinkObject->TargetName.Length + sizeof(WCHAR); - - _SEH_TRY - { - if(SafeLinkTarget.MaximumLength >= LengthRequired) - { - /* don't pass TargetLink to RtlCopyUnicodeString here because the caller - might have modified the structure which could lead to a copy into - kernel memory! */ - RtlCopyUnicodeString(&SafeLinkTarget, - &SymlinkObject->TargetName); - SafeLinkTarget.Buffer[SafeLinkTarget.Length / sizeof(WCHAR)] = L'\0'; - /* copy back the new UNICODE_STRING structure */ - *LinkTarget = SafeLinkTarget; - } - else - { - Status = STATUS_BUFFER_TOO_SMALL; - } - - if(ResultLength != NULL) - { - *ResultLength = LengthRequired; - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - ObDereferenceObject(SymlinkObject); - } - - return Status; + LengthRequired = SymlinkObject->TargetName.Length + sizeof(WCHAR); + + _SEH_TRY + { + if(SafeLinkTarget.MaximumLength >= LengthRequired) + { + /* + * Don't pass TargetLink to RtlCopyUnicodeString here because + * the caller might have modified the structure which could + * lead to a copy into kernel memory! + */ + RtlCopyUnicodeString(&SafeLinkTarget, + &SymlinkObject->TargetName); + SafeLinkTarget.Buffer[SafeLinkTarget.Length / + sizeof(WCHAR)] = UNICODE_NULL; + + /* Copy back the new UNICODE_STRING structure */ + *LinkTarget = SafeLinkTarget; + } + else + { + Status = STATUS_BUFFER_TOO_SMALL; + } + + if(ResultLength != NULL) + { + *ResultLength = LengthRequired; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + ObDereferenceObject(SymlinkObject); + } + + return Status; } /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/wait.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/wait.c?rev=2199… ============================================================================== --- trunk/reactos/ntoskrnl/ob/wait.c (original) +++ trunk/reactos/ntoskrnl/ob/wait.c Wed May 24 01:42:28 2006 @@ -1,11 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ob/wait.c - * PURPOSE: Handles Waiting on Objects - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * David Welch (welch(a)mcmail.com) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ob/wait.c + * PURPOSE: Handles Waiting on Objects + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * David Welch (welch(a)mcmail.com) */ /* INCLUDES ******************************************************************/ @@ -18,13 +17,39 @@ /* FUNCTIONS *****************************************************************/ +/*++ +* @name NtWaitForMultipleObjects +* @implemented NT4 +* +* The NtWaitForMultipleObjects routine <FILLMEIN> +* +* @param ObjectCount +* <FILLMEIN> +* +* @param HandleArray +* <FILLMEIN> +* +* @param WaitType +* <FILLMEIN> +* +* @param Alertable +* <FILLMEIN> +* +* @param TimeOut +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ NTSTATUS -STDCALL +NTAPI NtWaitForMultipleObjects(IN ULONG ObjectCount, IN PHANDLE HandleArray, IN WAIT_TYPE WaitType, IN BOOLEAN Alertable, - IN PLARGE_INTEGER TimeOut OPTIONAL) + IN PLARGE_INTEGER TimeOut OPTIONAL) { PKWAIT_BLOCK WaitBlockArray = NULL; HANDLE Handles[MAXIMUM_WAIT_OBJECTS]; @@ -41,8 +66,9 @@ PVOID DefaultObject; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtWaitForMultipleObjects(ObjectCount %lu HandleArray[] %x, Alertable %d, " - "TimeOut %x)\n", ObjectCount, HandleArray, Alertable, TimeOut); + DPRINT("NtWaitForMultipleObjects(ObjectCount %lu HandleArray[] %x," + " Alertable %d, TimeOut %x)\n", + ObjectCount, HandleArray, Alertable, TimeOut); /* Enter a critical region since we'll play with handles */ LockInUse = TRUE; @@ -81,8 +107,8 @@ } } - /* - * Make a copy so we don't have to guard with SEH later and keep + /* + * Make a copy so we don't have to guard with SEH later and keep * track of what objects we referenced if dereferencing pointers * suddenly fails */ @@ -231,7 +257,7 @@ { ReferencedObjects--; if (Objects[ReferencedObjects]) - { + { ObDereferenceObject(Objects[ReferencedObjects]); } } @@ -247,11 +273,28 @@ return Status; } -/* - * @implemented - */ +/*++ +* @name NtWaitForSingleObject +* @implemented NT4 +* +* The NtWaitForSingleObject routine <FILLMEIN> +* +* @param ObjectHandle +* <FILLMEIN> +* +* @param Alertable +* <FILLMEIN> +* +* @param TimeOut +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ NTSTATUS -STDCALL +NTAPI NtWaitForSingleObject(IN HANDLE ObjectHandle, IN BOOLEAN Alertable, IN PLARGE_INTEGER TimeOut OPTIONAL) @@ -325,12 +368,35 @@ return Status; } +/*++ +* @name NtSignalAndWaitForSingleObject +* @implemented NT4 +* +* The NtSignalAndWaitForSingleObject routine <FILLMEIN> +* +* @param ObjectHandleToSignal +* <FILLMEIN> +* +* @param WaitableObjectHandle +* <FILLMEIN> +* +* @param Alertable +* <FILLMEIN> +* +* @param TimeOut +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ NTSTATUS -STDCALL +NTAPI NtSignalAndWaitForSingleObject(IN HANDLE ObjectHandleToSignal, IN HANDLE WaitableObjectHandle, IN BOOLEAN Alertable, - IN PLARGE_INTEGER TimeOut OPTIONAL) + IN PLARGE_INTEGER TimeOut OPTIONAL) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); POBJECT_TYPE Type;

1 0

[fireball] 21997: - Fix build (forgot to add file) to msvcrt test
by fireball＠svn.reactos.org 23 May '06

23 May '06

Author: fireball Date: Wed May 24 01:32:04 2006 New Revision: 21997 URL: http://svn.reactos.ru/svn/reactos?rev=21997&view=rev Log: - Fix build (forgot to add file) to msvcrt test Added: trunk/reactos/regtests/winetests/msvcrt/dir.c Added: trunk/reactos/regtests/winetests/msvcrt/dir.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/d… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/dir.c (added) +++ trunk/reactos/regtests/winetests/msvcrt/dir.c Wed May 24 01:32:04 2006 @@ -1,0 +1,91 @@ +/* + * Unit test suite for dir functions + * + * Copyright 2006 CodeWeavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "wine/test.h" +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <io.h> +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <process.h> +#include <errno.h> + +void test_fullpath(void) +{ + char full[MAX_PATH]; + char tmppath[MAX_PATH]; + char level1[MAX_PATH]; + char level2[MAX_PATH]; + char teststring[MAX_PATH]; + char *freeme; + BOOL rc,free1,free2; + + free1=free2=TRUE; + GetTempPath(MAX_PATH,tmppath); + strcpy(level1,tmppath); + strcat(level1,"msvcrt-test\\"); + + rc = CreateDirectory(level1,NULL); + if (!rc && GetLastError()==ERROR_ALREADY_EXISTS) + free1=FALSE; + + strcpy(level2,level1); + strcat(level2,"nextlevel\\"); + rc = CreateDirectory(level2,NULL); + if (!rc && GetLastError()==ERROR_ALREADY_EXISTS) + free2=FALSE; + SetCurrentDirectory(level2); + + ok(_fullpath(full,"test", MAX_PATH)!=NULL,"_fullpath failed\n"); + strcpy(teststring,level2); + strcat(teststring,"test"); + ok(strcmp(full,teststring)==0,"Invalid Path returned %s\n",full); + ok(_fullpath(full,"\\test", MAX_PATH)!=NULL,"_fullpath failed\n"); + strncpy(teststring,level2,3); + teststring[3]=0; + strcat(teststring,"test"); + ok(strcmp(full,teststring)==0,"Invalid Path returned %s\n",full); + ok(_fullpath(full,"..\\test", MAX_PATH)!=NULL,"_fullpath failed\n"); + strcpy(teststring,level1); + strcat(teststring,"test"); + ok(strcmp(full,teststring)==0,"Invalid Path returned %s\n",full); + ok(_fullpath(full,"..\\test", 10)==NULL,"_fullpath failed to generate error\n"); + + freeme = _fullpath(NULL,"test", 0); + ok(freeme!=NULL,"No path returned\n"); + strcpy(teststring,level2); + strcat(teststring,"test"); + ok(strcmp(freeme,teststring)==0,"Invalid Path returned %s\n",freeme); + free(freeme); + + if (free2) + RemoveDirectory(level2); + if (free1) + RemoveDirectory(level1); +} + +START_TEST(dir) +{ + test_fullpath(); +}

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
38
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 May 2006