[DRWTSN32] Print some extra exception info

[reactos.git] / ntoskrnl / ex / profile.c

diff --git a/ntoskrnl/ex/profile.c b/ntoskrnl/ex/profile.c
index 173d4d6..ee21fba 100644 (file)
--- a/ntoskrnl/ex/profile.c
+++ b/ntoskrnl/ex/profile.c
@@ -42,7 +42,7 @@ ExpDeleteProfile(PVOID ObjectBody)
     ULONG State;
 
     /* Typecast the Object */
-    Profile = (PEPROFILE)ObjectBody;
+    Profile = ObjectBody;
 
     /* Check if there if the Profile was started */
     if (Profile->LockedBufferAddress)
@@ -55,19 +55,21 @@ ExpDeleteProfile(PVOID ObjectBody)
         MmUnmapLockedPages(Profile->LockedBufferAddress, Profile->Mdl);
         MmUnlockPages(Profile->Mdl);
         IoFreeMdl(Profile->Mdl);
+        ExFreePoolWithTag(Profile->ProfileObject, TAG_PROFILE);
     }
 
     /* Check if a Process is associated and reference it */
     if (Profile->Process) ObDereferenceObject(Profile->Process);
 }
 
-VOID
+BOOLEAN
 INIT_FUNCTION
 NTAPI
 ExpInitializeProfileImplementation(VOID)
 {
     OBJECT_TYPE_INITIALIZER ObjectTypeInitializer;
     UNICODE_STRING Name;
+    NTSTATUS Status;
     DPRINT("Creating Profile Object Type\n");
 
     /* Initialize the Mutex to lock the States */
@@ -82,7 +84,10 @@ ExpInitializeProfileImplementation(VOID)
     ObjectTypeInitializer.PoolType = NonPagedPool;
     ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile;
     ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS;
-    ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType);
+    ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK;
+    Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType);
+    if (!NT_SUCCESS(Status)) return FALSE;
+    return TRUE;
 }
 
 NTSTATUS
@@ -90,7 +95,7 @@ NTAPI
 NtCreateProfile(OUT PHANDLE ProfileHandle,
                 IN HANDLE Process OPTIONAL,
                 IN PVOID RangeBase,
-                IN ULONG RangeSize,
+                IN SIZE_T RangeSize,
                 IN ULONG BucketSize,
                 IN PVOID Buffer,
                 IN ULONG BufferSize,
@@ -243,7 +248,6 @@ NtCreateProfile(OUT PHANDLE ProfileHandle,
                              0,
                              NULL,
                              &hProfile);
-    ObDereferenceObject(Profile);
 
     /* Check for Success */
     if (!NT_SUCCESS(Status))
@@ -357,7 +361,7 @@ NtStartProfile(IN HANDLE ProfileHandle)
 
     /* Allocate a Kernel Profile Object. */
     ProfileObject = ExAllocatePoolWithTag(NonPagedPool,
-                                          sizeof(EPROFILE),
+                                          sizeof(*ProfileObject),
                                           TAG_PROFILE);
     if (!ProfileObject)
     {
@@ -392,7 +396,7 @@ NtStartProfile(IN HANDLE ProfileHandle)
     /* Initialize the Kernel Profile Object */
     Profile->ProfileObject = ProfileObject;
     KeInitializeProfile(ProfileObject,
-                        (PKPROCESS)Profile->Process,
+                        &Profile->Process->Pcb,
                         Profile->RangeBase,
                         Profile->RangeSize,
                         Profile->BucketSize,
@@ -449,6 +453,7 @@ NtStopProfile(IN HANDLE ProfileHandle)
     /* Unlock the Buffer */
     MmUnmapLockedPages(Profile->LockedBufferAddress, Profile->Mdl);
     MmUnlockPages(Profile->Mdl);
+    IoFreeMdl(Profile->Mdl);
     ExFreePoolWithTag(Profile->ProfileObject, TAG_PROFILE);
 
     /* Clear the Locked Buffer pointer, meaning the Object is Stopped */