Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 42921: Fix Czech file.
by dgorbachev＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: dgorbachev Date: Mon Aug 24 20:21:48 2009 New Revision: 42921 URL: http://svn.reactos.org/svn/reactos?rev=42921&view=rev Log: Fix Czech file. Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Mon Aug 24 20:21:48 2009 @@ -10,7 +10,6 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY PUSHBUTTON "&Nastavit", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Vybrané komponenty jsou pouívány tímto pøipojením:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalovat", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Odstranit", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 @@ -43,7 +42,7 @@ LTEXT "Bytù:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Vlastnosti", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Zakázat", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8 @@ -113,6 +112,7 @@ IDS_NET_REPAIR "Repair" IDS_NET_CREATELINK "Create Shortcut" IDS_NET_DELETE "Delete" + IDS_NET_RENAME "Rename" IDS_NET_PROPERTIES "Properties" IDS_FORMAT_BIT "%u Bit/s" @@ -124,4 +124,3 @@ IDS_ASSIGNED_DHCP "Pøiøazeno DHCP" IDS_ASSIGNED_MANUAL "Ruènì nastaveno" END -

1 0

[sginsberg] 42920: - Get rid of TAG() from the kernel - mmtypes.h: Goodbye TAG(), you won't be missed
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: sginsberg Date: Mon Aug 24 20:19:53 2009 New Revision: 42920 URL: http://svn.reactos.org/svn/reactos?rev=42920&view=rev Log: - Get rid of TAG() from the kernel - mmtypes.h: Goodbye TAG(), you won't be missed Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/config/cmhook.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/atom.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/lookas.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c trunk/reactos/ntoskrnl/include/internal/cm.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/lpc/create.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/mm/dbgpool.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obsdcach.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -40,12 +40,6 @@ #define ROUND_TO_ALLOCATION_GRANULARITY(Size) \ (((ULONG_PTR)(Size) + MM_ALLOCATION_GRANULARITY - 1) \ & ~(MM_ALLOCATION_GRANULARITY - 1)) - -// -// Macro for generating pool tags -// -#define TAG(A, B, C, D) \ - (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) // // PFN Identity Uses Modified: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -116,7 +116,7 @@ Callback = ExAllocatePoolWithTag(PagedPool, sizeof(REGISTRY_CALLBACK), - TAG('C', 'M', 'c', 'b')); + 'bcMC'); if (Callback != NULL) { /* initialize the callback */ Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -285,7 +285,7 @@ /* Setup the key body */ KeyBody = (PCM_KEY_BODY)(*Object); - KeyBody->Type = TAG('k', 'y', '0', '2'); + KeyBody->Type = '20yk'; KeyBody->KeyControlBlock = NULL; /* Check if we had a class */ @@ -680,7 +680,7 @@ /* Get the key body and fill it out */ KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->KeyControlBlock = Kcb; - KeyBody->Type = TAG('k', 'y', '0', '2'); + KeyBody->Type = '20yk'; KeyBody->ProcessID = PsGetCurrentProcessId(); KeyBody->NotifyBlock = NULL; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -63,7 +63,7 @@ CmpLockRegistry(); /* Make sure this is a valid key body */ - if (KeyBody->Type == TAG('k', 'y', '0', '2')) + if (KeyBody->Type == '20yk') { /* Get the KCB */ Kcb = KeyBody->KeyControlBlock; @@ -100,7 +100,7 @@ if (SystemHandleCount > 1) return; /* Make sure we're a valid key body */ - if (KeyBody->Type == TAG('k', 'y', '0', '2')) + if (KeyBody->Type == '20yk') { /* Don't do anything if we don't have a notify block */ if (!KeyBody->NotifyBlock) return; @@ -964,7 +964,7 @@ /* Initialize the object */ RootKey->KeyControlBlock = Kcb; - RootKey->Type = TAG('k', 'y', '0', '2'); + RootKey->Type = '20yk'; RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -59,7 +59,7 @@ /* Allocate it */ DebugEvent = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEBUG_EVENT), - TAG('D', 'b', 'g', 'E')); + 'EgbD'); if (!DebugEvent) return STATUS_INSUFFICIENT_RESOURCES; /* Set flags */ Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/atom.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define TAG_ATOM TAG('A', 't', 'o', 'm') +#define TAG_ATOM 'motA' /* GLOBALS ****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -402,7 +402,7 @@ if (NT_SUCCESS(Status)) { /* Set it up */ - Callback->Signature = TAG('C', 'a', 'l', 'l'); + Callback->Signature = 'llaC'; KeInitializeSpinLock(&Callback->Lock); InitializeListHead(&Callback->RegisteredCallbacks); Callback->AllowMultipleCallbacks = AllowMultipleCallbacks; Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -131,7 +131,7 @@ PVOID Buffer; /* Do the allocation */ - Buffer = ExAllocatePoolWithTag(PagedPool, Size, TAG('O', 'b', 't', 'b')); + Buffer = ExAllocatePoolWithTag(PagedPool, Size, 'btbO'); if (Buffer) { /* Clear the memory */ @@ -156,7 +156,7 @@ PVOID Buffer; /* Do the allocation */ - Buffer = ExAllocatePoolWithTag(PagedPool, Size, TAG('O', 'b', 't', 'b')); + Buffer = ExAllocatePoolWithTag(PagedPool, Size, 'btbO'); if (Buffer) { /* Check if we have a process to charge quota */ @@ -344,7 +344,7 @@ /* Allocate the table */ HandleTable = ExAllocatePoolWithTag(PagedPool, sizeof(HANDLE_TABLE), - TAG('O', 'b', 't', 'b')); + 'btbO'); if (!HandleTable) return NULL; /* Check if we have a process */ Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -12,7 +12,7 @@ #define NDEBUG #include <debug.h> -#define TAG_ERR TAG('E', 'r', 'r', ' ') +#define TAG_ERR ' rrE' /* GLOBALS ****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -235,7 +235,7 @@ /* Allocate the a new buffer since loader memory will be freed */ ExpNlsTableBase = ExAllocatePoolWithTag(NonPagedPool, ExpNlsTableSize, - TAG('R', 't', 'l', 'i')); + 'iltR'); if (!ExpNlsTableBase) KeBugCheck(PHASE0_INITIALIZATION_FAILED); /* Copy the codepage data in its new location. */ @@ -324,7 +324,7 @@ RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); /* Free the previously allocated buffer and set the new location */ - ExFreePoolWithTag(ExpNlsTableBase, TAG('R', 't', 'l', 'i')); + ExFreePoolWithTag(ExpNlsTableBase, 'iltR'); ExpNlsTableBase = SectionBase; /* Initialize the NLS Tables */ @@ -1188,7 +1188,7 @@ KeServiceDescriptorTable[0].Count = ExAllocatePoolWithTag(NonPagedPool, KiServiceLimit * sizeof(ULONG), - TAG('C', 'a', 'l', 'l')); + 'llaC'); /* Use it for the shadow table too */ KeServiceDescriptorTableShadow[0].Count = KeServiceDescriptorTable[0].Count; @@ -1269,7 +1269,7 @@ /* Allocate the initialization buffer */ InitBuffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(INIT_BUFFER), - TAG('I', 'n', 'i', 't')); + 'tinI'); if (!InitBuffer) { /* Bugcheck */ Modified: trunk/reactos/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/lookas.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -108,7 +108,7 @@ ExInitializeSystemLookasideList(&ExpSmallNPagedPoolLookasideLists[i], NonPagedPool, (i + 1) * 8, - TAG('P', 'o', 'o', 'l'), + 'looP', 256, &ExPoolLookasideListHead); @@ -116,7 +116,7 @@ ExInitializeSystemLookasideList(&ExpSmallPagedPoolLookasideLists[i], PagedPool, (i + 1) * 8, - TAG('P', 'o', 'o', 'l'), + 'looP', 256, &ExPoolLookasideListHead); } Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -17,7 +17,7 @@ #pragma alloc_text(INIT, ExpInitializeProfileImplementation) #endif -#define TAG_PROFILE TAG('P', 'r', 'o', 'f') +#define TAG_PROFILE 'forP' /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -172,7 +172,7 @@ FsRtlPagingIoResources = FsRtlAllocatePoolWithTag(NonPagedPool, FSRTL_MAX_RESOURCES * sizeof(ERESOURCE), - TAG('F', 's', 'R', 'e')); + 'eRsF'); /* Initialize the Resources */ for (i = 0; i < FSRTL_MAX_RESOURCES; i++) Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -45,8 +45,8 @@ // // CM_KEY_CONTROL_BLOCK Signatures // -#define CM_KCB_SIGNATURE TAG('C', 'm', 'K', 'b') -#define CM_KCB_INVALID_SIGNATURE TAG('C', 'm', 'F', '4') +#define CM_KCB_SIGNATURE 'bKmC' +#define CM_KCB_INVALID_SIGNATURE '4FmC' // // CM_KEY_CONTROL_BLOCK Flags Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -70,7 +70,7 @@ PAGE_SIZE) /* Signature of free pool blocks */ -#define MM_FREE_POOL_TAG TAG('F', 'r', 'p', 'l') +#define MM_FREE_POOL_TAG 'lprF' #define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ ((x) / (4*1024*1024)) Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -142,7 +142,7 @@ // // Private Temporary Buffer for Lookup Routines // -#define TAG_OB_TEMP_STORAGE TAG('O', 'b', 'S', 't') +#define TAG_OB_TEMP_STORAGE 'tSbO' typedef struct _OB_TEMP_BUFFER { ACCESS_STATE LocalAccessState; Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -2,166 +2,166 @@ #define _NTOSKRNL_TAG_H /* formerly located in cc/view.c */ -#define TAG_CSEG TAG('C', 'S', 'E', 'G') -#define TAG_BCB TAG('B', 'C', 'B', ' ') -#define TAG_IBCB TAG('i', 'B', 'C', 'B') +#define TAG_CSEG 'GESC' +#define TAG_BCB ' BCB' +#define TAG_IBCB 'BCBi' /* formely located in include/callback.h */ -#define CALLBACK_TAG TAG('C','L','B','K') +#define CALLBACK_TAG 'KBLC' /* formerly located in ex/resource.c */ -#define TAG_RESOURCE_TABLE TAG('R', 'e', 'T', 'a') -#define TAG_RESOURCE_EVENT TAG('R', 'e', 'T', 'a') -#define TAG_RESOURCE_SEMAPHORE TAG('R', 'e', 'T', 'a') +#define TAG_RESOURCE_TABLE 'aTeR' +#define TAG_RESOURCE_EVENT 'aTeR' +#define TAG_RESOURCE_SEMAPHORE 'aTeR' /* formerly located in fs/notify.c */ -#define FSRTL_NOTIFY_TAG TAG('N','O','T','I') +#define FSRTL_NOTIFY_TAG 'ITON' /* formerly located in io/device.c */ -#define TAG_DEVICE_EXTENSION TAG('D', 'E', 'X', 'T') -#define TAG_SHUTDOWN_ENTRY TAG('S', 'H', 'U', 'T') -#define TAG_IO_TIMER TAG('I', 'O', 'T', 'M') +#define TAG_DEVICE_EXTENSION 'TXED' +#define TAG_SHUTDOWN_ENTRY 'TUHS' +#define TAG_IO_TIMER 'MTOI' /* formerly located in io/driver.c */ -#define TAG_DRIVER TAG('D', 'R', 'V', 'R') -#define TAG_DRIVER_EXTENSION TAG('D', 'R', 'V', 'E') +#define TAG_DRIVER 'RVRD' +#define TAG_DRIVER_EXTENSION 'EVRD' /* formerly located in io/file.c */ -#define TAG_SYSB TAG('S', 'Y', 'S', 'B') -#define TAG_LOCK TAG('F','l','c','k') -#define TAG_FILE_NAME TAG('F', 'N', 'A', 'M') +#define TAG_SYSB 'BSYS' +#define TAG_LOCK 'kclF' +#define TAG_FILE_NAME 'MANF' /* formerly located in io/fs.c */ -#define TAG_FILE_SYSTEM TAG('F', 'S', 'Y', 'S') -#define TAG_FS_CHANGE_NOTIFY TAG('F', 'S', 'C', 'N') -#define IFS_POOL_TAG TAG('F', 'S', 'r', 't') +#define TAG_FILE_SYSTEM 'SYSF' +#define TAG_FS_CHANGE_NOTIFY 'NCSF' +#define IFS_POOL_TAG 'trSF' /* formerly located in io/iocomp.c */ -#define IOC_TAG TAG('I', 'O', 'C', 'T') +#define IOC_TAG 'TCOI' /* formerly located in io/iomgr.c */ -#define TAG_DEVICE_TYPE TAG('D', 'E', 'V', 'T') -#define TAG_FILE_TYPE TAG('F', 'I', 'L', 'E') -#define TAG_ADAPTER_TYPE TAG('A', 'D', 'P', 'T') -#define IO_LARGEIRP TAG('I', 'r', 'p', 'l') -#define IO_SMALLIRP TAG('I', 'r', 'p', 's') -#define IO_LARGEIRP_CPU TAG('I', 'r', 'p', 'L') -#define IO_SMALLIRP_CPU TAG('I', 'r', 'p', 'S') -#define IOC_TAG1 TAG('I', 'p', 'c', ' ') -#define IOC_CPU TAG('I', 'p', 'c', 'P') -#define TAG_APC TAG('K', 'A', 'P', 'C') -#define TAG_IO TAG('I', 'o', ' ', ' ') -#define TAG_ERROR_LOG TAG('I', 'o', 'E', 'r') -#define TAG_EA TAG('I', 'o', 'E', 'a') -#define TAG_IO_NAME TAG('I', 'o', 'N', 'm') -#define TAG_REINIT TAG('I', 'o', 'R', 'i') +#define TAG_DEVICE_TYPE 'TVED' +#define TAG_FILE_TYPE 'ELIF' +#define TAG_ADAPTER_TYPE 'TPDA' +#define IO_LARGEIRP 'lprI' +#define IO_SMALLIRP 'sprI' +#define IO_LARGEIRP_CPU 'LprI' +#define IO_SMALLIRP_CPU 'SprI' +#define IOC_TAG1 ' cpI' +#define IOC_CPU 'PcpI' +#define TAG_APC 'CPAK' +#define TAG_IO ' oI' +#define TAG_ERROR_LOG 'rEoI' +#define TAG_EA 'aEoI' +#define TAG_IO_NAME 'mNoI' +#define TAG_REINIT 'iRoI' /* formerly located in io/work.c */ -#define TAG_IOWI TAG('I', 'O', 'W', 'I') +#define TAG_IOWI 'IWOI' /* formerly located in io/irp.c */ -#define TAG_IRP TAG('I', 'R', 'P', ' ') -#define TAG_SYS_BUF TAG('S', 'Y', 'S' , 'B') +#define TAG_IRP ' PRI' +#define TAG_SYS_BUF 'BSYS' /* formerly located in io/irq.c */ -#define TAG_KINTERRUPT TAG('K', 'I', 'S', 'R') +#define TAG_KINTERRUPT 'RSIK' /* formerly located in io/mdl.c */ -#define TAG_MDL TAG('M', 'D', 'L', ' ') +#define TAG_MDL ' LDM' /* formerly located in io/pnpnotify.c */ -#define TAG_PNP_NOTIFY TAG('P', 'n', 'P', 'N') +#define TAG_PNP_NOTIFY 'NPnP' /* for io/pnproot.c */ -#define TAG_PNP_ROOT TAG('P', 'n', 'P', 'R') +#define TAG_PNP_ROOT 'RPnP' /* formerly located in io/resource.c */ -#define TAG_IO_RESOURCE TAG('R', 'S', 'R', 'C') +#define TAG_IO_RESOURCE 'CRSR' /* formerly located in io/timer.c */ -#define TAG_IO_TIMER TAG('I', 'O', 'T', 'M') +#define TAG_IO_TIMER 'MTOI' /* formerly located in io/vpb.c */ -#define TAG_VPB TAG('V', 'P', 'B', ' ') -#define TAG_SYSB TAG('S', 'Y', 'S', 'B') +#define TAG_VPB ' BPV' +#define TAG_SYSB 'BSYS' /* formerly located in kdbg/kdb_symbols.c */ -#define TAG_KDBS TAG('K', 'D', 'B', 'S') -#define TAG_KDBG TAG('K', 'D', 'B', 'G') +#define TAG_KDBS 'SBDK' +#define TAG_KDBG 'GBDK' /* formerly located in ldr/loader.c */ -#define TAG_DRIVER_MEM TAG('D', 'R', 'V', 'M') /* drvm */ -#define TAG_MODULE_OBJECT TAG('k', 'l', 'm', 'o') /* klmo - kernel ldr module object */ -#define TAG_LDR_WSTR TAG('k', 'l', 'w', 's') /* klws - kernel ldr wide string */ +#define TAG_DRIVER_MEM 'MVRD' /* drvm */ +#define TAG_MODULE_OBJECT 'omlk' /* klmo - kernel ldr module object */ +#define TAG_LDR_WSTR 'swlk' /* klws - kernel ldr wide string */ /* formerly located in lpc/connect */ -#define TAG_LPC_CONNECT_MESSAGE TAG('L', 'P', 'C', 'C') +#define TAG_LPC_CONNECT_MESSAGE 'CCPL' /* formerly located in mm/aspace.c */ -#define TAG_PTRC TAG('P', 'T', 'R', 'C') +#define TAG_PTRC 'CRTP' /* formerly located in mm/marea.c */ -#define TAG_MAREA TAG('M', 'A', 'R', 'E') +#define TAG_MAREA 'ERAM' /* formerly located in mm/pageop.c */ -#define TAG_MM_PAGEOP TAG('M', 'P', 'O', 'P') +#define TAG_MM_PAGEOP 'POPM' /* formerly located in mm/pool.c */ -#define TAG_NONE TAG('N', 'o', 'n', 'e') +#define TAG_NONE 'enoN' /* formerly located in mm/region.c */ -#define TAG_MM_REGION TAG('M', 'R', 'G', 'N') +#define TAG_MM_REGION 'NGRM' /* formerly located in mm/rmap.c */ -#define TAG_RMAP TAG('R', 'M', 'A', 'P') +#define TAG_RMAP 'PAMR' /* formerly located in mm/section.c */ -#define TAG_MM_SECTION_SEGMENT TAG('M', 'M', 'S', 'S') -#define TAG_SECTION_PAGE_TABLE TAG('M', 'S', 'P', 'T') +#define TAG_MM_SECTION_SEGMENT 'SSMM' +#define TAG_SECTION_PAGE_TABLE 'TPSM' /* formerly located in ob/symlink.c */ -#define TAG_OBJECT_TYPE TAG('O', 'b', 'j', 'T') -#define TAG_SYMLINK_TTARGET TAG('S', 'Y', 'T', 'T') -#define TAG_SYMLINK_TARGET TAG('S', 'Y', 'M', 'T') +#define TAG_OBJECT_TYPE 'TjbO' +#define TAG_SYMLINK_TTARGET 'TTYS' +#define TAG_SYMLINK_TARGET 'TMYS' /* Object Manager Tags */ -#define OB_NAME_TAG TAG('O', 'b', 'N', 'm') -#define OB_DIR_TAG TAG('O', 'b', 'D', 'i') +#define OB_NAME_TAG 'mNbO' +#define OB_DIR_TAG 'iDbO' /* formerly located in ps/cid.c */ -#define TAG_CIDOBJECT TAG('C', 'I', 'D', 'O') -#define TAG_PS_IMPERSONATION TAG('P', 's', 'I', 'm') +#define TAG_CIDOBJECT 'ODIC' +#define TAG_PS_IMPERSONATION 'mIsP' /* formerly located in ps/job.c */ -#define TAG_EJOB TAG('E', 'J', 'O', 'B') /* EJOB */ +#define TAG_EJOB 'BOJE' /* EJOB */ /* formerly located in ps/kill.c */ -#define TAG_TERMINATE_APC TAG('T', 'A', 'P', 'C') +#define TAG_TERMINATE_APC 'CPAT' /* formerly located in ps/notify.c */ -#define TAG_KAPC TAG('k','p','a','p') /* kpap - kernel ps apc */ -#define TAG_PS_APC TAG('P', 's', 'a', 'p') /* Psap - Ps APC */ +#define TAG_KAPC 'papk' /* kpap - kernel ps apc */ +#define TAG_PS_APC 'pasP' /* Psap - Ps APC */ /* formerly located in rtl/handle.c */ -#define TAG_HDTB TAG('H', 'D', 'T', 'B') +#define TAG_HDTB 'BTDH' /* formerly located in se/acl.c */ -#define TAG_ACL TAG('S', 'e', 'A', 'c') +#define TAG_ACL 'cAeS' /* formerly located in se/sid.c */ -#define TAG_SID TAG('S', 'e', 'S', 'i') +#define TAG_SID 'iSeS' /* formerly located in se/sd.c */ -#define TAG_SD TAG('S', 'e', 'S', 'd') +#define TAG_SD 'dSeS' /* LPC Tags */ -#define TAG_LPC_MESSAGE TAG('L', 'p', 'c', 'M') -#define TAG_LPC_ZONE TAG('L', 'p', 'c', 'Z') +#define TAG_LPC_MESSAGE 'McpL' +#define TAG_LPC_ZONE 'ZcpL' /* Se Process Audit */ -#define TAG_SEPA TAG('S', 'e', 'P', 'a') +#define TAG_SEPA 'aPeS' -#define TAG_WAIT TAG('W', 'a', 'i', 't') -#define TAG_SEC_QUERY TAG('O', 'b', 'S', 'q') +#define TAG_WAIT 'tiaW' +#define TAG_SEC_QUERY 'qSbO' #endif /* _NTOSKRNL_TAG_H */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -29,7 +29,7 @@ POBJECT_TYPE IoDriverObjectType = NULL; -#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') +#define TAG_RTLREGISTRY 'vrqR' extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN PnpSystemInit; Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -37,7 +37,7 @@ /* BOOLEAN ServiceRunning;*/ // needed ?? } SERVICE, *PSERVICE; -#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') +#define TAG_RTLREGISTRY 'vrqR' /* GLOBALS ********************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -230,7 +230,7 @@ /* Allocate the context */ UnloadContext = ExAllocatePoolWithTag(NonPagedPool, sizeof(*UnloadContext), - TAG('I', 'o', 'U', 's')); + 'sUoI'); if (!UnloadContext) return STATUS_INSUFFICIENT_RESOURCES; /* Set up the context */ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -50,7 +50,7 @@ break; #if DBG - case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */ + case ' soR': /* ROS-INTERNAL */ { switch ((ULONG)Buffer1) { @@ -81,7 +81,7 @@ } /* Special case for stack frame dumps */ - case TAG('R', 'o', 's', 'D'): + case 'DsoR': { KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length); break; Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -576,7 +576,7 @@ /* Allocate the IOPM save area. */ Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE * 2, - TAG('K', 'e', ' ', ' ')); + ' eK'); if (!Ki386IopmSaveArea) { /* Bugcheck. We need this for V86/VDM support. */ Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -74,7 +74,7 @@ /* Allocate VDM structure */ VdmProcessObjects = ExAllocatePoolWithTag(NonPagedPool, sizeof(VDM_PROCESS_OBJECTS), - TAG('K', 'e', ' ', ' ')); + ' eK'); if (!VdmProcessObjects) return STATUS_NO_MEMORY; /* Set it up */ Modified: trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/ppc_ir… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/ppc_irq.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -142,7 +142,7 @@ static ISR_TABLE IsrTable[NR_TRAPS][1]; #endif -#define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') +#define TAG_ISR_LOCK 'LRSI' /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -61,7 +61,7 @@ /* Allocate a buffer first, before we raise IRQL */ SourceBuffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KPROFILE_SOURCE_OBJECT), - TAG('P', 'r', 'o', 'f')); + 'forP'); RtlZeroMemory(SourceBuffer, sizeof(KPROFILE_SOURCE_OBJECT)); /* Raise to PROFILE_LEVEL */ Modified: trunk/reactos/ntoskrnl/lpc/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/create.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/create.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/create.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -24,7 +24,7 @@ /* Allocate the queue */ MessageQueue = ExAllocatePoolWithTag(NonPagedPool, sizeof(LPCP_NONPAGED_PORT_QUEUE), - TAG('P', 'o', 'r', 't')); + 'troP'); if (!MessageQueue) return STATUS_INSUFFICIENT_RESOURCES; /* Set it up */ Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -65,7 +65,7 @@ NULL, 0, LpcpMaxMessageSize, - TAG('L', 'p', 'c', 'M'), + 'McpL', 32); /* We're done */ Modified: trunk/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/dbgpool.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/dbgpool.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -25,19 +25,19 @@ ExpIsPoolTagDebuggable(ULONG Tag) { #if 0 - if (Tag == TAG('C', 'a', 'l', 'l')) return FALSE; - if (Tag == TAG('D', 'r', 'i', 'v')) return FALSE; - if (Tag == TAG('D', 'e', 'v', 'i')) return FALSE; - if (Tag == TAG('A', 'd', 'a', 'p')) return FALSE; + if (Tag == 'llaC') return FALSE; + if (Tag == 'virD') return FALSE; + if (Tag == 'iveD') return FALSE; + if (Tag == 'padA') return FALSE; - if (Tag == TAG('S', 'e', 'S', 'd')) return FALSE; - if (Tag == TAG('O', 'b', 'D', 'i')) return FALSE; - if (Tag == TAG('O', 'b', 'N', 'm')) return FALSE; - if (Tag == TAG('O', 'b', 'N', 'D')) return FALSE; - if (Tag == TAG('O', 'b', 't', 'b')) return FALSE; - if (Tag == TAG('O', 'b', 'S', 'c')) return FALSE; - //if (Tag == TAG('S', 'e', 'S', 'i')) return FALSE; - //if (Tag == TAG('S', 'e', 'A', 'c')) return FALSE; + if (Tag == 'dSeS') return FALSE; + if (Tag == 'iDbO') return FALSE; + if (Tag == 'mNbO') return FALSE; + if (Tag == 'DNbO') return FALSE; + if (Tag == 'btbO') return FALSE; + if (Tag == 'cSbO') return FALSE; + //if (Tag == 'iSeS') return FALSE; + //if (Tag == 'cAeS') return FALSE; #endif return TRUE; Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -50,7 +50,7 @@ if (Tag == 0) KeBugCheckEx(BAD_POOL_CALLER, 0x9b, PoolType, NumberOfBytes, (ULONG_PTR)Caller); - if (Tag == TAG('B','I','G',0)) + if (Tag == '0GIB') KeBugCheckEx(BAD_POOL_CALLER, 0x9c, PoolType, NumberOfBytes, (ULONG_PTR)Caller); #define IS_LETTER_OR_DIGIT(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z') || ((c) >= '0' && (c) <= '9')) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -125,7 +125,7 @@ /* Allocate memory for our structure */ ObjectNameInfo = ExAllocatePoolWithTag(PagedPool, 1024, - TAG('M', 'm', ' ', ' ')); + ' mM'); if (!ObjectNameInfo) return STATUS_NO_MEMORY; /* Query the name */ @@ -136,7 +136,7 @@ if (!NT_SUCCESS(Status)) { /* Failed, free memory */ - ExFreePoolWithTag(ObjectNameInfo, TAG('M', 'm', ' ', ' ')); + ExFreePoolWithTag(ObjectNameInfo, ' mM'); return Status; } @@ -191,7 +191,7 @@ ModuleNameInformation->Name.Buffer); /* Free temp taged buffer from MmGetFileNameForSection() */ - ExFreePoolWithTag(ModuleNameInformation, TAG('M', 'm', ' ', ' ')); + ExFreePoolWithTag(ModuleNameInformation, ' mM'); DPRINT("Found ModuleName %S by address %p\n", ModuleName->Buffer,Address); } @@ -2755,7 +2755,7 @@ */ Buffer = ExAllocatePoolWithTag(PagedPool, BufferSize, - TAG('M', 'm', 'X', 'r')); + 'rXmM'); UsedSize = 0; @@ -2806,7 +2806,7 @@ } else { - ExFreePoolWithTag(Buffer, TAG('M', 'm', 'X', 'r')); + ExFreePoolWithTag(Buffer, 'rXmM'); } return Status; @@ -3215,7 +3215,7 @@ break; } - ExFreePoolWithTag(FileHeaderBuffer, TAG('M', 'm', 'X', 'r')); + ExFreePoolWithTag(FileHeaderBuffer, 'rXmM'); /* * No loader handled the format Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -16,7 +16,7 @@ #define MI_MAPPED_COPY_PAGES 16 #define MI_POOL_COPY_BYTES 512 #define MI_MAX_TRANSFER_SIZE 64 * 1024 -#define TAG_VM TAG('V', 'm', 'R', 'w') +#define TAG_VM 'wRmV' /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -20,7 +20,7 @@ PHANDLE_TABLE ObpKernelHandleTable = NULL; ULONG ObpAccessProtectCloseBit = MAXIMUM_ALLOWED; -#define TAG_OB_HANDLE TAG('O', 'b', 'H', 'd') +#define TAG_OB_HANDLE 'dHbO' /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -73,14 +73,14 @@ Prcb->PPLookasideList[LookasideCreateInfoList].L = &ObpCreateInfoLookasideList; CurrentList = ExAllocatePoolWithTag(NonPagedPool, sizeof(GENERAL_LOOKASIDE), - TAG('O', 'b', 'C', 'I')); + 'ICbO'); if (CurrentList) { /* Initialize it */ ExInitializeSystemLookasideList(CurrentList, NonPagedPool, sizeof(OBJECT_CREATE_INFORMATION), - TAG('O', 'b', 'C', 'I'), + 'ICbO', 32, &ExSystemLookasideListHead); } @@ -97,14 +97,14 @@ Prcb->PPLookasideList[LookasideNameBufferList].L = &ObpNameBufferLookasideList; CurrentList = ExAllocatePoolWithTag(NonPagedPool, sizeof(GENERAL_LOOKASIDE), - TAG('O', 'b', 'N', 'M')); + 'MNbO'); if (CurrentList) { /* Initialize it */ ExInitializeSystemLookasideList(CurrentList, PagedPool, 248, - TAG('O', 'b', 'N', 'M'), + 'MNbO', 16, &ExSystemLookasideListHead); } @@ -145,7 +145,7 @@ ExInitializeSystemLookasideList(&ObpCreateInfoLookasideList, NonPagedPool, sizeof(OBJECT_CREATE_INFORMATION), - TAG('O', 'b', 'C', 'I'), + 'ICbO', 32, &ExSystemLookasideListHead); @@ -153,7 +153,7 @@ ExInitializeSystemLookasideList(&ObpNameBufferLookasideList, PagedPool, 248, - TAG('O', 'b', 'N', 'M'), + 'MNbO', 16, &ExSystemLookasideListHead); Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -599,7 +599,7 @@ { /* Use default tag and non-paged pool */ PoolType = NonPagedPool; - Tag = TAG('O', 'b', 'j', 'T'); + Tag = 'TjbO'; } else { @@ -1122,7 +1122,7 @@ /* Set the hard-coded key and object count */ LocalObjectType->TotalNumberOfObjects = 1; - LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); + LocalObjectType->Key = 'TjbO'; } else { Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -100,7 +100,7 @@ /* FIXME: Hack Hack! */ ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObSystemDeviceMap), - TAG('O', 'b', 'D', 'm')); + 'mDbO'); RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); /* Return status */ Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -131,7 +131,7 @@ /* Calculate the memory we'll need to allocate and allocate it */ CacheSize = Length + (sizeof(SECURITY_DESCRIPTOR_HEADER) - sizeof(QUAD)); - SdHeader = ExAllocatePoolWithTag(PagedPool, CacheSize, TAG('O', 'b', 'S', 'c')); + SdHeader = ExAllocatePoolWithTag(PagedPool, CacheSize, 'cSbO'); if (!SdHeader) return NULL; /* Setup the header */ Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=429… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -1298,7 +1298,7 @@ /* Allocate the Port and make sure it suceeded */ TerminationPort = ExAllocatePoolWithTag(NonPagedPool, sizeof(TERMINATION_PORT), - TAG('P', 's', 'T', '=')); + '=TsP'); if(TerminationPort) { /* Associate the Port */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -659,7 +659,7 @@ Process->SeAuditProcessCreationInfo.ImageFileName = ExAllocatePoolWithTag(PagedPool, sizeof(OBJECT_NAME_INFORMATION), - TAG('S', 'e', 'P', 'a')); + 'aPeS'); if (!Process->SeAuditProcessCreationInfo.ImageFileName) { /* Fail */ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -#define TAG_ATMT TAG('A', 't', 'o', 'T') /* Atom table */ +#define TAG_ATMT 'TotA' /* Atom table */ extern ULONG NtGlobalFlag; @@ -38,7 +38,7 @@ NULL, POOL_COLD_ALLOCATION, sizeof(RTL_RANGE_ENTRY), - TAG('R', 'R', 'l', 'e'), + 'elRR', 16); } @@ -76,9 +76,9 @@ } -#define TAG_USTR TAG('U', 'S', 'T', 'R') -#define TAG_ASTR TAG('A', 'S', 'T', 'R') -#define TAG_OSTR TAG('O', 'S', 'T', 'R') +#define TAG_USTR 'RTSU' +#define TAG_ASTR 'RTSA' +#define TAG_OSTR 'RTSO' VOID NTAPI RtlpFreeMemory(PVOID Mem, Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=42… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Aug 24 20:19:53 2009 @@ -287,7 +287,7 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uLength, - TAG('T', 'O', 'K', 'u')); + 'uKOT'); EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; @@ -314,7 +314,7 @@ AccessToken->Privileges = (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uLength, - TAG('T', 'O', 'K', 'p')); + 'pKOT'); for (i = 0; i < AccessToken->PrivilegeCount; i++) { @@ -329,7 +329,7 @@ AccessToken->DefaultDacl = (PACL) ExAllocatePoolWithTag(PagedPool, Token->DefaultDacl->AclSize, - TAG('T', 'O', 'K', 'd')); + 'kDOT'); memcpy(AccessToken->DefaultDacl, Token->DefaultDacl, Token->DefaultDacl->AclSize); @@ -589,7 +589,7 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uSize, - TAG('T', 'O', 'K', 'u')); + 'uKOT'); SidArea = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; i = 0; @@ -621,7 +621,7 @@ AccessToken->Privileges = (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uSize, - TAG('T', 'O', 'K', 'p')); + 'pKOT'); i = 0; AccessToken->Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT|SE_PRIVILEGE_ENABLED; @@ -700,7 +700,7 @@ AccessToken->DefaultDacl = (PACL) ExAllocatePoolWithTag(PagedPool, uSize, - TAG('T', 'O', 'K', 'd')); + 'kDOT'); Status = RtlCreateAcl(AccessToken->DefaultDacl, uSize, ACL_REVISION); if ( NT_SUCCESS(Status) ) { @@ -2079,7 +2079,7 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uLength, - TAG('T', 'O', 'K', 'u')); + 'uKOT'); EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; @@ -2115,7 +2115,7 @@ AccessToken->Privileges = (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uLength, - TAG('T', 'O', 'K', 'p')); + 'pKOT'); if (PreviousMode != KernelMode) { @@ -2144,7 +2144,7 @@ AccessToken->DefaultDacl = (PACL) ExAllocatePoolWithTag(PagedPool, TokenDefaultDacl->DefaultDacl->AclSize, - TAG('T', 'O', 'K', 'd')); + 'kDOT'); memcpy(AccessToken->DefaultDacl, TokenDefaultDacl->DefaultDacl, TokenDefaultDacl->DefaultDacl->AclSize);

1 0

[fireball] 42919: - Fix a typo in the assert which made a lot of false positives, e.g. when running taskmgr.
by fireball＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: fireball Date: Mon Aug 24 20:09:56 2009 New Revision: 42919 URL: http://svn.reactos.org/svn/reactos?rev=42919&view=rev Log: - Fix a typo in the assert which made a lot of false positives, e.g. when running taskmgr. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/main.c [iso-8859-1] Mon Aug 24 20:09:56 2009 @@ -190,7 +190,7 @@ /* set the reply data pointer directly (will be freed by request code) */ void set_reply_data_ptr( void *req, void *data, data_size_t size ) { - ASSERT( size < get_reply_max_size(req)); + ASSERT( size <= get_reply_max_size(req)); /* Just save them */ ReplySize = size;

1 0

[sginsberg] 42918: - Deprecate TAG() in rostests
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: sginsberg Date: Mon Aug 24 19:41:36 2009 New Revision: 42918 URL: http://svn.reactos.org/svn/reactos?rev=42918&view=rev Log: - Deprecate TAG() in rostests Modified: trunk/rostests/drivers/kmtest/ntos_pools.c trunk/rostests/tests/pseh2/psehtest.c trunk/rostests/win32/win32k/tests/eng-mem-1.c Modified: trunk/rostests/drivers/kmtest/ntos_pools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_pools… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_pools.c [iso-8859-1] Mon Aug 24 19:41:36 2009 @@ -30,7 +30,7 @@ //#define NDEBUG #include "debug.h" -#define TAG_POOLTEST TAG('P','t','s','t') +#define TAG_POOLTEST 'tstP' /* PRIVATE FUNCTIONS ***********************************************************/ Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Mon Aug 24 19:41:36 2009 @@ -778,6 +778,12 @@ _SEH2_END; return ret == return_positive(); +} + +DEFINE_TEST(test_continue_execution_13) +{ + /* XXX */ + return 1; } //}}} @@ -2573,6 +2579,8 @@ USE_TEST(test_execute_handler_12), USE_TEST(test_continue_execution_12), + USE_TEST(test_continue_execution_13), + USE_TEST(test_leave_1), USE_TEST(test_leave_2), USE_TEST(test_leave_3), Modified: trunk/rostests/win32/win32k/tests/eng-mem-1.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/win32k/tests/eng-me… ============================================================================== --- trunk/rostests/win32/win32k/tests/eng-mem-1.c [iso-8859-1] (original) +++ trunk/rostests/win32/win32k/tests/eng-mem-1.c [iso-8859-1] Mon Aug 24 19:41:36 2009 @@ -14,14 +14,14 @@ /* Allocate memory with EngAllocMem */ pmem1 = 0; AllocSize1 = 1024; - AllocTag1 = TAG('D','x','y','z'); + AllocTag1 = 'zyxD'; pmem1 = EngAllocMem(FL_ZERO_MEMORY, AllocSize1, AllocTag1); _AssertNotEqualValue(pmem1, NULL); /* Allocate memory with EngAllocMem */ pmem2 = 0; AllocSize2 = 1024; - AllocTag2 = TAG('D','x','y','z'); + AllocTag2 = 'zyxD'; pmem2 = EngAllocUserMem(AllocSize2, AllocTag2); _AssertNotEqualValue(pmem1, NULL);

1 0

[sginsberg] 42917: - Missed these in 42915
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: sginsberg Date: Mon Aug 24 19:38:50 2009 New Revision: 42917 URL: http://svn.reactos.org/svn/reactos?rev=42917&view=rev Log: - Missed these in 42915 Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/usb/usbhub/usbhub.h trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Mon Aug 24 19:38:50 2009 @@ -116,7 +116,7 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define FAT_NTC_VCB (USHORT) TAG('F', 'V', 0, 0) +#define FAT_NTC_VCB (USHORT) '00VF' /* Volume Control Block */ typedef struct _VCB Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Mon Aug 24 19:38:50 2009 @@ -6,7 +6,7 @@ #include "../miniport/usb_wrapper.h" #include "../usbport/hub.h" -#define USB_HUB_TAG TAG('u','s','b','h') +#define USB_HUB_TAG 'hbsu' typedef struct _HUB_DEVICE_EXTENSION { Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Mon Aug 24 19:38:50 2009 @@ -4,7 +4,7 @@ #include <initguid.h> #include <debug.h> -#define USB_STOR_TAG TAG('u','s','b','s') +#define USB_STOR_TAG 'sbsu' #define USB_MAXCHILDREN (16) NTSTATUS NTAPI

1 0

[sginsberg] 42916: - Actually commit prntfont.h change (leftover from 42915)
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: sginsberg Date: Mon Aug 24 19:36:23 2009 New Revision: 42916 URL: http://svn.reactos.org/svn/reactos?rev=42916&view=rev Log: - Actually commit prntfont.h change (leftover from 42915) Modified: trunk/reactos/include/ddk/prntfont.h Modified: trunk/reactos/include/ddk/prntfont.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/prntfont.h?rev… ============================================================================== --- trunk/reactos/include/ddk/prntfont.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/prntfont.h [iso-8859-1] Mon Aug 24 19:36:23 2009 @@ -71,11 +71,11 @@ #define CC_SJIS -17 #define CC_WANSUNG -18 -#define UFF_FILE_MAGIC TAG('1','F','F','U') +#define UFF_FILE_MAGIC 'UFF1' #define UFF_VERSION_NUMBER 0x10001 #define FONT_DIR_SORTED 1 -#define FONT_REC_SIG TAG('C','E','R','F') -#define WINNT_INSTALLER_SIG TAG('I','F','T','N') +#define FONT_REC_SIG 'CERF' +#define WINNT_INSTALLER_SIG 'IFTN' #define FONT_FL_UFM 0x0001 #define FONT_FL_IFI 0x0002 @@ -86,11 +86,11 @@ #define FONT_FL_GLYPHSET_RLE 0x0040 #define FONT_FL_RESERVED 0x8000 -#define DATA_UFM_SIG TAG('M','F','U','D') -#define DATA_IFI_SIG TAG('I','F','I','D') -#define DATA_GTT_SIG TAG('T','T','G','D') -#define DATA_CTT_SIG TAG('T','T','C','D') -#define DATA_VAR_SIG TAG('R','A','V','D') +#define DATA_UFM_SIG 'MFUD' +#define DATA_IFI_SIG 'IFID' +#define DATA_GTT_SIG 'TTGD' +#define DATA_CTT_SIG 'TTCD' +#define DATA_VAR_SIG 'RAVD' #define FG_CANCHANGE 128 #define WM_FI_FILENAME 900

1 0

[sginsberg] 42915: - Start deprecating TAG() - Fix inverted tags in prntfont.h, stdunk.h and win32k/objects/font.c
by sginsberg＠svn.reactos.org 24 Aug '09

24 Aug '09

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.… ============================================================================== --- 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=… ============================================================================== --- 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/c… ============================================================================== --- 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/i… ============================================================================== --- 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/fastfa… ============================================================================== --- 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/fastfa… ============================================================================== --- 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/fastfa… ============================================================================== --- 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/mu… ============================================================================== --- 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/d… ============================================================================== --- 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/d… ============================================================================== --- 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/f… ============================================================================== --- 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/m… ============================================================================== --- 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/n… ============================================================================== --- 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/n… ============================================================================== --- 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/i80… ============================================================================== --- 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/key… ============================================================================== --- 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/kbd… ============================================================================== --- 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/mou… ============================================================================== --- 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/ser… ============================================================================== --- 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/s… ============================================================================== --- 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/p… ============================================================================== --- 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/inclu… ============================================================================== --- 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/… ============================================================================== --- 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/incl… ============================================================================== --- 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/incl… ============================================================================== --- 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/ser… ============================================================================== --- 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/seri… ============================================================================== --- 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?… ============================================================================== --- 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/clas… ============================================================================== --- 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/ramd… ============================================================================== --- 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/s… ============================================================================== --- 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/fra… ============================================================================== --- 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/fra… ============================================================================== --- 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/ro… ============================================================================== --- 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/vid… ============================================================================== --- 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/vid… ============================================================================== --- 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/… ============================================================================== --- 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?r… ============================================================================== --- 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?r… ============================================================================== --- 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?r… ============================================================================== --- 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?r… ============================================================================== --- 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=4… ============================================================================== --- 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=4… ============================================================================== --- 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?re… ============================================================================== --- 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?re… ============================================================================== --- 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.… ============================================================================== --- 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/mem… ============================================================================== --- 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/nei… ============================================================================== --- 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/rou… ============================================================================== --- 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/t… ============================================================================== --- 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/t… ============================================================================== --- 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/vf… ============================================================================== --- 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=42… ============================================================================== --- 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=429… ============================================================================== --- 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=429… ============================================================================== --- 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&r… ============================================================================== --- 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&r1… ============================================================================== --- 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/en… ============================================================================== --- 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/in… ============================================================================== --- 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/in… ============================================================================== --- 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/ma… ============================================================================== --- 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/nt… ============================================================================== --- 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/ob… ============================================================================== --- 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/ob… ============================================================================== --- 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;

1 0

[fireball] 42914: - Update zorder when switching focus from one window to another, and when a windows becomes visible. Not quite there yet - window's contents is not being repainted if needed, but switching between windows is much better now. - Remove unneeded magic from NTDRV.
by fireball＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: fireball Date: Mon Aug 24 18:47:13 2009 New Revision: 42914 URL: http://svn.reactos.org/svn/reactos?rev=42914&view=rev Log: - Update zorder when switching focus from one window to another, and when a windows becomes visible. Not quite there yet - window's contents is not being repainted if needed, but switching between windows is much better now. - Remove unneeded magic from NTDRV. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Mon Aug 24 18:47:13 2009 @@ -708,12 +708,25 @@ void CDECL RosDrv_SetCapture( HWND hwnd, UINT flags ) { - UNIMPLEMENTED; + if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; + + if (hwnd) + { + /* Capturing */ + FIXME("Capture set for hwnd %x\n", hwnd); + } + else + { + FIXME("Capture released\n"); + } } void CDECL RosDrv_SetFocus( HWND hwnd ) { - UNIMPLEMENTED; + RECT rc; + //UNIMPLEMENTED; + GetWindowRect(hwnd, &rc); + RosDrv_UpdateZOrder(hwnd, &rc); } void CDECL RosDrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) @@ -774,19 +787,10 @@ UINT CDECL RosDrv_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) { - /*int x, y; - unsigned int width, height;*/ - DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); - - if (style & WS_MINIMIZE) return swp; - if (IsRectEmpty( rect )) return swp; - - /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */ - TRACE( "win %p cmd %d at %s flags %08x\n", hwnd, cmd, wine_dbgstr_rect(rect), swp ); - return swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); + return swp; } LRESULT CDECL RosDrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam )

1 0

[janderwald] 42913: - Check that all pins have been closed when the last filter reference is gone - Fix freeing of stream data (hacked atm) - Implement retrieving of all property items for PinWaveCyclic
by janderwald＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: janderwald Date: Mon Aug 24 15:00:14 2009 New Revision: 42913 URL: http://svn.reactos.org/svn/reactos?rev=42913&view=rev Log: - Check that all pins have been closed when the last filter reference is gone - Fix freeing of stream data (hacked atm) - Implement retrieving of all property items for PinWaveCyclic Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -235,16 +235,16 @@ NTSTATUS Status = STATUS_SUCCESS; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; - for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) - { - /* all pins should have been closed by now */ - ASSERT(This->Pins[Index] == NULL); - } - DPRINT("IPortFilterWaveCyclic_fnClose ref %u\n", This->ref); if (This->ref == 1) { + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + /* all pins should have been closed by now */ + ASSERT(This->Pins[Index] == NULL); + } + /* release reference to port */ This->SubDevice->lpVtbl->Release(This->SubDevice); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -73,6 +73,7 @@ const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSPROPTYPESETID_General = {0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID IID_IAllocatorMXF = {0xa5f0d62cL, 0xb30f, 0x11d2, {0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}}; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -300,11 +300,12 @@ */ This->Irp->IoStatus.Information = StreamHeader->FrameExtent; - /* free stream data, no tag as wdmaud.drv does it atm */ - //ExFreePool(StreamHeader->Data); - - /* free stream header, no tag as wdmaud.drv allocates it atm */ - //ExFreePool(StreamHeader); + if (This->Irp->RequestorMode != KernelMode) + { + /* HACK - WDMAUD should pass PKSSTREAM_HEADERs */ + ExFreePool(StreamHeader->Data); + ExFreePool(StreamHeader); + } /* complete the request */ IoCompleteRequest(This->Irp, IO_SOUND_INCREMENT); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -463,6 +463,34 @@ } Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + if (IsEqualGUIDAligned(&Property->Set, &GUID_NULL)) + { + if (Property->Flags & KSPROPERTY_TYPE_SETSUPPORT) + { + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GUID)) + { + /* buffer too small */ + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + Irp->IoStatus.Information = sizeof(GUID); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_BUFFER_OVERFLOW; + } + /* FIXME copy guids + * KSPROPSETID_Audio when available + * KSPROPSETID_Sysaudio_Pin + */ + RtlMoveMemory(Irp->UserBuffer, &KSPROPSETID_Connection, sizeof(GUID)); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(GUID); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; + } + } + if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Connection)) { @@ -1041,6 +1069,7 @@ KeBugCheck(0); } + Status = This->Miniport->lpVtbl->NewStream(This->Miniport, &This->Stream, NULL, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Mon Aug 24 15:00:14 2009 @@ -15,6 +15,7 @@ IN PKSPROPERTY Property, IN ULONG InputBufferLength, IN ULONG OutputBufferLength, + OUT PVOID OutputBuffer, OUT PFNKSHANDLER *PropertyHandler); NTSTATUS @@ -237,7 +238,7 @@ } /* property handler is used to verify input parameters */ - Status = FindPropertyHandler(IoStatus, Descriptor, Property, PropertyLength, DataLength, &PropertyHandler); + Status = FindPropertyHandler(IoStatus, Descriptor, Property, PropertyLength, DataLength, Data, &PropertyHandler); if (!NT_SUCCESS(Status)) { DPRINT("FindPropertyHandler failed with %x\n", Status); @@ -368,9 +369,12 @@ IN PKSPROPERTY Property, IN ULONG InputBufferLength, IN ULONG OutputBufferLength, + OUT PVOID OutputBuffer, OUT PFNKSHANDLER *PropertyHandler) { ULONG Index, ItemIndex; + PULONG Flags; + PKSPROPERTY_DESCRIPTION Description; for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) { @@ -385,6 +389,48 @@ if (Property->Flags & KSPROPERTY_TYPE_GET) *PropertyHandler = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].GetPropertyHandler; + + if (Property->Flags & KSPROPERTY_TYPE_BASICSUPPORT) + { + if (sizeof(ULONG) > OutputBufferLength) + { + /* too small buffer */ + return STATUS_INVALID_PARAMETER; + } + + /* get output buffer */ + Flags = (PULONG)OutputBuffer; + + /* clear flags */ + *Flags = KSPROPERTY_TYPE_BASICSUPPORT; + + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].GetSupported) + *Flags |= KSPROPERTY_TYPE_GET; + + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].SetSupported) + *Flags |= KSPROPERTY_TYPE_SET; + + IoStatus->Information = sizeof(ULONG); + + if (OutputBufferLength >= sizeof(KSPROPERTY_DESCRIPTION)) + { + /* get output buffer */ + Description = (PKSPROPERTY_DESCRIPTION)OutputBuffer; + + /* store result */ + Description->DescriptionSize = sizeof(KSPROPERTY_DESCRIPTION); + Description->PropTypeSet.Set = KSPROPTYPESETID_General; + Description->PropTypeSet.Id = 0; + Description->PropTypeSet.Flags = 0; + Description->MembersListCount = 0; + Description->Reserved = 0; + + IoStatus->Information = sizeof(KSPROPERTY_DESCRIPTION); + } + + return STATUS_SUCCESS; + } + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) { @@ -536,14 +582,14 @@ } } - Status = FindPropertyHandler(&Irp->IoStatus, Descriptor, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &PropertyHandler); - if (PropertyHandler) + Status = FindPropertyHandler(&Irp->IoStatus, Descriptor, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Irp->UserBuffer, &PropertyHandler); + if (NT_SUCCESS(Status) && PropertyHandler) { KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PVOID)Descriptor; DPRINT("Calling property handler %p\n", PropertyHandler); Status = PropertyHandler(Irp, Property, Irp->UserBuffer); } - else + else if (!NT_SUCCESS(Status)) { RtlStringFromGUID(&Property->Set, &GuidString); DPRINT1("Unhandeled property: Set %S Id %u Flags %x InputLength %u OutputLength %u\n", GuidString.Buffer, Property->Id, Property->Flags, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength);

1 0

[spetreolle] 42912: temporarily disable kernel32:pipe tests. the testing process seems to go further if this test crashes, looking at testman output.
by spetreolle＠svn.reactos.org 24 Aug '09

24 Aug '09

Author: spetreolle Date: Mon Aug 24 14:57:34 2009 New Revision: 42912 URL: http://svn.reactos.org/svn/reactos?rev=42912&view=rev Log: temporarily disable kernel32:pipe tests. the testing process seems to go further if this test crashes, looking at testman output. Modified: trunk/rostests/winetests/kernel32/testlist.c Modified: trunk/rostests/winetests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/testli… ============================================================================== --- trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] Mon Aug 24 14:57:34 2009 @@ -64,7 +64,7 @@ { "module", func_module }, { "mailslot", func_mailslot }, { "path", func_path }, - { "pipe", func_pipe }, + //{ "pipe", func_pipe }, { "process", func_process }, { "profile", func_profile }, { "resource", func_resource },

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs