- Start deprecating TAG()

- Fix inverted tags in prntfont.h, stdunk.h and win32k/objects/font.c

svn path=/trunk/; revision=42915
This commit is contained in:
Stefan Ginsberg 2009-08-24 17:12:25 +00:00
parent 7776fec6ce
commit ea23cd10c2
71 changed files with 203 additions and 274 deletions

View file

@ -7,8 +7,7 @@
extern "C" { extern "C" {
#endif #endif
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_ISAPNP 'PNPI'
#define TAG_ISAPNP TAG('I', 'P', 'N', 'P')
#define IO_RESOURCE_REQUIRED 0x00 //ROS Extension #define IO_RESOURCE_REQUIRED 0x00 //ROS Extension

View file

@ -6,8 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <ntddk.h> #include <ntddk.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_PCI '0ICP'
#define TAG_PCI TAG('P', 'C', 'I', '0')
typedef struct _PCI_DEVICE typedef struct _PCI_DEVICE
{ {

View file

@ -1,8 +1,8 @@
#define TAG_THDD TAG('t', 'h', 'd', 'd') #define TAG_THDD 'ddht'
#define TAG_GINI TAG('G', 'i', 'n', 'i') #define TAG_GINI 'iniG'

View file

@ -227,12 +227,8 @@ typedef struct _CCB
ULONG LastOffset; ULONG LastOffset;
} CCB, *PCCB; } CCB, *PCCB;
#ifndef TAG #define TAG_CCB 'BCCI'
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FCB 'BCFI'
#endif
#define TAG_CCB TAG('I', 'C', 'C', 'B')
#define TAG_FCB TAG('I', 'F', 'C', 'B')
typedef struct typedef struct
{ {

View file

@ -115,9 +115,8 @@ extern Ext2Data Ext2GlobalData;
} }
#ifdef EXT2_POOL_WITH_TAG #ifdef EXT2_POOL_WITH_TAG
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#define Ext2AllocatePool(PoolType,NumberOfBytes) \ #define Ext2AllocatePool(PoolType,NumberOfBytes) \
ExAllocatePoolWithTag( PoolType, NumberOfBytes, TAG ( 'E','x','t','2' ) ) ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' )
#else #else
#define Ext2AllocatePool(PoolType,NumberOfBytes) \ #define Ext2AllocatePool(PoolType,NumberOfBytes) \
ExAllocatePool( PoolType, NumberOfBytes ) ExAllocatePool( PoolType, NumberOfBytes )

View file

@ -19,7 +19,7 @@
/* -------------------------------------------------------- DEFINES */ /* -------------------------------------------------------- DEFINES */
#define TAG_FCB TAG('V', 'F', 'C', 'B') #define TAG_FCB 'BCFV'
/* -------------------------------------------------------- PUBLICS */ /* -------------------------------------------------------- PUBLICS */

View file

@ -402,14 +402,10 @@ typedef struct _VFATCCB
UNICODE_STRING SearchPattern; UNICODE_STRING SearchPattern;
} VFATCCB, *PVFATCCB; } VFATCCB, *PVFATCCB;
#ifndef TAG #define TAG_CCB 'BCCV'
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FCB 'BCFV'
#endif #define TAG_IRP 'PRIV'
#define TAG_VFAT 'TAFV'
#define TAG_CCB TAG('V', 'C', 'C', 'B')
#define TAG_FCB TAG('V', 'F', 'C', 'B')
#define TAG_IRP TAG('V', 'I', 'R', 'P')
#define TAG_VFAT TAG('V', 'F', 'A', 'T')
#define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry)) #define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry))

View file

@ -3,24 +3,16 @@
#include <debug.h> #include <debug.h>
#include <pseh/pseh2.h> #include <pseh/pseh2.h>
#ifndef TAG
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#endif
#include <fat.h> #include <fat.h>
#include <fatstruc.h> #include <fatstruc.h>
#define Add2Ptr(P,I,T) ((T)((PUCHAR)(P) + (I))) #define Add2Ptr(P,I,T) ((T)((PUCHAR)(P) + (I)))
#define PtrOffset(B,O) ((ULONG)((ULONG_PTR)(O) - (ULONG_PTR)(B))) #define PtrOffset(B,O) ((ULONG)((ULONG_PTR)(O) - (ULONG_PTR)(B)))
#ifndef TAG #define TAG_CCB 'BCCV'
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FCB 'BCFV'
#endif #define TAG_IRP 'PRIV'
#define TAG_VFAT 'TAFV'
#define TAG_CCB TAG('V', 'C', 'C', 'B')
#define TAG_FCB TAG('V', 'F', 'C', 'B')
#define TAG_IRP TAG('V', 'I', 'R', 'P')
#define TAG_VFAT TAG('V', 'F', 'A', 'T')
/* ------------------------------------------------------ shutdown.c */ /* ------------------------------------------------------ shutdown.c */
DRIVER_DISPATCH FatShutdown; DRIVER_DISPATCH FatShutdown;

View file

@ -17,8 +17,7 @@
// //
// Tag for memory allocations // Tag for memory allocations
// //
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define FSREC_TAG 'cRsF'
#define FSREC_TAG TAG('F', 's', 'R', 'c')
// //
// UDFS Offsets // UDFS Offsets

View file

@ -1,10 +1,6 @@
#ifndef MUP_H #ifndef MUP_H
#define MUP_H #define MUP_H
#ifndef TAG
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#endif
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))

View file

@ -715,7 +715,7 @@ NtfsFsdDirectoryControl(PDEVICE_OBJECT DeviceObject,
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
if (IrpContext) if (IrpContext)
ExFreePoolWithTag(IrpContext, TAG('N', 'I', 'R', 'P')); ExFreePoolWithTag(IrpContext, 'PRIN');
IoSetTopLevelIrp(NULL); IoSetTopLevelIrp(NULL);
FsRtlExitFileSystem(); FsRtlExitFileSystem();

View file

@ -82,7 +82,7 @@ NtfsFsdDispatch(PDEVICE_OBJECT DeviceObject,
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
if (IrpContext) if (IrpContext)
ExFreePoolWithTag(IrpContext, TAG('N', 'I', 'R', 'P')); ExFreePoolWithTag(IrpContext, 'PRIN');
IoSetTopLevelIrp(NULL); IoSetTopLevelIrp(NULL);
FsRtlExitFileSystem(); FsRtlExitFileSystem();

View file

@ -36,7 +36,7 @@
/* MACROS *******************************************************************/ /* MACROS *******************************************************************/
#define TAG_FCB TAG('I', 'F', 'C', 'B') #define TAG_FCB 'BCFI'

View file

@ -74,7 +74,7 @@ NtfsAllocateIrpContext(PDEVICE_OBJECT DeviceObject,
TRACE_(NTFS, "NtfsAllocateIrpContext()\n"); TRACE_(NTFS, "NtfsAllocateIrpContext()\n");
IrpContext = (PNTFS_IRP_CONTEXT)ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_IRP_CONTEXT), TAG('N', 'I', 'R', 'P')); IrpContext = (PNTFS_IRP_CONTEXT)ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_IRP_CONTEXT), 'PRIN');
if (IrpContext == NULL) if (IrpContext == NULL)
return NULL; return NULL;
RtlZeroMemory(IrpContext, sizeof(NTFS_IRP_CONTEXT)); RtlZeroMemory(IrpContext, sizeof(NTFS_IRP_CONTEXT));

View file

@ -55,7 +55,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
TRACE_(NTFS, "DriverEntry(%p, '%wZ')\n", DriverObject, RegistryPath); TRACE_(NTFS, "DriverEntry(%p, '%wZ')\n", DriverObject, RegistryPath);
/* Initialize global data */ /* Initialize global data */
NtfsGlobalData = ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_GLOBAL_DATA), TAG('N', 'D', 'R', 'G')); NtfsGlobalData = ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_GLOBAL_DATA), 'GRDN');
if (!NtfsGlobalData) if (!NtfsGlobalData)
{ {
Status = STATUS_INSUFFICIENT_RESOURCES; Status = STATUS_INSUFFICIENT_RESOURCES;
@ -107,7 +107,7 @@ ErrorEnd:
if (NtfsGlobalData) if (NtfsGlobalData)
{ {
ExDeleteResourceLite(&NtfsGlobalData->Resource); ExDeleteResourceLite(&NtfsGlobalData->Resource);
ExFreePoolWithTag(NtfsGlobalData, TAG('N', 'D', 'R', 'G')); ExFreePoolWithTag(NtfsGlobalData, 'GRDN');
} }
} }

View file

@ -9,11 +9,7 @@
((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \
(pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE) (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE)
#ifndef TAG #define TAG_NTFS 'SFTN'
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#endif
#define TAG_NTFS TAG('N', 'T', 'F', 'S')
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
@ -83,11 +79,11 @@ typedef struct _NTFS_INFO
} NTFS_INFO, *PNTFS_INFO; } NTFS_INFO, *PNTFS_INFO;
#define NTFS_TYPE_CCB TAG('F','S',0,2) #define NTFS_TYPE_CCB '20SF'
#define NTFS_TYPE_FCB TAG('F','S',0,3) #define NTFS_TYPE_FCB '30SF'
#define NTFS_TYPE_VCB TAG('F','S',0,5) #define NTFS_TYPE_VCB '50SF'
#define NTFS_TYPE_IRP_CONTEST TAG('F','S',0,6) #define NTFS_TYPE_IRP_CONTEST '60SF'
#define NTFS_TYPE_GLOBAL_DATA TAG('F','S',0,7) #define NTFS_TYPE_GLOBAL_DATA '70SF'
typedef struct typedef struct
{ {
@ -165,7 +161,7 @@ typedef struct
ULONG LastOffset; ULONG LastOffset;
} NTFS_CCB, *PNTFS_CCB; } NTFS_CCB, *PNTFS_CCB;
#define TAG_CCB TAG('I', 'C', 'C', 'B') #define TAG_CCB 'BCCI'
typedef struct typedef struct
{ {

View file

@ -14,8 +14,7 @@
* Structures * Structures
* --------------------------------------------------*/ * --------------------------------------------------*/
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define I8042PRT_TAG '2408'
#define I8042PRT_TAG TAG('8', '0', '4', '2')
typedef enum typedef enum
{ {

View file

@ -31,9 +31,6 @@ static LOCAL_KEYBOARD_INDICATOR_TRANSLATION IndicatorTranslation = { 3, {
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
/* Debug stuff */
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
static VOID NTAPI static VOID NTAPI
i8042DebugWorkItem( i8042DebugWorkItem(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
@ -48,7 +45,7 @@ i8042DebugWorkItem(
/* We hope kernel would understand this. If /* We hope kernel would understand this. If
* that's not the case, nothing would happen. * that's not the case, nothing would happen.
*/ */
KdSystemDebugControl(TAG('R', 'o', 's', ' '), Key, 0, NULL, 0, NULL, KernelMode); KdSystemDebugControl(' soR', Key, 0, NULL, 0, NULL, KernelMode);
} }
/* /*

View file

@ -10,8 +10,7 @@
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define CLASS_TAG 'CdbK'
#define CLASS_TAG TAG('K', 'b', 'd', 'C')
#define DPFLTR_CLASS_NAME_ID DPFLTR_KBDCLASS_ID #define DPFLTR_CLASS_NAME_ID DPFLTR_KBDCLASS_ID
typedef enum typedef enum

View file

@ -10,8 +10,7 @@
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define CLASS_TAG 'CuoM'
#define CLASS_TAG TAG('M', 'o', 'u', 'C')
#define DPFLTR_CLASS_NAME_ID DPFLTR_MOUCLASS_ID #define DPFLTR_CLASS_NAME_ID DPFLTR_MOUCLASS_ID
typedef enum typedef enum

View file

@ -4,8 +4,7 @@
#include <ntddmou.h> #include <ntddmou.h>
#include <debug.h> #include <debug.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define SERMOUSE_TAG 'uoMS'
#define SERMOUSE_TAG TAG('S', 'M', 'o', 'u')
typedef enum typedef enum
{ {

View file

@ -4,9 +4,8 @@
#include "ksiface.h" #include "ksiface.h"
#include "kstypes.h" #include "kstypes.h"
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_KSDEVICE 'DESK'
#define TAG_KSDEVICE TAG('K', 'S', 'E', 'D') #define TAG_KSOBJECT_TAG 'HOSK'
#define TAG_KSOBJECT_TAG TAG('K', 'S', 'O', 'H')
NTSTATUS NTSTATUS
NTAPI NTAPI

View file

@ -18,7 +18,7 @@
#include "ksiface.h" #include "ksiface.h"
#define TAG_DEVICE_HEADER TAG('H','D','S','K') #define TAG_DEVICE_HEADER 'KSDH'
#define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\
PropGeneral, PropInstances, PropIntersection)\ PropGeneral, PropInstances, PropIntersection)\

View file

@ -12,7 +12,6 @@
#define NDEBUG #define NDEBUG
#include <sndblst.h> #include <sndblst.h>
#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
/* /*
IRP DISPATCH ROUTINES IRP DISPATCH ROUTINES
@ -207,8 +206,8 @@ AllocateRegistryPathInfo(
ExFreePool(ptr) ExFreePool(ptr)
#define TAG_REG_INFO TAG('I','g','e','R') #define TAG_REG_INFO 'RegI'
#define TAG_REG_NAME TAG('N','g','e','R') #define TAG_REG_NAME 'RegN'
NTSTATUS NTAPI NTSTATUS NTAPI
EnumerateSubkey( EnumerateSubkey(

View file

@ -155,12 +155,8 @@ MiGetMediaDuplex(PADAPTER Adapter);
#define BREAKPOINT #define BREAKPOINT
#endif #endif
#ifndef TAG
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#endif
/* memory pool tag */ /* memory pool tag */
#define PCNET_TAG TAG('P', 'c', 'N', 't') #define PCNET_TAG 'tNcP'
#endif // _PCNET_H_ #endif // _PCNET_H_

View file

@ -31,7 +31,6 @@
/* the version of NDIS we claim to be */ /* the version of NDIS we claim to be */
#define NDIS_VERSION 0x00050000 #define NDIS_VERSION 0x00050000
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#define NDIS_TAG 0x4e4d4953 #define NDIS_TAG 0x4e4d4953
#define MIN(value1, value2) \ #define MIN(value1, value2) \

View file

@ -2236,7 +2236,7 @@ NdisIAddDevice(
* Gain the access to the miniport data structure first. * Gain the access to the miniport data structure first.
*/ */
MiniportPtr = IoGetDriverObjectExtension(DriverObject, (PVOID)TAG('D','I','M','N')); MiniportPtr = IoGetDriverObjectExtension(DriverObject, (PVOID)'NMID');
if (MiniportPtr == NULL) if (MiniportPtr == NULL)
{ {
NDIS_DbgPrint(MIN_TRACE, ("Can't get driver object extension.\n")); NDIS_DbgPrint(MIN_TRACE, ("Can't get driver object extension.\n"));
@ -2487,7 +2487,7 @@ NdisMRegisterMiniport(
* structure in the driver extension or what? * structure in the driver extension or what?
*/ */
Status = IoAllocateDriverObjectExtension(Miniport->DriverObject, (PVOID)TAG('D','I','M','N'), Status = IoAllocateDriverObjectExtension(Miniport->DriverObject, (PVOID)'NMID',
sizeof(PNDIS_M_DRIVER_BLOCK), (PVOID*)&MiniportPtr); sizeof(PNDIS_M_DRIVER_BLOCK), (PVOID*)&MiniportPtr);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {

View file

@ -15,7 +15,7 @@
*/ */
#define AddrInitIPv4(IPAddress, RawAddress) \ #define AddrInitIPv4(IPAddress, RawAddress) \
{ \ { \
INIT_TAG((IPAddress), TAG('I','P','V','4')); \ INIT_TAG((IPAddress), '4VPI'); \
(IPAddress)->Type = IP_ADDRESS_V4; \ (IPAddress)->Type = IP_ADDRESS_V4; \
(IPAddress)->Address.IPv4Address = (RawAddress); \ (IPAddress)->Address.IPv4Address = (RawAddress); \
} }

View file

@ -30,8 +30,7 @@
#include <debug.h> #include <debug.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_STRING ' RTS' /* string */
#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */
/* Define _NTTEST_ to make test version. Device names are prefixed with /* Define _NTTEST_ to make test version. Device names are prefixed with
'NT' to allow the driver to run side by side with MS TCP/IP driver */ 'NT' to allow the driver to run side by side with MS TCP/IP driver */

View file

@ -13,8 +13,6 @@
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
typedef enum typedef enum
{ {
dsStopped, dsStopped,
@ -57,7 +55,7 @@ typedef struct _PDO_DEVICE_EXTENSION
UNICODE_STRING CompatibleIds; // REG_MULTI_SZ UNICODE_STRING CompatibleIds; // REG_MULTI_SZ
} PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION;
#define SERENUM_TAG TAG('S', 'e', 'r', 'e') #define SERENUM_TAG 'ereS'
/* Flags */ /* Flags */
#define FLAG_ENUMERATION_DONE 0x01 #define FLAG_ENUMERATION_DONE 0x01

View file

@ -13,8 +13,6 @@
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
/* See winbase.h */ /* See winbase.h */
#define PST_RS232 1 #define PST_RS232 1
#define COMMPROP_INITIALIZED 0xE73CF52E #define COMMPROP_INITIALIZED 0xE73CF52E
@ -108,7 +106,7 @@ typedef struct _WORKITEM_DATA
BOOLEAN ReadAtLeastOneByte; BOOLEAN ReadAtLeastOneByte;
} WORKITEM_DATA, *PWORKITEM_DATA; } WORKITEM_DATA, *PWORKITEM_DATA;
#define SERIAL_TAG TAG('S', 'e', 'r', 'l') #define SERIAL_TAG 'lreS'
#define INFINITE ((ULONG)-1) #define INFINITE ((ULONG)-1)

View file

@ -12,11 +12,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef TAG #define TAG_BLUE 'EULB'
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#endif
#define TAG_BLUE TAG('B', 'L', 'U', 'E')
typedef struct _CFHEADER typedef struct _CFHEADER
{ {

View file

@ -15,8 +15,6 @@
//#define NDEBUG //#define NDEBUG
#include <debug.h> #include <debug.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#ifdef ALLOC_PRAGMA #ifdef ALLOC_PRAGMA
#pragma alloc_text(PAGE, ScsiClassGetInquiryData) #pragma alloc_text(PAGE, ScsiClassGetInquiryData)
#pragma alloc_text(PAGE, ScsiClassInitialize) #pragma alloc_text(PAGE, ScsiClassInitialize)
@ -4635,7 +4633,7 @@ Return Value:
NULL, NULL,
NonPagedPoolMustSucceed, NonPagedPoolMustSucceed,
SCSI_REQUEST_BLOCK_SIZE, SCSI_REQUEST_BLOCK_SIZE,
TAG('H','s','c','S'), 'ScsH',
(USHORT)NumberElements); (USHORT)NumberElements);
} }

View file

@ -493,7 +493,7 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension,
Length = GuidString.Length + 32; Length = GuidString.Length + 32;
Buffer = ExAllocatePoolWithTag(NonPagedPool, Buffer = ExAllocatePoolWithTag(NonPagedPool,
Length, Length,
TAG('R', 'a', 'm', 'd')); 'dmaR');
if (!Buffer) if (!Buffer)
{ {
// //
@ -542,7 +542,7 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension,
SymbolicLinkName.Length = GuidString.Length + 34; SymbolicLinkName.Length = GuidString.Length + 34;
Buffer = ExAllocatePoolWithTag(NonPagedPool, Buffer = ExAllocatePoolWithTag(NonPagedPool,
SymbolicLinkName.MaximumLength, SymbolicLinkName.MaximumLength,
TAG('R', 'a', 'm', 'd')); 'dmaR');
SymbolicLinkName.Buffer = Buffer; SymbolicLinkName.Buffer = Buffer;
if (Buffer) if (Buffer)
{ {
@ -618,7 +618,7 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension,
DiskLength = Input->DiskLength; DiskLength = Input->DiskLength;
ExInitializeFastMutex(&DriveExtension->DiskListLock); ExInitializeFastMutex(&DriveExtension->DiskListLock);
IoInitializeRemoveLock(&DriveExtension->RemoveLock, IoInitializeRemoveLock(&DriveExtension->RemoveLock,
TAG('R', 'a', 'm', 'd'), 'dmaR',
0, 0,
1); 1);
DriveExtension->DriveDeviceName = DeviceName; DriveExtension->DriveDeviceName = DeviceName;
@ -1811,7 +1811,7 @@ RamdiskQueryDeviceRelations(IN DEVICE_RELATION_TYPE Type,
Objects) + Objects) +
FinalCount * FinalCount *
sizeof(PDEVICE_OBJECT), sizeof(PDEVICE_OBJECT),
TAG('R', 'a', 'm', 'd')); 'dmaR');
if (!OurDeviceRelations) if (!OurDeviceRelations)
{ {
// //
@ -2231,7 +2231,7 @@ RamdiskAddDevice(IN PDRIVER_OBJECT DriverObject,
DeviceExtension->Type = RamdiskBus; DeviceExtension->Type = RamdiskBus;
ExInitializeFastMutex(&DeviceExtension->DiskListLock); ExInitializeFastMutex(&DeviceExtension->DiskListLock);
IoInitializeRemoveLock(&DeviceExtension->RemoveLock, IoInitializeRemoveLock(&DeviceExtension->RemoveLock,
TAG('R', 'a', 'm', 'd'), 'dmaR',
0, 0,
1); 1);
InitializeListHead(&DeviceExtension->DiskList); InitializeListHead(&DeviceExtension->DiskList);
@ -2322,7 +2322,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject,
DriverRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, DriverRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool,
RegistryPath->Length + RegistryPath->Length +
sizeof(WCHAR), sizeof(WCHAR),
TAG('R', 'a', 'm', 'd')); 'dmaR');
if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES;
RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath); RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath);

View file

@ -23,8 +23,7 @@ extern "C" {
#undef ExAllocatePool #undef ExAllocatePool
#endif #endif
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_UNIATA 'Uata'
#define TAG_UNIATA TAG('a', 't', 'a', 'U')
#define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,TAG_UNIATA) #define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,TAG_UNIATA)

View file

@ -14,8 +14,7 @@
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
#endif #endif
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_SCSIPORT 'ISCS'
#define TAG_SCSIPORT TAG('S', 'C', 'S', 'I')
/* Defines how many logical unit arrays will be in a device extension */ /* Defines how many logical unit arrays will be in a device extension */
#define LUS_NUMBER 8 #define LUS_NUMBER 8

View file

@ -68,10 +68,8 @@ typedef struct _PDEV
DDPIXELFORMAT ddpfDisplay; DDPIXELFORMAT ddpfDisplay;
} PDEV, *PPDEV; } PDEV, *PPDEV;
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#define DEVICE_NAME L"framebuf" #define DEVICE_NAME L"framebuf"
#define ALLOC_TAG TAG('F','B','U','F') #define ALLOC_TAG 'FUBF'
DHPDEV APIENTRY DHPDEV APIENTRY

View file

@ -95,10 +95,8 @@ typedef struct _PDEV
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#define DEVICE_NAME L"framebuf" #define DEVICE_NAME L"framebuf"
#define ALLOC_TAG TAG('F','B','U','F') #define ALLOC_TAG 'FUBF'
DHPDEV APIENTRY DHPDEV APIENTRY

View file

@ -67,8 +67,6 @@ InitializeListHead(
/***********************************************************/ /***********************************************************/
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#define DS_SOLIDBRUSH 0x00000001 #define DS_SOLIDBRUSH 0x00000001
#define DS_GREYBRUSH 0x00000002 #define DS_GREYBRUSH 0x00000002
#define DS_BRUSH 0x00000004 #define DS_BRUSH 0x00000004
@ -249,7 +247,7 @@ BOOL InitVGA(PPDEV ppdev, BOOL bFirst); // screen.c: initialize VGA mode
BOOL DeinitVGA(PPDEV ppdev); // screen.c: Free resources allocated in InitVGA BOOL DeinitVGA(PPDEV ppdev); // screen.c: Free resources allocated in InitVGA
#define DRIVER_EXTRA_SIZE 0 #define DRIVER_EXTRA_SIZE 0
#define ALLOC_TAG TAG('D', 'v', 'g', 'a') // Dvga tag #define ALLOC_TAG 'agvD' // Dvga tag
#define DLL_NAME L"vga" // DLL name in Unicode #define DLL_NAME L"vga" // DLL name in Unicode
#define MAX_SCAN_WIDTH 2048 // pixels #define MAX_SCAN_WIDTH 2048 // pixels

View file

@ -17,8 +17,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FREETYPE 'PYTF'
#define TAG_FREETYPE TAG('F', 'T', 'Y', 'P')
/* /*
* First some generic routines * First some generic routines

View file

@ -38,8 +38,7 @@
#include "ntddvdeo.h" #include "ntddvdeo.h"
#include "video.h" #include "video.h"
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_VBE ' EBV'
#define TAG_VBE TAG('V', 'B', 'E', ' ')
/* /*
* Compile-time define to get VBE 1.2 support. The implementation * Compile-time define to get VBE 1.2 support. The implementation

View file

@ -666,7 +666,7 @@ VideoPortInitialize(
ExAllocatePoolWithTag( ExAllocatePoolWithTag(
PagedPool, PagedPool,
DriverExtension->RegistryPath.MaximumLength, DriverExtension->RegistryPath.MaximumLength,
TAG('U', 'S', 'T', 'R')); 'RTSU');
if (DriverExtension->RegistryPath.Buffer == NULL) if (DriverExtension->RegistryPath.Buffer == NULL)
{ {
RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL); RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL);

View file

@ -36,8 +36,8 @@
#include <debug.h> #include <debug.h>
#define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') #define TAG_VIDEO_PORT 'PDIV'
#define TAG_VIDEO_PORT_BUFFER TAG('V', 'p', 'm', '\0' ) #define TAG_VIDEO_PORT_BUFFER '\0mpV'
typedef struct _VIDEO_PORT_ADDRESS_MAPPING typedef struct _VIDEO_PORT_ADDRESS_MAPPING
{ {

View file

@ -23,8 +23,7 @@
#include <math.h> #include <math.h>
#include <intrin.h> #include <intrin.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_PORTCLASS 'SLCP'
#define TAG_PORTCLASS TAG('P', 'C', 'L', 'S')
#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x))

View file

@ -114,7 +114,7 @@ static DMA_OPERATIONS HalpDmaOperations = {
#define MAX_MAP_REGISTERS 64 #define MAX_MAP_REGISTERS 64
#define TAG_DMA TAG('D','M','A',' ') #define TAG_DMA ' AMD'
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

View file

@ -656,7 +656,7 @@ HalpQueryPciRegistryInfo(VOID)
/* Allocate the return structure */ /* Allocate the return structure */
PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool,
sizeof(PCI_REGISTRY_INFO_INTERNAL), sizeof(PCI_REGISTRY_INFO_INTERNAL),
TAG('H', 'a', 'l', ' ')); ' laH');
if (!PciRegistryInfo) return NULL; if (!PciRegistryInfo) return NULL;
/* Fill it out */ /* Fill it out */

View file

@ -114,7 +114,7 @@ static DMA_OPERATIONS HalpDmaOperations = {
#define MAX_MAP_REGISTERS 64 #define MAX_MAP_REGISTERS 64
#define TAG_DMA TAG('D','M','A',' ') #define TAG_DMA ' AMD'
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

View file

@ -595,7 +595,7 @@ HalpAssignPCISlotResources(IN PBUS_HANDLER BusHandler,
PagedPool, PagedPool,
sizeof(CM_RESOURCE_LIST) + sizeof(CM_RESOURCE_LIST) +
(ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR),
TAG('H','a','l',' ')); ' laH');
if (NULL == *AllocatedResources) if (NULL == *AllocatedResources)
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
@ -815,7 +815,7 @@ HalpQueryPciRegistryInfo(VOID)
/* Allocate the return structure */ /* Allocate the return structure */
PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool,
sizeof(PCI_REGISTRY_INFO_INTERNAL), sizeof(PCI_REGISTRY_INFO_INTERNAL),
TAG('H', 'a', 'l', ' ')); ' laH');
if (!PciRegistryInfo) return NULL; if (!PciRegistryInfo) return NULL;
/* Fill it out */ /* Fill it out */

View file

@ -11,8 +11,6 @@
#ifndef STDUNK_H #ifndef STDUNK_H
#define STDUNK_H #define STDUNK_H
#define STDUNK_TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#include <punknown.h> #include <punknown.h>
/* =============================================================== /* ===============================================================
@ -153,7 +151,7 @@ typedef struct CUnknown
STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, PUNKNOWN) STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, PUNKNOWN)
#define STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, base) \ #define STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, base) \
STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, STDUNK_TAG('r','C','c','P'), base) STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, 'rCcP', base)
#define STD_CREATE_BODY(classname, unknown, outer_unknown, pool_type) \ #define STD_CREATE_BODY(classname, unknown, outer_unknown, pool_type) \
STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, PUNKNOWN) STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, PUNKNOWN)
@ -187,7 +185,7 @@ operator new (
size_t size, size_t size,
POOL_TYPE pool_type) POOL_TYPE pool_type)
{ {
return KCOM_New(size, pool_type, STDUNK_TAG ('w','N','c','P')); return KCOM_New(size, pool_type, 'wNcP');
} }
inline PVOID inline PVOID

View file

@ -5585,7 +5585,7 @@ typedef VOID
IN ULONG Length IN ULONG Length
); );
#define PCI_DATA_TAG TAG('P', 'C', 'I', ' ') #define PCI_DATA_TAG ' ICP'
#define PCI_DATA_VERSION 1 #define PCI_DATA_VERSION 1
typedef struct _PCIBUSDATA typedef struct _PCIBUSDATA

View file

@ -20,7 +20,7 @@ enum
#define DBGKD_VERS_FLAG_HSS 0x0010 #define DBGKD_VERS_FLAG_HSS 0x0010
#define DBGKD_VERS_FLAG_PARTITIONS 0x0020 #define DBGKD_VERS_FLAG_PARTITIONS 0x0020
#define KDBG_TAG TAG('K', 'D', 'B', 'G') #define KDBG_TAG 'GBDK'
typedef struct _DBGKD_GET_VERSION32 typedef struct _DBGKD_GET_VERSION32
{ {

View file

@ -164,7 +164,7 @@ ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest,
/* Allocate space for the buffer */ /* Allocate space for the buffer */
Buffer = ExAllocatePoolWithTag(PagedPool, Buffer = ExAllocatePoolWithTag(PagedPool,
Dest->Length + sizeof(WCHAR), Dest->Length + sizeof(WCHAR),
TAG('U', 'S', 'T', 'R')); 'RTSU');
if (Buffer == NULL) if (Buffer == NULL)
{ {
Status = STATUS_INSUFFICIENT_RESOURCES; Status = STATUS_INSUFFICIENT_RESOURCES;

View file

@ -58,7 +58,7 @@ PIP_PACKET IPInitializePacket(
/* FIXME: Is this needed? */ /* FIXME: Is this needed? */
RtlZeroMemory(IPPacket, sizeof(IP_PACKET)); RtlZeroMemory(IPPacket, sizeof(IP_PACKET));
INIT_TAG(IPPacket, TAG('I','P','K','T')); INIT_TAG(IPPacket, 'TKPI');
IPPacket->Free = DontFreePacket; IPPacket->Free = DontFreePacket;
IPPacket->Type = Type; IPPacket->Type = Type;
@ -146,7 +146,7 @@ PIP_INTERFACE IPCreateInterface(
return NULL; return NULL;
} }
INIT_TAG(IF, TAG('F','A','C','E')); INIT_TAG(IF, 'ECAF');
RtlZeroMemory(IF, sizeof(IP_INTERFACE)); RtlZeroMemory(IF, sizeof(IP_INTERFACE));
@ -371,7 +371,7 @@ NTSTATUS IPStartup(PUNICODE_STRING RegistryPath)
NULL, /* Free routine */ NULL, /* Free routine */
0, /* Flags */ 0, /* Flags */
sizeof(IPDATAGRAM_REASSEMBLY), /* Size of each entry */ sizeof(IPDATAGRAM_REASSEMBLY), /* Size of each entry */
TAG('I','P','D','R'), /* Tag */ 'RDPI', /* Tag */
0); /* Depth */ 0); /* Depth */
ExInitializeNPagedLookasideList( ExInitializeNPagedLookasideList(
@ -380,7 +380,7 @@ NTSTATUS IPStartup(PUNICODE_STRING RegistryPath)
NULL, /* Free routine */ NULL, /* Free routine */
0, /* Flags */ 0, /* Flags */
sizeof(IP_FRAGMENT), /* Size of each entry */ sizeof(IP_FRAGMENT), /* Size of each entry */
TAG('I','P','F','G'), /* Tag */ 'GFPI', /* Tag */
0); /* Depth */ 0); /* Depth */
ExInitializeNPagedLookasideList( ExInitializeNPagedLookasideList(
@ -389,7 +389,7 @@ NTSTATUS IPStartup(PUNICODE_STRING RegistryPath)
NULL, /* Free routine */ NULL, /* Free routine */
0, /* Flags */ 0, /* Flags */
sizeof(IPDATAGRAM_HOLE), /* Size of each entry */ sizeof(IPDATAGRAM_HOLE), /* Size of each entry */
TAG('I','P','H','L'), /* Tag */ 'LHPI', /* Tag */
0); /* Depth */ 0); /* Depth */
/* Start routing subsystem */ /* Start routing subsystem */

View file

@ -3,7 +3,7 @@
#if DBG #if DBG
#define TRACK_TAG TAG('T','r','C','K') #define TRACK_TAG 'KCrT'
static LIST_ENTRY AllocatedObjectsList; static LIST_ENTRY AllocatedObjectsList;
static KSPIN_LOCK AllocatedObjectsLock; static KSPIN_LOCK AllocatedObjectsLock;

View file

@ -287,7 +287,7 @@ PNEIGHBOR_CACHE_ENTRY NBAddNeighbor(
return NULL; return NULL;
} }
INIT_TAG(NCE, TAG('N','C','E',' ')); INIT_TAG(NCE, ' ECN');
NCE->Interface = Interface; NCE->Interface = Interface;
NCE->Address = *Address; NCE->Address = *Address;

View file

@ -219,7 +219,7 @@ PFIB_ENTRY RouterAddRoute(
return NULL; return NULL;
} }
INIT_TAG(Router, TAG('R','O','U','T')); INIT_TAG(Router, 'TUOR');
RtlCopyMemory( &FIBE->NetworkAddress, NetworkAddress, RtlCopyMemory( &FIBE->NetworkAddress, NetworkAddress,
sizeof(FIBE->NetworkAddress) ); sizeof(FIBE->NetworkAddress) );

View file

@ -197,10 +197,10 @@ void TCPWakeup( void *ClientData, void *token ) {
#define SMALL_SIZE 128 #define SMALL_SIZE 128
#define LARGE_SIZE 2048 #define LARGE_SIZE 2048
#define SIGNATURE_LARGE TAG('L','L','L','L') #define SIGNATURE_LARGE 'LLLL'
#define SIGNATURE_SMALL TAG('S','S','S','S') #define SIGNATURE_SMALL 'SSSS'
#define SIGNATURE_OTHER TAG('O','O','O','O') #define SIGNATURE_OTHER 'OOOO'
#define TCP_TAG TAG('T','C','P',' ') #define TCP_TAG ' PCT'
static NPAGED_LOOKASIDE_LIST LargeLookasideList; static NPAGED_LOOKASIDE_LIST LargeLookasideList;
static NPAGED_LOOKASIDE_LIST SmallLookasideList; static NPAGED_LOOKASIDE_LIST SmallLookasideList;

View file

@ -509,7 +509,7 @@ NTSTATUS TCPStartup(VOID)
NULL, /* Free routine */ NULL, /* Free routine */
0, /* Flags */ 0, /* Flags */
sizeof(TCP_SEGMENT), /* Size of each entry */ sizeof(TCP_SEGMENT), /* Size of each entry */
TAG('T','C','P','S'), /* Tag */ 'SPCT', /* Tag */
0); /* Depth */ 0); /* Depth */
StartTimer(); StartTimer();

View file

@ -361,13 +361,9 @@ typedef struct _VFATCCB
UNICODE_STRING SearchPattern; UNICODE_STRING SearchPattern;
} VFATCCB, *PVFATCCB; } VFATCCB, *PVFATCCB;
#ifndef TAG #define TAG_CCB 'BCCV'
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FCB 'BCFV'
#endif #define TAG_IRP 'PRIV'
#define TAG_CCB TAG('V', 'C', 'C', 'B')
#define TAG_FCB TAG('V', 'F', 'C', 'B')
#define TAG_IRP TAG('V', 'I', 'R', 'P')
#define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry)) #define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry))

View file

@ -17,8 +17,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_ROSSYM 'MYSR'
#define TAG_ROSSYM TAG('R', 'S', 'Y', 'M')
static PVOID static PVOID
RosSymAllocMemKM(ULONG_PTR Size) RosSymAllocMemKM(ULONG_PTR Size)

View file

@ -45,7 +45,7 @@ RtlpSysVolCreateSecurityDescriptor(OUT PISECURITY_DESCRIPTOR *SecurityDescriptor
/* allocate and initialize the security descriptor */ /* allocate and initialize the security descriptor */
AbsSD = RtlpAllocateMemory(sizeof(SECURITY_DESCRIPTOR), AbsSD = RtlpAllocateMemory(sizeof(SECURITY_DESCRIPTOR),
TAG('S', 'e', 'S', 'd')); 'dSeS');
if (AbsSD == NULL) if (AbsSD == NULL)
{ {
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
@ -63,7 +63,7 @@ RtlpSysVolCreateSecurityDescriptor(OUT PISECURITY_DESCRIPTOR *SecurityDescriptor
DaclSize = sizeof(ACL) + sizeof(ACE) + DaclSize = sizeof(ACL) + sizeof(ACE) +
RtlLengthSid(LocalSystemSid); RtlLengthSid(LocalSystemSid);
Dacl = RtlpAllocateMemory(DaclSize, Dacl = RtlpAllocateMemory(DaclSize,
TAG('S', 'e', 'A', 'c')); 'cAeS');
if (Dacl == NULL) if (Dacl == NULL)
{ {
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
@ -111,13 +111,13 @@ Cleanup:
if (Dacl != NULL) if (Dacl != NULL)
{ {
RtlpFreeMemory(Dacl, RtlpFreeMemory(Dacl,
TAG('S', 'e', 'A', 'c')); 'cAeS');
} }
if (AbsSD != NULL) if (AbsSD != NULL)
{ {
RtlpFreeMemory(AbsSD, RtlpFreeMemory(AbsSD,
TAG('S', 'e', 'S', 'd')); 'dSeS');
} }
} }
@ -162,7 +162,7 @@ RtlpSysVolCheckOwnerAndSecurity(IN HANDLE DirectoryHandle,
/* allocate enough memory for the security descriptor */ /* allocate enough memory for the security descriptor */
RelSD = RtlpAllocateMemory(DescriptorSize, RelSD = RtlpAllocateMemory(DescriptorSize,
TAG('S', 'e', 'S', 'd')); 'dSeS');
if (RelSD == NULL) if (RelSD == NULL)
{ {
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
@ -297,7 +297,7 @@ RtlpSysVolCheckOwnerAndSecurity(IN HANDLE DirectoryHandle,
ASSERT(AbsSDSize > DescriptorSize); ASSERT(AbsSDSize > DescriptorSize);
AbsSD = RtlpAllocateMemory(DescriptorSize, AbsSD = RtlpAllocateMemory(DescriptorSize,
TAG('S', 'e', 'S', 'd')); 'dSeS');
if (AbsSD == NULL) if (AbsSD == NULL)
{ {
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
@ -357,7 +357,7 @@ RtlpSysVolCheckOwnerAndSecurity(IN HANDLE DirectoryHandle,
/* allocate enough memory for the new self-relative descriptor */ /* allocate enough memory for the new self-relative descriptor */
NewRelSD = RtlpAllocateMemory(RelSDSize, NewRelSD = RtlpAllocateMemory(RelSDSize,
TAG('S', 'e', 'S', 'd')); 'dSeS');
if (NewRelSD == NULL) if (NewRelSD == NULL)
{ {
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
@ -392,20 +392,20 @@ Cleanup:
if (RelSD != NULL) if (RelSD != NULL)
{ {
RtlpFreeMemory(RelSD, RtlpFreeMemory(RelSD,
TAG('S', 'e', 'S', 'd')); 'dSeS');
} }
if (NewRelSD != NULL) if (NewRelSD != NULL)
{ {
RtlpFreeMemory(NewRelSD, RtlpFreeMemory(NewRelSD,
TAG('S', 'e', 'S', 'd')); 'dSeS');
} }
#ifdef _WIN64 #ifdef _WIN64
if (AbsSDAllocated) if (AbsSDAllocated)
{ {
RtlpFreeMemory(AbsSD, RtlpFreeMemory(AbsSD,
TAG('S', 'e', 'S', 'd')); 'dSeS');
} }
#endif #endif
@ -660,9 +660,9 @@ RtlCreateSystemVolumeInformationFolder(
ASSERT(SecurityDescriptor->Dacl != NULL); ASSERT(SecurityDescriptor->Dacl != NULL);
RtlpFreeMemory(SecurityDescriptor->Dacl, RtlpFreeMemory(SecurityDescriptor->Dacl,
TAG('S', 'e', 'A', 'c')); 'cAeS');
RtlpFreeMemory(SecurityDescriptor, RtlpFreeMemory(SecurityDescriptor,
TAG('S', 'e', 'S', 'd')); 'dSeS');
RtlFreeSid(SystemSid); RtlFreeSid(SystemSid);
} }

View file

@ -13,7 +13,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') #define TAG_RTLREGISTRY 'vrqR'
extern SIZE_T RtlpAllocDeallocQueryBufferSize; extern SIZE_T RtlpAllocDeallocQueryBufferSize;

View file

@ -165,9 +165,9 @@ DebugService2(IN PVOID Argument1,
IN ULONG Service); IN ULONG Service);
/* Tags for the String Allocators */ /* Tags for the String Allocators */
#define TAG_USTR TAG('U', 'S', 'T', 'R') #define TAG_USTR 'RTSU'
#define TAG_ASTR TAG('A', 'S', 'T', 'R') #define TAG_ASTR 'RTSA'
#define TAG_OSTR TAG('O', 'S', 'T', 'R') #define TAG_OSTR 'RTSO'
/* Timer Queue */ /* Timer Queue */

View file

@ -13,7 +13,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
#define TAG_SID TAG('p', 'S', 'i', 'd') #define TAG_SID 'diSp'
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/

View file

@ -12,7 +12,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
#define TAG_ENG TAG('E', 'n', 'g', ' ') #define TAG_ENG ' gnE'
/* PUBLIC FUNCTIONS **********************************************************/ /* PUBLIC FUNCTIONS **********************************************************/

View file

@ -1,102 +1,102 @@
#ifndef _WIN32K_TAGS_H #ifndef _WIN32K_TAGS_H
#define _WIN32K_TAGS_H #define _WIN32K_TAGS_H
#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ #define TAG_STRING ' RTS' /* string */
#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') /* RTL registry */ #define TAG_RTLREGISTRY 'vrqR' /* RTL registry */
/* ntuser */ /* ntuser */
#define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ #define TAG_MOUSE 'SUOM' /* mouse */
#define TAG_KEYBOARD TAG('K', 'B', 'D', ' ') /* keyboard */ #define TAG_KEYBOARD ' DBK' /* keyboard */
#define TAG_ACCEL TAG('A', 'C', 'C', 'L') /* accelerator */ #define TAG_ACCEL 'LCCA' /* accelerator */
#define TAG_HOOK TAG('W', 'N', 'H', 'K') /* hook */ #define TAG_HOOK 'KHNW' /* hook */
#define TAG_HOTKEY TAG('H', 'O', 'T', 'K') /* hotkey */ #define TAG_HOTKEY 'KTOH' /* hotkey */
#define TAG_MENUITEM TAG('M', 'E', 'N', 'I') /* menu item */ #define TAG_MENUITEM 'INEM' /* menu item */
#define TAG_MSG TAG('M', 'E', 'S', 'G') /* message */ #define TAG_MSG 'GSEM' /* message */
#define TAG_MSGQ TAG('M', 'S', 'G', 'Q') /* message queue */ #define TAG_MSGQ 'QGSM' /* message queue */
#define TAG_USRMSG TAG('U', 'M', 'S', 'G') /* user message */ #define TAG_USRMSG 'GSMU' /* user message */
#define TAG_WNDPROP TAG('W', 'P', 'R', 'P') /* window property */ #define TAG_WNDPROP 'PRPW' /* window property */
#define TAG_WNAM TAG('W', 'N', 'A', 'M') /* window name */ #define TAG_WNAM 'MANW' /* window name */
#define TAG_WINLIST TAG('W', 'N', 'L', 'S') /* window handle list */ #define TAG_WINLIST 'SLNW' /* window handle list */
#define TAG_WININTLIST TAG('W', 'N', 'I', 'P') /* window internal pos */ #define TAG_WININTLIST 'PINW' /* window internal pos */
#define TAG_WINPROCLST TAG('W', 'N', 'P', 'L') /* window proc list */ #define TAG_WINPROCLST 'LPNW' /* window proc list */
#define TAG_SBARINFO TAG('S', 'B', 'I', 'N') /* scrollbar info */ #define TAG_SBARINFO 'NIBS' /* scrollbar info */
#define TAG_TIMER TAG('T', 'I', 'M', 'R') /* timer entry */ #define TAG_TIMER 'RMIT' /* timer entry */
#define TAG_TIMERTD TAG('T', 'I', 'M', 'T') /* timer thread dereference list */ #define TAG_TIMERTD 'TMIT' /* timer thread dereference list */
#define TAG_TIMERBMP TAG('T', 'I', 'M', 'B') /* timers bitmap */ #define TAG_TIMERBMP 'BMIT' /* timers bitmap */
#define TAG_CALLBACK TAG('C', 'B', 'C', 'K') /* callback memory */ #define TAG_CALLBACK 'KCBC' /* callback memory */
#define TAG_WINSTA TAG('W', 'S', 'T', 'A') /* window station */ #define TAG_WINSTA 'ATSW' /* window station */
#define TAG_PDCE TAG('U', 's', 'd', 'c') /* dce */ #define TAG_PDCE 'cdsU' /* dce */
#define TAG_INPUT TAG('U', 's', 's', 'y') /* Input */ #define TAG_INPUT 'yssU' /* Input */
/* gdi objects from the handle table */ /* gdi objects from the handle table */
#define TAG_DC TAG('G', 'l', 'a', '1') /* dc */ #define TAG_DC '1alG' /* dc */
#define TAG_REGION TAG('G', 'l', 'a', '4') /* region */ #define TAG_REGION '4alG' /* region */
#define TAG_SURFACE TAG('G', 'l', 'a', '5') /* bitmap */ #define TAG_SURFACE '5alG' /* bitmap */
#define TAG_CLIENTOBJ TAG('G', 'h', '0', '6') #define TAG_CLIENTOBJ '60hG'
#define TAG_PATH TAG('G', 'h', '0', '7') #define TAG_PATH '70hG'
#define TAG_PALETTE TAG('G', 'l', 'a', '8') #define TAG_PALETTE '8alG'
#define TAG_ICMLCS TAG('G', 'h', '0', '9') #define TAG_ICMLCS '90hG'
#define TAG_LFONT TAG('G', 'l', 'a', ':') #define TAG_LFONT ':alG'
#define TAG_RFONT TAG('G', 'h', '0', ';') /* correct? */ #define TAG_RFONT ';0gG' /* correct? */
#define TAG_PFE TAG('G', 'h', '0', '<') #define TAG_PFE '<0hG'
#define TAG_PFT TAG('G', 'h', '0', '=') /* correct? */ #define TAG_PFT '=0hG' /* correct? */
#define TAG_ICMCXF TAG('G', 'h', '0', '>') /* correct? */ #define TAG_ICMCXF '>0hG' /* correct? */
#define TAG_SPRITE TAG('G', 'h', '0', '?') /* correct? */ #define TAG_SPRITE '?0hG' /* correct? */
#define TAG_BRUSH TAG('G', 'l', 'a', '@') #define TAG_BRUSH '@alG'
#define TAG_UMPD TAG('G', 'h', '0', 'A') /* correct? */ #define TAG_UMPD 'A0hG' /* correct? */
#define TAG_SPACE TAG('G', 'h', '0', 'C') /* correct? */ #define TAG_SPACE 'c0hG' /* correct? */
#define TAG_META TAG('G', 'h', '0', 'E') /* correct? */ #define TAG_META 'E0hG' /* correct? */
#define TAG_EFSTATE TAG('G', 'h', '0', 'F') /* correct? */ #define TAG_EFSTATE 'F0hG' /* correct? */
#define TAG_BMFD TAG('G', 'h', '0', 'G') /* correct? */ #define TAG_BMFD 'G0hG' /* correct? */
#define TAG_VTFD TAG('G', 'h', '0', 'H') /* correct? */ #define TAG_VTFD 'H0hG' /* correct? */
#define TAG_TTFD TAG('G', 'h', '0', 'I') /* correct? */ #define TAG_TTFD 'I0hG' /* correct? */
#define TAG_RC TAG('G', 'h', '0', 'J') /* correct? */ #define TAG_RC 'J0hG' /* correct? */
#define TAG_TEMP TAG('G', 'h', '0', 'K') /* correct? */ #define TAG_TEMP 'K0hG' /* correct? */
#define TAG_DRVOBJ TAG('G', 'h', '0', 'L') /* correct? */ #define TAG_DRVOBJ 'L0hG' /* correct? */
#define TAG_DCIOBJ TAG('G', 'h', '0', 'M') /* correct? */ #define TAG_DCIOBJ 'M0hG' /* correct? */
#define TAG_SPOOL TAG('G', 'h', '0', 'N') /* correct? */ #define TAG_SPOOL 'N0hG' /* correct? */
/* other gdi objects */ /* other gdi objects */
#define TAG_BEZIER TAG('B', 'E', 'Z', 'R') /* bezier */ #define TAG_BEZIER 'RZEB' /* bezier */
#define TAG_BITMAP TAG('B', 'T', 'M', 'P') /* bitmap */ #define TAG_BITMAP 'PMTB' /* bitmap */
#define TAG_PATBLT TAG('P', 'B', 'L', 'T') /* patblt */ #define TAG_PATBLT 'TLBP' /* patblt */
#define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ #define TAG_CLIP 'PILC' /* clipping */
#define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ #define TAG_COORD 'DROC' /* coords */
#define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ #define TAG_GDIDEV 'vedG' /* gdi dev support*/
#define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ #define TAG_GDIPDEV 'veDG' /* gdi PDev */
#define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ #define TAG_GDIHNDTBLE 'HIDG' /* gdi handle table */
#define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ #define TAG_GDIICM 'mciG' /* gdi Icm */
#define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ #define TAG_DIB ' BID' /* dib */
#define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ #define TAG_COLORMAP 'MLOC' /* color map */
#define TAG_SHAPE TAG('S', 'H', 'A', 'P') /* shape */ #define TAG_SHAPE 'PAHS' /* shape */
#define TAG_PALETTEMAP TAG('P', 'A', 'L', 'M') /* palette mapping */ #define TAG_PALETTEMAP 'MLAP' /* palette mapping */
#define TAG_PRINT TAG('P', 'R', 'N', 'T') /* print */ #define TAG_PRINT 'TNRP' /* print */
#define TAG_GDITEXT TAG('T', 'X', 'T', 'O') /* text */ #define TAG_GDITEXT 'OTXT' /* text */
#define TAG_PENSTYLES TAG('G', 's', 't', 'y') /* pen styles */ #define TAG_PENSTYLES 'ytsG' /* pen styles */
/* Eng objects */ /* Eng objects */
#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ #define TAG_CLIPOBJ 'OPLC' /* clip object */
#define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ #define TAG_DRIVEROBJ 'OVRD' /* driver object */
#define TAG_DFSM TAG('D', 'f', 's', 'm') /* Eng event allocation */ #define TAG_DFSM 'msfD' /* Eng event allocation */
#define TAG_EPATH TAG('G', 'p', 'a', 't') /* path object */ #define TAG_EPATH 'tapG' /* path object */
#define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ #define TAG_FONT 'ETNF' /* font entry */
#define TAG_FONTOBJ TAG('G', 'f', 'n', 't') /* font object */ #define TAG_FONTOBJ 'tnfG' /* font object */
#define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ #define TAG_WNDOBJ 'ODNW' /* window object */
#define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ #define TAG_XLATEOBJ 'OALX' /* xlate object */
#define TAG_GSEM TAG('G', 's', 'e', 'm') /* Gdi Semaphore */ #define TAG_GSEM 'mesG' /* Gdi Semaphore */
/* misc */ /* misc */
#define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ #define TAG_DRIVER 'VRDG' /* video drivers */
#define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ #define TAG_FNTFILE 'FTNF' /* font file */
#define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ #define TAG_SSECTPOOL 'PCSS' /* shared section pool */
#define TAG_PFF TAG('G', 'p', 'f', 'f') /* physical font file */ #define TAG_PFF 'ffpG' /* physical font file */
/* Dx internal tags rember I do not known if it right namees */ /* Dx internal tags rember I do not known if it right namees */
#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ #define TAG_DXPVMLIST 'LPXD' /* pmvlist for the driver */
#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ #define TAG_DXFOURCC 'OFXD' /* pdwFourCC for the driver */
#define TAG_DDRAW TAG('D', 'h', ' ', '1') #define TAG_DDRAW '1 hD'
#define TAG_DDSURF TAG('D', 'h', ' ', '2') #define TAG_DDSURF '2 hD'
#define TAG_EDDGBL TAG('E', 'D', 'D', 'G') /* ? edd_directdraw_global ??*/ #define TAG_EDDGBL 'GDDE' /* ? edd_directdraw_global ??*/
#endif /* _WIN32K_TAGS_H */ #endif /* _WIN32K_TAGS_H */

View file

@ -3,7 +3,7 @@
#include <include/engobjects.h> #include <include/engobjects.h>
#define TAG_FINF TAG('F', 'I', 'N', 'F') #define TAG_FINF 'FNIF'
// //
// EXSTROBJ flags. // EXSTROBJ flags.
// //

View file

@ -70,7 +70,7 @@ Win32kProcessCallback(struct _EPROCESS *Process,
/* FIXME - lock the process */ /* FIXME - lock the process */
Win32Process = ExAllocatePoolWithTag(NonPagedPool, Win32Process = ExAllocatePoolWithTag(NonPagedPool,
sizeof(PROCESSINFO), sizeof(PROCESSINFO),
TAG('W', '3', '2', 'p')); 'p23W');
if (Win32Process == NULL) RETURN( STATUS_NO_MEMORY); if (Win32Process == NULL) RETURN( STATUS_NO_MEMORY);
@ -188,7 +188,7 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
/* FIXME - lock the process */ /* FIXME - lock the process */
Win32Thread = ExAllocatePoolWithTag(NonPagedPool, Win32Thread = ExAllocatePoolWithTag(NonPagedPool,
sizeof(THREADINFO), sizeof(THREADINFO),
TAG('W', '3', '2', 't')); 't23W');
if (Win32Thread == NULL) RETURN( STATUS_NO_MEMORY); if (Win32Thread == NULL) RETURN( STATUS_NO_MEMORY);

View file

@ -18,7 +18,7 @@
#include <winsta.h> #include <winsta.h>
#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl(TAG('R', 'o', 's', 'D'), (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) #define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode)
HBITMAP NTAPI UserLoadImage(PCWSTR); HBITMAP NTAPI UserLoadImage(PCWSTR);
BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING); BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING);

View file

@ -656,7 +656,7 @@ NtGdiGetFontResourceInfoInternalW(
SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR); SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR);
SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool,
cbStringSize, cbStringSize,
TAG('R','T','S','U')); 'RTSU');
if (!SafeFileNames.Buffer) if (!SafeFileNames.Buffer)
{ {
SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
@ -682,7 +682,7 @@ NtGdiGetFontResourceInfoInternalW(
{ {
SetLastNtError(Status); SetLastNtError(Status);
/* Free the string buffer for the safe filename */ /* Free the string buffer for the safe filename */
ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); ExFreePoolWithTag(SafeFileNames.Buffer,'RTSU');
return FALSE; return FALSE;
} }
@ -713,7 +713,7 @@ NtGdiGetFontResourceInfoInternalW(
} }
/* Free the string for the safe filenames */ /* Free the string for the safe filenames */
ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); ExFreePoolWithTag(SafeFileNames.Buffer,'RTSU');
return bRet; return bRet;
} }

View file

@ -1,6 +1,6 @@
#ifdef GDI_DEBUG #ifdef GDI_DEBUG
#define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl(TAG('R', 'o', 's', 'D'), (PVOID)Frames, Count, NULL, 0, NULL, KernelMode) #define KeRosDumpStackFrames(Frames, Count) KdSystemDebugControl('DsoR', (PVOID)Frames, Count, NULL, 0, NULL, KernelMode)
NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags); NTSYSAPI ULONG APIENTRY RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG Flags);
static int leak_reported = 0; static int leak_reported = 0;