Reactos

[NTOSKRNL] Regroup the pool allocation tags in one dedicated place

We have a special file, tag.h, which serves as a place to store whatever kernel pool allocation tag yet we still have some tags sparse over the kernel code... So just re-group them in one unique place.

+118 -188
+3 -3
ntoskrnl/dbgk/dbgkobj.c
··· 59 59 /* Allocate it */ 60 60 DebugEvent = ExAllocatePoolWithTag(NonPagedPool, 61 61 sizeof(DEBUG_EVENT), 62 - 'EgbD'); 62 + TAG_DEBUG_EVENT); 63 63 if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES; 64 64 65 65 /* Set flags */ ··· 192 192 ObDereferenceObject(Process); 193 193 194 194 /* Free the debug event */ 195 - ExFreePoolWithTag(DebugEvent, 'EgbD'); 195 + ExFreePoolWithTag(DebugEvent, TAG_DEBUG_EVENT); 196 196 } 197 197 } 198 198 ··· 418 418 /* Dereference process and thread and free the event */ 419 419 ObDereferenceObject(DebugEvent->Process); 420 420 ObDereferenceObject(DebugEvent->Thread); 421 - ExFreePoolWithTag(DebugEvent, 'EgbD'); 421 + ExFreePoolWithTag(DebugEvent, TAG_DEBUG_EVENT); 422 422 } 423 423 424 424 VOID
-2
ntoskrnl/ex/atom.c
··· 13 13 #define NDEBUG 14 14 #include <debug.h> 15 15 16 - #define TAG_ATOM 'motA' 17 - 18 16 /* GLOBALS ****************************************************************/ 19 17 20 18 /*
-2
ntoskrnl/ex/harderr.c
··· 12 12 #define NDEBUG 13 13 #include <debug.h> 14 14 15 - #define TAG_ERR ' rrE' 16 - 17 15 /* GLOBALS ******************************************************************/ 18 16 19 17 BOOLEAN ExReadyForErrors = FALSE;
-2
ntoskrnl/ex/profile.c
··· 13 13 #define NDEBUG 14 14 #include <debug.h> 15 15 16 - #define TAG_PROFILE 'forP' 17 - 18 16 /* GLOBALS *******************************************************************/ 19 17 20 18 POBJECT_TYPE ExProfileObjectType = NULL;
-4
ntoskrnl/fsrtl/filelock.c
··· 51 51 } 52 52 LOCK_SHARED_RANGE, *PLOCK_SHARED_RANGE; 53 53 54 - #define TAG_TABLE 'BATL' 55 - #define TAG_RANGE 'ARSF' 56 - #define TAG_FLOCK 'KCLF' 57 - 58 54 /* PRIVATE FUNCTIONS *********************************************************/ 59 55 60 56 VOID
-2
ntoskrnl/fsrtl/oplock.c
··· 27 27 #define BROKEN_TO_CLOSE_PENDING 0x800 28 28 #define BROKEN_ANY (BROKEN_TO_LEVEL_2 | BROKEN_TO_NONE | BROKEN_TO_NONE_FROM_LEVEL_2 | BROKEN_TO_CLOSE_PENDING) 29 29 30 - #define TAG_OPLOCK 'orSF' 31 - 32 30 typedef struct _INTERNAL_OPLOCK 33 31 { 34 32 /* Level I IRP */
-4
ntoskrnl/inbv/inbv.c
··· 11 11 #define MM_READONLY 1 // PAGE_READONLY 12 12 #define MM_READWRITE 4 // PAGE_WRITECOPY 13 13 14 - #ifndef TAG_OSTR 15 - #define TAG_OSTR 'RTSO' 16 - #endif 17 - 18 14 /* GLOBALS *******************************************************************/ 19 15 20 16 /*
+111 -142
ntoskrnl/include/internal/tag.h
··· 1 + /* 2 + * PROJECT: ReactOS Kernel 3 + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) 4 + * PURPOSE: ReactOS NT kernel pool allocation tags 5 + * COPYRIGHT: Copyright 2005 Steven Edwards <sedwards@reactos.com> 6 + * Copyright 2006 Alex Ionescu <alex.ionescu@reactos.org> 7 + * Copyright 2015 Thomas Faber <thomas.faber@reactos.org> 8 + * Copyright 2021 George Bișoc <george.bisoc@reactos.org> 9 + */ 10 + 1 11 #pragma once 2 12 3 13 /* Cache Manager Tags */ ··· 7 17 #define TAG_PRIVATE_CACHE_MAP 'cPcC' 8 18 #define TAG_BCB 'cBcC' 9 19 10 - /* Executive Callbacks */ 20 + /* Executive Tags */ 11 21 #define TAG_CALLBACK_ROUTINE_BLOCK 'brbC' 12 22 #define TAG_CALLBACK_REGISTRATION 'eRBC' 13 - 14 - /* formely located in dbg/dbgkobj.c */ 15 - #define TAG_DEBUG_EVENT 'EgbD' 16 - 17 - /* formerly located in ex/resource.c */ 18 - #define TAG_RESOURCE_TABLE 'aTeR' 19 - #define TAG_RESOURCE_EVENT 'aTeR' 20 - #define TAG_RESOURCE_SEMAPHORE 'aTeR' 23 + #define TAG_RESOURCE_TABLE 'aTeR' 24 + #define TAG_RESOURCE_EVENT 'aTeR' 25 + #define TAG_RESOURCE_SEMAPHORE 'aTeR' 26 + #define TAG_OBJECT_TABLE 'btbO' 27 + #define TAG_INIT 'tinI' 28 + #define TAG_RTLI 'iltR' 29 + #define TAG_ATOM 'motA' 30 + #define TAG_PROFILE 'forP' 31 + #define TAG_ERR ' rrE' 21 32 22 - /* formerly located in ex/handle.c */ 23 - #define TAG_OBJECT_TABLE 'btbO' 33 + /* User Mode Debugging Manager Tag */ 34 + #define TAG_DEBUG_EVENT 'EgbD' 24 35 25 - /* formerly located in ex/init.c */ 26 - #define TAG_INIT 'tinI' 27 - #define TAG_RTLI 'iltR' 36 + /* Kernel Debugger Tags */ 37 + #define TAG_KDBS 'SBDK' 38 + #define TAG_KDBG 'GBDK' 28 39 29 - /* formerly located in fs/notify.c */ 30 - #define FSRTL_NOTIFY_TAG 'ITON' 40 + /* Kernel Tags */ 41 + #define TAG_KNMI 'IMNK' 42 + #define TAG_KERNEL ' eK' 31 43 32 - /* formerly located in fsrtl/unc.c */ 33 - #define TAG_UNC 'nuSF' 44 + /* File-System Run-Time Library Tags */ 45 + #define TAG_UNC 'nuSF' 46 + #define TAG_TABLE 'BATL' 47 + #define TAG_RANGE 'ARSF' 48 + #define TAG_FLOCK 'KCLF' 49 + #define TAG_OPLOCK 'orSF' 34 50 35 - /* formerly located in io/device.c */ 51 + /* I/O Manager Tags */ 36 52 #define TAG_DEVICE_EXTENSION 'TXED' 37 - #define TAG_SHUTDOWN_ENTRY 'TUHS' 38 - #define TAG_IO_TIMER 'MTOI' 39 - 40 - /* formerly located in io/driver.c */ 53 + #define TAG_SHUTDOWN_ENTRY 'TUHS' 54 + #define TAG_IO_TIMER 'MTOI' 41 55 #define TAG_DRIVER 'RVRD' 42 56 #define TAG_DRIVER_EXTENSION 'EVRD' 43 - 44 - /* formerly located in io/file.c */ 45 - #define TAG_SYSB 'BSYS' 46 - #define TAG_LOCK 'kclF' 47 - #define TAG_FILE_NAME 'MANF' 48 - 49 - /* formerly located in io/fs.c */ 50 - #define TAG_FILE_SYSTEM 'SYSF' 51 - #define TAG_FS_CHANGE_NOTIFY 'NCSF' 52 - #define IFS_POOL_TAG 'trSF' 53 - #define TAG_FS_NOTIFICATIONS 'NrSF' 54 - 55 - /* formerly located in io/iocomp.c */ 56 - #define IOC_TAG 'TCOI' 57 + #define TAG_SYSB 'BSYS' 58 + #define TAG_LOCK 'kclF' 59 + #define TAG_FILE_NAME 'MANF' 60 + #define TAG_FILE_SYSTEM 'SYSF' 61 + #define TAG_FS_CHANGE_NOTIFY 'NCSF' 62 + #define IFS_POOL_TAG 'trSF' 63 + #define TAG_FS_NOTIFICATIONS 'NrSF' 64 + #define IOC_TAG 'TCOI' 65 + #define TAG_DEVICE_TYPE 'TVED' 66 + #define TAG_FILE_TYPE 'ELIF' 67 + #define TAG_ADAPTER_TYPE 'TPDA' 68 + #define IO_LARGEIRP 'lprI' 69 + #define IO_SMALLIRP 'sprI' 70 + #define IO_LARGEIRP_CPU 'LprI' 71 + #define IO_SMALLIRP_CPU 'SprI' 72 + #define IOC_TAG1 ' cpI' 73 + #define IOC_CPU 'PcpI' 74 + #define TAG_APC 'CPAK' 75 + #define TAG_IO ' oI' 76 + #define TAG_ERROR_LOG 'rEoI' 77 + #define TAG_EA 'aEoI' 78 + #define TAG_IO_NAME 'mNoI' 79 + #define TAG_REINIT 'iRoI' 80 + #define TAG_IOWI 'IWOI' 81 + #define TAG_IRP ' prI' 82 + #define TAG_SYS_BUF 'BSYS' 83 + #define TAG_KINTERRUPT 'RSIK' 84 + #define TAG_MDL ' LDM' 85 + #define TAG_IO_DEVNODE 'donD' 86 + #define TAG_PNP_NOTIFY 'NPnP' 87 + #define TAG_PNP_ROOT 'RPnP' 88 + #define TAG_IO_RESOURCE 'CRSR' 89 + #define TAG_IO_TIMER 'MTOI' 90 + #define TAG_VPB ' BPV' 91 + #define TAG_SYSB 'BSYS' 92 + #define TAG_RTLREGISTRY 'vrqR' 93 + #define TAG_PNP_DEVACTION 'aDpP' 57 94 58 - /* formerly located in io/iomgr.c */ 59 - #define TAG_DEVICE_TYPE 'TVED' 60 - #define TAG_FILE_TYPE 'ELIF' 61 - #define TAG_ADAPTER_TYPE 'TPDA' 62 - #define IO_LARGEIRP 'lprI' 63 - #define IO_SMALLIRP 'sprI' 64 - #define IO_LARGEIRP_CPU 'LprI' 65 - #define IO_SMALLIRP_CPU 'SprI' 66 - #define IOC_TAG1 ' cpI' 67 - #define IOC_CPU 'PcpI' 68 - #define TAG_APC 'CPAK' 69 - #define TAG_IO ' oI' 70 - #define TAG_ERROR_LOG 'rEoI' 71 - #define TAG_EA 'aEoI' 72 - #define TAG_IO_NAME 'mNoI' 73 - #define TAG_REINIT 'iRoI' 74 - 75 - /* formerly located in io/work.c */ 76 - #define TAG_IOWI 'IWOI' 77 - 78 - /* formerly located in io/irp.c */ 79 - #define TAG_IRP ' prI' 80 - #define TAG_SYS_BUF 'BSYS' 81 - 82 - /* formerly located in io/irq.c */ 83 - #define TAG_KINTERRUPT 'RSIK' 84 - 85 - /* formerly located in io/mdl.c */ 86 - #define TAG_MDL ' LDM' 87 - 88 - /* formerly located in io/pnpmgr.c */ 89 - #define TAG_IO_DEVNODE 'donD' 90 - 91 - /* formerly located in io/pnpnotify.c */ 92 - #define TAG_PNP_NOTIFY 'NPnP' 93 - 94 - /* for io/pnproot.c */ 95 - #define TAG_PNP_ROOT 'RPnP' 96 - 97 - /* formerly located in io/resource.c */ 98 - #define TAG_IO_RESOURCE 'CRSR' 99 - 100 - /* formerly located in io/timer.c */ 101 - #define TAG_IO_TIMER 'MTOI' 102 - 103 - /* formerly located in io/vpb.c */ 104 - #define TAG_VPB ' BPV' 105 - #define TAG_SYSB 'BSYS' 106 - 107 - /* formerly located in ldr/loader.c */ 108 - #define TAG_DRIVER_MEM 'MVRD' /* drvm */ 95 + /* Loader Related Tags */ 109 96 #define TAG_MODULE_OBJECT 'omlk' /* klmo - kernel ldr module object */ 110 - #define TAG_LDR_WSTR 'swlk' /* klws - kernel ldr wide string */ 111 - #define TAG_LDR_IMPORTS 'milk' /* klim - kernel ldr imports */ 112 - 113 - /* formerly located in lpc/connect */ 114 - #define TAG_LPC_CONNECT_MESSAGE 'CCPL' 115 - 116 - /* formerly located in mm/aspace.c */ 117 - #define TAG_PTRC 'CRTP' 118 - 119 - /* formerly located in mm/marea.c */ 120 - #define TAG_MAREA 'ERAM' 121 - #define TAG_MVAD 'VADM' 122 - 123 - /* formerly located in mm/pageop.c */ 124 - #define TAG_MM_PAGEOP 'POPM' 125 - 126 - /* formerly located in mm/pool.c */ 127 - #define TAG_NONE 'enoN' 128 - 129 - /* formerly located in mm/region.c */ 130 - #define TAG_MM_REGION 'NGRM' 131 - 132 - /* formerly located in mm/rmap.c */ 133 - #define TAG_RMAP 'PAMR' 134 - 135 - /* formerly located in mm/ARM3/section.c */ 136 - #define TAG_MM ' mM' 97 + #define TAG_LDR_WSTR 'swlk' /* klws - kernel ldr wide string */ 98 + #define TAG_LDR_IMPORTS 'milk' /* klim - kernel ldr imports */ 137 99 138 - /* formerly located in mm/section.c */ 100 + /* Memory Manager Tags */ 101 + #define TAG_PTRC 'CRTP' 102 + #define TAG_MAREA 'ERAM' 103 + #define TAG_MVAD 'VADM' 104 + #define TAG_MM_PAGEOP 'POPM' 105 + #define TAG_NONE 'enoN' 106 + #define TAG_MM_REGION 'NGRM' 107 + #define TAG_RMAP 'PAMR' 108 + #define TAG_MM ' mM' 139 109 #define TAG_MM_SECTION_SEGMENT 'SSMM' 140 110 #define TAG_SECTION_PAGE_TABLE 'TPSM' 141 111 142 - /* formerly located in ob/symlink.c */ 112 + /* Object Manager Tags */ 113 + #define OB_NAME_TAG 'mNbO' 114 + #define OB_DIR_TAG 'iDbO' 115 + #define TAG_WAIT 'tiaW' 116 + #define TAG_SEC_QUERY 'qSbO' 143 117 #define TAG_OBJECT_TYPE 'TjbO' 144 118 #define TAG_SYMLINK_TTARGET 'TTYS' 145 119 #define TAG_SYMLINK_TARGET 'TMYS' 146 - 147 - /* formerly located in ob/obsdcach.c */ 148 120 #define TAG_OB_SD_CACHE 'cSbO' 149 - 150 - /* Object Manager Tags */ 151 - #define OB_NAME_TAG 'mNbO' 152 - #define OB_DIR_TAG 'iDbO' 121 + #define TAG_OB_HANDLE 'dHbO' 153 122 123 + /* Power Manager Tag */ 124 + #define TAG_PO_DOPE 'EPOD' 154 125 155 - /* formerly located in ps/cid.c */ 156 - #define TAG_CIDOBJECT 'ODIC' 126 + /* Process Manager Tags */ 127 + #define TAG_CIDOBJECT 'ODIC' 157 128 #define TAG_PS_IMPERSONATION 'mIsP' 129 + #define TAG_EJOB 'BOJE' /* EJOB */ 130 + #define TAG_TERMINATE_APC 'CPAT' 131 + #define TAG_KAPC 'papk' /* kpap - kernel ps apc */ 132 + #define TAG_PS_APC 'pasP' /* Psap - Ps APC */ 133 + #define TAG_SHIM 'MIHS' 158 134 159 - /* formerly located in ps/job.c */ 160 - #define TAG_EJOB 'BOJE' /* EJOB */ 161 - 162 - /* formerly located in ps/kill.c */ 163 - #define TAG_TERMINATE_APC 'CPAT' 164 - 165 - /* formerly located in ps/notify.c */ 166 - #define TAG_KAPC 'papk' /* kpap - kernel ps apc */ 167 - #define TAG_PS_APC 'pasP' /* Psap - Ps APC */ 168 - 169 - /* formerly located in rtl/handle.c */ 135 + /* Run-Time Library Tags */ 170 136 #define TAG_HDTB 'BTDH' 137 + #define TAG_ATMT 'TotA' /* Atom table */ 138 + #define TAG_RTHL 'LHtR' /* Heap Lock */ 139 + #define TAG_USTR 'RTSU' 140 + #define TAG_ASTR 'RTSA' 141 + #define TAG_OSTR 'RTSO' 171 142 172 143 /* Security Manager Tags */ 173 144 #define TAG_SE ' eS' ··· 189 160 #define TAG_SID_VALIDATE 'vSeS' 190 161 191 162 /* LPC Tags */ 192 - #define TAG_LPC_MESSAGE 'McpL' 193 - #define TAG_LPC_ZONE 'ZcpL' 194 - 195 - #define TAG_WAIT 'tiaW' 196 - #define TAG_SEC_QUERY 'qSbO' 163 + #define TAG_LPC_MESSAGE 'McpL' 164 + #define TAG_LPC_ZONE 'ZcpL' 165 + #define TAG_LPC_CONNECT_MESSAGE 'CCPL' 197 166 198 - /* FSTUB */ 167 + /* FSTUB Tag */ 199 168 #define TAG_FSTUB 'BtsF'
-2
ntoskrnl/io/iomgr/driver.c
··· 32 32 33 33 POBJECT_TYPE IoDriverObjectType = NULL; 34 34 35 - #define TAG_RTLREGISTRY 'vrqR' 36 - 37 35 extern BOOLEAN ExpInTextModeSetup; 38 36 extern BOOLEAN PnpSystemInit; 39 37 extern BOOLEAN PnPBootDriversLoaded;
-2
ntoskrnl/io/pnpmgr/devaction.c
··· 50 50 KEVENT PiEnumerationFinished; 51 51 static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; 52 52 53 - #define TAG_PNP_DEVACTION 'aDpP' 54 - 55 53 /* TYPES *********************************************************************/ 56 54 57 55 typedef struct _DEVICE_ACTION_REQUEST
-6
ntoskrnl/kdbg/kdb.h
··· 1 1 #pragma once 2 2 #include "internal/kd.h" 3 3 4 - /* DEFINES *******************************************************************/ 5 - 6 - /* formerly located in kdbg/kdb_symbols.c */ 7 - #define TAG_KDBS 'SBDK' 8 - #define TAG_KDBG 'GBDK' 9 - 10 4 /* TYPES *********************************************************************/ 11 5 12 6 /* from kdb.c */
-1
ntoskrnl/ke/bug.c
··· 28 28 29 29 PKNMI_HANDLER_CALLBACK KiNmiCallbackListHead = NULL; 30 30 KSPIN_LOCK KiNmiCallbackListLock; 31 - #define TAG_KNMI 'IMNK' 32 31 33 32 /* Bugzilla Reporting */ 34 33 UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion;
+1 -1
ntoskrnl/ke/i386/kiinit.c
··· 591 591 /* Allocate the IOPM save area */ 592 592 Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, 593 593 IOPM_SIZE, 594 - ' eK'); 594 + TAG_KERNEL); 595 595 if (!Ki386IopmSaveArea) 596 596 { 597 597 /* Bugcheck. We need this for V86/VDM support. */
+2 -2
ntoskrnl/ke/i386/v86vdm.c
··· 655 655 /* Allocate VDM structure */ 656 656 VdmProcessObjects = ExAllocatePoolWithTag(NonPagedPool, 657 657 sizeof(VDM_PROCESS_OBJECTS), 658 - ' eK'); 658 + TAG_KERNEL); 659 659 if (!VdmProcessObjects) return STATUS_NO_MEMORY; 660 660 661 661 /* Set it up */ ··· 694 694 Context->ContextFlags = CONTEXT_FULL; 695 695 696 696 /* Free VDM objects */ 697 - ExFreePoolWithTag(PsGetCurrentProcess()->VdmObjects, ' eK'); 697 + ExFreePoolWithTag(PsGetCurrentProcess()->VdmObjects, TAG_KERNEL); 698 698 PsGetCurrentProcess()->VdmObjects = NULL; 699 699 700 700 /* Return status */
-2
ntoskrnl/ob/obhandle.c
··· 19 19 20 20 PHANDLE_TABLE ObpKernelHandleTable = NULL; 21 21 22 - #define TAG_OB_HANDLE 'dHbO' 23 - 24 22 /* PRIVATE FUNCTIONS *********************************************************/ 25 23 26 24 PHANDLE_TABLE
-2
ntoskrnl/po/povolume.c
··· 27 27 LIST_ENTRY PopVolumeDevices; 28 28 KSPIN_LOCK PopDopeGlobalLock; 29 29 30 - #define TAG_PO_DOPE 'EPOD' 31 - 32 30 /* PRIVATE FUNCTIONS *********************************************************/ 33 31 34 32 PDEVICE_OBJECT_POWER_EXTENSION
-1
ntoskrnl/ps/apphelp.c
··· 39 39 40 40 #define EMPTY_SHIM_ENTRY { { 0 }, { { 0 } }, 0 } 41 41 #define MAX_SHIM_ENTRIES 0x200 42 - #define TAG_SHIM 'MIHS' 43 42 44 43 #ifndef INVALID_HANDLE_VALUE 45 44 #define INVALID_HANDLE_VALUE (HANDLE)(-1)
+1 -1
ntoskrnl/ps/i386/psldt.c
··· 34 34 UNIMPLEMENTED; 35 35 36 36 /* Free VDM objects */ 37 - ExFreePoolWithTag(Process->VdmObjects, ' eK'); 37 + ExFreePoolWithTag(Process->VdmObjects, TAG_KERNEL); 38 38 Process->VdmObjects = NULL; 39 39 } 40 40
-7
ntoskrnl/rtl/libsupp.c
··· 13 13 #define NDEBUG 14 14 #include <debug.h> 15 15 16 - #define TAG_ATMT 'TotA' /* Atom table */ 17 - #define TAG_RTHL 'LHtR' /* Heap Lock */ 18 - 19 16 extern ULONG NtGlobalFlag; 20 17 21 18 typedef struct _RTL_RANGE_ENTRY ··· 114 111 Tag); 115 112 } 116 113 117 - 118 - #define TAG_USTR 'RTSU' 119 - #define TAG_ASTR 'RTSA' 120 - #define TAG_OSTR 'RTSO' 121 114 VOID 122 115 NTAPI 123 116 RtlpFreeMemory(PVOID Mem,