Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-05 02:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Directory objects must be able to parse a 'remaining path' that does not start with a backslash.

Browse source 
This is needed to support relative path names in the object tree.

svn path=/trunk/; revision=4678
This commit is contained in:
Eric Kohl 2003-05-12 13:59:09 +00:00
parent c0f1cf6933
commit 484cf7d5bf
1 changed files with 60 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
reactos/ntoskrnl/ob/namespc.c
View file

@ -1,4 +1,4 @@
/* $Id: namespc.c,v 1.36 2003/02/25 16:49:08 ekohl Exp $
/* $Id: namespc.c,v 1.37 2003/05/12 13:59:09 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -11,10 +11,6 @@
/* INCLUDES ***************************************************************/
#ifdef WIN32_REGDBG
#include "cm_win32.h"
#else
#include <limits.h>
#include <ddk/ntddk.h>
#include <internal/ob.h>
@ -24,7 +20,6 @@
#define NDEBUG
#include <internal/debug.h>
#endif
/* GLOBALS ****************************************************************/
@ -46,7 +41,7 @@ static GENERIC_MAPPING ObpTypeMapping = {
0x000F0001};
/* FUNCTIONS **************************************************************/
#ifndef WIN32_REGDBG
NTSTATUS STDCALL
ObReferenceObjectByName(PUNICODE_STRING ObjectPath,
ULONG Attributes,
@ -90,7 +85,7 @@ DPRINT("Object %p\n", Object);
RtlFreeUnicodeString (&RemainingPath);
return(STATUS_SUCCESS);
}
#endif // WIN32_REGDBG
/**********************************************************************
* NAME EXPORTED
@ -139,6 +134,7 @@ ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes,
ObjectType);
if (!NT_SUCCESS(Status))
{
DPRINT("ObFindObject() failed (Status %lx)\n", Status);
return Status;
}
@ -184,6 +180,7 @@ ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent,
KeReleaseSpinLock(&Parent->Lock, oldlvl);
}
VOID
ObpRemoveEntryDirectory(POBJECT_HEADER Header)
/*
@ -201,6 +198,7 @@ ObpRemoveEntryDirectory(POBJECT_HEADER Header)
KeReleaseSpinLock(&(Header->Parent->Lock),oldlvl);
}
PVOID
ObpFindEntryDirectory(PDIRECTORY_OBJECT DirectoryObject,
PWSTR Name,
@ -249,6 +247,7 @@ ObpFindEntryDirectory(PDIRECTORY_OBJECT DirectoryObject,
return(NULL);
}
NTSTATUS STDCALL
ObpParseDirectory(PVOID Object,
PVOID * NextObject,
@ -256,56 +255,61 @@ ObpParseDirectory(PVOID Object,
PWSTR * Path,
ULONG Attributes)
{
PWSTR end;
PVOID FoundObject;
DPRINT("ObpParseDirectory(Object %x, Path %x, *Path %S)\n",
Object,Path,*Path);
*NextObject = NULL;
if ((*Path) == NULL)
{
return STATUS_UNSUCCESSFUL;
}
end = wcschr((*Path)+1, '\\');
if (end != NULL)
{
*end = 0;
}
FoundObject = ObpFindEntryDirectory(Object, (*Path)+1, Attributes);
if (FoundObject == NULL)
{
if (end != NULL)
{
*end = '\\';
}
return STATUS_UNSUCCESSFUL;
}
ObReferenceObjectByPointer(FoundObject,
STANDARD_RIGHTS_REQUIRED,
NULL,
UserMode);
if (end != NULL)
{
*end = '\\';
*Path = end;
}
else
{
*Path = NULL;
}
*NextObject = FoundObject;
return STATUS_SUCCESS;
PWSTR Start;
PWSTR End;
PVOID FoundObject;
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;
}
FoundObject = ObpFindEntryDirectory(Object, Start, Attributes);
if (FoundObject == NULL)
{
if (End != NULL)
{
*End = L'\\';
}
return STATUS_UNSUCCESSFUL;
}
ObReferenceObjectByPointer(FoundObject,
STANDARD_RIGHTS_REQUIRED,
NULL,
UserMode);
if (End != NULL)
{
*End = L'\\';
*Path = End;
}
else
{
*Path = NULL;
}
*NextObject = FoundObject;
return STATUS_SUCCESS;
}
NTSTATUS STDCALL
ObpCreateDirectory(PVOID ObjectBody,
PVOID Parent,
@ -450,5 +454,4 @@ ObpCreateTypeObject(POBJECT_TYPE ObjectType)
return(STATUS_SUCCESS);
}
/* EOF */