add PoolType parameter to ObpCaptureObjectAttributes() and removed an unused parameter

svn path=/trunk/; revision=13183

diff --git a/reactos/ntoskrnl/include/internal/ob.h b/reactos/ntoskrnl/include/internal/ob.h
index aa0a3a9..4be6e33 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ob.h
+++ b/reactos/ntoskrnl/include/internal/ob.h
@@ -327,8 +327,8 @@ typedef struct _CAPTURED_OBJECT_ATTRIBUTES
 
 NTSTATUS
 ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes  OPTIONAL,
-                           IN POBJECT_TYPE ObjectType,
                            IN KPROCESSOR_MODE AccessMode,
+                           IN POOL_TYPE PoolType,
                            IN BOOLEAN CaptureIfKernel,
                            OUT PCAPTURED_OBJECT_ATTRIBUTES CapturedObjectAttributes  OPTIONAL,
                            OUT PUNICODE_STRING ObjectName  OPTIONAL);

diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c
index 8b1314e..cff56e3 100644 (file)
--- a/reactos/ntoskrnl/ob/object.c
+++ b/reactos/ntoskrnl/ob/object.c
@@ -41,8 +41,8 @@ POBJECT_HEADER BODY_TO_HEADER(PVOID body)
 
 NTSTATUS
 ObpCaptureObjectAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes  OPTIONAL,
-                           IN POBJECT_TYPE ObjectType,
                            IN KPROCESSOR_MODE AccessMode,
+                           IN POOL_TYPE PoolType,
                            IN BOOLEAN CaptureIfKernel,
                            OUT PCAPTURED_OBJECT_ATTRIBUTES CapturedObjectAttributes  OPTIONAL,
                            OUT PUNICODE_STRING ObjectName  OPTIONAL)
@@ -135,7 +135,7 @@ failbasiccleanup:
     {
       Status = SeCaptureSecurityDescriptor(AttributesCopy.SecurityDescriptor,
                                            AccessMode,
-                                           PagedPool,
+                                           PoolType,
                                            TRUE,
                                            &CapturedObjectAttributes->SecurityDescriptor);
       if(!NT_SUCCESS(Status))
@@ -183,7 +183,7 @@ failbasiccleanup:
           if(OriginalCopy.Length > 0)
           {
             ObjectName->MaximumLength = OriginalCopy.Length + sizeof(WCHAR);
-            ObjectName->Buffer = ExAllocatePool(NonPagedPool,
+            ObjectName->Buffer = ExAllocatePool(PoolType,
                                                 ObjectName->MaximumLength);
             if(ObjectName->Buffer != NULL)
             {
@@ -237,7 +237,7 @@ failallocatedcleanup:
         if(OriginalCopy.Length > 0)
         {
           ObjectName->MaximumLength = OriginalCopy.Length + sizeof(WCHAR);
-          ObjectName->Buffer = ExAllocatePool(NonPagedPool,
+          ObjectName->Buffer = ExAllocatePool(PoolType,
                                               ObjectName->MaximumLength);
           if(ObjectName->Buffer != NULL)
           {