From 7fb3ebb9f924effc7eb7742589eadfef7735dd51 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Fri, 20 May 2005 04:33:47 +0000
Subject: [PATCH] move the rest of the alread defined tags to the private tag.h

svn path=/trunk/; revision=15427
---
 reactos/ntoskrnl/include/internal/tag.h | 77 +++++++++++++++++++++++++
 reactos/ntoskrnl/io/mdl.c               |  4 --
 reactos/ntoskrnl/io/pnpnotify.c         |  2 -
 reactos/ntoskrnl/io/resource.c          |  2 -
 reactos/ntoskrnl/io/timer.c             |  2 -
 reactos/ntoskrnl/io/vpb.c               |  3 -
 reactos/ntoskrnl/kdbg/kdb_symbols.c     |  2 -
 reactos/ntoskrnl/ldr/loader.c           |  5 --
 reactos/ntoskrnl/lpc/connect.c          |  4 --
 reactos/ntoskrnl/mm/aspace.c            |  2 -
 reactos/ntoskrnl/mm/marea.c             |  4 --
 reactos/ntoskrnl/mm/pageop.c            |  2 -
 reactos/ntoskrnl/mm/pool.c              |  2 -
 reactos/ntoskrnl/mm/region.c            |  4 --
 reactos/ntoskrnl/mm/rmap.c              |  2 -
 reactos/ntoskrnl/mm/section.c           |  3 -
 reactos/ntoskrnl/ob/symlink.c           |  4 --
 reactos/ntoskrnl/ps/cid.c               |  2 -
 reactos/ntoskrnl/ps/job.c               |  2 -
 reactos/ntoskrnl/ps/kill.c              |  2 -
 reactos/ntoskrnl/ps/notify.c            |  1 -
 reactos/ntoskrnl/rtl/handle.c           |  4 --
 reactos/ntoskrnl/se/acl.c               |  3 -
 reactos/ntoskrnl/se/semgr.c             |  3 -
 reactos/ntoskrnl/se/sid.c               |  3 -
 25 files changed, 77 insertions(+), 67 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/tag.h b/reactos/ntoskrnl/include/internal/tag.h
index e7a36ab5218..a0b0583ac1e 100644
--- a/reactos/ntoskrnl/include/internal/tag.h
+++ b/reactos/ntoskrnl/include/internal/tag.h
@@ -64,5 +64,82 @@
 /* formerly located in io/irq.c */
 #define TAG_KINTERRUPT   TAG('K', 'I', 'S', 'R')
 
+/* formerly located in io/mdl.c */
+#define TAG_MDL    TAG('M', 'D', 'L', ' ')
+
+/* formerly located in io/pnpnotify.c */
+#define TAG_PNP_NOTIFY  TAG('P', 'n', 'P', 'N')
+
+/* formerly located in io/resource.c */
+#define TAG_IO_RESOURCE    TAG('R', 'S', 'R', 'C')
+
+/* formerly located in io/timer.c */
+#define TAG_IO_TIMER      TAG('I', 'O', 'T', 'M')
+
+/* formerly located in io/vpb.c */
+#define TAG_VPB    TAG('V', 'P', 'B', ' ')
+#define TAG_SYSB   TAG('S', 'Y', 'S', 'B')
+
+/* formerly located in kdbg/kdb_symbols.c */
+#define TAG_KDBS TAG('K', 'D', 'B', 'S')
+
+/* formerly located in ldr/loader.c */
+#define TAG_DRIVER_MEM  TAG('D', 'R', 'V', 'M') /* drvm */
+#define TAG_MODULE_OBJECT TAG('k', 'l', 'm', 'o') /* klmo - kernel ldr module object */
+#define TAG_LDR_WSTR TAG('k', 'l', 'w', 's') /* klws - kernel ldr wide string */
+#define TAG_MODULE_TEXT_SECTION TAG('k', 'l', 'm', 't') /* klmt - kernel ldr module text */
+
+/* formerly located in lpc/connect */
+#define TAG_LPC_CONNECT_MESSAGE   TAG('L', 'P', 'C', 'C')
+
+/* formerly located in mm/aspace.c */
+#define TAG_PTRC      TAG('P', 'T', 'R', 'C')
+
+/* formerly located in mm/marea.c */
+#define TAG_MAREA   TAG('M', 'A', 'R', 'E')
+
+/* formerly located in mm/pageop.c */
+#define TAG_MM_PAGEOP   TAG('M', 'P', 'O', 'P')
+
+/* formerly located in mm/pool.c */
+#define TAG_NONE TAG('N', 'o', 'n', 'e')
+
+/* formerly located in mm/region.c */
+#define TAG_MM_REGION    TAG('M', 'R', 'G', 'N')
+
+/* formerly located in mm/rmap.c */
+#define TAG_RMAP    TAG('R', 'M', 'A', 'P')
+
+/* formerly located in mm/section.c */
+#define TAG_MM_SECTION_SEGMENT   TAG('M', 'M', 'S', 'S')
+#define TAG_SECTION_PAGE_TABLE   TAG('M', 'S', 'P', 'T')
+
+/* formerly located in ob/symlink.c */
+#define TAG_SYMLINK_TTARGET     TAG('S', 'Y', 'T', 'T')
+#define TAG_SYMLINK_TARGET      TAG('S', 'Y', 'M', 'T')
+
+/* formerly located in ps/cid.c */
+#define TAG_CIDOBJECT TAG('C', 'I', 'D', 'O')
+
+/* formerly located in ps/job.c */
+#define TAG_EJOB TAG('E', 'J', 'O', 'B') /* EJOB */
+
+/* formerly located in ps/kill.c */
+#define TAG_TERMINATE_APC   TAG('T', 'A', 'P', 'C')
+
+/* formerly located in ps/notify.c */
+#define TAG_KAPC TAG('k','p','a','p') /* kpap - kernel ps apc */
+
+/* formerly located in rtl/handle.c */
+#define TAG_HDTB  TAG('H', 'D', 'T', 'B')
+
+/* formerly located in se/acl.c */
+#define TAG_ACL    TAG('A', 'C', 'L', 'T')
+
+/* formerly located in se/semgr.c */
+#define TAG_SXPT   TAG('S', 'X', 'P', 'T')
+
+/* formerly located in se/sid.c */
+#define TAG_SID    TAG('S', 'I', 'D', 'T')
 
 #endif /* _NTOSKRNL_TAG_H */
diff --git a/reactos/ntoskrnl/io/mdl.c b/reactos/ntoskrnl/io/mdl.c
index b5319ab7202..a26ab838cf2 100644
--- a/reactos/ntoskrnl/io/mdl.c
+++ b/reactos/ntoskrnl/io/mdl.c
@@ -14,10 +14,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-/* GLOBALS *******************************************************************/
-
-#define TAG_MDL    TAG('M', 'D', 'L', ' ')
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/ntoskrnl/io/pnpnotify.c b/reactos/ntoskrnl/io/pnpnotify.c
index d218e99265d..e92e5cc578b 100644
--- a/reactos/ntoskrnl/io/pnpnotify.c
+++ b/reactos/ntoskrnl/io/pnpnotify.c
@@ -30,8 +30,6 @@ typedef struct _PNP_NOTIFY_ENTRY
 static KGUARDED_MUTEX PnpNotifyListLock;
 static LIST_ENTRY PnpNotifyListHead;
 
-#define TAG_PNP_NOTIFY  TAG('P', 'n', 'P', 'N')
-
 /* FUNCTIONS *****************************************************************/
 
 /*
diff --git a/reactos/ntoskrnl/io/resource.c b/reactos/ntoskrnl/io/resource.c
index 49c78788fc6..aea22acc1e2 100644
--- a/reactos/ntoskrnl/io/resource.c
+++ b/reactos/ntoskrnl/io/resource.c
@@ -76,8 +76,6 @@ PWSTR ArcTypes[42] = {
     L"Undefined"
 };
 
-#define TAG_IO_RESOURCE    TAG('R', 'S', 'R', 'C')
-
 /* PRIVATE FUNCTIONS **********************************************************/
 
 /*
diff --git a/reactos/ntoskrnl/io/timer.c b/reactos/ntoskrnl/io/timer.c
index 090daa1a671..33f9cf83ab8 100644
--- a/reactos/ntoskrnl/io/timer.c
+++ b/reactos/ntoskrnl/io/timer.c
@@ -17,8 +17,6 @@
 
 /* GLOBALS *******************************************************************/
 
-#define TAG_IO_TIMER      TAG('I', 'O', 'T', 'M')
-
 /* Timer Database */
 KSPIN_LOCK IopTimerLock;
 LIST_ENTRY IopTimerQueueHead;
diff --git a/reactos/ntoskrnl/io/vpb.c b/reactos/ntoskrnl/io/vpb.c
index 56f34acad90..b16186bffe6 100644
--- a/reactos/ntoskrnl/io/vpb.c
+++ b/reactos/ntoskrnl/io/vpb.c
@@ -18,9 +18,6 @@
 
 static KSPIN_LOCK IoVpbLock;
 
-#define TAG_VPB    TAG('V', 'P', 'B', ' ')
-#define TAG_SYSB   TAG('S', 'Y', 'S', 'B')
-
 /* FUNCTIONS *****************************************************************/
 
 VOID INIT_FUNCTION
diff --git a/reactos/ntoskrnl/kdbg/kdb_symbols.c b/reactos/ntoskrnl/kdbg/kdb_symbols.c
index 0cfd513b47d..70d39905471 100644
--- a/reactos/ntoskrnl/kdbg/kdb_symbols.c
+++ b/reactos/ntoskrnl/kdbg/kdb_symbols.c
@@ -19,8 +19,6 @@
 
 /* GLOBALS ******************************************************************/
 
-#define TAG_KDBS TAG('K', 'D', 'B', 'S')
-
 typedef struct _IMAGE_SYMBOL_INFO_CACHE {
   LIST_ENTRY ListEntry;
   ULONG RefCount;
diff --git a/reactos/ntoskrnl/ldr/loader.c b/reactos/ntoskrnl/ldr/loader.c
index c71d06ef939..60be30011d2 100644
--- a/reactos/ntoskrnl/ldr/loader.c
+++ b/reactos/ntoskrnl/ldr/loader.c
@@ -41,11 +41,6 @@ STATIC MODULE_TEXT_SECTION NtoskrnlTextSection;
 STATIC MODULE_TEXT_SECTION LdrHalTextSection;
 ULONG_PTR LdrHalBase;
 
-#define TAG_DRIVER_MEM  TAG('D', 'R', 'V', 'M') /* drvm */
-#define TAG_MODULE_OBJECT TAG('k', 'l', 'm', 'o') /* klmo - kernel ldr module object */
-#define TAG_LDR_WSTR TAG('k', 'l', 'w', 's') /* klws - kernel ldr wide string */
-#define TAG_MODULE_TEXT_SECTION TAG('k', 'l', 'm', 't') /* klmt - kernel ldr module text */
-
 #ifndef HIWORD
 #define HIWORD(X)   ((WORD) (((DWORD) (X) >> 16) & 0xFFFF))
 #endif
diff --git a/reactos/ntoskrnl/lpc/connect.c b/reactos/ntoskrnl/lpc/connect.c
index 9bb82a7ea0f..6020915f7eb 100644
--- a/reactos/ntoskrnl/lpc/connect.c
+++ b/reactos/ntoskrnl/lpc/connect.c
@@ -14,10 +14,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-/* GLOBALS *******************************************************************/
-
-#define TAG_LPC_CONNECT_MESSAGE   TAG('L', 'P', 'C', 'C')
-
 /* FUNCTIONS *****************************************************************/
 
 /**********************************************************************
diff --git a/reactos/ntoskrnl/mm/aspace.c b/reactos/ntoskrnl/mm/aspace.c
index d66d5610e40..5a97b03bf5b 100644
--- a/reactos/ntoskrnl/mm/aspace.c
+++ b/reactos/ntoskrnl/mm/aspace.c
@@ -17,8 +17,6 @@
 
 STATIC MADDRESS_SPACE KernelAddressSpace;
 
-#define TAG_PTRC      TAG('P', 'T', 'R', 'C')
-
 /* FUNCTIONS *****************************************************************/
 
 VOID
diff --git a/reactos/ntoskrnl/mm/marea.c b/reactos/ntoskrnl/mm/marea.c
index cf3f55f1ec3..9291de2816f 100644
--- a/reactos/ntoskrnl/mm/marea.c
+++ b/reactos/ntoskrnl/mm/marea.c
@@ -14,10 +14,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-/* GLOBALS *******************************************************************/
-
-#define TAG_MAREA   TAG('M', 'A', 'R', 'E')
-
 /* #define VALIDATE_MEMORY_AREAS */
 
 /* FUNCTIONS *****************************************************************/
diff --git a/reactos/ntoskrnl/mm/pageop.c b/reactos/ntoskrnl/mm/pageop.c
index d290c960e88..47b3c92480b 100644
--- a/reactos/ntoskrnl/mm/pageop.c
+++ b/reactos/ntoskrnl/mm/pageop.c
@@ -22,8 +22,6 @@ static KSPIN_LOCK MmPageOpHashTableLock;
 static PMM_PAGEOP MmPageOpHashTable[PAGEOP_HASH_TABLE_SIZE];
 static NPAGED_LOOKASIDE_LIST MmPageOpLookasideList;
 
-#define TAG_MM_PAGEOP   TAG('M', 'P', 'O', 'P')
-
 /* FUNCTIONS *****************************************************************/
 
 VOID
diff --git a/reactos/ntoskrnl/mm/pool.c b/reactos/ntoskrnl/mm/pool.c
index 5d7d8b7cb23..15be0c02b21 100644
--- a/reactos/ntoskrnl/mm/pool.c
+++ b/reactos/ntoskrnl/mm/pool.c
@@ -22,8 +22,6 @@ extern MM_STATS MmStats;
 
 /* GLOBALS *****************************************************************/
 
-#define TAG_NONE (ULONG)(('N'<<0) + ('o'<<8) + ('n'<<16) + ('e'<<24))
-
 ULONG STDCALL
 ExRosQueryPagedPoolTag ( PVOID Block );
 
diff --git a/reactos/ntoskrnl/mm/region.c b/reactos/ntoskrnl/mm/region.c
index 0a7738c46e1..4dc04aea08d 100644
--- a/reactos/ntoskrnl/mm/region.c
+++ b/reactos/ntoskrnl/mm/region.c
@@ -14,10 +14,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-/* GLOBALS *******************************************************************/
-
-#define TAG_MM_REGION    TAG('M', 'R', 'G', 'N')
-
 /* FUNCTIONS *****************************************************************/
 
 VOID STATIC
diff --git a/reactos/ntoskrnl/mm/rmap.c b/reactos/ntoskrnl/mm/rmap.c
index 8223714bc93..6808388b794 100644
--- a/reactos/ntoskrnl/mm/rmap.c
+++ b/reactos/ntoskrnl/mm/rmap.c
@@ -24,8 +24,6 @@ typedef struct _MM_RMAP_ENTRY
 }
 MM_RMAP_ENTRY, *PMM_RMAP_ENTRY;
 
-#define TAG_RMAP    TAG('R', 'M', 'A', 'P')
-
 /* GLOBALS ******************************************************************/
 
 static FAST_MUTEX RmapListLock;
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 685846adf6c..b1150751df6 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -38,9 +38,6 @@ static GENERIC_MAPPING MmpSectionMapping = {
          STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE,
          SECTION_ALL_ACCESS};
 
-#define TAG_MM_SECTION_SEGMENT   TAG('M', 'M', 'S', 'S')
-#define TAG_SECTION_PAGE_TABLE   TAG('M', 'S', 'P', 'T')
-
 #define PAGE_FROM_SSE(E)         ((E) & 0xFFFFF000)
 #define PFN_FROM_SSE(E)          ((E) >> PAGE_SHIFT)
 #define SHARE_COUNT_FROM_SSE(E)  (((E) & 0x00000FFE) >> 1)
diff --git a/reactos/ntoskrnl/ob/symlink.c b/reactos/ntoskrnl/ob/symlink.c
index 48347025e5d..5eaa38012f8 100644
--- a/reactos/ntoskrnl/ob/symlink.c
+++ b/reactos/ntoskrnl/ob/symlink.c
@@ -25,10 +25,6 @@ static GENERIC_MAPPING ObpSymbolicLinkMapping = {
 	STANDARD_RIGHTS_EXECUTE|SYMBOLIC_LINK_QUERY,
 	SYMBOLIC_LINK_ALL_ACCESS};
 
-#define TAG_SYMLINK_TTARGET     TAG('S', 'Y', 'T', 'T')
-#define TAG_SYMLINK_TARGET      TAG('S', 'Y', 'M', 'T')
-
-
 /* FUNCTIONS ****************************************************************/
 
 /**********************************************************************
diff --git a/reactos/ntoskrnl/ps/cid.c b/reactos/ntoskrnl/ps/cid.c
index c50839043cf..83eea3ba00b 100644
--- a/reactos/ntoskrnl/ps/cid.c
+++ b/reactos/ntoskrnl/ps/cid.c
@@ -18,8 +18,6 @@
 
 PHANDLE_TABLE PspCidTable = NULL;
 
-#define TAG_CIDOBJECT TAG('C', 'I', 'D', 'O')
-
 #define CID_FLAG_PROCESS 0x1
 #define CID_FLAG_THREAD 0x2
 #define CID_FLAGS_MASK (CID_FLAG_PROCESS | CID_FLAG_THREAD)
diff --git a/reactos/ntoskrnl/ps/job.c b/reactos/ntoskrnl/ps/job.c
index 47588371455..edc83e4f9b8 100644
--- a/reactos/ntoskrnl/ps/job.c
+++ b/reactos/ntoskrnl/ps/job.c
@@ -17,8 +17,6 @@
 
 /* GLOBALS *******************************************************************/
 
-#define TAG_EJOB TAG('E', 'J', 'O', 'B') /* EJOB */
-
 POBJECT_TYPE EXPORTED PsJobType = NULL;
 
 LIST_ENTRY PsJobListHead;
diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index 9306a6b2de6..35bafc4a59e 100644
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -16,8 +16,6 @@
 
 /* GLOBALS *******************************************************************/
 
-#define TAG_TERMINATE_APC   TAG('T', 'A', 'P', 'C')
-
 PETHREAD PspReaperList = NULL;
 WORK_QUEUE_ITEM PspReaperWorkItem;
 BOOLEAN PspReaping = FALSE;
diff --git a/reactos/ntoskrnl/ps/notify.c b/reactos/ntoskrnl/ps/notify.c
index b3fe83dc967..703d82114d9 100644
--- a/reactos/ntoskrnl/ps/notify.c
+++ b/reactos/ntoskrnl/ps/notify.c
@@ -16,7 +16,6 @@
 /* GLOBAL *******************************************************************/
 
 #define MAX_THREAD_NOTIFY_ROUTINE_COUNT    8
-#define TAG_KAPC TAG('k','p','a','p') /* kpap - kernel ps apc */
 
 static ULONG PspThreadNotifyRoutineCount = 0;
 static PCREATE_THREAD_NOTIFY_ROUTINE
diff --git a/reactos/ntoskrnl/rtl/handle.c b/reactos/ntoskrnl/rtl/handle.c
index 8bd7df97b25..d7adfd56a6a 100644
--- a/reactos/ntoskrnl/rtl/handle.c
+++ b/reactos/ntoskrnl/rtl/handle.c
@@ -14,10 +14,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-
-#define TAG_HDTB  TAG('H', 'D', 'T', 'B')
-
-
 static BOOLEAN
 RtlpIsValidHandle(PRTL_HANDLE_TABLE HandleTable, PRTL_HANDLE Handle);
 static BOOLEAN
diff --git a/reactos/ntoskrnl/se/acl.c b/reactos/ntoskrnl/se/acl.c
index 4e2c732b6a7..3ad94a742ac 100644
--- a/reactos/ntoskrnl/se/acl.c
+++ b/reactos/ntoskrnl/se/acl.c
@@ -13,9 +13,6 @@
 #include <ntoskrnl.h>
 #include <internal/debug.h>
 
-#define TAG_ACL    TAG('A', 'C', 'L', 'T')
-
-
 /* GLOBALS ******************************************************************/
 
 PACL EXPORTED SePublicDefaultDacl = NULL;
diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c
index 1e606152e4e..e32f211f8d9 100644
--- a/reactos/ntoskrnl/se/semgr.c
+++ b/reactos/ntoskrnl/se/semgr.c
@@ -14,9 +14,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-#define TAG_SXPT   TAG('S', 'X', 'P', 'T')
-
-
 /* GLOBALS ******************************************************************/
 
 PSE_EXPORTS EXPORTED SeExports = NULL;
diff --git a/reactos/ntoskrnl/se/sid.c b/reactos/ntoskrnl/se/sid.c
index de59741a876..be327852699 100644
--- a/reactos/ntoskrnl/se/sid.c
+++ b/reactos/ntoskrnl/se/sid.c
@@ -15,9 +15,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-#define TAG_SID    TAG('S', 'I', 'D', 'T')
-
-
 /* GLOBALS ******************************************************************/
 
 SID_IDENTIFIER_AUTHORITY SeNullSidAuthority = {SECURITY_NULL_SID_AUTHORITY};