[ros-diffs] [ion] 23370: - Merge 22364:22365

Author: ion
Date: Sun Jul 30 00:28:08 2006
New Revision: 23370

URL: http://svn.reactos.org/svn/reactos?rev=23370&view=rev
Log:
- Merge 22364:22365

Modified:
    branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h
    branches/alex-cm-branch/reactos/ntoskrnl/cm/ntfunc.c
    branches/alex-cm-branch/reactos/ntoskrnl/cm/registry.c

Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h
URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl/...
==============================================================================
--- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original)
+++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Sun Jul 30 00:28:08 2006
@@ -461,4 +461,8 @@
 #define HvAllocateCell(hive, size) xHvAllocateCell(__FILE__, __LINE__, hive, size)
 #endif

+// Some Ob definitions for debug messages in Cm
+#define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount
+#define ObGetObjectHandleCount(x) OBJECT_TO_OBJECT_HEADER(x)->HandleCount
+
 #endif /*__INCLUDE_CM_H*/

Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/ntfunc.c
URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl/...
==============================================================================
--- branches/alex-cm-branch/reactos/ntoskrnl/cm/ntfunc.c (original)
+++ branches/alex-cm-branch/reactos/ntoskrnl/cm/ntfunc.c Sun Jul 30 00:28:08 2006
@@ -638,7 +638,7 @@
   ExReleaseResourceLite(&CmiRegistryLock);
   KeLeaveCriticalRegion();

-  //DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject));
+  DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject));

/* Remove the keep-alive reference */
   ObDereferenceObject(KeyObject);
@@ -652,8 +652,8 @@
   /* Dereference the object */
   ObDereferenceObject(KeyObject);

-  //DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject));
-  //DPRINT("HandleCount %lu\n", ObGetObjectHandleCount((PVOID)KeyObject));
+  DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject));
+  DPRINT("HandleCount %lu\n", ObGetObjectHandleCount((PVOID)KeyObject));

/*
    * Note:

Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/registry.c
URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl/...
==============================================================================
--- branches/alex-cm-branch/reactos/ntoskrnl/cm/registry.c (original)
+++ branches/alex-cm-branch/reactos/ntoskrnl/cm/registry.c Sun Jul 30 00:28:08 2006
@@ -21,9 +21,6 @@
 #pragma alloc_text(INIT, CmInitializeRegistry)
 #pragma alloc_text(INIT, CmInit2)
 #endif
-
-#define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount
-#define ObGetObjectHandleCount(x) OBJECT_TO_OBJECT_HEADER(x)->HandleCount

/* GLOBALS ******************************************************************/