[sginsberg] 42915: - Start deprecating TAG() - Fix inverted tags in prntfont.h, stdunk.h and win32k/objects/font.c
Author: sginsberg Date: Mon Aug 24 19:12:25 2009 New Revision: 42915
URL: http://svn.reactos.org/svn/reactos?rev=42915&view=rev Log: - Start deprecating TAG() - Fix inverted tags in prntfont.h, stdunk.h and win32k/objects/font.c
Modified: trunk/reactos/drivers/bus/isapnp/isapnp.h trunk/reactos/drivers/bus/pci/pci.h trunk/reactos/drivers/directx/dxg/tags.h trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/vfat.h trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h trunk/reactos/drivers/filesystems/mup/mup.h trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/mouclass/mouclass.h trunk/reactos/drivers/input/sermouse/sermouse.h trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/priv.h trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/main.c trunk/reactos/drivers/network/dd/pcnet/pcnet.h trunk/reactos/drivers/network/ndis/include/ndissys.h trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/tcpip/include/address.h trunk/reactos/drivers/network/tcpip/include/tcpip.h trunk/reactos/drivers/serial/serenum/serenum.h trunk/reactos/drivers/serial/serial/serial.h trunk/reactos/drivers/setup/blue/blue.h trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/drivers/storage/ide/uniata/stdafx.h trunk/reactos/drivers/storage/scsiport/scsiport_int.h trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h trunk/reactos/drivers/video/displays/vga/vgaddi.h trunk/reactos/drivers/video/font/ftfd/rosglue.c trunk/reactos/drivers/video/miniport/vbe/vbemp.h trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/drivers/video/videoprt/videoprt.h trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/hal/halppc/generic/dma.c trunk/reactos/hal/halppc/generic/pci.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/wdbgexts.h trunk/reactos/include/reactos/probe.h trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/memtrack.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/network/router.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/fslib/vfatlib/check/vfat.h trunk/reactos/lib/rossym/initkm.c trunk/reactos/lib/rtl/bootdata.c trunk/reactos/lib/rtl/registry.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/lib/rtl/sid.c trunk/reactos/subsystems/win32/win32k/eng/engevent.c trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c
Modified: trunk/reactos/drivers/bus/isapnp/isapnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.h... ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -7,8 +7,7 @@ extern "C" { #endif
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_ISAPNP TAG('I', 'P', 'N', 'P') +#define TAG_ISAPNP 'PNPI'
#define IO_RESOURCE_REQUIRED 0x00 //ROS Extension
Modified: trunk/reactos/drivers/bus/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.h?rev=4... ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pci.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -6,8 +6,7 @@ #include <stdio.h> #include <ntddk.h>
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_PCI TAG('P', 'C', 'I', '0') +#define TAG_PCI '0ICP'
typedef struct _PCI_DEVICE {
Modified: trunk/reactos/drivers/directx/dxg/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/tags.h?... ============================================================================== --- trunk/reactos/drivers/directx/dxg/tags.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/tags.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -1,8 +1,8 @@
-#define TAG_THDD TAG('t', 'h', 'd', 'd') -#define TAG_GINI TAG('G', 'i', 'n', 'i') +#define TAG_THDD 'ddht' +#define TAG_GINI 'iniG'
Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/cd... ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -227,12 +227,8 @@ ULONG LastOffset; } CCB, *PCCB;
-#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_CCB TAG('I', 'C', 'C', 'B') -#define TAG_FCB TAG('I', 'F', 'C', 'B') +#define TAG_CCB 'BCCI' +#define TAG_FCB 'BCFI'
typedef struct {
Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/in... ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -115,9 +115,8 @@ }
#ifdef EXT2_POOL_WITH_TAG - #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define Ext2AllocatePool(PoolType,NumberOfBytes) \ - ExAllocatePoolWithTag( PoolType, NumberOfBytes, TAG ( 'E','x','t','2' ) ) + ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' ) #else #define Ext2AllocatePool(PoolType,NumberOfBytes) \ ExAllocatePool( PoolType, NumberOfBytes )
Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat... ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -19,7 +19,7 @@
/* -------------------------------------------------------- DEFINES */
-#define TAG_FCB TAG('V', 'F', 'C', 'B') +#define TAG_FCB 'BCFV'
/* -------------------------------------------------------- PUBLICS */
Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat... ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -402,14 +402,10 @@ UNICODE_STRING SearchPattern; } VFATCCB, *PVFATCCB;
-#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#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 TAG_CCB 'BCCV' +#define TAG_FCB 'BCFV' +#define TAG_IRP 'PRIV' +#define TAG_VFAT 'TAFV'
#define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry))
Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat... ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -3,24 +3,16 @@ #include <debug.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 <fatstruc.h>
#define Add2Ptr(P,I,T) ((T)((PUCHAR)(P) + (I))) #define PtrOffset(B,O) ((ULONG)((ULONG_PTR)(O) - (ULONG_PTR)(B)))
-#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#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 TAG_CCB 'BCCV' +#define TAG_FCB 'BCFV' +#define TAG_IRP 'PRIV' +#define TAG_VFAT 'TAFV' /* ------------------------------------------------------ shutdown.c */
DRIVER_DISPATCH FatShutdown;
Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec/... ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -17,8 +17,7 @@ // // Tag for memory allocations // -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define FSREC_TAG TAG('F', 's', 'R', 'c') +#define FSREC_TAG 'cRsF'
// // UDFS Offsets
Modified: trunk/reactos/drivers/filesystems/mup/mup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mup... ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -1,9 +1,5 @@ #ifndef 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))
Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/di... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -715,7 +715,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT);
if (IrpContext) - ExFreePoolWithTag(IrpContext, TAG('N', 'I', 'R', 'P')); + ExFreePoolWithTag(IrpContext, 'PRIN');
IoSetTopLevelIrp(NULL); FsRtlExitFileSystem();
Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/di... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -82,7 +82,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); if (IrpContext) - ExFreePoolWithTag(IrpContext, TAG('N', 'I', 'R', 'P')); + ExFreePoolWithTag(IrpContext, 'PRIN'); IoSetTopLevelIrp(NULL); FsRtlExitFileSystem();
Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/fc... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -36,7 +36,7 @@
/* MACROS *******************************************************************/
-#define TAG_FCB TAG('I', 'F', 'C', 'B') +#define TAG_FCB 'BCFI'
Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/mi... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -74,7 +74,7 @@
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) return NULL; RtlZeroMemory(IrpContext, sizeof(NTFS_IRP_CONTEXT));
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/nt... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -55,7 +55,7 @@ TRACE_(NTFS, "DriverEntry(%p, '%wZ')\n", DriverObject, RegistryPath);
/* 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) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -107,7 +107,7 @@ if (NtfsGlobalData) { ExDeleteResourceLite(&NtfsGlobalData->Resource); - ExFreePoolWithTag(NtfsGlobalData, TAG('N', 'D', 'R', 'G')); + ExFreePoolWithTag(NtfsGlobalData, 'GRDN'); } }
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/nt... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -9,11 +9,7 @@ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE)
-#ifndef TAG -#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 TAG_NTFS 'SFTN'
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
@@ -83,11 +79,11 @@
} NTFS_INFO, *PNTFS_INFO;
-#define NTFS_TYPE_CCB TAG('F','S',0,2) -#define NTFS_TYPE_FCB TAG('F','S',0,3) -#define NTFS_TYPE_VCB TAG('F','S',0,5) -#define NTFS_TYPE_IRP_CONTEST TAG('F','S',0,6) -#define NTFS_TYPE_GLOBAL_DATA TAG('F','S',0,7) +#define NTFS_TYPE_CCB '20SF' +#define NTFS_TYPE_FCB '30SF' +#define NTFS_TYPE_VCB '50SF' +#define NTFS_TYPE_IRP_CONTEST '60SF' +#define NTFS_TYPE_GLOBAL_DATA '70SF'
typedef struct { @@ -165,7 +161,7 @@ ULONG LastOffset; } NTFS_CCB, *PNTFS_CCB;
-#define TAG_CCB TAG('I', 'C', 'C', 'B') +#define TAG_CCB 'BCCI'
typedef struct {
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i804... ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -14,8 +14,7 @@ * Structures * --------------------------------------------------*/
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define I8042PRT_TAG TAG('8', '0', '4', '2') +#define I8042PRT_TAG '2408'
typedef enum {
Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/keyb... ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -31,9 +31,6 @@
/* FUNCTIONS *****************************************************************/
-/* Debug stuff */ -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - static VOID NTAPI i8042DebugWorkItem( IN PDEVICE_OBJECT DeviceObject, @@ -48,7 +45,7 @@ /* We hope kernel would understand this. If * 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); }
/*
Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc... ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -10,8 +10,7 @@
#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 TAG('K', 'b', 'd', 'C') +#define CLASS_TAG 'CdbK' #define DPFLTR_CLASS_NAME_ID DPFLTR_KBDCLASS_ID
typedef enum
Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mouc... ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -10,8 +10,7 @@
#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 TAG('M', 'o', 'u', 'C') +#define CLASS_TAG 'CuoM' #define DPFLTR_CLASS_NAME_ID DPFLTR_MOUCLASS_ID
typedef enum
Modified: trunk/reactos/drivers/input/sermouse/sermouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/serm... ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -4,8 +4,7 @@ #include <ntddmou.h> #include <debug.h>
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define SERMOUSE_TAG TAG('S', 'M', 'o', 'u') +#define SERMOUSE_TAG 'uoMS'
typedef enum {
Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc.... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -4,9 +4,8 @@ #include "ksiface.h" #include "kstypes.h"
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_KSDEVICE TAG('K', 'S', 'E', 'D') -#define TAG_KSOBJECT_TAG TAG('K', 'S', 'O', 'H') +#define TAG_KSDEVICE 'DESK' +#define TAG_KSOBJECT_TAG 'HOSK'
NTSTATUS NTAPI
Modified: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h?... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -18,7 +18,7 @@ #include "ksiface.h"
-#define TAG_DEVICE_HEADER TAG('H','D','S','K') +#define TAG_DEVICE_HEADER 'KSDH'
#define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\
Modified: trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/sb... ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/main.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,7 +12,6 @@ #define NDEBUG #include <sndblst.h>
-#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
/* IRP DISPATCH ROUTINES @@ -207,8 +206,8 @@ ExFreePool(ptr)
-#define TAG_REG_INFO TAG('I','g','e','R') -#define TAG_REG_NAME TAG('N','g','e','R') +#define TAG_REG_INFO 'RegI' +#define TAG_REG_NAME 'RegN'
NTSTATUS NTAPI EnumerateSubkey(
Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/pc... ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -155,12 +155,8 @@ #define BREAKPOINT #endif
-#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - /* memory pool tag */ -#define PCNET_TAG TAG('P', 'c', 'N', 't') +#define PCNET_TAG 'tNcP'
#endif // _PCNET_H_
Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/includ... ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -31,7 +31,6 @@ /* the version of NDIS we claim to be */ #define NDIS_VERSION 0x00050000
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define NDIS_TAG 0x4e4d4953
#define MIN(value1, value2) \
Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/m... ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -2236,7 +2236,7 @@ * 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) { NDIS_DbgPrint(MIN_TRACE, ("Can't get driver object extension.\n")); @@ -2487,7 +2487,7 @@ * 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); if (!NT_SUCCESS(Status)) {
Modified: trunk/reactos/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/inclu... ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -15,7 +15,7 @@ */ #define AddrInitIPv4(IPAddress, RawAddress) \ { \ - INIT_TAG((IPAddress), TAG('I','P','V','4')); \ + INIT_TAG((IPAddress), '4VPI'); \ (IPAddress)->Type = IP_ADDRESS_V4; \ (IPAddress)->Address.IPv4Address = (RawAddress); \ }
Modified: trunk/reactos/drivers/network/tcpip/include/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/inclu... ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcpip.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -30,8 +30,7 @@
#include <debug.h>
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ +#define TAG_STRING ' RTS' /* string */
/* 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 */
Modified: trunk/reactos/drivers/serial/serenum/serenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/sere... ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.h [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/serenum.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,8 +12,6 @@ #include <ntddser.h> #include <stdio.h> #include <debug.h> - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
typedef enum { @@ -57,7 +55,7 @@ UNICODE_STRING CompatibleIds; // REG_MULTI_SZ } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION;
-#define SERENUM_TAG TAG('S', 'e', 'r', 'e') +#define SERENUM_TAG 'ereS'
/* Flags */ #define FLAG_ENUMERATION_DONE 0x01
Modified: trunk/reactos/drivers/serial/serial/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/seria... ============================================================================== --- trunk/reactos/drivers/serial/serial/serial.h [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/serial.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,8 +12,6 @@ #include <ntddser.h> #include <stdio.h> #include <debug.h> - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
/* See winbase.h */ #define PST_RS232 1 @@ -108,7 +106,7 @@ BOOLEAN ReadAtLeastOneByte; } WORKITEM_DATA, *PWORKITEM_DATA;
-#define SERIAL_TAG TAG('S', 'e', 'r', 'l') +#define SERIAL_TAG 'lreS'
#define INFINITE ((ULONG)-1)
Modified: trunk/reactos/drivers/setup/blue/blue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.h?r... ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,11 +12,7 @@ #include <stdio.h> #include <stdlib.h>
-#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#define TAG_BLUE TAG('B', 'L', 'U', 'E') +#define TAG_BLUE 'EULB'
typedef struct _CFHEADER {
Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/class... ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -14,8 +14,6 @@
//#define NDEBUG #include <debug.h> - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ScsiClassGetInquiryData) @@ -4635,7 +4633,7 @@ NULL, NonPagedPoolMustSucceed, SCSI_REQUEST_BLOCK_SIZE, - TAG('H','s','c','S'), + 'ScsH', (USHORT)NumberElements);
}
Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramdi... ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -493,7 +493,7 @@ Length = GuidString.Length + 32; Buffer = ExAllocatePoolWithTag(NonPagedPool, Length, - TAG('R', 'a', 'm', 'd')); + 'dmaR'); if (!Buffer) { // @@ -542,7 +542,7 @@ SymbolicLinkName.Length = GuidString.Length + 34; Buffer = ExAllocatePoolWithTag(NonPagedPool, SymbolicLinkName.MaximumLength, - TAG('R', 'a', 'm', 'd')); + 'dmaR'); SymbolicLinkName.Buffer = Buffer; if (Buffer) { @@ -618,7 +618,7 @@ DiskLength = Input->DiskLength; ExInitializeFastMutex(&DriveExtension->DiskListLock); IoInitializeRemoveLock(&DriveExtension->RemoveLock, - TAG('R', 'a', 'm', 'd'), + 'dmaR', 0, 1); DriveExtension->DriveDeviceName = DeviceName; @@ -1811,7 +1811,7 @@ Objects) + FinalCount * sizeof(PDEVICE_OBJECT), - TAG('R', 'a', 'm', 'd')); + 'dmaR'); if (!OurDeviceRelations) { // @@ -2231,7 +2231,7 @@ DeviceExtension->Type = RamdiskBus; ExInitializeFastMutex(&DeviceExtension->DiskListLock); IoInitializeRemoveLock(&DeviceExtension->RemoveLock, - TAG('R', 'a', 'm', 'd'), + 'dmaR', 0, 1); InitializeListHead(&DeviceExtension->DiskList); @@ -2322,7 +2322,7 @@ DriverRegistryPath.Buffer = ExAllocatePoolWithTag(PagedPool, RegistryPath->Length + sizeof(WCHAR), - TAG('R', 'a', 'm', 'd')); + 'dmaR'); if (!DriverRegistryPath.Buffer) return STATUS_INSUFFICIENT_RESOURCES; RtlCopyUnicodeString(&DriverRegistryPath, RegistryPath);
Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/stdafx.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/stdafx.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -23,8 +23,7 @@ #undef ExAllocatePool #endif
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_UNIATA TAG('a', 't', 'a', 'U') +#define TAG_UNIATA 'Uata'
#define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,TAG_UNIATA)
Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/sc... ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -14,8 +14,7 @@ #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #endif
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_SCSIPORT TAG('S', 'C', 'S', 'I') +#define TAG_SCSIPORT 'ISCS'
/* Defines how many logical unit arrays will be in a device extension */ #define LUS_NUMBER 8
Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -68,10 +68,8 @@ DDPIXELFORMAT ddpfDisplay; } PDEV, *PPDEV;
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - #define DEVICE_NAME L"framebuf" -#define ALLOC_TAG TAG('F','B','U','F') +#define ALLOC_TAG 'FUBF'
DHPDEV APIENTRY
Modified: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebufacc.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -95,10 +95,8 @@
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) - #define DEVICE_NAME L"framebuf" -#define ALLOC_TAG TAG('F','B','U','F') +#define ALLOC_TAG 'FUBF'
DHPDEV APIENTRY
Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga/... ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -66,8 +66,6 @@ }
/***********************************************************/ - -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#define DS_SOLIDBRUSH 0x00000001 #define DS_GREYBRUSH 0x00000002 @@ -249,7 +247,7 @@ BOOL DeinitVGA(PPDEV ppdev); // screen.c: Free resources allocated in InitVGA
#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 MAX_SCAN_WIDTH 2048 // pixels
Modified: trunk/reactos/drivers/video/font/ftfd/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ros... ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/rosglue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/rosglue.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -17,8 +17,7 @@ #define NDEBUG #include <debug.h>
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_FREETYPE TAG('F', 'T', 'Y', 'P') +#define TAG_FREETYPE 'PYTF'
/* * First some generic routines
Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/... ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -38,8 +38,7 @@ #include "ntddvdeo.h" #include "video.h"
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_VBE TAG('V', 'B', 'E', ' ') +#define TAG_VBE ' EBV'
/* * Compile-time define to get VBE 1.2 support. The implementation
Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vide... ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -666,7 +666,7 @@ ExAllocatePoolWithTag( PagedPool, DriverExtension->RegistryPath.MaximumLength, - TAG('U', 'S', 'T', 'R')); + 'RTSU'); if (DriverExtension->RegistryPath.Buffer == NULL) { RtlInitUnicodeString(&DriverExtension->RegistryPath, NULL);
Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vide... ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -36,8 +36,8 @@
#include <debug.h>
-#define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') -#define TAG_VIDEO_PORT_BUFFER TAG('V', 'p', 'm', '\0' ) +#define TAG_VIDEO_PORT 'PDIV' +#define TAG_VIDEO_PORT_BUFFER '\0mpV'
typedef struct _VIDEO_PORT_ADDRESS_MAPPING {
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/p... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -23,8 +23,7 @@ #include <math.h> #include <intrin.h>
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_PORTCLASS TAG('P', 'C', 'L', 'S') +#define TAG_PORTCLASS 'SLCP'
#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x))
Modified: trunk/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?re... ============================================================================== --- trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -114,7 +114,7 @@
#define MAX_MAP_REGISTERS 64
-#define TAG_DMA TAG('D','M','A',' ') +#define TAG_DMA ' AMD'
/* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/hal/halppc/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/pci.c?re... ============================================================================== --- trunk/reactos/hal/halppc/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/pci.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -656,7 +656,7 @@ /* Allocate the return structure */ PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_REGISTRY_INFO_INTERNAL), - TAG('H', 'a', 'l', ' ')); + ' laH'); if (!PciRegistryInfo) return NULL;
/* Fill it out */
Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?re... ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -114,7 +114,7 @@
#define MAX_MAP_REGISTERS 64
-#define TAG_DMA TAG('D','M','A',' ') +#define TAG_DMA ' AMD'
/* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?re... ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -595,7 +595,7 @@ PagedPool, sizeof(CM_RESOURCE_LIST) + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - TAG('H','a','l',' ')); + ' laH');
if (NULL == *AllocatedResources) return STATUS_NO_MEMORY; @@ -815,7 +815,7 @@ /* Allocate the return structure */ PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_REGISTRY_INFO_INTERNAL), - TAG('H', 'a', 'l', ' ')); + ' laH'); if (!PciRegistryInfo) return NULL;
/* Fill it out */
Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=42... ============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -10,8 +10,6 @@
#ifndef STDUNK_H #define STDUNK_H - -#define STDUNK_TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#include <punknown.h>
@@ -153,7 +151,7 @@ STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, PUNKNOWN)
#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) \ STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, PUNKNOWN) @@ -187,7 +185,7 @@ size_t size, 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
Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=42... ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -5585,7 +5585,7 @@ IN ULONG Length );
-#define PCI_DATA_TAG TAG('P', 'C', 'I', ' ') +#define PCI_DATA_TAG ' ICP' #define PCI_DATA_VERSION 1
typedef struct _PCIBUSDATA
Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?rev... ============================================================================== --- trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -20,7 +20,7 @@ #define DBGKD_VERS_FLAG_HSS 0x0010 #define DBGKD_VERS_FLAG_PARTITIONS 0x0020
-#define KDBG_TAG TAG('K', 'D', 'B', 'G') +#define KDBG_TAG 'GBDK'
typedef struct _DBGKD_GET_VERSION32 {
Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?rev... ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -164,7 +164,7 @@ /* Allocate space for the buffer */ Buffer = ExAllocatePoolWithTag(PagedPool, Dest->Length + sizeof(WCHAR), - TAG('U', 'S', 'T', 'R')); + 'RTSU'); if (Buffer == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES;
Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.c... ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -58,7 +58,7 @@ /* FIXME: Is this needed? */ RtlZeroMemory(IPPacket, sizeof(IP_PACKET));
- INIT_TAG(IPPacket, TAG('I','P','K','T')); + INIT_TAG(IPPacket, 'TKPI');
IPPacket->Free = DontFreePacket; IPPacket->Type = Type; @@ -146,7 +146,7 @@ return NULL; }
- INIT_TAG(IF, TAG('F','A','C','E')); + INIT_TAG(IF, 'ECAF');
RtlZeroMemory(IF, sizeof(IP_INTERFACE));
@@ -371,7 +371,7 @@ NULL, /* Free routine */ 0, /* Flags */ sizeof(IPDATAGRAM_REASSEMBLY), /* Size of each entry */ - TAG('I','P','D','R'), /* Tag */ + 'RDPI', /* Tag */ 0); /* Depth */
ExInitializeNPagedLookasideList( @@ -380,7 +380,7 @@ NULL, /* Free routine */ 0, /* Flags */ sizeof(IP_FRAGMENT), /* Size of each entry */ - TAG('I','P','F','G'), /* Tag */ + 'GFPI', /* Tag */ 0); /* Depth */
ExInitializeNPagedLookasideList( @@ -389,7 +389,7 @@ NULL, /* Free routine */ 0, /* Flags */ sizeof(IPDATAGRAM_HOLE), /* Size of each entry */ - TAG('I','P','H','L'), /* Tag */ + 'LHPI', /* Tag */ 0); /* Depth */
/* Start routing subsystem */
Modified: trunk/reactos/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/memt... ============================================================================== --- trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -3,7 +3,7 @@
#if DBG -#define TRACK_TAG TAG('T','r','C','K') +#define TRACK_TAG 'KCrT'
static LIST_ENTRY AllocatedObjectsList; static KSPIN_LOCK AllocatedObjectsLock;
Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/neig... ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -287,7 +287,7 @@ return NULL; }
- INIT_TAG(NCE, TAG('N','C','E',' ')); + INIT_TAG(NCE, ' ECN');
NCE->Interface = Interface; NCE->Address = *Address;
Modified: trunk/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rout... ============================================================================== --- trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -219,7 +219,7 @@ return NULL; }
- INIT_TAG(Router, TAG('R','O','U','T')); + INIT_TAG(Router, 'TUOR');
RtlCopyMemory( &FIBE->NetworkAddress, NetworkAddress, sizeof(FIBE->NetworkAddress) );
Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/tc... ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -197,10 +197,10 @@ #define SMALL_SIZE 128 #define LARGE_SIZE 2048
-#define SIGNATURE_LARGE TAG('L','L','L','L') -#define SIGNATURE_SMALL TAG('S','S','S','S') -#define SIGNATURE_OTHER TAG('O','O','O','O') -#define TCP_TAG TAG('T','C','P',' ') +#define SIGNATURE_LARGE 'LLLL' +#define SIGNATURE_SMALL 'SSSS' +#define SIGNATURE_OTHER 'OOOO' +#define TCP_TAG ' PCT'
static NPAGED_LOOKASIDE_LIST LargeLookasideList; static NPAGED_LOOKASIDE_LIST SmallLookasideList;
Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/tc... ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -509,7 +509,7 @@ NULL, /* Free routine */ 0, /* Flags */ sizeof(TCP_SEGMENT), /* Size of each entry */ - TAG('T','C','P','S'), /* Tag */ + 'SPCT', /* Tag */ 0); /* Depth */
StartTimer();
Modified: trunk/reactos/lib/fslib/vfatlib/check/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/vfa... ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/vfat.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/vfat.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -361,13 +361,9 @@ UNICODE_STRING SearchPattern; } VFATCCB, *PVFATCCB;
-#ifndef TAG -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#endif - -#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_CCB 'BCCV' +#define TAG_FCB 'BCFV' +#define TAG_IRP 'PRIV'
#define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry))
Modified: trunk/reactos/lib/rossym/initkm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/initkm.c?rev=429... ============================================================================== --- trunk/reactos/lib/rossym/initkm.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym/initkm.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -17,8 +17,7 @@ #define NDEBUG #include <debug.h>
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) -#define TAG_ROSSYM TAG('R', 'S', 'Y', 'M') +#define TAG_ROSSYM 'MYSR'
static PVOID RosSymAllocMemKM(ULONG_PTR Size)
Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=4291... ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -45,7 +45,7 @@
/* allocate and initialize the security descriptor */ AbsSD = RtlpAllocateMemory(sizeof(SECURITY_DESCRIPTOR), - TAG('S', 'e', 'S', 'd')); + 'dSeS'); if (AbsSD == NULL) { Status = STATUS_NO_MEMORY; @@ -63,7 +63,7 @@ DaclSize = sizeof(ACL) + sizeof(ACE) + RtlLengthSid(LocalSystemSid); Dacl = RtlpAllocateMemory(DaclSize, - TAG('S', 'e', 'A', 'c')); + 'cAeS'); if (Dacl == NULL) { Status = STATUS_NO_MEMORY; @@ -111,13 +111,13 @@ if (Dacl != NULL) { RtlpFreeMemory(Dacl, - TAG('S', 'e', 'A', 'c')); + 'cAeS'); }
if (AbsSD != NULL) { RtlpFreeMemory(AbsSD, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); } }
@@ -162,7 +162,7 @@
/* allocate enough memory for the security descriptor */ RelSD = RtlpAllocateMemory(DescriptorSize, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); if (RelSD == NULL) { Status = STATUS_NO_MEMORY; @@ -297,7 +297,7 @@ ASSERT(AbsSDSize > DescriptorSize);
AbsSD = RtlpAllocateMemory(DescriptorSize, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); if (AbsSD == NULL) { Status = STATUS_NO_MEMORY; @@ -357,7 +357,7 @@
/* allocate enough memory for the new self-relative descriptor */ NewRelSD = RtlpAllocateMemory(RelSDSize, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); if (NewRelSD == NULL) { Status = STATUS_NO_MEMORY; @@ -392,20 +392,20 @@ if (RelSD != NULL) { RtlpFreeMemory(RelSD, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); }
if (NewRelSD != NULL) { RtlpFreeMemory(NewRelSD, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); }
#ifdef _WIN64 if (AbsSDAllocated) { RtlpFreeMemory(AbsSD, - TAG('S', 'e', 'S', 'd')); + 'dSeS'); } #endif
@@ -660,9 +660,9 @@ ASSERT(SecurityDescriptor->Dacl != NULL);
RtlpFreeMemory(SecurityDescriptor->Dacl, - TAG('S', 'e', 'A', 'c')); + 'cAeS'); RtlpFreeMemory(SecurityDescriptor, - TAG('S', 'e', 'S', 'd')); + 'dSeS');
RtlFreeSid(SystemSid); }
Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=4291... ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h>
-#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') +#define TAG_RTLREGISTRY 'vrqR'
extern SIZE_T RtlpAllocDeallocQueryBufferSize;
Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=42915&am... ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -165,9 +165,9 @@ IN ULONG Service);
/* Tags for the String Allocators */ -#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'
/* Timer Queue */
Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=42915&... ============================================================================== --- trunk/reactos/lib/rtl/sid.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sid.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h>
-#define TAG_SID TAG('p', 'S', 'i', 'd') +#define TAG_SID 'diSp'
/* FUNCTIONS ***************************************************************/
Modified: trunk/reactos/subsystems/win32/win32k/eng/engevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engevent.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -12,7 +12,7 @@ #define NDEBUG #include <debug.h>
-#define TAG_ENG TAG('E', 'n', 'g', ' ') +#define TAG_ENG ' gnE'
/* PUBLIC FUNCTIONS **********************************************************/
Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -1,102 +1,102 @@ #ifndef _WIN32K_TAGS_H #define _WIN32K_TAGS_H
-#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ -#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') /* RTL registry */ +#define TAG_STRING ' RTS' /* string */ +#define TAG_RTLREGISTRY 'vrqR' /* RTL registry */
/* ntuser */ -#define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ -#define TAG_KEYBOARD TAG('K', 'B', 'D', ' ') /* keyboard */ -#define TAG_ACCEL TAG('A', 'C', 'C', 'L') /* accelerator */ -#define TAG_HOOK TAG('W', 'N', 'H', 'K') /* hook */ -#define TAG_HOTKEY TAG('H', 'O', 'T', 'K') /* hotkey */ -#define TAG_MENUITEM TAG('M', 'E', 'N', 'I') /* menu item */ -#define TAG_MSG TAG('M', 'E', 'S', 'G') /* message */ -#define TAG_MSGQ TAG('M', 'S', 'G', 'Q') /* message queue */ -#define TAG_USRMSG TAG('U', 'M', 'S', 'G') /* user message */ -#define TAG_WNDPROP TAG('W', 'P', 'R', 'P') /* window property */ -#define TAG_WNAM TAG('W', 'N', 'A', 'M') /* window name */ -#define TAG_WINLIST TAG('W', 'N', 'L', 'S') /* window handle list */ -#define TAG_WININTLIST TAG('W', 'N', 'I', 'P') /* window internal pos */ -#define TAG_WINPROCLST TAG('W', 'N', 'P', 'L') /* window proc list */ -#define TAG_SBARINFO TAG('S', 'B', 'I', 'N') /* scrollbar info */ -#define TAG_TIMER TAG('T', 'I', 'M', 'R') /* timer entry */ -#define TAG_TIMERTD TAG('T', 'I', 'M', 'T') /* timer thread dereference list */ -#define TAG_TIMERBMP TAG('T', 'I', 'M', 'B') /* timers bitmap */ -#define TAG_CALLBACK TAG('C', 'B', 'C', 'K') /* callback memory */ -#define TAG_WINSTA TAG('W', 'S', 'T', 'A') /* window station */ -#define TAG_PDCE TAG('U', 's', 'd', 'c') /* dce */ -#define TAG_INPUT TAG('U', 's', 's', 'y') /* Input */ +#define TAG_MOUSE 'SUOM' /* mouse */ +#define TAG_KEYBOARD ' DBK' /* keyboard */ +#define TAG_ACCEL 'LCCA' /* accelerator */ +#define TAG_HOOK 'KHNW' /* hook */ +#define TAG_HOTKEY 'KTOH' /* hotkey */ +#define TAG_MENUITEM 'INEM' /* menu item */ +#define TAG_MSG 'GSEM' /* message */ +#define TAG_MSGQ 'QGSM' /* message queue */ +#define TAG_USRMSG 'GSMU' /* user message */ +#define TAG_WNDPROP 'PRPW' /* window property */ +#define TAG_WNAM 'MANW' /* window name */ +#define TAG_WINLIST 'SLNW' /* window handle list */ +#define TAG_WININTLIST 'PINW' /* window internal pos */ +#define TAG_WINPROCLST 'LPNW' /* window proc list */ +#define TAG_SBARINFO 'NIBS' /* scrollbar info */ +#define TAG_TIMER 'RMIT' /* timer entry */ +#define TAG_TIMERTD 'TMIT' /* timer thread dereference list */ +#define TAG_TIMERBMP 'BMIT' /* timers bitmap */ +#define TAG_CALLBACK 'KCBC' /* callback memory */ +#define TAG_WINSTA 'ATSW' /* window station */ +#define TAG_PDCE 'cdsU' /* dce */ +#define TAG_INPUT 'yssU' /* Input */
/* gdi objects from the handle table */ -#define TAG_DC TAG('G', 'l', 'a', '1') /* dc */ -#define TAG_REGION TAG('G', 'l', 'a', '4') /* region */ -#define TAG_SURFACE TAG('G', 'l', 'a', '5') /* bitmap */ -#define TAG_CLIENTOBJ TAG('G', 'h', '0', '6') -#define TAG_PATH TAG('G', 'h', '0', '7') -#define TAG_PALETTE TAG('G', 'l', 'a', '8') -#define TAG_ICMLCS TAG('G', 'h', '0', '9') -#define TAG_LFONT TAG('G', 'l', 'a', ':') -#define TAG_RFONT TAG('G', 'h', '0', ';') /* correct? */ -#define TAG_PFE TAG('G', 'h', '0', '<') -#define TAG_PFT TAG('G', 'h', '0', '=') /* correct? */ -#define TAG_ICMCXF TAG('G', 'h', '0', '>') /* correct? */ -#define TAG_SPRITE TAG('G', 'h', '0', '?') /* correct? */ -#define TAG_BRUSH TAG('G', 'l', 'a', '@') -#define TAG_UMPD TAG('G', 'h', '0', 'A') /* correct? */ -#define TAG_SPACE TAG('G', 'h', '0', 'C') /* correct? */ -#define TAG_META TAG('G', 'h', '0', 'E') /* correct? */ -#define TAG_EFSTATE TAG('G', 'h', '0', 'F') /* correct? */ -#define TAG_BMFD TAG('G', 'h', '0', 'G') /* correct? */ -#define TAG_VTFD TAG('G', 'h', '0', 'H') /* correct? */ -#define TAG_TTFD TAG('G', 'h', '0', 'I') /* correct? */ -#define TAG_RC TAG('G', 'h', '0', 'J') /* correct? */ -#define TAG_TEMP TAG('G', 'h', '0', 'K') /* correct? */ -#define TAG_DRVOBJ TAG('G', 'h', '0', 'L') /* correct? */ -#define TAG_DCIOBJ TAG('G', 'h', '0', 'M') /* correct? */ -#define TAG_SPOOL TAG('G', 'h', '0', 'N') /* correct? */ +#define TAG_DC '1alG' /* dc */ +#define TAG_REGION '4alG' /* region */ +#define TAG_SURFACE '5alG' /* bitmap */ +#define TAG_CLIENTOBJ '60hG' +#define TAG_PATH '70hG' +#define TAG_PALETTE '8alG' +#define TAG_ICMLCS '90hG' +#define TAG_LFONT ':alG' +#define TAG_RFONT ';0gG' /* correct? */ +#define TAG_PFE '<0hG' +#define TAG_PFT '=0hG' /* correct? */ +#define TAG_ICMCXF '>0hG' /* correct? */ +#define TAG_SPRITE '?0hG' /* correct? */ +#define TAG_BRUSH '@alG' +#define TAG_UMPD 'A0hG' /* correct? */ +#define TAG_SPACE 'c0hG' /* correct? */ +#define TAG_META 'E0hG' /* correct? */ +#define TAG_EFSTATE 'F0hG' /* correct? */ +#define TAG_BMFD 'G0hG' /* correct? */ +#define TAG_VTFD 'H0hG' /* correct? */ +#define TAG_TTFD 'I0hG' /* correct? */ +#define TAG_RC 'J0hG' /* correct? */ +#define TAG_TEMP 'K0hG' /* correct? */ +#define TAG_DRVOBJ 'L0hG' /* correct? */ +#define TAG_DCIOBJ 'M0hG' /* correct? */ +#define TAG_SPOOL 'N0hG' /* correct? */
/* other gdi objects */ -#define TAG_BEZIER TAG('B', 'E', 'Z', 'R') /* bezier */ -#define TAG_BITMAP TAG('B', 'T', 'M', 'P') /* bitmap */ -#define TAG_PATBLT TAG('P', 'B', 'L', 'T') /* patblt */ -#define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ -#define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ -#define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ -#define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ -#define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ -#define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ -#define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ -#define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ -#define TAG_SHAPE TAG('S', 'H', 'A', 'P') /* shape */ -#define TAG_PALETTEMAP TAG('P', 'A', 'L', 'M') /* palette mapping */ -#define TAG_PRINT TAG('P', 'R', 'N', 'T') /* print */ -#define TAG_GDITEXT TAG('T', 'X', 'T', 'O') /* text */ -#define TAG_PENSTYLES TAG('G', 's', 't', 'y') /* pen styles */ +#define TAG_BEZIER 'RZEB' /* bezier */ +#define TAG_BITMAP 'PMTB' /* bitmap */ +#define TAG_PATBLT 'TLBP' /* patblt */ +#define TAG_CLIP 'PILC' /* clipping */ +#define TAG_COORD 'DROC' /* coords */ +#define TAG_GDIDEV 'vedG' /* gdi dev support*/ +#define TAG_GDIPDEV 'veDG' /* gdi PDev */ +#define TAG_GDIHNDTBLE 'HIDG' /* gdi handle table */ +#define TAG_GDIICM 'mciG' /* gdi Icm */ +#define TAG_DIB ' BID' /* dib */ +#define TAG_COLORMAP 'MLOC' /* color map */ +#define TAG_SHAPE 'PAHS' /* shape */ +#define TAG_PALETTEMAP 'MLAP' /* palette mapping */ +#define TAG_PRINT 'TNRP' /* print */ +#define TAG_GDITEXT 'OTXT' /* text */ +#define TAG_PENSTYLES 'ytsG' /* pen styles */
/* Eng objects */ -#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ -#define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ -#define TAG_DFSM TAG('D', 'f', 's', 'm') /* Eng event allocation */ -#define TAG_EPATH TAG('G', 'p', 'a', 't') /* path object */ -#define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ -#define TAG_FONTOBJ TAG('G', 'f', 'n', 't') /* font object */ -#define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ -#define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ -#define TAG_GSEM TAG('G', 's', 'e', 'm') /* Gdi Semaphore */ +#define TAG_CLIPOBJ 'OPLC' /* clip object */ +#define TAG_DRIVEROBJ 'OVRD' /* driver object */ +#define TAG_DFSM 'msfD' /* Eng event allocation */ +#define TAG_EPATH 'tapG' /* path object */ +#define TAG_FONT 'ETNF' /* font entry */ +#define TAG_FONTOBJ 'tnfG' /* font object */ +#define TAG_WNDOBJ 'ODNW' /* window object */ +#define TAG_XLATEOBJ 'OALX' /* xlate object */ +#define TAG_GSEM 'mesG' /* Gdi Semaphore */
/* misc */ -#define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ -#define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ -#define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ -#define TAG_PFF TAG('G', 'p', 'f', 'f') /* physical font file */ +#define TAG_DRIVER 'VRDG' /* video drivers */ +#define TAG_FNTFILE 'FTNF' /* font file */ +#define TAG_SSECTPOOL 'PCSS' /* shared section pool */ +#define TAG_PFF 'ffpG' /* physical font file */
/* 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_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ -#define TAG_DDRAW TAG('D', 'h', ' ', '1') -#define TAG_DDSURF TAG('D', 'h', ' ', '2') -#define TAG_EDDGBL TAG('E', 'D', 'D', 'G') /* ? edd_directdraw_global ??*/ +#define TAG_DXPVMLIST 'LPXD' /* pmvlist for the driver */ +#define TAG_DXFOURCC 'OFXD' /* pdwFourCC for the driver */ +#define TAG_DDRAW '1 hD' +#define TAG_DDSURF '2 hD' +#define TAG_EDDGBL 'GDDE' /* ? edd_directdraw_global ??*/
#endif /* _WIN32K_TAGS_H */
Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -3,7 +3,7 @@
#include <include/engobjects.h>
-#define TAG_FINF TAG('F', 'I', 'N', 'F') +#define TAG_FINF 'FNIF' // // EXSTROBJ flags. //
Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mai... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -70,7 +70,7 @@ /* FIXME - lock the process */ Win32Process = ExAllocatePoolWithTag(NonPagedPool, sizeof(PROCESSINFO), - TAG('W', '3', '2', 'p')); + 'p23W');
if (Win32Process == NULL) RETURN( STATUS_NO_MEMORY);
@@ -188,7 +188,7 @@ /* FIXME - lock the process */ Win32Thread = ExAllocatePoolWithTag(NonPagedPool, sizeof(THREADINFO), - TAG('W', '3', '2', 't')); + 't23W');
if (Win32Thread == NULL) RETURN( STATUS_NO_MEMORY);
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -18,7 +18,7 @@
#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); BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING);
Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -656,7 +656,7 @@ SafeFileNames.MaximumLength = SafeFileNames.Length = cbStringSize - sizeof(WCHAR); SafeFileNames.Buffer = ExAllocatePoolWithTag(PagedPool, cbStringSize, - TAG('R','T','S','U')); + 'RTSU'); if (!SafeFileNames.Buffer) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -682,7 +682,7 @@ { SetLastNtError(Status); /* Free the string buffer for the safe filename */ - ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); + ExFreePoolWithTag(SafeFileNames.Buffer,'RTSU'); return FALSE; }
@@ -713,7 +713,7 @@ }
/* Free the string for the safe filenames */ - ExFreePoolWithTag(SafeFileNames.Buffer,TAG('R','T','S','U')); + ExFreePoolWithTag(SafeFileNames.Buffer,'RTSU');
return bRet; }
Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Mon Aug 24 19:12:25 2009 @@ -1,6 +1,6 @@ #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);
static int leak_reported = 0;
-
sginsberg＠svn.reactos.org