- Fix compile issues caused by previous patch.

[reactos.git] / reactos / ntoskrnl / ob / ntobj.c

diff --git a/reactos/ntoskrnl/ob/ntobj.c b/reactos/ntoskrnl/ob/ntobj.c
index b6553f1..527ac5d 100644 (file)
--- a/reactos/ntoskrnl/ob/ntobj.c
+++ b/reactos/ntoskrnl/ob/ntobj.c
@@ -4,7 +4,7 @@
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ob/ntobj.c
  * PURPOSE:         User mode interface to object manager
- * 
+ *
  * PROGRAMMERS:     David Welch (welch@cwcom.net)
  */
 
@@ -20,7 +20,7 @@
 /**********************************************************************
  * NAME                                                        EXPORTED
  *     NtSetInformationObject
- *     
+ *
  * DESCRIPTION
  *
  * ARGUMENTS
@@ -37,7 +37,7 @@ NtSetInformationObject (IN HANDLE ObjectHandle,
 {
   PVOID Object;
   NTSTATUS Status;
-  
+
   PAGED_CODE();
 
   if (ObjectInformationClass != ObjectHandleInformation)
@@ -90,7 +90,7 @@ NtQueryObject (IN HANDLE ObjectHandle,
   ULONG InfoLength;
   PVOID Object;
   NTSTATUS Status;
-  
+
   PAGED_CODE();
 
   Status = ObReferenceObjectByHandle (ObjectHandle,
@@ -122,13 +122,13 @@ NtQueryObject (IN HANDLE ObjectHandle,
            BasicInfo->Attributes = HandleInfo.HandleAttributes;
            BasicInfo->GrantedAccess = HandleInfo.GrantedAccess;
            BasicInfo->HandleCount = ObjectHeader->HandleCount;
-           BasicInfo->PointerCount = ObjectHeader->RefCount;
+           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->ObjectType == ObSymbolicLinkType)
+           if (ObjectHeader->Type == ObSymbolicLinkType)
              {
                BasicInfo->CreateTime.QuadPart =
                  ((PSYMLINK_OBJECT)Object)->CreateTime.QuadPart;
@@ -169,10 +169,10 @@ NtQueryObject (IN HANDLE ObjectHandle,
            break;
          }
 
-       RtlCopyUnicodeString(&typeinfo->Type,&ObjectHeader->ObjectType->TypeName);
+       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 -> RefCount;
+       typeinfo->ReferenceCount = ObjectHeader -> PointerCount;
          }
 #endif
        Status = STATUS_NOT_IMPLEMENTED;
@@ -223,12 +223,19 @@ ObpSetPermanentObject (IN PVOID ObjectBody, IN BOOLEAN Permanent)
   POBJECT_HEADER ObjectHeader;
 
   ObjectHeader = BODY_TO_HEADER(ObjectBody);
-  ObjectHeader->Permanent = Permanent;
-  
-  if (ObjectHeader->HandleCount == 0 && !Permanent && ObjectHeader->Parent != NULL)
+  ASSERT (ObjectHeader->PointerCount > 0);
+  if (Permanent)
   {
-    /* Remove the object from the namespace */
-    ObpRemoveEntryDirectory(ObjectHeader);
+     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(ObjectHeader);
+     }
   }
 }
 
@@ -270,7 +277,7 @@ NtMakeTemporaryObject(IN HANDLE ObjectHandle)
 {
   PVOID ObjectBody;
   NTSTATUS Status;
-  
+
   PAGED_CODE();
 
   Status = ObReferenceObjectByHandle(ObjectHandle,
@@ -311,7 +318,7 @@ NtMakePermanentObject(IN HANDLE ObjectHandle)
 {
   PVOID ObjectBody;
   NTSTATUS Status;
-  
+
   PAGED_CODE();
 
   Status = ObReferenceObjectByHandle(ObjectHandle,