Free the capture buffer in ObReferenceObjectByName.
[reactos.git] / reactos / ntoskrnl / ob / namespc.c
index bd876a9..fe51c7a 100644 (file)
-/*
+/* $Id$
+ *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
  * FILE:           ntoskrnl/ob/namespc.c
  * PURPOSE:        Manages the system namespace
- * PROGRAMMER:     David Welch (welch@mcmail.com)
- * UPDATE HISTORY:
- *                 22/05/98: Created
+ *
+ * PROGRAMMERS:    David Welch (welch@mcmail.com)
  */
 
 /* INCLUDES ***************************************************************/
 
-#include <windows.h>
-#include <wstring.h>
-#include <ddk/ntddk.h>
-#include <internal/ob.h>
-#include <internal/io.h>
-#include <internal/string.h>
-
+#include <ntoskrnl.h>
 #define NDEBUG
 #include <internal/debug.h>
 
+
 /* GLOBALS ****************************************************************/
 
-OBJECT_TYPE DirectoryObjectType = {{0,0,NULL},
-                                   0,
-                                   0,
-                                   ULONG_MAX,
-                                   ULONG_MAX,
-                                   sizeof(DIRECTORY_OBJECT),
-                                   0,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   NULL,
-                                   };
-
-
-static struct
-{
-   OBJECT_HEADER hdr;
-//   DIRECTORY_OBJECT directory;
-   LIST_ENTRY head;
-   KSPIN_LOCK Lock;
-} namespc_root = {{0,},};
+POBJECT_TYPE ObDirectoryType = NULL;
+POBJECT_TYPE ObTypeObjectType = NULL;
+
+PDIRECTORY_OBJECT NameSpaceRoot = NULL;
+PDIRECTORY_OBJECT ObpTypeDirectoryObject = NULL;
+ /* FIXME: Move this somewhere else once devicemap support is in */
+PDEVICE_MAP ObSystemDeviceMap = NULL;
+
+
+static GENERIC_MAPPING ObpDirectoryMapping = {
+       STANDARD_RIGHTS_READ|DIRECTORY_QUERY|DIRECTORY_TRAVERSE,
+       STANDARD_RIGHTS_WRITE|DIRECTORY_CREATE_OBJECT|DIRECTORY_CREATE_SUBDIRECTORY,
+       STANDARD_RIGHTS_EXECUTE|DIRECTORY_QUERY|DIRECTORY_TRAVERSE,
+       DIRECTORY_ALL_ACCESS};
+
+static GENERIC_MAPPING ObpTypeMapping = {
+       STANDARD_RIGHTS_READ,
+       STANDARD_RIGHTS_WRITE,
+       STANDARD_RIGHTS_EXECUTE,
+       0x000F0001};
+
+NTSTATUS
+STDCALL
+ObpAllocateObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo,
+                  PUNICODE_STRING ObjectName,
+                  POBJECT_TYPE ObjectType,
+                  ULONG ObjectSize,
+                  POBJECT_HEADER *ObjectHeader);
 
 /* FUNCTIONS **************************************************************/
 
-NTSTATUS ZwOpenDirectoryObject(PHANDLE DirectoryHandle,
-                              ACCESS_MASK DesiredAccess,
-                              POBJECT_ATTRIBUTES ObjectAttributes)
 /*
- * FUNCTION: 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
- * RETURNS: Status
- * NOTES: Undocumented
+ * @implemented
  */
+NTSTATUS STDCALL
+ObReferenceObjectByName(PUNICODE_STRING ObjectPath,
+                       ULONG Attributes,
+                       PACCESS_STATE PassedAccessState,
+                       ACCESS_MASK DesiredAccess,
+                       POBJECT_TYPE ObjectType,
+                       KPROCESSOR_MODE AccessMode,
+                       PVOID ParseContext,
+                       PVOID* ObjectPtr)
 {
-   PVOID Object;
+   PVOID Object = NULL;
+   UNICODE_STRING RemainingPath;
+   UNICODE_STRING ObjectName;
+   OBJECT_ATTRIBUTES ObjectAttributes;
+   OBJECT_CREATE_INFORMATION ObjectCreateInfo;
    NTSTATUS Status;
-   PWSTR Ignored;
-   
-   *DirectoryHandle = 0;
-   
-   Status = ObOpenObjectByName(ObjectAttributes,&Object,&Ignored);
+
+   PAGED_CODE();
+
+   InitializeObjectAttributes(&ObjectAttributes,
+                             ObjectPath,
+                             Attributes | OBJ_OPENIF,
+                             NULL,
+                             NULL);
+    
+   /* Capture all the info */
+   DPRINT("Capturing Create Info\n");
+   Status = ObpCaptureObjectAttributes(&ObjectAttributes,
+                                       AccessMode,
+                                       ObjectType,
+                                       &ObjectCreateInfo,
+                                       &ObjectName);
+   if (!NT_SUCCESS(Status))
+     {
+       DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status);
+       return Status;
+     }
+     
+   Status = ObFindObject(&ObjectCreateInfo,
+                         &ObjectName,
+                        &Object,
+                        &RemainingPath,
+                        ObjectType);
+
+   ObpReleaseCapturedAttributes(&ObjectCreateInfo);
+   if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer);
+
    if (!NT_SUCCESS(Status))
      {
        return(Status);
      }
-       
-   if (BODY_TO_HEADER(Object)->Type!=OBJTYP_DIRECTORY)
-     { 
-       return(STATUS_UNSUCCESSFUL);
+   DPRINT("RemainingPath.Buffer '%S' Object %p\n", RemainingPath.Buffer, Object);
+
+   if (RemainingPath.Buffer != NULL || Object == NULL)
+     {
+        DPRINT("Object %p\n", Object);
+       *ObjectPtr = NULL;
+       RtlFreeUnicodeString (&RemainingPath);
+       return(STATUS_OBJECT_NAME_NOT_FOUND);
      }
-   
-   *DirectoryHandle = ObAddHandle(Object);
-   CHECKPOINT;
+   *ObjectPtr = Object;
+   RtlFreeUnicodeString (&RemainingPath);
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS ZwQueryDirectoryObject(IN HANDLE DirObjHandle,
-                               OUT POBJDIR_INFORMATION DirObjInformation, 
-                               IN ULONG                BufferLength, 
-                               IN BOOLEAN              GetNextIndex, 
-                               IN BOOLEAN              IgnoreInputIndex, 
-                               IN OUT PULONG           ObjectIndex,
-                               OUT PULONG              DataWritten OPTIONAL)
-/*
- * FUNCTION: Reads information from a namespace directory
- * ARGUMENTS:
- *        DirObjInformation (OUT) = Buffer to hold the data read
- *        BufferLength = Size of the buffer in bytes
- *        GetNextIndex = If TRUE then set ObjectIndex to the index of the
- *                       next object
- *                       If FALSE then set ObjectIndex to the number of
- *                       objects in the directory
- *        IgnoreInputIndex = If TRUE start reading at index 0
- *                           If FALSE start reading at the index specified
- *                           by object index
- *        ObjectIndex = Zero based index into the directory, interpretation
- *                      depends on IgnoreInputIndex and GetNextIndex
- *        DataWritten (OUT) = Caller supplied storage for the number of bytes
- *                            written (or NULL)
- * RETURNS: Status
+
+/**********************************************************************
+ * NAME                                                        EXPORTED
+ *     ObOpenObjectByName
+ *
+ * DESCRIPTION
+ *     Obtain a handle to an existing object.
+ *
+ * ARGUMENTS
+ *     ObjectAttributes
+ *             ...
+ *     ObjectType
+ *             ...
+ *     ParseContext
+ *             ...
+ *     AccessMode
+ *             ...
+ *     DesiredAccess
+ *             ...
+ *     PassedAccessState
+ *             ...
+ *     Handle
+ *             Handle to close.
+ *
+ * RETURN VALUE
+ *     Status.
+ *
+ * @implemented
  */
+NTSTATUS STDCALL
+ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes,
+                  IN POBJECT_TYPE ObjectType,
+                  IN OUT PVOID ParseContext,
+                  IN KPROCESSOR_MODE AccessMode,
+                  IN ACCESS_MASK DesiredAccess,
+                  IN PACCESS_STATE PassedAccessState,
+                  OUT PHANDLE Handle)
 {
-   COMMON_BODY_HEADER* hdr = ObGetObjectByHandle(DirObjHandle);
-   PDIRECTORY_OBJECT dir = (PDIRECTORY_OBJECT)hdr;
-   ULONG EntriesToRead;
-   PLIST_ENTRY current_entry;
-   POBJECT_HEADER current;
-   ULONG i=0;
-   ULONG EntriesToSkip;
-   
-   DPRINT("ZwQueryDirectoryObject(DirObjHandle %x)\n",DirObjHandle);
-   DPRINT("dir %x namespc_root %x\n",dir,HEADER_TO_BODY(&(namespc_root.hdr)));
-   
-   assert_irql(PASSIVE_LEVEL);
+   UNICODE_STRING RemainingPath;
+   PVOID Object = NULL;
+   UNICODE_STRING ObjectName;
+   OBJECT_CREATE_INFORMATION ObjectCreateInfo;
+   NTSTATUS Status;
 
-   EntriesToRead = BufferLength / sizeof(OBJDIR_INFORMATION);
-   *DataWritten = 0;
-   
-   DPRINT("EntriesToRead %d\n",EntriesToRead);
-   
-   current_entry = dir->head.Flink;
-   
-   /*
-    * Optionally, skip over some entries at the start of the directory
-    */
-   if (!IgnoreInputIndex)
-     {
-       CHECKPOINT;
-       
-       EntriesToSkip = *ObjectIndex;
-       while ( i<EntriesToSkip && current_entry!=NULL)
-         {
-            current_entry = current_entry->Flink;
-         }
-     }
-   
-   DPRINT("DirObjInformation %x\n",DirObjInformation);
-   
-   /*
-    * Read the maximum entries possible into the buffer
-    */
-   while ( i<EntriesToRead && current_entry!=(&(dir->head)))
+   PAGED_CODE();
+
+   DPRINT("ObOpenObjectByName(...)\n");
+
+    /* Capture all the info */
+    DPRINT("Capturing Create Info\n");
+    Status = ObpCaptureObjectAttributes(ObjectAttributes,
+                                        AccessMode,
+                                        ObjectType,
+                                        &ObjectCreateInfo,
+                                        &ObjectName);
+   if (!NT_SUCCESS(Status))
      {
-       current = CONTAINING_RECORD(current_entry,OBJECT_HEADER,entry);
-       DPRINT("Scanning %w\n",current->name.Buffer);
-       DirObjInformation[i].ObjectName.Buffer = 
-                      ExAllocatePool(NonPagedPool,current->name.Length);
-       DirObjInformation[i].ObjectName.Length = current->name.Length;
-       DirObjInformation[i].ObjectName.MaximumLength = current->name.Length;
-       DPRINT("DirObjInformation[i].ObjectName.Buffer %x\n",
-              DirObjInformation[i].ObjectName.Buffer);
-       RtlCopyUnicodeString(&DirObjInformation[i].ObjectName,
-                            &(current->name));
-       i++;
-       current_entry = current_entry->Flink;
-       (*DataWritten) = (*DataWritten) + sizeof(OBJDIR_INFORMATION);
-       CHECKPOINT;
+       DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status);
+       return Status;
      }
-   CHECKPOINT;
-   
-   /*
-    * Optionally, count the number of entries in the directory
-    */
-   if (GetNextIndex)
+                                        
+   Status = ObFindObject(&ObjectCreateInfo,
+                         &ObjectName,
+                        &Object,
+                        &RemainingPath,
+                        ObjectType);
+   ObpReleaseCapturedAttributes(&ObjectCreateInfo);
+   if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer);
+   if (!NT_SUCCESS(Status))
      {
-       *ObjectIndex=i;
+       DPRINT("ObFindObject() failed (Status %lx)\n", Status);
+       return Status;
      }
-   else
+
+   DPRINT("OBject: %x, Remaining Path: %wZ\n", Object, &RemainingPath);
+   if (Object == NULL)
      {
-       while ( current_entry!=(&(dir->head)) )
-         {
-            current_entry=current_entry->Flink;
-            i++;
-         }
-       *ObjectIndex=i;
+       RtlFreeUnicodeString(&RemainingPath);
+       return STATUS_UNSUCCESSFUL;
      }
-   return(STATUS_SUCCESS);
-}
+   if (RemainingPath.Buffer != NULL)
+   {
+      if (wcschr(RemainingPath.Buffer + 1, L'\\') == NULL)
+         Status = STATUS_OBJECT_NAME_NOT_FOUND;
+      else
+         Status =STATUS_OBJECT_PATH_NOT_FOUND;
+      RtlFreeUnicodeString(&RemainingPath);
+      ObDereferenceObject(Object);
+      return Status;
+   }
+   
+   Status = ObpCreateHandle(PsGetCurrentProcess(),
+                          Object,
+                          DesiredAccess,
+                          FALSE,
+                          Handle);
 
+   ObDereferenceObject(Object);
+   RtlFreeUnicodeString(&RemainingPath);
 
-NTSTATUS ObReferenceObjectByName(PUNICODE_STRING ObjectPath,
-                                ULONG Attributes,
-                                PACCESS_STATE PassedAccessState,
-                                ACCESS_MASK DesiredAccess,
-                                POBJECT_TYPE ObjectType,
-                                KPROCESSOR_MODE Accessmode,
-                                PVOID ParseContext,
-                                PVOID* ObjectPtr)
-{
-   UNIMPLEMENTED;
+   return Status;
 }
 
-NTSTATUS ObOpenObjectByName(POBJECT_ATTRIBUTES ObjectAttributes,
-                           PVOID* Object, PWSTR* UnparsedSection)
+VOID
+STDCALL
+ObQueryDeviceMapInformation(PEPROCESS Process,
+                           PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo)
 {
-   NTSTATUS Status;
-   
-   DPRINT("ObOpenObjectByName(ObjectAttributes %x, Object %x)\n",
-         ObjectAttributes,Object);
-   DPRINT("ObjectAttributes = {ObjectName %x ObjectName->Buffer %w}\n",
-         ObjectAttributes->ObjectName,ObjectAttributes->ObjectName->Buffer);
-   
-   *Object = NULL;
-   Status = ObLookupObject(ObjectAttributes->RootDirectory, 
-                          ObjectAttributes->ObjectName->Buffer, 
-                          Object,
-                          UnparsedSection);
-   DPRINT("*Object %x\n",*Object);
-   return(Status);
+       //KIRQL OldIrql ;
+
+       /*
+        * FIXME: This is an ugly hack for now, to always return the System Device Map
+        * instead of returning the Process Device Map. Not important yet since we don't use it
+        */
+
+        /* FIXME: Acquire the DeviceMap Spinlock */
+        // KeAcquireSpinLock(DeviceMap->Lock, &OldIrql);
+
+        /* Make a copy */
+        DeviceMapInfo->Query.DriveMap = ObSystemDeviceMap->DriveMap;
+        RtlMoveMemory(DeviceMapInfo->Query.DriveType, ObSystemDeviceMap->DriveType, sizeof(ObSystemDeviceMap->DriveType));
+
+        /* FIXME: Release the DeviceMap Spinlock */
+        // KeReleasepinLock(DeviceMap->Lock, OldIrql);
 }
 
-void ObInit(void)
+VOID
+ObpAddEntryDirectory(PDIRECTORY_OBJECT Parent,
+                    POBJECT_HEADER Header,
+                    PWSTR Name)
 /*
- * FUNCTION: Initialize the object manager namespace
+ * 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
  */
 {
-   ANSI_STRING ansi_str;
-   
-   ObInitializeObjectHeader(OBJTYP_DIRECTORY,NULL,&namespc_root.hdr);
-   InitializeListHead(&namespc_root.head);
-   
-   RtlInitAnsiString(&ansi_str,"Directory");
-   RtlAnsiStringToUnicodeString(&DirectoryObjectType.TypeName,&ansi_str,
-                               TRUE);
-   ObRegisterType(OBJTYP_DIRECTORY,&DirectoryObjectType);
+  KIRQL oldlvl;
+
+  Header->NameInfo->Directory = Parent;
+
+  KeAcquireSpinLock(&Parent->Lock, &oldlvl);
+  InsertTailList(&Parent->head, &Header->Entry);
+  KeReleaseSpinLock(&Parent->Lock, oldlvl);
 }
 
-NTSTATUS ZwCreateDirectoryObject(PHANDLE DirectoryHandle,
-                                ACCESS_MASK DesiredAccess,
-                                POBJECT_ATTRIBUTES ObjectAttributes)
+
+VOID
+ObpRemoveEntryDirectory(POBJECT_HEADER Header)
 /*
- * FUNCTION: Creates or opens a directory object (a container for other
- * objects)
+ * FUNCTION: Remove an entry from a namespace directory
  * ARGUMENTS:
- *        DirectoryHandle (OUT) = Caller supplied storage for the handle
- *                                of the directory
- *        DesiredAccess = Access desired to the directory
- *        ObjectAttributes = Object attributes initialized with
- *                           InitializeObjectAttributes
- * RETURNS: Status
+ *         Header = Header of the object to remove
  */
 {
-   PDIRECTORY_OBJECT dir;
-   
-   dir = ObGenericCreateObject(DirectoryHandle,DesiredAccess,ObjectAttributes,
-                              OBJTYP_DIRECTORY);
-   
-   /*
-    * Initialize the object body
-    */
-   InitializeListHead(&dir->head);
-   KeInitializeSpinLock(&(dir->Lock));
-   
-   return(STATUS_SUCCESS);
+  KIRQL oldlvl;
+
+  DPRINT("ObpRemoveEntryDirectory(Header %x)\n",Header);
+
+  KeAcquireSpinLock(&(Header->NameInfo->Directory->Lock),&oldlvl);
+  if (Header->Entry.Flink && Header->Entry.Blink)
+  {
+    RemoveEntryList(&(Header->Entry));
+    Header->Entry.Flink = Header->Entry.Blink = NULL;
+  }
+  KeReleaseSpinLock(&(Header->NameInfo->Directory->Lock),oldlvl);
 }
 
-VOID InitializeObjectAttributes(POBJECT_ATTRIBUTES InitializedAttributes,
-                               PUNICODE_STRING ObjectName,
-                               ULONG Attributes,
-                               HANDLE RootDirectory,
-                               PSECURITY_DESCRIPTOR SecurityDescriptor)
-/*
- * FUNCTION: Sets up a parameter of type OBJECT_ATTRIBUTES for a 
- * subsequent call to ZwCreateXXX or ZwOpenXXX
- * ARGUMENTS:
- *        InitializedAttributes (OUT) = Caller supplied storage for the
- *                                      object attributes
- *        ObjectName = Full path name for object
- *        Attributes = Attributes for the object
- *        RootDirectory = Where the object should be placed or NULL
- *        SecurityDescriptor = Ignored
- * 
- * NOTE:
- *     Either ObjectName is a fully qualified pathname or a path relative
- *     to RootDirectory
- */
+NTSTATUS
+STDCALL
+ObpCreateDirectory(OB_OPEN_REASON Reason,
+                   PVOID ObjectBody,
+                   PEPROCESS Process,
+                   ULONG HandleCount,
+                   ACCESS_MASK GrantedAccess)
 {
-   DPRINT("InitializeObjectAttributes(InitializedAttributes %x "
-         "ObjectName %x Attributes %x RootDirectory %x)\n",
-         InitializedAttributes,ObjectName,Attributes,RootDirectory);
-   InitializedAttributes->Length=sizeof(OBJECT_ATTRIBUTES);
-   InitializedAttributes->RootDirectory=RootDirectory;
-   InitializedAttributes->ObjectName=ObjectName;
-   InitializedAttributes->Attributes=Attributes;
-   InitializedAttributes->SecurityDescriptor=SecurityDescriptor;
-   InitializedAttributes->SecurityQualityOfService=NULL;
+    PDIRECTORY_OBJECT Directory = ObjectBody;
+    
+    if (Reason == ObCreateHandle)
+    {
+        InitializeListHead(&Directory->head);
+        KeInitializeSpinLock(&Directory->Lock);
+    }
+    
+    return STATUS_SUCCESS;
 }
 
-static PVOID ObDirLookup(PDIRECTORY_OBJECT dir, PWSTR name)
-/*
- * FUNCTION: Looks up an entry within a namespace directory
- * ARGUMENTS:
- *        dir = Directory to lookup in
- *        name = Entry name to find
- * RETURNS: A pointer to the object body if found
- *          NULL otherwise
- */
+PVOID
+ObpFindEntryDirectory(PDIRECTORY_OBJECT DirectoryObject,
+                     PWSTR Name,
+                     ULONG Attributes)
 {
-   LIST_ENTRY* current = dir->head.Flink;
+   PLIST_ENTRY current = DirectoryObject->head.Flink;
    POBJECT_HEADER current_obj;
-   
-   DPRINT("ObDirLookup(dir %x, name %w)\n",dir,name);
-   
-   if (name[0]==0)
+
+   DPRINT("ObFindEntryDirectory(dir %x, name %S)\n",DirectoryObject, Name);
+
+   if (Name[0]==0)
      {
-       return(dir);
+       return(DirectoryObject);
      }
-   if (name[0]=='.'&&name[1]==0)
+   if (Name[0]=='.' && Name[1]==0)
      {
-       return(dir);
+       return(DirectoryObject);
      }
-   if (name[0]=='.'&&name[1]=='.'&&name[2]==0)
+   if (Name[0]=='.' && Name[1]=='.' && Name[2]==0)
      {
-       return(BODY_TO_HEADER(dir)->Parent);
+       return(BODY_TO_HEADER(DirectoryObject)->NameInfo->Directory);
      }
-   while (current!=(&(dir->head)))
+   while (current!=(&(DirectoryObject->head)))
      {
-       current_obj = CONTAINING_RECORD(current,OBJECT_HEADER,entry);
-       DPRINT("Scanning %w\n",current_obj->name.Buffer);
-       if ( wcscmp(current_obj->name.Buffer, name)==0)
+       current_obj = CONTAINING_RECORD(current,OBJECT_HEADER,Entry);
+       DPRINT("  Scanning: %S for: %S\n",current_obj->NameInfo->Name.Buffer, Name);
+       if (Attributes & OBJ_CASE_INSENSITIVE)
          {
-            return(HEADER_TO_BODY(current_obj));
+            if (_wcsicmp(current_obj->NameInfo->Name.Buffer, Name)==0)
+              {
+                 DPRINT("Found it %x\n",HEADER_TO_BODY(current_obj));
+                 return(HEADER_TO_BODY(current_obj));
+              }
+         }
+       else
+         {
+            if ( wcscmp(current_obj->NameInfo->Name.Buffer, Name)==0)
+              {
+                 DPRINT("Found it %x\n",HEADER_TO_BODY(current_obj));
+                 return(HEADER_TO_BODY(current_obj));
+              }
          }
        current = current->Flink;
      }
-   DPRINT("%s() = NULL\n",__FUNCTION__);
+   DPRINT("    Not Found: %s() = NULL\n",__FUNCTION__);
    return(NULL);
 }
 
 
-VOID ObCreateEntry(PDIRECTORY_OBJECT parent,POBJECT_HEADER Object)
-/*
- * FUNCTION: Add an entry to a namespace directory
- * ARGUMENTS:
- *         parent = directory to add in
- *         name = Name to give the entry
- *         Object = Header of the object to add the entry for
- */
+NTSTATUS STDCALL
+ObpParseDirectory(PVOID Object,
+                 PVOID * NextObject,
+                 PUNICODE_STRING FullPath,
+                 PWSTR * Path,
+                 ULONG Attributes)
 {
-   DPRINT("ObjCreateEntry(%x,%x,%x,%w)\n",parent,Object,Object->name.Buffer,
-         Object->name.Buffer);
-   assert(parent->Type == OBJTYP_DIRECTORY);
-   
-   /*
-    * Insert ourselves in our parents list
-    */
-   InsertTailList(&parent->head,&Object->entry);
+  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 ObLookupObject(HANDLE rootdir, PWSTR string, PVOID* Object,
-                        PWSTR* UnparsedSection)
-/*
- * FUNCTION: Lookup an object within the system namespc
- * ARGUMENTS:
- *         root = Directory to start lookup from
- *         _string = Pathname to lookup
- * RETURNS: On success a pointer to the object body
- *          On failure NULL
- */
+VOID 
+INIT_FUNCTION
+ObInit(VOID)
 {
-   PWSTR current;
-   PWSTR next;
-   PDIRECTORY_OBJECT current_dir = NULL;
-   NTSTATUS Status;
-   
-   DPRINT("ObLookupObject(rootdir %x, string %x, string %w, Object %x, "
-         "UnparsedSection %x)\n",rootdir,string,string,Object,
-         UnparsedSection);
-                         
-   
-   *UnparsedSection = NULL;
-   *Object = NULL;
-   
-   if (rootdir==NULL)
-     {
-       current_dir = HEADER_TO_BODY(&(namespc_root.hdr));
-     }
-   else
-     {
-       ObReferenceObjectByHandle(rootdir,DIRECTORY_TRAVERSE,NULL,
-                                 UserMode,(PVOID*)&current_dir,NULL);
-     }
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    UNICODE_STRING Name;
+    SECURITY_DESCRIPTOR SecurityDescriptor;
+    OBJECT_TYPE_INITIALIZER ObjectTypeInitializer;
+
+    /* Initialize the security descriptor cache */
+    ObpInitSdCache();
+
+    /* Create the Type Type */
+    DPRINT("Creating Type Type\n");
+    RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));
+    RtlInitUnicodeString(&Name, L"Type");
+    ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer);
+    ObjectTypeInitializer.ValidAccessMask = OBJECT_TYPE_ALL_ACCESS;
+    ObjectTypeInitializer.UseDefaultObject = TRUE;
+    ObjectTypeInitializer.MaintainTypeList = TRUE;
+    ObjectTypeInitializer.PoolType = NonPagedPool;
+    ObjectTypeInitializer.GenericMapping = ObpTypeMapping;
+    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_TYPE);
+    ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObTypeObjectType);
   
-   /*
-    * Bit of a hack this
-    */
-   if (string[0]==0)
-   {
-      *Object=current_dir;
-      return(STATUS_SUCCESS);
-   }
+    /* Create the Directory Type */
+    DPRINT("Creating Directory Type\n");
+    RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));
+    RtlInitUnicodeString(&Name, L"Directory");
+    ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer);
+    ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS;
+    ObjectTypeInitializer.UseDefaultObject = FALSE;
+    ObjectTypeInitializer.OpenProcedure = ObpCreateDirectory;
+    ObjectTypeInitializer.ParseProcedure = ObpParseDirectory;
+    ObjectTypeInitializer.MaintainTypeList = FALSE;
+    ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping;
+    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DIRECTORY_OBJECT);
+    ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObDirectoryType);
 
-   if (string[0]!='\\')
-     {
-        DbgPrint("(%s:%d) Non absolute pathname passed to %s\n",__FILE__,
-               __LINE__,__FUNCTION__);
-       return(STATUS_UNSUCCESSFUL);
-     }
-      
-   next = &string[0];
-   current = next+1;
-   
-   while (next!=NULL && current_dir->Type==OBJTYP_DIRECTORY)
-     {         
-       *next = '\\';
-       current = next+1;
-       next = wcschr(next+1,'\\');
-       if (next!=NULL)
-         {
-            *next=0;
-         }
+    /* Create security descriptor */
+    RtlCreateSecurityDescriptor(&SecurityDescriptor,
+                                SECURITY_DESCRIPTOR_REVISION1);
+    RtlSetOwnerSecurityDescriptor(&SecurityDescriptor,
+                                  SeAliasAdminsSid,
+                                  FALSE);
+    RtlSetGroupSecurityDescriptor(&SecurityDescriptor,
+                                  SeLocalSystemSid,
+                                  FALSE);
+    RtlSetDaclSecurityDescriptor(&SecurityDescriptor,
+                                 TRUE,
+                                 SePublicDefaultDacl,
+                                 FALSE);
 
-       DPRINT("current %w current[5] %x next %x ",current,current[5],next);
-       if (next!=NULL)
-         {
-            DPRINT("(next+1) %w",next+1);
-         }
-       DPRINT("\n",0);
-       
-       current_dir=(PDIRECTORY_OBJECT)ObDirLookup(current_dir,current);
-       if (current_dir==NULL)
-         {
-             DbgPrint("(%s:%d) Path component not found\n",__FILE__,
-                    __LINE__);
-            ExFreePool(string);
-            return(STATUS_UNSUCCESSFUL);                    
-         }
-       
-       DPRINT("current_dir %x\n",current_dir);
-       DPRINT("current_dir->Type %d OBJTYP_SYMLNK %d OBJTYP_DIRECTORY %d\n",
-              current_dir->Type,OBJTYP_SYMLNK,OBJTYP_DIRECTORY);
-       DPRINT("&(current_dir->Type) %x\n",&(current_dir->Type));
-       if (current_dir->Type==OBJTYP_SYMLNK)
-         {
-            current_dir = IoOpenSymlink(current_dir);     
-         }
-       
-     }
-   DPRINT("next %x\n",next);
-   DPRINT("current %x current %w\n",current,current);
-   if (next==NULL)
-     {
-       if (current_dir==NULL)
-         {
-            Status = STATUS_UNSUCCESSFUL;
-         }
-       else
-         {
-            Status = STATUS_SUCCESS;
-         }
-     }
-   else
-     {
-       CHECKPOINT;
-       *next = '\\';
-       *UnparsedSection = next;
-       switch(current_dir->Type)
-         {
-          case OBJTYP_DEVICE:
-            CHECKPOINT;
-            Status = STATUS_FS_QUERY_REQUIRED;
-            break;
-            
-          default:
-            current_dir = NULL;
-            Status = STATUS_UNSUCCESSFUL;
-            break;
-         }
-     }
-   CHECKPOINT;
-   *Object = current_dir;
-   
-   return(Status);
+    /* Create root directory */
+    DPRINT("Creating Root Directory\n");    
+    InitializeObjectAttributes(&ObjectAttributes,
+                               NULL,
+                               OBJ_PERMANENT,
+                               NULL,
+                               &SecurityDescriptor);
+    ObCreateObject(KernelMode,
+                   ObDirectoryType,
+                   &ObjectAttributes,
+                   KernelMode,
+                   NULL,
+                   sizeof(DIRECTORY_OBJECT),
+                   0,
+                   0,
+                   (PVOID*)&NameSpaceRoot);
+    ObInsertObject((PVOID)NameSpaceRoot,
+                   NULL,
+                   DIRECTORY_ALL_ACCESS,
+                   0,
+                   NULL,
+                   NULL);
+
+    /* Create '\ObjectTypes' directory */
+    RtlInitUnicodeString(&Name, L"\\ObjectTypes");
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &Name,
+                               OBJ_PERMANENT,
+                               NULL,
+                               &SecurityDescriptor);
+    ObCreateObject(KernelMode,
+                   ObDirectoryType,
+                   &ObjectAttributes,
+                   KernelMode,
+                   NULL,
+                   sizeof(DIRECTORY_OBJECT),
+                   0,
+                   0,
+                   (PVOID*)&ObpTypeDirectoryObject);
+    ObInsertObject((PVOID)ObpTypeDirectoryObject,
+                   NULL,
+                   DIRECTORY_ALL_ACCESS,
+                   0,
+                   NULL,
+                   NULL);
+    
+    /* Insert the two objects we already created but couldn't add */
+    /* NOTE: Uses TypeList & Creator Info in OB 2.0 */
+    ObpAddEntryDirectory(ObpTypeDirectoryObject, BODY_TO_HEADER(ObTypeObjectType), NULL);
+    ObpAddEntryDirectory(ObpTypeDirectoryObject, BODY_TO_HEADER(ObDirectoryType), NULL);
+
+    /* Create 'symbolic link' object type */
+    ObInitSymbolicLinkImplementation();
+
+    /* FIXME: Hack Hack! */
+    ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObSystemDeviceMap), TAG('O', 'b', 'D', 'm'));
+    RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap));
 }
+
+NTSTATUS
+STDCALL
+ObpCreateTypeObject(POBJECT_TYPE_INITIALIZER ObjectTypeInitializer,
+                    PUNICODE_STRING TypeName,
+                    POBJECT_TYPE *ObjectType)
+{
+    POBJECT_HEADER Header;
+    POBJECT_TYPE LocalObjectType;
+    NTSTATUS Status;
+
+    DPRINT("ObpCreateTypeObject(ObjectType: %wZ)\n", TypeName);
+    
+    /* Allocate the Object */
+    Status = ObpAllocateObject(NULL, 
+                               TypeName,
+                               ObTypeObjectType, 
+                               OBJECT_ALLOC_SIZE(sizeof(OBJECT_TYPE)),
+                               &Header);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("ObpAllocateObject failed!\n");
+        return Status;
+    }
+    
+    LocalObjectType = HEADER_TO_BODY(Header);
+    
+    /* Check if this is the first Object Type */
+    if (!ObTypeObjectType)
+    {
+        ObTypeObjectType = LocalObjectType;
+        Header->ObjectType = ObTypeObjectType;
+    }
+    
+    /* FIXME: Generate Tag */
+        
+    /* Set it up */
+    LocalObjectType->TypeInfo = *ObjectTypeInitializer;
+    LocalObjectType->Name = *TypeName;
+    
+    /* Insert it into the Object Directory */
+    if (ObpTypeDirectoryObject)
+    {
+        ObpAddEntryDirectory(ObpTypeDirectoryObject, Header, TypeName->Buffer);
+        ObReferenceObject(ObpTypeDirectoryObject);
+    }
+        
+    *ObjectType = LocalObjectType;
+    return Status;
+} 
+
+/* EOF */