Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:OB] Minor refactoring.

Browse source 
- NtQuerySymbolicLinkObject(): Use an intermediate variable for the object header.
- Simplify code in ObpLookupEntryDirectory() by calling ObpReleaseLookupContextObject() instead.
- Use TAG_OBJECT_TYPE instead of hardcoded tag values.
This commit is contained in:
Hermès Bélusca-Maïto 2021-09-24 22:39:35 +02:00
parent 4c63ed5a7a
commit 74513a75ab
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ntoskrnl/ob/obdir.c
View file

@ -174,6 +174,7 @@ ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory,
PVOID FoundObject = NULL;
PWSTR Buffer;
POBJECT_DIRECTORY ShadowDirectory;
PAGED_CODE();
/* Check if we should search the shadow directory */
@ -317,20 +318,11 @@ Quickie:
}
}
/* Check if we found an object already */
if (Context->Object)
{
/* We already did a lookup, so remove this object's query reference */
ObjectHeader = OBJECT_TO_OBJECT_HEADER(Context->Object);
HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader);
ObpDereferenceNameInfo(HeaderNameInfo);
/* Also dereference the object itself */
ObDereferenceObject(Context->Object);
}
/* Release any object previously looked up and replace it with the new one */
ObpReleaseLookupContextObject(Context);
Context->Object = FoundObject;
/* Return the object we found */
Context->Object = FoundObject;
return FoundObject;
}

4
ntoskrnl/ob/oblife.c
View file

@ -635,7 +635,7 @@ ObpAllocateObject(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo,
{
/* Use default tag and non-paged pool */
PoolType = NonPagedPool;
Tag = 'TjbO';
Tag = TAG_OBJECT_TYPE;
}
else
{
@ -1159,7 +1159,7 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
/* Set the hard-coded key and object count */
LocalObjectType->TotalNumberOfObjects = 1;
LocalObjectType->Key = 'TjbO';
LocalObjectType->Key = TAG_OBJECT_TYPE;
}
else
{

15
ntoskrnl/ob/oblink.c
View file

@ -904,11 +904,13 @@ NtQuerySymbolicLinkObject(IN HANDLE LinkHandle,
OUT PUNICODE_STRING LinkTarget,
OUT PULONG ResultLength OPTIONAL)
{
NTSTATUS Status;
UNICODE_STRING SafeLinkTarget = { 0, 0, NULL };
POBJECT_SYMBOLIC_LINK SymlinkObject;
KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
NTSTATUS Status;
POBJECT_HEADER ObjectHeader;
ULONG LengthUsed;
KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
PAGED_CODE();
if (PreviousMode != KernelMode)
@ -945,12 +947,15 @@ NtQuerySymbolicLinkObject(IN HANDLE LinkHandle,
SYMBOLIC_LINK_QUERY,
ObpSymbolicLinkObjectType,
PreviousMode,
(PVOID *)&SymlinkObject,
(PVOID*)&SymlinkObject,
NULL);
if (NT_SUCCESS(Status))
{
/* Get the object header */
ObjectHeader = OBJECT_TO_OBJECT_HEADER(SymlinkObject);
/* Lock the object */
ObpAcquireObjectLock(OBJECT_TO_OBJECT_HEADER(SymlinkObject));
ObpAcquireObjectLock(ObjectHeader);
/*
* So here's the thing: If you specify a return length, then the
@ -995,7 +1000,7 @@ NtQuerySymbolicLinkObject(IN HANDLE LinkHandle,
_SEH2_END;
/* Unlock and dereference the object */
ObpReleaseObjectLock(OBJECT_TO_OBJECT_HEADER(SymlinkObject));
ObpReleaseObjectLock(ObjectHeader);
ObDereferenceObject(SymlinkObject);
}