[ros-diffs] [ion] 22278: - I just noticed that ObInsertObject never got updated to deal with the improvements in ObFindObject and ACCESS_STATE usage, so made the following fixes: * Create the ACCESS_STATE structure much earlier. * Actually send the access state and parse context to ObFindObject, when called from ObInsertObject (this should fix some hidden regressions, since they finally get an access state with access masks now). * Remove some deprecated hacks. * If inserting the handle failed, cleanup the

Author: ion
Date: Thu Jun  8 06:56:59 2006
New Revision: 22278

URL: http://svn.reactos.ru/svn/reactos?rev=22278&view=rev
Log:
- I just noticed that ObInsertObject never got updated to deal with the improvements in
ObFindObject and ACCESS_STATE usage, so made the following fixes:
  * Create the ACCESS_STATE structure much earlier.
  * Actually send the access state and parse context to ObFindObject, when called from
ObInsertObject (this should fix some hidden regressions, since they finally get an access
state with access masks now).
  * Remove some deprecated hacks.
  * If inserting the handle failed, cleanup the name and remove it from the directory
entry.
  * Fix a memory leak because we weren't deleting the access state.

Modified:
    trunk/reactos/ntoskrnl/ob/obhandle.c

Modified: trunk/reactos/ntoskrnl/ob/obhandle.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/ob/obhandle.c (original)
+++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun  8 06:56:59 2006
@@ -1152,8 +1152,8 @@
 /*
 * @implemented
 */
-NTSTATUS 
-STDCALL
+NTSTATUS
+NTAPI
 ObInsertObject(IN PVOID Object,
                IN PACCESS_STATE PassedAccessState OPTIONAL,
                IN ACCESS_MASK DesiredAccess,
@@ -1163,6 +1163,7 @@
 {
     POBJECT_CREATE_INFORMATION ObjectCreateInfo;
     POBJECT_HEADER Header;
+    POBJECT_TYPE ObjectType;
     PVOID FoundObject = NULL;
     POBJECT_HEADER FoundHeader = NULL;
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1172,27 +1173,51 @@
     POBJECT_HEADER_NAME_INFO ObjectNameInfo;
     ACCESS_STATE AccessState;
     AUX_DATA AuxData;
+    BOOLEAN IsNamed = FALSE;
+    OB_OPEN_REASON OpenReason = ObCreateHandle;
     PAGED_CODE();
 
     /* Get the Header and Create Info */
     Header = OBJECT_TO_OBJECT_HEADER(Object);
     ObjectCreateInfo = Header->ObjectCreateInfo;
     ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header);
-
-    /* First try to find the Object */
-    if (ObjectNameInfo && ObjectNameInfo->Name.Buffer)
-    {
+    ObjectType = Header->Type;
+
+    /* Check if we didn't get an access state */
+    if (!PassedAccessState)
+    {
+        /* Use our built-in access state */
+        PassedAccessState = &AccessState;
+        Status = SeCreateAccessState(&AccessState,
+                                     &AuxData,
+                                     DesiredAccess,
+                                     &ObjectType->TypeInfo.GenericMapping);
+        if (!NT_SUCCESS(Status))
+        {
+            /* Fail */
+            ObDereferenceObject(Object);
+            return Status;
+        }
+    }
+
+    /* Check if this is an named object */
+    if ((ObjectNameInfo) && (ObjectNameInfo->Name.Buffer)) IsNamed = TRUE;
+
+    /* Check if the object is named */
+    if (IsNamed)
+    {
+        /* Look it up */
         Status = ObFindObject(ObjectCreateInfo->RootDirectory,
-            &ObjectNameInfo->Name,
-            ObjectCreateInfo->Attributes,
-            KernelMode,
-            &FoundObject,
-            Header->Type,
-            &Context,
-            NULL,
-            ObjectCreateInfo->SecurityQos,
-            NULL,
-            Object);
+                              &ObjectNameInfo->Name,
+                              ObjectCreateInfo->Attributes,
+                              KernelMode,
+                              &FoundObject,
+                              ObjectType,
+                              &Context,
+                              PassedAccessState,
+                              ObjectCreateInfo->SecurityQos,
+                              ObjectCreateInfo->ParseContext,
+                              Object);
         if (!NT_SUCCESS(Status)) return Status;
 
         if (FoundObject)
@@ -1211,8 +1236,7 @@
          * called ObFindObject which already has this code.
          * We basically kill 3-4 hacks and add 2 new ones.
          */
-        if ((Header->Type == IoFileObjectType) ||
-            (Header->Type->TypeInfo.OpenProcedure != NULL))
+        if (Header->Type == IoFileObjectType)
         {
             DPRINT("About to call Open Routine\n");
             if (Header->Type == IoFileObjectType)
@@ -1225,22 +1249,6 @@
                                        NULL);
                 DPRINT("Called IopCreateFile: %x\n", Status);
             }
-            else if (Header->Type->TypeInfo.OpenProcedure)
-            {
-                DPRINT("Calling %x\n",
Header->Type->TypeInfo.OpenProcedure);
-                Status = Header->Type->TypeInfo.OpenProcedure(ObCreateHandle,
-                                                              NULL,
-                                                              &Header->Body,
-                                                              0,
-                                                              0);
-            }
-
-            if (!NT_SUCCESS(Status))
-            {
-                DPRINT1("Create Failed\n");
-                if (FoundObject) ObDereferenceObject(FoundObject);
-                return Status;
-            }
         }
     }
 
@@ -1287,24 +1295,6 @@
     DPRINT("Security Complete\n");
     SeReleaseSubjectContext(&SubjectContext);
 
-    /* Check if we didn't get an access state */
-    if (!PassedAccessState)
-    {
-        /* Use our built-in access state */
-        PassedAccessState = &AccessState;
-        Status = SeCreateAccessState(&AccessState,
-                                     &AuxData,
-                                     DesiredAccess,
-                                     &Header->Type->TypeInfo.GenericMapping);
-        if (!NT_SUCCESS(Status))
-        {
-            /* Fail */
-            ObDereferenceObject(Object);
-            return Status;
-        }
-    }
-
-    /* Create the Handle */
     /* HACKHACK: Because of ROS's incorrect startup, this can be called
     * without a valid Process until I finalize the startup patch,
     * so don't create a handle if this is the case. We also don't create
@@ -1314,7 +1304,8 @@
     DPRINT("Creating handle\n");
     if (Handle != NULL)
     {
-        Status = ObpCreateHandle(ObCreateHandle,
+        /* Create the handle */
+        Status = ObpCreateHandle(OpenReason,
                                  &Header->Body,
                                  NULL,
                                  PassedAccessState,
@@ -1329,6 +1320,24 @@
     Header->ObjectCreateInfo = NULL;
     ObpFreeAndReleaseCapturedAttributes(ObjectCreateInfo);
 
+    /* Check if creating the handle failed */
+    if (!NT_SUCCESS(Status))
+    {
+        /* If the object had a name, backout everything */
+        if (IsNamed) ObpDeleteNameCheck(Object);
+    }
+
+    /* Remove the extra keep-alive reference */
+    //ObDereferenceObject(Object); FIXME: Will require massive changes
+
+    /* Check if we created our own access state */
+    if (PassedAccessState == &AccessState)
+    {
+        /* We used a local one; delete it */
+        SeDeleteAccessState(PassedAccessState);
+    }
+
+    /* Return failure code */
     DPRINT("Status %x\n", Status);
     return Status;
 }