https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bc2d590a1ff9e8d178dd5e1f96a092c35f66fc0
commit 3bc2d590a1ff9e8d178dd5e1f96a092c35f66fc0 Author: George Bișoc <[email protected]> AuthorDate: Sun Dec 26 20:58:28 2021 +0100 Commit: George Bișoc <[email protected]> CommitDate: Mon Dec 27 18:57:03 2021 +0100 [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. --- ntoskrnl/dbgk/dbgkobj.c | 6 +- ntoskrnl/ex/atom.c | 2 - ntoskrnl/ex/harderr.c | 2 - ntoskrnl/ex/profile.c | 2 - ntoskrnl/fsrtl/filelock.c | 4 - ntoskrnl/fsrtl/oplock.c | 2 - ntoskrnl/inbv/inbv.c | 4 - ntoskrnl/include/internal/tag.h | 267 ++++++++++++++++++---------------------- ntoskrnl/io/iomgr/driver.c | 2 - ntoskrnl/io/pnpmgr/devaction.c | 2 - ntoskrnl/kdbg/kdb.h | 6 - ntoskrnl/ke/bug.c | 1 - ntoskrnl/ke/i386/kiinit.c | 2 +- ntoskrnl/ke/i386/v86vdm.c | 4 +- ntoskrnl/ob/obhandle.c | 2 - ntoskrnl/po/povolume.c | 2 - ntoskrnl/ps/apphelp.c | 1 - ntoskrnl/ps/i386/psldt.c | 2 +- ntoskrnl/rtl/libsupp.c | 7 -- 19 files changed, 125 insertions(+), 195 deletions(-) diff --git a/ntoskrnl/dbgk/dbgkobj.c b/ntoskrnl/dbgk/dbgkobj.c index 2175db14594..4b480a2cbf9 100644 --- a/ntoskrnl/dbgk/dbgkobj.c +++ b/ntoskrnl/dbgk/dbgkobj.c @@ -59,7 +59,7 @@ DbgkpQueueMessage(IN PEPROCESS Process, /* Allocate it */ DebugEvent = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEBUG_EVENT), - 'EgbD'); + TAG_DEBUG_EVENT); if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES; /* Set flags */ @@ -192,7 +192,7 @@ DbgkpQueueMessage(IN PEPROCESS Process, ObDereferenceObject(Process); /* Free the debug event */ - ExFreePoolWithTag(DebugEvent, 'EgbD'); + ExFreePoolWithTag(DebugEvent, TAG_DEBUG_EVENT); } } @@ -418,7 +418,7 @@ DbgkpFreeDebugEvent(IN PDEBUG_EVENT DebugEvent) /* Dereference process and thread and free the event */ ObDereferenceObject(DebugEvent->Process); ObDereferenceObject(DebugEvent->Thread); - ExFreePoolWithTag(DebugEvent, 'EgbD'); + ExFreePoolWithTag(DebugEvent, TAG_DEBUG_EVENT); } VOID diff --git a/ntoskrnl/ex/atom.c b/ntoskrnl/ex/atom.c index a33e0e9bccb..967fd6c6d65 100644 --- a/ntoskrnl/ex/atom.c +++ b/ntoskrnl/ex/atom.c @@ -13,8 +13,6 @@ #define NDEBUG #include <debug.h> -#define TAG_ATOM 'motA' - /* GLOBALS ****************************************************************/ /* diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 10b6682e657..490514d601e 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -12,8 +12,6 @@ #define NDEBUG #include <debug.h> -#define TAG_ERR ' rrE' - /* GLOBALS ******************************************************************/ BOOLEAN ExReadyForErrors = FALSE; diff --git a/ntoskrnl/ex/profile.c b/ntoskrnl/ex/profile.c index 45c49f2586a..a7e2e9b9fbe 100644 --- a/ntoskrnl/ex/profile.c +++ b/ntoskrnl/ex/profile.c @@ -13,8 +13,6 @@ #define NDEBUG #include <debug.h> -#define TAG_PROFILE 'forP' - /* GLOBALS *******************************************************************/ POBJECT_TYPE ExProfileObjectType = NULL; diff --git a/ntoskrnl/fsrtl/filelock.c b/ntoskrnl/fsrtl/filelock.c index 624d2dd7047..6d7a9d8afc8 100644 --- a/ntoskrnl/fsrtl/filelock.c +++ b/ntoskrnl/fsrtl/filelock.c @@ -51,10 +51,6 @@ typedef struct _LOCK_SHARED_RANGE } LOCK_SHARED_RANGE, *PLOCK_SHARED_RANGE; -#define TAG_TABLE 'BATL' -#define TAG_RANGE 'ARSF' -#define TAG_FLOCK 'KCLF' - /* PRIVATE FUNCTIONS *********************************************************/ VOID diff --git a/ntoskrnl/fsrtl/oplock.c b/ntoskrnl/fsrtl/oplock.c index f4c38d37d2c..04e90193716 100644 --- a/ntoskrnl/fsrtl/oplock.c +++ b/ntoskrnl/fsrtl/oplock.c @@ -27,8 +27,6 @@ #define BROKEN_TO_CLOSE_PENDING 0x800 #define BROKEN_ANY (BROKEN_TO_LEVEL_2 | BROKEN_TO_NONE | BROKEN_TO_NONE_FROM_LEVEL_2 | BROKEN_TO_CLOSE_PENDING) -#define TAG_OPLOCK 'orSF' - typedef struct _INTERNAL_OPLOCK { /* Level I IRP */ diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 78da5d5dd84..049ff230555 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -11,10 +11,6 @@ #define MM_READONLY 1 // PAGE_READONLY #define MM_READWRITE 4 // PAGE_WRITECOPY -#ifndef TAG_OSTR -#define TAG_OSTR 'RTSO' -#endif - /* GLOBALS *******************************************************************/ /* diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index 38c26245023..0e466482dd2 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -1,3 +1,13 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ReactOS NT kernel pool allocation tags + * COPYRIGHT: Copyright 2005 Steven Edwards <[email protected]> + * Copyright 2006 Alex Ionescu <[email protected]> + * Copyright 2015 Thomas Faber <[email protected]> + * Copyright 2021 George Bișoc <[email protected]> + */ + #pragma once /* Cache Manager Tags */ @@ -7,167 +17,128 @@ #define TAG_PRIVATE_CACHE_MAP 'cPcC' #define TAG_BCB 'cBcC' -/* Executive Callbacks */ +/* Executive Tags */ #define TAG_CALLBACK_ROUTINE_BLOCK 'brbC' #define TAG_CALLBACK_REGISTRATION 'eRBC' - -/* formely located in dbg/dbgkobj.c */ -#define TAG_DEBUG_EVENT 'EgbD' - -/* formerly located in ex/resource.c */ -#define TAG_RESOURCE_TABLE 'aTeR' -#define TAG_RESOURCE_EVENT 'aTeR' -#define TAG_RESOURCE_SEMAPHORE 'aTeR' - -/* formerly located in ex/handle.c */ -#define TAG_OBJECT_TABLE 'btbO' - -/* formerly located in ex/init.c */ -#define TAG_INIT 'tinI' -#define TAG_RTLI 'iltR' - -/* formerly located in fs/notify.c */ -#define FSRTL_NOTIFY_TAG 'ITON' - -/* formerly located in fsrtl/unc.c */ -#define TAG_UNC 'nuSF' - -/* formerly located in io/device.c */ +#define TAG_RESOURCE_TABLE 'aTeR' +#define TAG_RESOURCE_EVENT 'aTeR' +#define TAG_RESOURCE_SEMAPHORE 'aTeR' +#define TAG_OBJECT_TABLE 'btbO' +#define TAG_INIT 'tinI' +#define TAG_RTLI 'iltR' +#define TAG_ATOM 'motA' +#define TAG_PROFILE 'forP' +#define TAG_ERR ' rrE' + +/* User Mode Debugging Manager Tag */ +#define TAG_DEBUG_EVENT 'EgbD' + +/* Kernel Debugger Tags */ +#define TAG_KDBS 'SBDK' +#define TAG_KDBG 'GBDK' + +/* Kernel Tags */ +#define TAG_KNMI 'IMNK' +#define TAG_KERNEL ' eK' + +/* File-System Run-Time Library Tags */ +#define TAG_UNC 'nuSF' +#define TAG_TABLE 'BATL' +#define TAG_RANGE 'ARSF' +#define TAG_FLOCK 'KCLF' +#define TAG_OPLOCK 'orSF' + +/* I/O Manager Tags */ #define TAG_DEVICE_EXTENSION 'TXED' -#define TAG_SHUTDOWN_ENTRY 'TUHS' -#define TAG_IO_TIMER 'MTOI' - -/* formerly located in io/driver.c */ +#define TAG_SHUTDOWN_ENTRY 'TUHS' +#define TAG_IO_TIMER 'MTOI' #define TAG_DRIVER 'RVRD' #define TAG_DRIVER_EXTENSION 'EVRD' - -/* formerly located in io/file.c */ -#define TAG_SYSB 'BSYS' -#define TAG_LOCK 'kclF' -#define TAG_FILE_NAME 'MANF' - -/* formerly located in io/fs.c */ -#define TAG_FILE_SYSTEM 'SYSF' -#define TAG_FS_CHANGE_NOTIFY 'NCSF' -#define IFS_POOL_TAG 'trSF' -#define TAG_FS_NOTIFICATIONS 'NrSF' - -/* formerly located in io/iocomp.c */ -#define IOC_TAG 'TCOI' - -/* formerly located in io/iomgr.c */ -#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 */ -#define TAG_IOWI 'IWOI' - -/* formerly located in io/irp.c */ -#define TAG_IRP ' prI' -#define TAG_SYS_BUF 'BSYS' - -/* formerly located in io/irq.c */ -#define TAG_KINTERRUPT 'RSIK' - -/* formerly located in io/mdl.c */ -#define TAG_MDL ' LDM' - -/* formerly located in io/pnpmgr.c */ -#define TAG_IO_DEVNODE 'donD' - -/* formerly located in io/pnpnotify.c */ -#define TAG_PNP_NOTIFY 'NPnP' - -/* for io/pnproot.c */ -#define TAG_PNP_ROOT 'RPnP' - -/* formerly located in io/resource.c */ -#define TAG_IO_RESOURCE 'CRSR' - -/* formerly located in io/timer.c */ -#define TAG_IO_TIMER 'MTOI' - -/* formerly located in io/vpb.c */ -#define TAG_VPB ' BPV' -#define TAG_SYSB 'BSYS' - -/* formerly located in ldr/loader.c */ -#define TAG_DRIVER_MEM 'MVRD' /* drvm */ +#define TAG_SYSB 'BSYS' +#define TAG_LOCK 'kclF' +#define TAG_FILE_NAME 'MANF' +#define TAG_FILE_SYSTEM 'SYSF' +#define TAG_FS_CHANGE_NOTIFY 'NCSF' +#define IFS_POOL_TAG 'trSF' +#define TAG_FS_NOTIFICATIONS 'NrSF' +#define IOC_TAG 'TCOI' +#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' +#define TAG_IOWI 'IWOI' +#define TAG_IRP ' prI' +#define TAG_SYS_BUF 'BSYS' +#define TAG_KINTERRUPT 'RSIK' +#define TAG_MDL ' LDM' +#define TAG_IO_DEVNODE 'donD' +#define TAG_PNP_NOTIFY 'NPnP' +#define TAG_PNP_ROOT 'RPnP' +#define TAG_IO_RESOURCE 'CRSR' +#define TAG_IO_TIMER 'MTOI' +#define TAG_VPB ' BPV' +#define TAG_SYSB 'BSYS' +#define TAG_RTLREGISTRY 'vrqR' +#define TAG_PNP_DEVACTION 'aDpP' + +/* Loader Related Tags */ #define TAG_MODULE_OBJECT 'omlk' /* klmo - kernel ldr module object */ -#define TAG_LDR_WSTR 'swlk' /* klws - kernel ldr wide string */ -#define TAG_LDR_IMPORTS 'milk' /* klim - kernel ldr imports */ - -/* formerly located in lpc/connect */ -#define TAG_LPC_CONNECT_MESSAGE 'CCPL' - -/* formerly located in mm/aspace.c */ -#define TAG_PTRC 'CRTP' - -/* formerly located in mm/marea.c */ -#define TAG_MAREA 'ERAM' -#define TAG_MVAD 'VADM' - -/* formerly located in mm/pageop.c */ -#define TAG_MM_PAGEOP 'POPM' - -/* formerly located in mm/pool.c */ -#define TAG_NONE 'enoN' - -/* formerly located in mm/region.c */ -#define TAG_MM_REGION 'NGRM' - -/* formerly located in mm/rmap.c */ -#define TAG_RMAP 'PAMR' - -/* formerly located in mm/ARM3/section.c */ -#define TAG_MM ' mM' - -/* formerly located in mm/section.c */ +#define TAG_LDR_WSTR 'swlk' /* klws - kernel ldr wide string */ +#define TAG_LDR_IMPORTS 'milk' /* klim - kernel ldr imports */ + +/* Memory Manager Tags */ +#define TAG_PTRC 'CRTP' +#define TAG_MAREA 'ERAM' +#define TAG_MVAD 'VADM' +#define TAG_MM_PAGEOP 'POPM' +#define TAG_NONE 'enoN' +#define TAG_MM_REGION 'NGRM' +#define TAG_RMAP 'PAMR' +#define TAG_MM ' mM' #define TAG_MM_SECTION_SEGMENT 'SSMM' #define TAG_SECTION_PAGE_TABLE 'TPSM' -/* formerly located in ob/symlink.c */ +/* Object Manager Tags */ +#define OB_NAME_TAG 'mNbO' +#define OB_DIR_TAG 'iDbO' +#define TAG_WAIT 'tiaW' +#define TAG_SEC_QUERY 'qSbO' #define TAG_OBJECT_TYPE 'TjbO' #define TAG_SYMLINK_TTARGET 'TTYS' #define TAG_SYMLINK_TARGET 'TMYS' - -/* formerly located in ob/obsdcach.c */ #define TAG_OB_SD_CACHE 'cSbO' +#define TAG_OB_HANDLE 'dHbO' -/* Object Manager Tags */ -#define OB_NAME_TAG 'mNbO' -#define OB_DIR_TAG 'iDbO' - +/* Power Manager Tag */ +#define TAG_PO_DOPE 'EPOD' -/* formerly located in ps/cid.c */ -#define TAG_CIDOBJECT 'ODIC' +/* Process Manager Tags */ +#define TAG_CIDOBJECT 'ODIC' #define TAG_PS_IMPERSONATION 'mIsP' +#define TAG_EJOB 'BOJE' /* EJOB */ +#define TAG_TERMINATE_APC 'CPAT' +#define TAG_KAPC 'papk' /* kpap - kernel ps apc */ +#define TAG_PS_APC 'pasP' /* Psap - Ps APC */ +#define TAG_SHIM 'MIHS' -/* formerly located in ps/job.c */ -#define TAG_EJOB 'BOJE' /* EJOB */ - -/* formerly located in ps/kill.c */ -#define TAG_TERMINATE_APC 'CPAT' - -/* formerly located in ps/notify.c */ -#define TAG_KAPC 'papk' /* kpap - kernel ps apc */ -#define TAG_PS_APC 'pasP' /* Psap - Ps APC */ - -/* formerly located in rtl/handle.c */ +/* Run-Time Library Tags */ #define TAG_HDTB 'BTDH' +#define TAG_ATMT 'TotA' /* Atom table */ +#define TAG_RTHL 'LHtR' /* Heap Lock */ +#define TAG_USTR 'RTSU' +#define TAG_ASTR 'RTSA' +#define TAG_OSTR 'RTSO' /* Security Manager Tags */ #define TAG_SE ' eS' @@ -189,11 +160,9 @@ #define TAG_SID_VALIDATE 'vSeS' /* LPC Tags */ -#define TAG_LPC_MESSAGE 'McpL' -#define TAG_LPC_ZONE 'ZcpL' - -#define TAG_WAIT 'tiaW' -#define TAG_SEC_QUERY 'qSbO' +#define TAG_LPC_MESSAGE 'McpL' +#define TAG_LPC_ZONE 'ZcpL' +#define TAG_LPC_CONNECT_MESSAGE 'CCPL' -/* FSTUB */ +/* FSTUB Tag */ #define TAG_FSTUB 'BtsF' diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 8be45e3459a..3925477bbd3 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -32,8 +32,6 @@ static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentCon POBJECT_TYPE IoDriverObjectType = NULL; -#define TAG_RTLREGISTRY 'vrqR' - extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN PnpSystemInit; extern BOOLEAN PnPBootDriversLoaded; diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 2126d31e059..c97f1fdd1c5 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -50,8 +50,6 @@ KSPIN_LOCK IopDeviceActionLock; KEVENT PiEnumerationFinished; static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; -#define TAG_PNP_DEVACTION 'aDpP' - /* TYPES *********************************************************************/ typedef struct _DEVICE_ACTION_REQUEST diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 3ccd6fc49e0..aa8cb8e8f18 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -1,12 +1,6 @@ #pragma once #include "internal/kd.h" -/* DEFINES *******************************************************************/ - -/* formerly located in kdbg/kdb_symbols.c */ -#define TAG_KDBS 'SBDK' -#define TAG_KDBG 'GBDK' - /* TYPES *********************************************************************/ /* from kdb.c */ diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index f7b9175feab..8930e5fc88d 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -28,7 +28,6 @@ ULONG_PTR KiBugCheckData[5]; PKNMI_HANDLER_CALLBACK KiNmiCallbackListHead = NULL; KSPIN_LOCK KiNmiCallbackListLock; -#define TAG_KNMI 'IMNK' /* Bugzilla Reporting */ UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 0414176c3d8..c8a9872b519 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -591,7 +591,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, /* Allocate the IOPM save area */ Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, IOPM_SIZE, - ' eK'); + TAG_KERNEL); if (!Ki386IopmSaveArea) { /* Bugcheck. We need this for V86/VDM support. */ diff --git a/ntoskrnl/ke/i386/v86vdm.c b/ntoskrnl/ke/i386/v86vdm.c index 0421f005217..a50f3aba188 100644 --- a/ntoskrnl/ke/i386/v86vdm.c +++ b/ntoskrnl/ke/i386/v86vdm.c @@ -655,7 +655,7 @@ Ke386CallBios(IN ULONG Int, /* Allocate VDM structure */ VdmProcessObjects = ExAllocatePoolWithTag(NonPagedPool, sizeof(VDM_PROCESS_OBJECTS), - ' eK'); + TAG_KERNEL); if (!VdmProcessObjects) return STATUS_NO_MEMORY; /* Set it up */ @@ -694,7 +694,7 @@ Ke386CallBios(IN ULONG Int, Context->ContextFlags = CONTEXT_FULL; /* Free VDM objects */ - ExFreePoolWithTag(PsGetCurrentProcess()->VdmObjects, ' eK'); + ExFreePoolWithTag(PsGetCurrentProcess()->VdmObjects, TAG_KERNEL); PsGetCurrentProcess()->VdmObjects = NULL; /* Return status */ diff --git a/ntoskrnl/ob/obhandle.c b/ntoskrnl/ob/obhandle.c index c738e3669ee..cff2cbb80e9 100644 --- a/ntoskrnl/ob/obhandle.c +++ b/ntoskrnl/ob/obhandle.c @@ -19,8 +19,6 @@ PHANDLE_TABLE ObpKernelHandleTable = NULL; -#define TAG_OB_HANDLE 'dHbO' - /* PRIVATE FUNCTIONS *********************************************************/ PHANDLE_TABLE diff --git a/ntoskrnl/po/povolume.c b/ntoskrnl/po/povolume.c index 235b6a2feb3..1897c045942 100644 --- a/ntoskrnl/po/povolume.c +++ b/ntoskrnl/po/povolume.c @@ -27,8 +27,6 @@ KGUARDED_MUTEX PopVolumeLock; LIST_ENTRY PopVolumeDevices; KSPIN_LOCK PopDopeGlobalLock; -#define TAG_PO_DOPE 'EPOD' - /* PRIVATE FUNCTIONS *********************************************************/ PDEVICE_OBJECT_POWER_EXTENSION diff --git a/ntoskrnl/ps/apphelp.c b/ntoskrnl/ps/apphelp.c index 8a17777a852..91cd277cb04 100644 --- a/ntoskrnl/ps/apphelp.c +++ b/ntoskrnl/ps/apphelp.c @@ -39,7 +39,6 @@ static UNICODE_STRING AppCompatCacheValue = RTL_CONSTANT_STRING(L"AppCompatCache #define EMPTY_SHIM_ENTRY { { 0 }, { { 0 } }, 0 } #define MAX_SHIM_ENTRIES 0x200 -#define TAG_SHIM 'MIHS' #ifndef INVALID_HANDLE_VALUE #define INVALID_HANDLE_VALUE (HANDLE)(-1) diff --git a/ntoskrnl/ps/i386/psldt.c b/ntoskrnl/ps/i386/psldt.c index f13e2952a4a..43bcbd9a185 100644 --- a/ntoskrnl/ps/i386/psldt.c +++ b/ntoskrnl/ps/i386/psldt.c @@ -34,7 +34,7 @@ PspDeleteVdmObjects(PEPROCESS Process) UNIMPLEMENTED; /* Free VDM objects */ - ExFreePoolWithTag(Process->VdmObjects, ' eK'); + ExFreePoolWithTag(Process->VdmObjects, TAG_KERNEL); Process->VdmObjects = NULL; } diff --git a/ntoskrnl/rtl/libsupp.c b/ntoskrnl/rtl/libsupp.c index 432b9185b40..e8d7b68df88 100644 --- a/ntoskrnl/rtl/libsupp.c +++ b/ntoskrnl/rtl/libsupp.c @@ -13,9 +13,6 @@ #define NDEBUG #include <debug.h> -#define TAG_ATMT 'TotA' /* Atom table */ -#define TAG_RTHL 'LHtR' /* Heap Lock */ - extern ULONG NtGlobalFlag; typedef struct _RTL_RANGE_ENTRY @@ -114,10 +111,6 @@ RtlpAllocateMemory(ULONG Bytes, Tag); } - -#define TAG_USTR 'RTSU' -#define TAG_ASTR 'RTSA' -#define TAG_OSTR 'RTSO' VOID NTAPI RtlpFreeMemory(PVOID Mem,
