- Get rid of TAG() from the kernel

- mmtypes.h: Goodbye TAG(), you won't be missed

svn path=/trunk/; revision=42920

diff --git a/reactos/include/ndk/mmtypes.h b/reactos/include/ndk/mmtypes.h
index 32d4b27..fcc8faa 100644 (file)
--- a/reactos/include/ndk/mmtypes.h
+++ b/reactos/include/ndk/mmtypes.h
@@ -41,12 +41,6 @@ Author:
     (((ULONG_PTR)(Size) + MM_ALLOCATION_GRANULARITY - 1)    \
     & ~(MM_ALLOCATION_GRANULARITY - 1))
 
     (((ULONG_PTR)(Size) + MM_ALLOCATION_GRANULARITY - 1)    \
     & ~(MM_ALLOCATION_GRANULARITY - 1))
 

-//
-// Macro for generating pool tags
-//
-#define TAG(A, B, C, D)                                     \
-    (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
-

 //
 // PFN Identity Uses
 //
 //
 // PFN Identity Uses
 //

diff --git a/reactos/ntoskrnl/config/cmhook.c b/reactos/ntoskrnl/config/cmhook.c
index bab02fe..6ccd751 100644 (file)
--- a/reactos/ntoskrnl/config/cmhook.c
+++ b/reactos/ntoskrnl/config/cmhook.c
@@ -116,7 +116,7 @@ CmRegisterCallback(IN PEX_CALLBACK_FUNCTION Function,
 
     Callback = ExAllocatePoolWithTag(PagedPool,
                                    sizeof(REGISTRY_CALLBACK),
 
     Callback = ExAllocatePoolWithTag(PagedPool,
                                    sizeof(REGISTRY_CALLBACK),

-                                   TAG('C', 'M', 'c', 'b'));
+                                   'bcMC');

     if (Callback != NULL)
     {
         /* initialize the callback */
     if (Callback != NULL)
     {
         /* initialize the callback */

diff --git a/reactos/ntoskrnl/config/cmparse.c b/reactos/ntoskrnl/config/cmparse.c
index 79c35d4..9e2944b 100644 (file)
--- a/reactos/ntoskrnl/config/cmparse.c
+++ b/reactos/ntoskrnl/config/cmparse.c
@@ -285,7 +285,7 @@ CmpDoCreateChild(IN PHHIVE Hive,
     
     /* Setup the key body */
     KeyBody = (PCM_KEY_BODY)(*Object);
     
     /* Setup the key body */
     KeyBody = (PCM_KEY_BODY)(*Object);

-    KeyBody->Type = TAG('k', 'y', '0', '2');
+    KeyBody->Type = '20yk';

     KeyBody->KeyControlBlock = NULL;
 
     /* Check if we had a class */
     KeyBody->KeyControlBlock = NULL;
 
     /* Check if we had a class */


@@ -680,7 +680,7 @@ CmpDoOpen(IN PHHIVE Hive,
         /* Get the key body and fill it out */
         KeyBody = (PCM_KEY_BODY)(*Object);       
         KeyBody->KeyControlBlock = Kcb;
         /* Get the key body and fill it out */
         KeyBody = (PCM_KEY_BODY)(*Object);       
         KeyBody->KeyControlBlock = Kcb;

-        KeyBody->Type = TAG('k', 'y', '0', '2');
+        KeyBody->Type = '20yk';

         KeyBody->ProcessID = PsGetCurrentProcessId();
         KeyBody->NotifyBlock = NULL;
         
         KeyBody->ProcessID = PsGetCurrentProcessId();
         KeyBody->NotifyBlock = NULL;
         

diff --git a/reactos/ntoskrnl/config/cmsysini.c b/reactos/ntoskrnl/config/cmsysini.c
index 37fe7f5..2fb8373 100644 (file)
--- a/reactos/ntoskrnl/config/cmsysini.c
+++ b/reactos/ntoskrnl/config/cmsysini.c
@@ -63,7 +63,7 @@ CmpDeleteKeyObject(PVOID DeletedObject)
     CmpLockRegistry();
 
     /* Make sure this is a valid key body */
     CmpLockRegistry();
 
     /* Make sure this is a valid key body */

-    if (KeyBody->Type == TAG('k', 'y', '0', '2'))
+    if (KeyBody->Type == '20yk')

     {
         /* Get the KCB */
         Kcb = KeyBody->KeyControlBlock;
     {
         /* Get the KCB */
         Kcb = KeyBody->KeyControlBlock;


@@ -100,7 +100,7 @@ CmpCloseKeyObject(IN PEPROCESS Process OPTIONAL,
     if (SystemHandleCount > 1) return;
 
     /* Make sure we're a valid key body */
     if (SystemHandleCount > 1) return;
 
     /* Make sure we're a valid key body */

-    if (KeyBody->Type == TAG('k', 'y', '0', '2'))
+    if (KeyBody->Type == '20yk')

     {
         /* Don't do anything if we don't have a notify block */
         if (!KeyBody->NotifyBlock) return;
     {
         /* Don't do anything if we don't have a notify block */
         if (!KeyBody->NotifyBlock) return;


@@ -964,7 +964,7 @@ CmpCreateRegistryRoot(VOID)
 
     /* Initialize the object */
     RootKey->KeyControlBlock = Kcb;
 
     /* Initialize the object */
     RootKey->KeyControlBlock = Kcb;

-    RootKey->Type = TAG('k', 'y', '0', '2');
+    RootKey->Type = '20yk';

     RootKey->NotifyBlock = NULL;
     RootKey->ProcessID = PsGetCurrentProcessId();
 
     RootKey->NotifyBlock = NULL;
     RootKey->ProcessID = PsGetCurrentProcessId();
 

diff --git a/reactos/ntoskrnl/dbgk/dbgkobj.c b/reactos/ntoskrnl/dbgk/dbgkobj.c
index 98b6084..c59ad79 100644 (file)
--- a/reactos/ntoskrnl/dbgk/dbgkobj.c
+++ b/reactos/ntoskrnl/dbgk/dbgkobj.c
@@ -59,7 +59,7 @@ DbgkpQueueMessage(IN PEPROCESS Process,
         /* Allocate it */
         DebugEvent = ExAllocatePoolWithTag(NonPagedPool,
                                            sizeof(DEBUG_EVENT),
         /* Allocate it */
         DebugEvent = ExAllocatePoolWithTag(NonPagedPool,
                                            sizeof(DEBUG_EVENT),

-                                           TAG('D', 'b', 'g', 'E'));
+                                           'EgbD');

         if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES;
 
         /* Set flags */
         if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES;
 
         /* Set flags */

diff --git a/reactos/ntoskrnl/ex/atom.c b/reactos/ntoskrnl/ex/atom.c
index dd5c997..36ca10f 100644 (file)
--- a/reactos/ntoskrnl/ex/atom.c
+++ b/reactos/ntoskrnl/ex/atom.c
@@ -13,7 +13,7 @@
 #define NDEBUG
 #include <debug.h>
 
 #define NDEBUG
 #include <debug.h>
 

-#define TAG_ATOM TAG('A', 't', 'o', 'm')
+#define TAG_ATOM 'motA'

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

diff --git a/reactos/ntoskrnl/ex/callback.c b/reactos/ntoskrnl/ex/callback.c
index 2763233..202e294 100644 (file)
--- a/reactos/ntoskrnl/ex/callback.c
+++ b/reactos/ntoskrnl/ex/callback.c
@@ -402,7 +402,7 @@ ExCreateCallback(OUT PCALLBACK_OBJECT *CallbackObject,
         if (NT_SUCCESS(Status))
         {
             /* Set it up */
         if (NT_SUCCESS(Status))
         {
             /* Set it up */

-            Callback->Signature = TAG('C', 'a', 'l', 'l');
+            Callback->Signature = 'llaC';

             KeInitializeSpinLock(&Callback->Lock);
             InitializeListHead(&Callback->RegisteredCallbacks);
             Callback->AllowMultipleCallbacks = AllowMultipleCallbacks;
             KeInitializeSpinLock(&Callback->Lock);
             InitializeListHead(&Callback->RegisteredCallbacks);
             Callback->AllowMultipleCallbacks = AllowMultipleCallbacks;

diff --git a/reactos/ntoskrnl/ex/handle.c b/reactos/ntoskrnl/ex/handle.c
index d1d5d4e..18ab69f 100644 (file)
--- a/reactos/ntoskrnl/ex/handle.c
+++ b/reactos/ntoskrnl/ex/handle.c
@@ -131,7 +131,7 @@ ExpAllocateTablePagedPool(IN PEPROCESS Process OPTIONAL,
     PVOID Buffer;
 
     /* Do the allocation */
     PVOID Buffer;
 
     /* Do the allocation */

-    Buffer = ExAllocatePoolWithTag(PagedPool, Size, TAG('O', 'b', 't', 'b'));
+    Buffer = ExAllocatePoolWithTag(PagedPool, Size, 'btbO');

     if (Buffer)
     {
         /* Clear the memory */
     if (Buffer)
     {
         /* Clear the memory */


@@ -156,7 +156,7 @@ ExpAllocateTablePagedPoolNoZero(IN PEPROCESS Process OPTIONAL,
     PVOID Buffer;
 
     /* Do the allocation */
     PVOID Buffer;
 
     /* Do the allocation */

-    Buffer = ExAllocatePoolWithTag(PagedPool, Size, TAG('O', 'b', 't', 'b'));
+    Buffer = ExAllocatePoolWithTag(PagedPool, Size, 'btbO');

     if (Buffer)
     {
         /* Check if we have a process to charge quota */
     if (Buffer)
     {
         /* Check if we have a process to charge quota */


@@ -344,7 +344,7 @@ ExpAllocateHandleTable(IN PEPROCESS Process OPTIONAL,
     /* Allocate the table */
     HandleTable = ExAllocatePoolWithTag(PagedPool,
                                         sizeof(HANDLE_TABLE),
     /* Allocate the table */
     HandleTable = ExAllocatePoolWithTag(PagedPool,
                                         sizeof(HANDLE_TABLE),

-                                        TAG('O', 'b', 't', 'b'));
+                                        'btbO');

     if (!HandleTable) return NULL;
 
     /* Check if we have a process */
     if (!HandleTable) return NULL;
 
     /* Check if we have a process */

diff --git a/reactos/ntoskrnl/ex/harderr.c b/reactos/ntoskrnl/ex/harderr.c
index 084295a..8062519 100644 (file)
--- a/reactos/ntoskrnl/ex/harderr.c
+++ b/reactos/ntoskrnl/ex/harderr.c
@@ -12,7 +12,7 @@
 #define NDEBUG
 #include <debug.h>
 
 #define NDEBUG
 #include <debug.h>
 

-#define TAG_ERR TAG('E', 'r', 'r', ' ')
+#define TAG_ERR ' rrE'

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

diff --git a/reactos/ntoskrnl/ex/init.c b/reactos/ntoskrnl/ex/init.c
index e4693b8..b747ede 100644 (file)
--- a/reactos/ntoskrnl/ex/init.c
+++ b/reactos/ntoskrnl/ex/init.c
@@ -235,7 +235,7 @@ ExpInitNls(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
         /* Allocate the a new buffer since loader memory will be freed */
         ExpNlsTableBase = ExAllocatePoolWithTag(NonPagedPool,
                                                 ExpNlsTableSize,
         /* Allocate the a new buffer since loader memory will be freed */
         ExpNlsTableBase = ExAllocatePoolWithTag(NonPagedPool,
                                                 ExpNlsTableSize,

-                                                TAG('R', 't', 'l', 'i'));
+                                                'iltR');

         if (!ExpNlsTableBase) KeBugCheck(PHASE0_INITIALIZATION_FAILED);
 
         /* Copy the codepage data in its new location. */
         if (!ExpNlsTableBase) KeBugCheck(PHASE0_INITIALIZATION_FAILED);
 
         /* Copy the codepage data in its new location. */


@@ -324,7 +324,7 @@ ExpInitNls(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize);
 
     /* Free the previously allocated buffer and set the new location */
     RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize);
 
     /* Free the previously allocated buffer and set the new location */

-    ExFreePoolWithTag(ExpNlsTableBase, TAG('R', 't', 'l', 'i'));
+    ExFreePoolWithTag(ExpNlsTableBase, 'iltR');

     ExpNlsTableBase = SectionBase;
 
     /* Initialize the NLS Tables */
     ExpNlsTableBase = SectionBase;
 
     /* Initialize the NLS Tables */


@@ -1188,7 +1188,7 @@ ExpInitializeExecutive(IN ULONG Cpu,
     KeServiceDescriptorTable[0].Count =
         ExAllocatePoolWithTag(NonPagedPool,
                               KiServiceLimit * sizeof(ULONG),
     KeServiceDescriptorTable[0].Count =
         ExAllocatePoolWithTag(NonPagedPool,
                               KiServiceLimit * sizeof(ULONG),

-                              TAG('C', 'a', 'l', 'l'));
+                              'llaC');

 
     /* Use it for the shadow table too */
     KeServiceDescriptorTableShadow[0].Count = KeServiceDescriptorTable[0].Count;
 
     /* Use it for the shadow table too */
     KeServiceDescriptorTableShadow[0].Count = KeServiceDescriptorTable[0].Count;


@@ -1269,7 +1269,7 @@ Phase1InitializationDiscard(IN PVOID Context)
     /* Allocate the initialization buffer */
     InitBuffer = ExAllocatePoolWithTag(NonPagedPool,
                                        sizeof(INIT_BUFFER),
     /* Allocate the initialization buffer */
     InitBuffer = ExAllocatePoolWithTag(NonPagedPool,
                                        sizeof(INIT_BUFFER),

-                                       TAG('I', 'n', 'i', 't'));
+                                       'tinI');

     if (!InitBuffer)
     {
         /* Bugcheck */
     if (!InitBuffer)
     {
         /* Bugcheck */

diff --git a/reactos/ntoskrnl/ex/lookas.c b/reactos/ntoskrnl/ex/lookas.c
index f32e249..42ccb9f 100644 (file)
--- a/reactos/ntoskrnl/ex/lookas.c
+++ b/reactos/ntoskrnl/ex/lookas.c
@@ -108,7 +108,7 @@ ExpInitLookasideLists()
         ExInitializeSystemLookasideList(&ExpSmallNPagedPoolLookasideLists[i],
                                         NonPagedPool,
                                         (i + 1) * 8,
         ExInitializeSystemLookasideList(&ExpSmallNPagedPoolLookasideLists[i],
                                         NonPagedPool,
                                         (i + 1) * 8,

-                                        TAG('P', 'o', 'o', 'l'),
+                                        'looP',

                                         256,
                                         &ExPoolLookasideListHead);
 
                                         256,
                                         &ExPoolLookasideListHead);
 


@@ -116,7 +116,7 @@ ExpInitLookasideLists()
         ExInitializeSystemLookasideList(&ExpSmallPagedPoolLookasideLists[i],
                                         PagedPool,
                                         (i + 1) * 8,
         ExInitializeSystemLookasideList(&ExpSmallPagedPoolLookasideLists[i],
                                         PagedPool,
                                         (i + 1) * 8,

-                                        TAG('P', 'o', 'o', 'l'),
+                                        'looP',

                                         256,
                                         &ExPoolLookasideListHead);
     }
                                         256,
                                         &ExPoolLookasideListHead);
     }

diff --git a/reactos/ntoskrnl/ex/profile.c b/reactos/ntoskrnl/ex/profile.c
index 65cef59..3348018 100644 (file)
--- a/reactos/ntoskrnl/ex/profile.c
+++ b/reactos/ntoskrnl/ex/profile.c
@@ -17,7 +17,7 @@
 #pragma alloc_text(INIT, ExpInitializeProfileImplementation)
 #endif
 
 #pragma alloc_text(INIT, ExpInitializeProfileImplementation)
 #endif
 

-#define TAG_PROFILE TAG('P', 'r', 'o', 'f')
+#define TAG_PROFILE 'forP'

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

diff --git a/reactos/ntoskrnl/fsrtl/fsrtlpc.c b/reactos/ntoskrnl/fsrtl/fsrtlpc.c
index dd015b1..601a94b 100644 (file)
--- a/reactos/ntoskrnl/fsrtl/fsrtlpc.c
+++ b/reactos/ntoskrnl/fsrtl/fsrtlpc.c
@@ -172,7 +172,7 @@ FsRtlInitSystem(VOID)
     FsRtlPagingIoResources = FsRtlAllocatePoolWithTag(NonPagedPool,\r
                                                       FSRTL_MAX_RESOURCES *\r
                                                       sizeof(ERESOURCE),\r
     FsRtlPagingIoResources = FsRtlAllocatePoolWithTag(NonPagedPool,\r
                                                       FSRTL_MAX_RESOURCES *\r
                                                       sizeof(ERESOURCE),\r

-                                                      TAG('F', 's', 'R', 'e'));\r
+                                                      'eRsF');\r

 \r
     /* Initialize the Resources */\r
     for (i = 0; i < FSRTL_MAX_RESOURCES; i++)\r
 \r
     /* Initialize the Resources */\r
     for (i = 0; i < FSRTL_MAX_RESOURCES; i++)\r

diff --git a/reactos/ntoskrnl/include/internal/cm.h b/reactos/ntoskrnl/include/internal/cm.h
index 6334705..7782f41 100644 (file)
--- a/reactos/ntoskrnl/include/internal/cm.h
+++ b/reactos/ntoskrnl/include/internal/cm.h
@@ -45,8 +45,8 @@
 //
 // CM_KEY_CONTROL_BLOCK Signatures
 //
 //
 // CM_KEY_CONTROL_BLOCK Signatures
 //

-#define CM_KCB_SIGNATURE                                TAG('C', 'm', 'K', 'b')
-#define CM_KCB_INVALID_SIGNATURE                        TAG('C', 'm', 'F', '4')
+#define CM_KCB_SIGNATURE                                'bKmC'
+#define CM_KCB_INVALID_SIGNATURE                        '4FmC'

 
 //
 // CM_KEY_CONTROL_BLOCK Flags
 
 //
 // CM_KEY_CONTROL_BLOCK Flags

diff --git a/reactos/ntoskrnl/include/internal/mm.h b/reactos/ntoskrnl/include/internal/mm.h
index c67ebd8..51bdc0e 100644 (file)
--- a/reactos/ntoskrnl/include/internal/mm.h
+++ b/reactos/ntoskrnl/include/internal/mm.h
@@ -70,7 +70,7 @@ typedef ULONG PFN_TYPE, *PPFN_TYPE;
                                              PAGE_SIZE)
 
 /* Signature of free pool blocks */
                                              PAGE_SIZE)
 
 /* Signature of free pool blocks */

-#define MM_FREE_POOL_TAG    TAG('F', 'r', 'p', 'l')
+#define MM_FREE_POOL_TAG    'lprF'

 
 #define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \
     ((x) / (4*1024*1024))
 
 #define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \
     ((x) / (4*1024*1024))

diff --git a/reactos/ntoskrnl/include/internal/ob.h b/reactos/ntoskrnl/include/internal/ob.h
index 892f405..521bf58 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ob.h
+++ b/reactos/ntoskrnl/include/internal/ob.h
@@ -142,7 +142,7 @@ typedef union
 //
 // Private Temporary Buffer for Lookup Routines
 //
 //
 // Private Temporary Buffer for Lookup Routines
 //

-#define TAG_OB_TEMP_STORAGE TAG('O', 'b', 'S', 't')
+#define TAG_OB_TEMP_STORAGE 'tSbO'

 typedef struct _OB_TEMP_BUFFER
 {
     ACCESS_STATE LocalAccessState;
 typedef struct _OB_TEMP_BUFFER
 {
     ACCESS_STATE LocalAccessState;

diff --git a/reactos/ntoskrnl/include/internal/tag.h b/reactos/ntoskrnl/include/internal/tag.h
index 041ec0c..8a23c7f 100644 (file)
--- a/reactos/ntoskrnl/include/internal/tag.h
+++ b/reactos/ntoskrnl/include/internal/tag.h
@@ -2,166 +2,166 @@
 #define _NTOSKRNL_TAG_H
 
 /* formerly located in cc/view.c */
 #define _NTOSKRNL_TAG_H
 
 /* formerly located in cc/view.c */

-#define TAG_CSEG  TAG('C', 'S', 'E', 'G')
-#define TAG_BCB   TAG('B', 'C', 'B', ' ')
-#define TAG_IBCB  TAG('i', 'B', 'C', 'B')
+#define TAG_CSEG  'GESC'
+#define TAG_BCB   ' BCB'
+#define TAG_IBCB  'BCBi'

 
 /* formely located in include/callback.h */
 
 /* formely located in include/callback.h */

-#define CALLBACK_TAG        TAG('C','L','B','K')
+#define CALLBACK_TAG        'KBLC'

 
 /* formerly located in ex/resource.c */
 
 /* formerly located in ex/resource.c */

-#define TAG_RESOURCE_TABLE      TAG('R', 'e', 'T', 'a')
-#define TAG_RESOURCE_EVENT      TAG('R', 'e', 'T', 'a')
-#define TAG_RESOURCE_SEMAPHORE  TAG('R', 'e', 'T', 'a')
+#define TAG_RESOURCE_TABLE      'aTeR'
+#define TAG_RESOURCE_EVENT      'aTeR'
+#define TAG_RESOURCE_SEMAPHORE  'aTeR'

 
 /* formerly located in fs/notify.c */
 
 /* formerly located in fs/notify.c */

-#define FSRTL_NOTIFY_TAG TAG('N','O','T','I')
+#define FSRTL_NOTIFY_TAG 'ITON'

 
 /* formerly located in io/device.c */
 
 /* formerly located in io/device.c */

-#define TAG_DEVICE_EXTENSION   TAG('D', 'E', 'X', 'T')
-#define TAG_SHUTDOWN_ENTRY    TAG('S', 'H', 'U', 'T')
-#define TAG_IO_TIMER      TAG('I', 'O', 'T', 'M')
+#define TAG_DEVICE_EXTENSION   'TXED'
+#define TAG_SHUTDOWN_ENTRY    'TUHS'
+#define TAG_IO_TIMER      'MTOI'

 
 /* formerly located in io/driver.c */
 
 /* formerly located in io/driver.c */

-#define TAG_DRIVER             TAG('D', 'R', 'V', 'R')
-#define TAG_DRIVER_EXTENSION   TAG('D', 'R', 'V', 'E')
+#define TAG_DRIVER             'RVRD'
+#define TAG_DRIVER_EXTENSION   'EVRD'

 
 /* formerly located in io/file.c */
 
 /* formerly located in io/file.c */

-#define TAG_SYSB        TAG('S', 'Y', 'S', 'B')
-#define TAG_LOCK        TAG('F','l','c','k')
-#define TAG_FILE_NAME   TAG('F', 'N', 'A', 'M')
+#define TAG_SYSB        'BSYS'
+#define TAG_LOCK        'kclF'
+#define TAG_FILE_NAME   'MANF'

 
 /* formerly located in io/fs.c */
 
 /* formerly located in io/fs.c */

-#define TAG_FILE_SYSTEM       TAG('F', 'S', 'Y', 'S')
-#define TAG_FS_CHANGE_NOTIFY  TAG('F', 'S', 'C', 'N')
-#define IFS_POOL_TAG          TAG('F', 'S', 'r', 't')
+#define TAG_FILE_SYSTEM       'SYSF'
+#define TAG_FS_CHANGE_NOTIFY  'NCSF'
+#define IFS_POOL_TAG          'trSF'

 
 /* formerly located in io/iocomp.c */
 
 /* formerly located in io/iocomp.c */

-#define IOC_TAG   TAG('I', 'O', 'C', 'T')
+#define IOC_TAG   'TCOI'

 
 /* formerly located in io/iomgr.c */
 
 /* formerly located in io/iomgr.c */

-#define TAG_DEVICE_TYPE     TAG('D', 'E', 'V', 'T')
-#define TAG_FILE_TYPE       TAG('F', 'I', 'L', 'E')
-#define TAG_ADAPTER_TYPE    TAG('A', 'D', 'P', 'T')
-#define IO_LARGEIRP         TAG('I', 'r', 'p', 'l')
-#define IO_SMALLIRP         TAG('I', 'r', 'p', 's')
-#define IO_LARGEIRP_CPU     TAG('I', 'r', 'p', 'L')
-#define IO_SMALLIRP_CPU     TAG('I', 'r', 'p', 'S')
-#define IOC_TAG1             TAG('I', 'p', 'c', ' ')
-#define IOC_CPU             TAG('I', 'p', 'c', 'P')
-#define TAG_APC             TAG('K', 'A', 'P', 'C')
-#define TAG_IO              TAG('I', 'o', ' ', ' ')
-#define TAG_ERROR_LOG       TAG('I', 'o', 'E', 'r')
-#define TAG_EA              TAG('I', 'o', 'E', 'a')
-#define TAG_IO_NAME         TAG('I', 'o', 'N', 'm')
-#define TAG_REINIT          TAG('I', 'o', 'R', 'i')
+#define TAG_DEVICE_TYPE     'TVED'
+#define TAG_FILE_TYPE       'ELIF'
+#define TAG_ADAPTER_TYPE    'TPDA'
+#define IO_LARGEIRP         'lprI'
+#define IO_SMALLIRP         'sprI'
+#define IO_LARGEIRP_CPU     'LprI'
+#define IO_SMALLIRP_CPU     'SprI'
+#define IOC_TAG1            ' cpI'
+#define IOC_CPU             'PcpI'
+#define TAG_APC             'CPAK'
+#define TAG_IO              '  oI'
+#define TAG_ERROR_LOG       'rEoI'
+#define TAG_EA              'aEoI'
+#define TAG_IO_NAME         'mNoI'
+#define TAG_REINIT          'iRoI'

 
 /* formerly located in io/work.c */
 
 /* formerly located in io/work.c */

-#define TAG_IOWI TAG('I', 'O', 'W', 'I')
+#define TAG_IOWI 'IWOI'

 
 /* formerly located in io/irp.c */
 
 /* formerly located in io/irp.c */

-#define TAG_IRP      TAG('I', 'R', 'P', ' ')
-#define TAG_SYS_BUF  TAG('S', 'Y', 'S' , 'B')
+#define TAG_IRP      ' PRI'
+#define TAG_SYS_BUF  'BSYS'

 
 /* formerly located in io/irq.c */
 
 /* formerly located in io/irq.c */

-#define TAG_KINTERRUPT   TAG('K', 'I', 'S', 'R')
+#define TAG_KINTERRUPT   'RSIK'

 
 /* formerly located in io/mdl.c */
 
 /* formerly located in io/mdl.c */

-#define TAG_MDL    TAG('M', 'D', 'L', ' ')
+#define TAG_MDL    ' LDM'

 
 /* formerly located in io/pnpnotify.c */
 
 /* formerly located in io/pnpnotify.c */

-#define TAG_PNP_NOTIFY  TAG('P', 'n', 'P', 'N')
+#define TAG_PNP_NOTIFY  'NPnP'

 
 /* for io/pnproot.c */
 
 /* for io/pnproot.c */

-#define TAG_PNP_ROOT    TAG('P', 'n', 'P', 'R')
+#define TAG_PNP_ROOT    'RPnP'

 
 /* formerly located in io/resource.c */
 
 /* formerly located in io/resource.c */

-#define TAG_IO_RESOURCE    TAG('R', 'S', 'R', 'C')
+#define TAG_IO_RESOURCE    'CRSR'

 
 /* formerly located in io/timer.c */
 
 /* formerly located in io/timer.c */

-#define TAG_IO_TIMER      TAG('I', 'O', 'T', 'M')
+#define TAG_IO_TIMER      'MTOI'

 
 /* formerly located in io/vpb.c */
 
 /* formerly located in io/vpb.c */

-#define TAG_VPB    TAG('V', 'P', 'B', ' ')
-#define TAG_SYSB   TAG('S', 'Y', 'S', 'B')
+#define TAG_VPB    ' BPV'
+#define TAG_SYSB   'BSYS'

 
 /* formerly located in kdbg/kdb_symbols.c */
 
 /* formerly located in kdbg/kdb_symbols.c */

-#define TAG_KDBS TAG('K', 'D', 'B', 'S')
-#define TAG_KDBG TAG('K', 'D', 'B', 'G')
+#define TAG_KDBS 'SBDK'
+#define TAG_KDBG 'GBDK'

 
 /* formerly located in ldr/loader.c */
 
 /* 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_DRIVER_MEM  'MVRD' /* drvm */
+#define TAG_MODULE_OBJECT 'omlk' /* klmo - kernel ldr module object */
+#define TAG_LDR_WSTR 'swlk' /* klws - kernel ldr wide string */

 
 /* formerly located in lpc/connect */
 
 /* formerly located in lpc/connect */

-#define TAG_LPC_CONNECT_MESSAGE   TAG('L', 'P', 'C', 'C')
+#define TAG_LPC_CONNECT_MESSAGE   'CCPL'

 
 /* formerly located in mm/aspace.c */
 
 /* formerly located in mm/aspace.c */

-#define TAG_PTRC      TAG('P', 'T', 'R', 'C')
+#define TAG_PTRC      'CRTP'

 
 /* formerly located in mm/marea.c */
 
 /* formerly located in mm/marea.c */

-#define TAG_MAREA   TAG('M', 'A', 'R', 'E')
+#define TAG_MAREA   'ERAM'

 
 /* formerly located in mm/pageop.c */
 
 /* formerly located in mm/pageop.c */

-#define TAG_MM_PAGEOP   TAG('M', 'P', 'O', 'P')
+#define TAG_MM_PAGEOP   'POPM'

 
 /* formerly located in mm/pool.c */
 
 /* formerly located in mm/pool.c */

-#define TAG_NONE TAG('N', 'o', 'n', 'e')
+#define TAG_NONE 'enoN'

 
 /* formerly located in mm/region.c */
 
 /* formerly located in mm/region.c */

-#define TAG_MM_REGION    TAG('M', 'R', 'G', 'N')
+#define TAG_MM_REGION    'NGRM'

 
 /* formerly located in mm/rmap.c */
 
 /* formerly located in mm/rmap.c */

-#define TAG_RMAP    TAG('R', 'M', 'A', 'P')
+#define TAG_RMAP    'PAMR'

 
 /* formerly located in mm/section.c */
 
 /* 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')
+#define TAG_MM_SECTION_SEGMENT   'SSMM'
+#define TAG_SECTION_PAGE_TABLE   'TPSM'

 
 /* formerly located in ob/symlink.c */
 
 /* formerly located in ob/symlink.c */

-#define TAG_OBJECT_TYPE         TAG('O', 'b', 'j', 'T')
-#define TAG_SYMLINK_TTARGET     TAG('S', 'Y', 'T', 'T')
-#define TAG_SYMLINK_TARGET      TAG('S', 'Y', 'M', 'T')
+#define TAG_OBJECT_TYPE         'TjbO'
+#define TAG_SYMLINK_TTARGET     'TTYS'
+#define TAG_SYMLINK_TARGET      'TMYS'

 
 /* Object Manager Tags */
 
 /* Object Manager Tags */

-#define OB_NAME_TAG             TAG('O', 'b', 'N', 'm')
-#define OB_DIR_TAG              TAG('O', 'b', 'D', 'i')
+#define OB_NAME_TAG             'mNbO'
+#define OB_DIR_TAG              'iDbO'

 
 /* formerly located in ps/cid.c */
 
 /* formerly located in ps/cid.c */

-#define TAG_CIDOBJECT TAG('C', 'I', 'D', 'O')
-#define TAG_PS_IMPERSONATION    TAG('P', 's', 'I', 'm')
+#define TAG_CIDOBJECT 'ODIC'
+#define TAG_PS_IMPERSONATION    'mIsP'

 
 /* formerly located in ps/job.c */
 
 /* formerly located in ps/job.c */

-#define TAG_EJOB TAG('E', 'J', 'O', 'B') /* EJOB */
+#define TAG_EJOB 'BOJE' /* EJOB */

 
 /* formerly located in ps/kill.c */
 
 /* formerly located in ps/kill.c */

-#define TAG_TERMINATE_APC   TAG('T', 'A', 'P', 'C')
+#define TAG_TERMINATE_APC   'CPAT'

 
 /* formerly located in ps/notify.c */
 
 /* formerly located in ps/notify.c */

-#define TAG_KAPC TAG('k','p','a','p') /* kpap - kernel ps apc */
-#define TAG_PS_APC TAG('P', 's', 'a', 'p') /* Psap - Ps APC */
+#define TAG_KAPC 'papk' /* kpap - kernel ps apc */
+#define TAG_PS_APC 'pasP' /* Psap - Ps APC */

 
 /* formerly located in rtl/handle.c */
 
 /* formerly located in rtl/handle.c */

-#define TAG_HDTB  TAG('H', 'D', 'T', 'B')
+#define TAG_HDTB  'BTDH'

 
 /* formerly located in se/acl.c */
 
 /* formerly located in se/acl.c */

-#define TAG_ACL    TAG('S', 'e', 'A', 'c')
+#define TAG_ACL    'cAeS'

 
 /* formerly located in se/sid.c */
 
 /* formerly located in se/sid.c */

-#define TAG_SID    TAG('S', 'e', 'S', 'i')
+#define TAG_SID    'iSeS'

 
 /* formerly located in se/sd.c */
 
 /* formerly located in se/sd.c */

-#define TAG_SD     TAG('S', 'e', 'S', 'd')
+#define TAG_SD     'dSeS'

 
 /* LPC Tags */
 
 /* LPC Tags */

-#define TAG_LPC_MESSAGE   TAG('L', 'p', 'c', 'M')
-#define TAG_LPC_ZONE      TAG('L', 'p', 'c', 'Z')
+#define TAG_LPC_MESSAGE   'McpL'
+#define TAG_LPC_ZONE      'ZcpL'

 
 /* Se Process Audit */
 
 /* Se Process Audit */

-#define TAG_SEPA          TAG('S', 'e', 'P', 'a')
+#define TAG_SEPA          'aPeS'

 
 

-#define TAG_WAIT            TAG('W', 'a', 'i', 't')
-#define TAG_SEC_QUERY       TAG('O', 'b', 'S', 'q')
+#define TAG_WAIT            'tiaW'
+#define TAG_SEC_QUERY       'qSbO'

 
 #endif /* _NTOSKRNL_TAG_H */
 
 #endif /* _NTOSKRNL_TAG_H */

diff --git a/reactos/ntoskrnl/io/iomgr/driver.c b/reactos/ntoskrnl/io/iomgr/driver.c
index f314a41..7d605d6 100644 (file)
--- a/reactos/ntoskrnl/io/iomgr/driver.c
+++ b/reactos/ntoskrnl/io/iomgr/driver.c
@@ -29,7 +29,7 @@ UNICODE_STRING IopHardwareDatabaseKey =
 
 POBJECT_TYPE IoDriverObjectType = NULL;
 
 
 POBJECT_TYPE IoDriverObjectType = NULL;
 

-#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v')
+#define TAG_RTLREGISTRY 'vrqR'

 
 extern BOOLEAN ExpInTextModeSetup;
 extern BOOLEAN PnpSystemInit;
 
 extern BOOLEAN ExpInTextModeSetup;
 extern BOOLEAN PnpSystemInit;

diff --git a/reactos/ntoskrnl/io/iomgr/drvrlist.c b/reactos/ntoskrnl/io/iomgr/drvrlist.c
index 1528c6c..366cbab 100644 (file)
--- a/reactos/ntoskrnl/io/iomgr/drvrlist.c
+++ b/reactos/ntoskrnl/io/iomgr/drvrlist.c
@@ -37,7 +37,7 @@ typedef struct _SERVICE
 /*  BOOLEAN ServiceRunning;*/  // needed ??
 } SERVICE, *PSERVICE;
 
 /*  BOOLEAN ServiceRunning;*/  // needed ??
 } SERVICE, *PSERVICE;
 

-#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v')
+#define TAG_RTLREGISTRY 'vrqR'

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

diff --git a/reactos/ntoskrnl/io/iomgr/iocomp.c b/reactos/ntoskrnl/io/iomgr/iocomp.c
index 832a632..b187b14 100644 (file)
--- a/reactos/ntoskrnl/io/iomgr/iocomp.c
+++ b/reactos/ntoskrnl/io/iomgr/iocomp.c
@@ -230,7 +230,7 @@ IoSetCompletionRoutineEx(IN PDEVICE_OBJECT DeviceObject,
     /* Allocate the context */
     UnloadContext = ExAllocatePoolWithTag(NonPagedPool,
                                           sizeof(*UnloadContext),
     /* Allocate the context */
     UnloadContext = ExAllocatePoolWithTag(NonPagedPool,
                                           sizeof(*UnloadContext),

-                                          TAG('I', 'o', 'U', 's'));
+                                          'sUoI');

     if (!UnloadContext) return STATUS_INSUFFICIENT_RESOURCES;
 
     /* Set up the context */
     if (!UnloadContext) return STATUS_INSUFFICIENT_RESOURCES;
 
     /* Set up the context */

diff --git a/reactos/ntoskrnl/kd/kdmain.c b/reactos/ntoskrnl/kd/kdmain.c
index 83c151e..da7d340 100644 (file)
--- a/reactos/ntoskrnl/kd/kdmain.c
+++ b/reactos/ntoskrnl/kd/kdmain.c
@@ -50,7 +50,7 @@ KdpServiceDispatcher(ULONG Service,
             break;
 
 #if DBG
             break;
 
 #if DBG

-        case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */
+        case ' soR': /* ROS-INTERNAL */

         {
             switch ((ULONG)Buffer1)
             {
         {
             switch ((ULONG)Buffer1)
             {


@@ -81,7 +81,7 @@ KdpServiceDispatcher(ULONG Service,
         }
 
         /* Special  case for stack frame dumps */
         }
 
         /* Special  case for stack frame dumps */

-        case TAG('R', 'o', 's', 'D'):
+        case 'DsoR':

         {
             KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length);
             break;
         {
             KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length);
             break;

diff --git a/reactos/ntoskrnl/ke/i386/kiinit.c b/reactos/ntoskrnl/ke/i386/kiinit.c
index 11d1762..1dc2812 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/kiinit.c
+++ b/reactos/ntoskrnl/ke/i386/kiinit.c
@@ -576,7 +576,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess,
         /* Allocate the IOPM save area. */
         Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool,
                                                   PAGE_SIZE * 2,
         /* Allocate the IOPM save area. */
         Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool,
                                                   PAGE_SIZE * 2,

-                                                  TAG('K', 'e', ' ', ' '));
+                                                  '  eK');

         if (!Ki386IopmSaveArea)
         {
             /* Bugcheck. We need this for V86/VDM support. */
         if (!Ki386IopmSaveArea)
         {
             /* Bugcheck. We need this for V86/VDM support. */

diff --git a/reactos/ntoskrnl/ke/i386/v86vdm.c b/reactos/ntoskrnl/ke/i386/v86vdm.c
index efb8a0c..4814259 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/v86vdm.c
+++ b/reactos/ntoskrnl/ke/i386/v86vdm.c
@@ -74,7 +74,7 @@ Ke386CallBios(IN ULONG Int,
     /* Allocate VDM structure */
     VdmProcessObjects = ExAllocatePoolWithTag(NonPagedPool,
                                               sizeof(VDM_PROCESS_OBJECTS),
     /* Allocate VDM structure */
     VdmProcessObjects = ExAllocatePoolWithTag(NonPagedPool,
                                               sizeof(VDM_PROCESS_OBJECTS),

-                                              TAG('K', 'e', ' ', ' '));
+                                              '  eK');

     if (!VdmProcessObjects) return STATUS_NO_MEMORY;
 
     /* Set it up */
     if (!VdmProcessObjects) return STATUS_NO_MEMORY;
 
     /* Set it up */

diff --git a/reactos/ntoskrnl/ke/powerpc/ppc_irq.c b/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
index f4b1b82..9d127e7 100644 (file)
--- a/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
+++ b/reactos/ntoskrnl/ke/powerpc/ppc_irq.c
@@ -142,7 +142,7 @@ static ISR_TABLE IsrTable[NR_TRAPS][MAXIMUM_PROCESSORS];
 static ISR_TABLE IsrTable[NR_TRAPS][1];\r
 #endif\r
 \r
 static ISR_TABLE IsrTable[NR_TRAPS][1];\r
 #endif\r
 \r

-#define TAG_ISR_LOCK     TAG('I', 'S', 'R', 'L')\r
+#define TAG_ISR_LOCK     'LRSI'\r

 \r
 /* FUNCTIONS ****************************************************************/\r
 \r
 \r
 /* FUNCTIONS ****************************************************************/\r
 \r

diff --git a/reactos/ntoskrnl/ke/profobj.c b/reactos/ntoskrnl/ke/profobj.c
index 786eae7..21dda7b 100644 (file)
--- a/reactos/ntoskrnl/ke/profobj.c
+++ b/reactos/ntoskrnl/ke/profobj.c
@@ -61,7 +61,7 @@ KeStartProfile(PKPROFILE Profile,
     /* Allocate a buffer first, before we raise IRQL */
     SourceBuffer = ExAllocatePoolWithTag(NonPagedPool,
                                           sizeof(KPROFILE_SOURCE_OBJECT),
     /* Allocate a buffer first, before we raise IRQL */
     SourceBuffer = ExAllocatePoolWithTag(NonPagedPool,
                                           sizeof(KPROFILE_SOURCE_OBJECT),

-                                          TAG('P', 'r', 'o', 'f'));
+                                          'forP');

     RtlZeroMemory(SourceBuffer, sizeof(KPROFILE_SOURCE_OBJECT));
 
     /* Raise to PROFILE_LEVEL */
     RtlZeroMemory(SourceBuffer, sizeof(KPROFILE_SOURCE_OBJECT));
 
     /* Raise to PROFILE_LEVEL */

diff --git a/reactos/ntoskrnl/lpc/create.c b/reactos/ntoskrnl/lpc/create.c
index f98df57..8f6093e 100644 (file)
--- a/reactos/ntoskrnl/lpc/create.c
+++ b/reactos/ntoskrnl/lpc/create.c
@@ -24,7 +24,7 @@ LpcpInitializePortQueue(IN PLPCP_PORT_OBJECT Port)
     /* Allocate the queue */
     MessageQueue = ExAllocatePoolWithTag(NonPagedPool,
                                          sizeof(LPCP_NONPAGED_PORT_QUEUE),
     /* Allocate the queue */
     MessageQueue = ExAllocatePoolWithTag(NonPagedPool,
                                          sizeof(LPCP_NONPAGED_PORT_QUEUE),

-                                         TAG('P', 'o', 'r', 't'));
+                                         'troP');

     if (!MessageQueue) return STATUS_INSUFFICIENT_RESOURCES;
 
     /* Set it up */
     if (!MessageQueue) return STATUS_INSUFFICIENT_RESOURCES;
 
     /* Set it up */

diff --git a/reactos/ntoskrnl/lpc/port.c b/reactos/ntoskrnl/lpc/port.c
index adea907..b179fd3 100644 (file)
--- a/reactos/ntoskrnl/lpc/port.c
+++ b/reactos/ntoskrnl/lpc/port.c
@@ -65,7 +65,7 @@ LpcInitSystem(VOID)
                                    NULL,
                                    0,
                                    LpcpMaxMessageSize,
                                    NULL,
                                    0,
                                    LpcpMaxMessageSize,

-                                   TAG('L', 'p', 'c', 'M'),
+                                   'McpL',

                                    32);
 
     /* We're done */
                                    32);
 
     /* We're done */

diff --git a/reactos/ntoskrnl/mm/dbgpool.c b/reactos/ntoskrnl/mm/dbgpool.c
index 93d0f3f..86f9639 100644 (file)
--- a/reactos/ntoskrnl/mm/dbgpool.c
+++ b/reactos/ntoskrnl/mm/dbgpool.c
@@ -25,19 +25,19 @@ NTAPI
 ExpIsPoolTagDebuggable(ULONG Tag)
 {
 #if 0
 ExpIsPoolTagDebuggable(ULONG Tag)
 {
 #if 0

-    if (Tag == TAG('C', 'a', 'l', 'l')) return FALSE;
-    if (Tag == TAG('D', 'r', 'i', 'v')) return FALSE;
-    if (Tag == TAG('D', 'e', 'v', 'i')) return FALSE;
-    if (Tag == TAG('A', 'd', 'a', 'p')) return FALSE;
-
-    if (Tag == TAG('S', 'e', 'S', 'd')) return FALSE;
-    if (Tag == TAG('O', 'b', 'D', 'i')) return FALSE;
-    if (Tag == TAG('O', 'b', 'N', 'm')) return FALSE;
-    if (Tag == TAG('O', 'b', 'N', 'D')) return FALSE;
-    if (Tag == TAG('O', 'b', 't', 'b')) return FALSE;
-    if (Tag == TAG('O', 'b', 'S', 'c')) return FALSE;
-    //if (Tag == TAG('S', 'e', 'S', 'i')) return FALSE;
-    //if (Tag == TAG('S', 'e', 'A', 'c')) return FALSE;
+    if (Tag == 'llaC') return FALSE;
+    if (Tag == 'virD') return FALSE;
+    if (Tag == 'iveD') return FALSE;
+    if (Tag == 'padA') return FALSE;
+
+    if (Tag == 'dSeS') return FALSE;
+    if (Tag == 'iDbO') return FALSE;
+    if (Tag == 'mNbO') return FALSE;
+    if (Tag == 'DNbO') return FALSE;
+    if (Tag == 'btbO') return FALSE;
+    if (Tag == 'cSbO') return FALSE;
+    //if (Tag == 'iSeS') return FALSE;
+    //if (Tag == 'cAeS') return FALSE;

 #endif
 
     return TRUE;
 #endif
 
     return TRUE;

diff --git a/reactos/ntoskrnl/mm/pool.c b/reactos/ntoskrnl/mm/pool.c
index 64f3398..c31c4c7 100644 (file)
--- a/reactos/ntoskrnl/mm/pool.c
+++ b/reactos/ntoskrnl/mm/pool.c
@@ -50,7 +50,7 @@ EiAllocatePool(POOL_TYPE PoolType,
 
    if (Tag == 0)
        KeBugCheckEx(BAD_POOL_CALLER, 0x9b, PoolType, NumberOfBytes, (ULONG_PTR)Caller);
 
    if (Tag == 0)
        KeBugCheckEx(BAD_POOL_CALLER, 0x9b, PoolType, NumberOfBytes, (ULONG_PTR)Caller);

-   if (Tag == TAG('B','I','G',0))
+   if (Tag == '0GIB')

        KeBugCheckEx(BAD_POOL_CALLER, 0x9c, PoolType, NumberOfBytes, (ULONG_PTR)Caller);
 
 #define IS_LETTER_OR_DIGIT(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z') || ((c) >= '0' && (c) <= '9'))
        KeBugCheckEx(BAD_POOL_CALLER, 0x9c, PoolType, NumberOfBytes, (ULONG_PTR)Caller);
 
 #define IS_LETTER_OR_DIGIT(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z') || ((c) >= '0' && (c) <= '9'))

diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 54393c1..6aece77 100644 (file)
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -125,7 +125,7 @@ MmGetFileNameForSection(IN PROS_SECTION_OBJECT Section,
     /* Allocate memory for our structure */
     ObjectNameInfo = ExAllocatePoolWithTag(PagedPool,
                                            1024,
     /* Allocate memory for our structure */
     ObjectNameInfo = ExAllocatePoolWithTag(PagedPool,
                                            1024,

-                                           TAG('M', 'm', ' ', ' '));
+                                           '  mM');

     if (!ObjectNameInfo) return STATUS_NO_MEMORY;
 
     /* Query the name */
     if (!ObjectNameInfo) return STATUS_NO_MEMORY;
 
     /* Query the name */


@@ -136,7 +136,7 @@ MmGetFileNameForSection(IN PROS_SECTION_OBJECT Section,
     if (!NT_SUCCESS(Status))
     {
         /* Failed, free memory */
     if (!NT_SUCCESS(Status))
     {
         /* Failed, free memory */

-        ExFreePoolWithTag(ObjectNameInfo, TAG('M', 'm', ' ', ' '));
+        ExFreePoolWithTag(ObjectNameInfo, '  mM');

         return Status;
     }
 
         return Status;
     }
 


@@ -191,7 +191,7 @@ MmGetFileNameForAddress(IN PVOID Address,
                                 ModuleNameInformation->Name.Buffer);
 
          /* Free temp taged buffer from MmGetFileNameForSection() */
                                 ModuleNameInformation->Name.Buffer);
 
          /* Free temp taged buffer from MmGetFileNameForSection() */

-         ExFreePoolWithTag(ModuleNameInformation, TAG('M', 'm', ' ', ' '));
+         ExFreePoolWithTag(ModuleNameInformation, '  mM');

          DPRINT("Found ModuleName %S by address %p\n",
                 ModuleName->Buffer,Address);
       }
          DPRINT("Found ModuleName %S by address %p\n",
                 ModuleName->Buffer,Address);
       }


@@ -2755,7 +2755,7 @@ ExeFmtpReadFile(IN PVOID File,
     */
    Buffer = ExAllocatePoolWithTag(PagedPool,
                                   BufferSize,
     */
    Buffer = ExAllocatePoolWithTag(PagedPool,
                                   BufferSize,

-                                  TAG('M', 'm', 'X', 'r'));
+                                  'rXmM');

 
    UsedSize = 0;
 
 
    UsedSize = 0;
 


@@ -2806,7 +2806,7 @@ ExeFmtpReadFile(IN PVOID File,
    }
    else
    {
    }
    else
    {

-      ExFreePoolWithTag(Buffer, TAG('M', 'm', 'X', 'r'));
+      ExFreePoolWithTag(Buffer, 'rXmM');

    }
 
    return Status;
    }
 
    return Status;


@@ -3215,7 +3215,7 @@ ExeFmtpCreateImageSection(HANDLE FileHandle,
          break;
    }
 
          break;
    }
 

-   ExFreePoolWithTag(FileHeaderBuffer, TAG('M', 'm', 'X', 'r'));
+   ExFreePoolWithTag(FileHeaderBuffer, 'rXmM');

 
    /*
     * No loader handled the format
 
    /*
     * No loader handled the format

diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index 9aa23fb..d1961f8 100644 (file)
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.c
@@ -16,7 +16,7 @@
 #define MI_MAPPED_COPY_PAGES  16
 #define MI_POOL_COPY_BYTES    512
 #define MI_MAX_TRANSFER_SIZE  64 * 1024
 #define MI_MAPPED_COPY_PAGES  16
 #define MI_POOL_COPY_BYTES    512
 #define MI_MAX_TRANSFER_SIZE  64 * 1024

-#define TAG_VM TAG('V', 'm', 'R', 'w')
+#define TAG_VM 'wRmV'

 
 /* PRIVATE FUNCTIONS **********************************************************/
 
 
 /* PRIVATE FUNCTIONS **********************************************************/
 

diff --git a/reactos/ntoskrnl/ob/obhandle.c b/reactos/ntoskrnl/ob/obhandle.c
index f6a2c0c..6cd101e 100644 (file)
--- a/reactos/ntoskrnl/ob/obhandle.c
+++ b/reactos/ntoskrnl/ob/obhandle.c
@@ -20,7 +20,7 @@
 PHANDLE_TABLE ObpKernelHandleTable = NULL;
 ULONG ObpAccessProtectCloseBit = MAXIMUM_ALLOWED;
 
 PHANDLE_TABLE ObpKernelHandleTable = NULL;
 ULONG ObpAccessProtectCloseBit = MAXIMUM_ALLOWED;
 

-#define TAG_OB_HANDLE TAG('O', 'b', 'H', 'd')
+#define TAG_OB_HANDLE 'dHbO'

 
 /* PRIVATE FUNCTIONS *********************************************************/
 
 
 /* PRIVATE FUNCTIONS *********************************************************/
 

diff --git a/reactos/ntoskrnl/ob/obinit.c b/reactos/ntoskrnl/ob/obinit.c
index 51a2f9f..5a24101 100644 (file)
--- a/reactos/ntoskrnl/ob/obinit.c
+++ b/reactos/ntoskrnl/ob/obinit.c
@@ -73,14 +73,14 @@ ObInit2(VOID)
         Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCreateInfoLookasideList;
         CurrentList = ExAllocatePoolWithTag(NonPagedPool,
                                             sizeof(GENERAL_LOOKASIDE),
         Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCreateInfoLookasideList;
         CurrentList = ExAllocatePoolWithTag(NonPagedPool,
                                             sizeof(GENERAL_LOOKASIDE),

-                                            TAG('O', 'b', 'C', 'I'));
+                                            'ICbO');

         if (CurrentList)
         {
             /* Initialize it */
             ExInitializeSystemLookasideList(CurrentList,
                                             NonPagedPool,
                                             sizeof(OBJECT_CREATE_INFORMATION),
         if (CurrentList)
         {
             /* Initialize it */
             ExInitializeSystemLookasideList(CurrentList,
                                             NonPagedPool,
                                             sizeof(OBJECT_CREATE_INFORMATION),

-                                            TAG('O', 'b', 'C', 'I'),
+                                            'ICbO',

                                             32,
                                             &ExSystemLookasideListHead);
         }
                                             32,
                                             &ExSystemLookasideListHead);
         }


@@ -97,14 +97,14 @@ ObInit2(VOID)
         Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNameBufferLookasideList;
         CurrentList = ExAllocatePoolWithTag(NonPagedPool,
                                             sizeof(GENERAL_LOOKASIDE),
         Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNameBufferLookasideList;
         CurrentList = ExAllocatePoolWithTag(NonPagedPool,
                                             sizeof(GENERAL_LOOKASIDE),

-                                            TAG('O', 'b', 'N', 'M'));
+                                            'MNbO');

         if (CurrentList)
         {
             /* Initialize it */
             ExInitializeSystemLookasideList(CurrentList,
                                             PagedPool,
                                             248,
         if (CurrentList)
         {
             /* Initialize it */
             ExInitializeSystemLookasideList(CurrentList,
                                             PagedPool,
                                             248,

-                                            TAG('O', 'b', 'N', 'M'),
+                                            'MNbO',

                                             16,
                                             &ExSystemLookasideListHead);
         }
                                             16,
                                             &ExSystemLookasideListHead);
         }


@@ -145,7 +145,7 @@ ObInitSystem(VOID)
     ExInitializeSystemLookasideList(&ObpCreateInfoLookasideList,
                                     NonPagedPool,
                                     sizeof(OBJECT_CREATE_INFORMATION),
     ExInitializeSystemLookasideList(&ObpCreateInfoLookasideList,
                                     NonPagedPool,
                                     sizeof(OBJECT_CREATE_INFORMATION),

-                                    TAG('O', 'b', 'C', 'I'),
+                                    'ICbO',

                                     32,
                                     &ExSystemLookasideListHead);
 
                                     32,
                                     &ExSystemLookasideListHead);
 


@@ -153,7 +153,7 @@ ObInitSystem(VOID)
     ExInitializeSystemLookasideList(&ObpNameBufferLookasideList,
                                     PagedPool,
                                     248,
     ExInitializeSystemLookasideList(&ObpNameBufferLookasideList,
                                     PagedPool,
                                     248,

-                                    TAG('O', 'b', 'N', 'M'),
+                                    'MNbO',

                                     16,
                                     &ExSystemLookasideListHead);
 
                                     16,
                                     &ExSystemLookasideListHead);
 

diff --git a/reactos/ntoskrnl/ob/oblife.c b/reactos/ntoskrnl/ob/oblife.c
index 15f3e3c..9baa7b1 100644 (file)
--- a/reactos/ntoskrnl/ob/oblife.c
+++ b/reactos/ntoskrnl/ob/oblife.c
@@ -599,7 +599,7 @@ ObpAllocateObject(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo,
     {
         /* Use default tag and non-paged pool */
         PoolType = NonPagedPool;
     {
         /* Use default tag and non-paged pool */
         PoolType = NonPagedPool;

-        Tag = TAG('O', 'b', 'j', 'T');
+        Tag = 'TjbO';

     }
     else
     {
     }
     else
     {


@@ -1122,7 +1122,7 @@ ObCreateObjectType(IN PUNICODE_STRING TypeName,
 
         /* Set the hard-coded key and object count */
         LocalObjectType->TotalNumberOfObjects = 1;
 
         /* Set the hard-coded key and object count */
         LocalObjectType->TotalNumberOfObjects = 1;

-        LocalObjectType->Key = TAG('O', 'b', 'j', 'T');
+        LocalObjectType->Key = 'TjbO';

     }
     else
     {
     }
     else
     {

diff --git a/reactos/ntoskrnl/ob/obname.c b/reactos/ntoskrnl/ob/obname.c
index 05c3d79..c04460e 100644 (file)
--- a/reactos/ntoskrnl/ob/obname.c
+++ b/reactos/ntoskrnl/ob/obname.c
@@ -100,7 +100,7 @@ ObpCreateDosDevicesDirectory(VOID)
     /* FIXME: Hack Hack! */
     ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool,
                                               sizeof(*ObSystemDeviceMap),
     /* FIXME: Hack Hack! */
     ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool,
                                               sizeof(*ObSystemDeviceMap),

-                                              TAG('O', 'b', 'D', 'm'));
+                                              'mDbO');

     RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap));
 
     /* Return status */
     RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap));
 
     /* Return status */

diff --git a/reactos/ntoskrnl/ob/obsdcach.c b/reactos/ntoskrnl/ob/obsdcach.c
index 60fda02..8e51d96 100644 (file)
--- a/reactos/ntoskrnl/ob/obsdcach.c
+++ b/reactos/ntoskrnl/ob/obsdcach.c
@@ -131,7 +131,7 @@ ObpCreateCacheEntry(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
     
     /* Calculate the memory we'll need to allocate and allocate it */
     CacheSize = Length + (sizeof(SECURITY_DESCRIPTOR_HEADER) - sizeof(QUAD));
     
     /* Calculate the memory we'll need to allocate and allocate it */
     CacheSize = Length + (sizeof(SECURITY_DESCRIPTOR_HEADER) - sizeof(QUAD));

-    SdHeader = ExAllocatePoolWithTag(PagedPool, CacheSize, TAG('O', 'b', 'S', 'c'));
+    SdHeader = ExAllocatePoolWithTag(PagedPool, CacheSize, 'cSbO');

     if (!SdHeader) return NULL;
     
     /* Setup the header */
     if (!SdHeader) return NULL;
     
     /* Setup the header */

diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index 549cae5..71e6f41 100644 (file)
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -1298,7 +1298,7 @@ NtRegisterThreadTerminatePort(IN HANDLE PortHandle)
     /* Allocate the Port and make sure it suceeded */
     TerminationPort = ExAllocatePoolWithTag(NonPagedPool,
                                             sizeof(TERMINATION_PORT),
     /* Allocate the Port and make sure it suceeded */
     TerminationPort = ExAllocatePoolWithTag(NonPagedPool,
                                             sizeof(TERMINATION_PORT),

-                                            TAG('P', 's', 'T', '='));
+                                            '=TsP');

     if(TerminationPort)
     {
         /* Associate the Port */
     if(TerminationPort)
     {
         /* Associate the Port */

diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index 1213c23..bb27453 100644 (file)
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -659,7 +659,7 @@ PspCreateProcess(OUT PHANDLE ProcessHandle,
             Process->SeAuditProcessCreationInfo.ImageFileName =
                 ExAllocatePoolWithTag(PagedPool,
                                       sizeof(OBJECT_NAME_INFORMATION),
             Process->SeAuditProcessCreationInfo.ImageFileName =
                 ExAllocatePoolWithTag(PagedPool,
                                       sizeof(OBJECT_NAME_INFORMATION),

-                                      TAG('S', 'e', 'P', 'a'));
+                                      'aPeS');

             if (!Process->SeAuditProcessCreationInfo.ImageFileName)
             {
                 /* Fail */
             if (!Process->SeAuditProcessCreationInfo.ImageFileName)
             {
                 /* Fail */

diff --git a/reactos/ntoskrnl/rtl/libsupp.c b/reactos/ntoskrnl/rtl/libsupp.c
index 9115683..5f4f7e5 100644 (file)
--- a/reactos/ntoskrnl/rtl/libsupp.c
+++ b/reactos/ntoskrnl/rtl/libsupp.c
@@ -13,7 +13,7 @@
 #define NDEBUG
 #include <debug.h>
 
 #define NDEBUG
 #include <debug.h>
 

-#define TAG_ATMT TAG('A', 't', 'o', 'T') /* Atom table */
+#define TAG_ATMT 'TotA' /* Atom table */

 
 extern ULONG NtGlobalFlag;
 
 
 extern ULONG NtGlobalFlag;
 


@@ -38,7 +38,7 @@ RtlInitializeRangeListPackage(VOID)
                                    NULL,
                                    POOL_COLD_ALLOCATION,
                                    sizeof(RTL_RANGE_ENTRY),
                                    NULL,
                                    POOL_COLD_ALLOCATION,
                                    sizeof(RTL_RANGE_ENTRY),

-                                   TAG('R', 'R', 'l', 'e'),
+                                   'elRR',

                                    16);
 }
 
                                    16);
 }
 


@@ -76,9 +76,9 @@ RtlpAllocateMemory(ULONG Bytes,
 }
 
 
 }
 
 

-#define TAG_USTR        TAG('U', 'S', 'T', 'R')
-#define TAG_ASTR        TAG('A', 'S', 'T', 'R')
-#define TAG_OSTR        TAG('O', 'S', 'T', 'R')
+#define TAG_USTR        'RTSU'
+#define TAG_ASTR        'RTSA'
+#define TAG_OSTR        'RTSO'

 VOID
 NTAPI
 RtlpFreeMemory(PVOID Mem,
 VOID
 NTAPI
 RtlpFreeMemory(PVOID Mem,

diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c
index 5184b5b..86bfc44 100644 (file)
--- a/reactos/ntoskrnl/se/token.c
+++ b/reactos/ntoskrnl/se/token.c
@@ -287,7 +287,7 @@ SepDuplicateToken(PTOKEN Token,
     AccessToken->UserAndGroups =
     (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                uLength,
     AccessToken->UserAndGroups =
     (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                uLength,

-                                               TAG('T', 'O', 'K', 'u'));
+                                               'uKOT');

     
     EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount];
     
     
     EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount];
     


@@ -314,7 +314,7 @@ SepDuplicateToken(PTOKEN Token,
         AccessToken->Privileges =
         (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                     uLength,
         AccessToken->Privileges =
         (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                     uLength,

-                                                    TAG('T', 'O', 'K', 'p'));
+                                                    'pKOT');

         
         for (i = 0; i < AccessToken->PrivilegeCount; i++)
         {
         
         for (i = 0; i < AccessToken->PrivilegeCount; i++)
         {


@@ -329,7 +329,7 @@ SepDuplicateToken(PTOKEN Token,
             AccessToken->DefaultDacl =
             (PACL) ExAllocatePoolWithTag(PagedPool,
                                          Token->DefaultDacl->AclSize,
             AccessToken->DefaultDacl =
             (PACL) ExAllocatePoolWithTag(PagedPool,
                                          Token->DefaultDacl->AclSize,

-                                         TAG('T', 'O', 'K', 'd'));
+                                         'kDOT');

             memcpy(AccessToken->DefaultDacl,
                    Token->DefaultDacl,
                    Token->DefaultDacl->AclSize);
             memcpy(AccessToken->DefaultDacl,
                    Token->DefaultDacl,
                    Token->DefaultDacl->AclSize);


@@ -589,7 +589,7 @@ SepCreateSystemProcessToken(VOID)
     AccessToken->UserAndGroups =
     (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                uSize,
     AccessToken->UserAndGroups =
     (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                uSize,

-                                               TAG('T', 'O', 'K', 'u'));
+                                               'uKOT');

     SidArea = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount];
     
     i = 0;
     SidArea = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount];
     
     i = 0;


@@ -621,7 +621,7 @@ SepCreateSystemProcessToken(VOID)
     AccessToken->Privileges =
     (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                 uSize,
     AccessToken->Privileges =
     (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                 uSize,

-                                                TAG('T', 'O', 'K', 'p'));
+                                                'pKOT');

     
     i = 0;
     AccessToken->Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT|SE_PRIVILEGE_ENABLED;
     
     i = 0;
     AccessToken->Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT|SE_PRIVILEGE_ENABLED;


@@ -700,7 +700,7 @@ SepCreateSystemProcessToken(VOID)
     AccessToken->DefaultDacl =
     (PACL) ExAllocatePoolWithTag(PagedPool,
                                  uSize,
     AccessToken->DefaultDacl =
     (PACL) ExAllocatePoolWithTag(PagedPool,
                                  uSize,

-                                 TAG('T', 'O', 'K', 'd'));
+                                 'kDOT');

     Status = RtlCreateAcl(AccessToken->DefaultDacl, uSize, ACL_REVISION);
     if ( NT_SUCCESS(Status) )
     {
     Status = RtlCreateAcl(AccessToken->DefaultDacl, uSize, ACL_REVISION);
     if ( NT_SUCCESS(Status) )
     {


@@ -2079,7 +2079,7 @@ NtCreateToken(OUT PHANDLE TokenHandle,
     AccessToken->UserAndGroups =
     (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                uLength,
     AccessToken->UserAndGroups =
     (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                uLength,

-                                               TAG('T', 'O', 'K', 'u'));
+                                               'uKOT');

     
     EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount];
     
     
     EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount];
     


@@ -2115,7 +2115,7 @@ NtCreateToken(OUT PHANDLE TokenHandle,
         AccessToken->Privileges =
         (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                     uLength,
         AccessToken->Privileges =
         (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool,
                                                     uLength,

-                                                    TAG('T', 'O', 'K', 'p'));
+                                                    'pKOT');

         
         if (PreviousMode != KernelMode)
         {
         
         if (PreviousMode != KernelMode)
         {


@@ -2144,7 +2144,7 @@ NtCreateToken(OUT PHANDLE TokenHandle,
         AccessToken->DefaultDacl =
         (PACL) ExAllocatePoolWithTag(PagedPool,
                                      TokenDefaultDacl->DefaultDacl->AclSize,
         AccessToken->DefaultDacl =
         (PACL) ExAllocatePoolWithTag(PagedPool,
                                      TokenDefaultDacl->DefaultDacl->AclSize,

-                                     TAG('T', 'O', 'K', 'd'));
+                                     'kDOT');

         memcpy(AccessToken->DefaultDacl,
                TokenDefaultDacl->DefaultDacl,
                TokenDefaultDacl->DefaultDacl->AclSize);
         memcpy(AccessToken->DefaultDacl,
                TokenDefaultDacl->DefaultDacl,
                TokenDefaultDacl->DefaultDacl->AclSize);