1 Nov
2019
1 Nov
'19
6:11 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b2f1585933da12f7a247…
commit 3b2f1585933da12f7a247f0a16003448c654a252
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Fri Nov 1 19:05:20 2019 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Fri Nov 1 19:12:27 2019 +0100
[NTOS][CLASS2][FFS][WIN32SS] Fix some pool tags so that they correctly appear in pool
dump lists.
Reminder: in the code they are defined using reverse byte order
(Windows/ReactOS are little-endian OSes).
---
drivers/filesystems/ffs/src/init.c | 8 ++++----
drivers/storage/class/class2/class2.c | 2 +-
ntoskrnl/fsrtl/filelock.c | 6 +++---
ntoskrnl/fsrtl/largemcb.c | 8 ++++----
ntoskrnl/fsrtl/notify.c | 8 ++++----
ntoskrnl/fsrtl/stackovf.c | 4 ++--
ntoskrnl/include/internal/tag.h | 2 +-
win32ss/user/ntuser/tags.h | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/filesystems/ffs/src/init.c b/drivers/filesystems/ffs/src/init.c
index df9189e6c7d..bf867a23f68 100644
--- a/drivers/filesystems/ffs/src/init.c
+++ b/drivers/filesystems/ffs/src/init.c
@@ -411,7 +411,7 @@ DriverEntry(
NULL,
0,
sizeof(FFS_IRP_CONTEXT),
- 'SFF',
+ ' SFF',
0);
ExInitializeNPagedLookasideList(&(FFSGlobal->FFSFcbLookasideList),
@@ -419,7 +419,7 @@ DriverEntry(
NULL,
0,
sizeof(FFS_FCB),
- 'SFF',
+ ' SFF',
0);
ExInitializeNPagedLookasideList(&(FFSGlobal->FFSCcbLookasideList),
@@ -427,7 +427,7 @@ DriverEntry(
NULL,
0,
sizeof(FFS_CCB),
- 'SFF',
+ ' SFF',
0);
ExInitializePagedLookasideList(&(FFSGlobal->FFSMcbLookasideList),
@@ -435,7 +435,7 @@ DriverEntry(
NULL,
0,
sizeof(FFS_MCB),
- 'SFF',
+ ' SFF',
0);
#if FFS_UNLOAD
diff --git a/drivers/storage/class/class2/class2.c
b/drivers/storage/class/class2/class2.c
index 5107c45f7ad..bf67de960fd 100644
--- a/drivers/storage/class/class2/class2.c
+++ b/drivers/storage/class/class2/class2.c
@@ -5120,7 +5120,7 @@ Return Value:
NULL,
NonPagedPoolMustSucceed,
SCSI_REQUEST_BLOCK_SIZE,
- 'ScsH',
+ 'HscS',
(USHORT)NumberElements);
}
diff --git a/ntoskrnl/fsrtl/filelock.c b/ntoskrnl/fsrtl/filelock.c
index d42e35b781a..9cb46e0d301 100644
--- a/ntoskrnl/fsrtl/filelock.c
+++ b/ntoskrnl/fsrtl/filelock.c
@@ -51,9 +51,9 @@ typedef struct _LOCK_SHARED_RANGE
}
LOCK_SHARED_RANGE, *PLOCK_SHARED_RANGE;
-#define TAG_TABLE 'LTAB'
-#define TAG_RANGE 'FSRA'
-#define TAG_FLOCK 'FLCK'
+#define TAG_TABLE 'BATL'
+#define TAG_RANGE 'ARSF'
+#define TAG_FLOCK 'KCLF'
/* PRIVATE FUNCTIONS *********************************************************/
diff --git a/ntoskrnl/fsrtl/largemcb.c b/ntoskrnl/fsrtl/largemcb.c
index 8e007660e6f..a70584b6663 100644
--- a/ntoskrnl/fsrtl/largemcb.c
+++ b/ntoskrnl/fsrtl/largemcb.c
@@ -55,7 +55,7 @@ static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG
Bytes)
{
PVOID Result;
PBASE_MCB Mcb = (PBASE_MCB)Table->TableContext;
- Result = ExAllocatePoolWithTag(Mcb->PoolType, Bytes, 'LMCB');
+ Result = ExAllocatePoolWithTag(Mcb->PoolType, Bytes, 'BCML');
DPRINT("McbMappingAllocate(%lu) => %p\n", Bytes, Result);
return Result;
}
@@ -63,7 +63,7 @@ static PVOID NTAPI McbMappingAllocate(PRTL_GENERIC_TABLE Table, CLONG
Bytes)
static VOID NTAPI McbMappingFree(PRTL_GENERIC_TABLE Table, PVOID Buffer)
{
DPRINT("McbMappingFree(%p)\n", Buffer);
- ExFreePoolWithTag(Buffer, 'LMCB');
+ ExFreePoolWithTag(Buffer, 'BCML');
}
static
@@ -429,7 +429,7 @@ FsRtlInitializeBaseMcb(IN PBASE_MCB OpaqueMcb,
{
Mcb->Mapping = ExAllocatePoolWithTag(PoolType |
POOL_RAISE_IF_ALLOCATION_FAILURE,
sizeof(LARGE_MCB_MAPPING),
- 'FSBC');
+ 'CBSF');
}
Mcb->PoolType = PoolType;
@@ -1041,7 +1041,7 @@ FsRtlUninitializeBaseMcb(IN PBASE_MCB Mcb)
}
else
{
- ExFreePoolWithTag(Mcb->Mapping, 'FSBC');
+ ExFreePoolWithTag(Mcb->Mapping, 'CBSF');
}
}
diff --git a/ntoskrnl/fsrtl/notify.c b/ntoskrnl/fsrtl/notify.c
index 73f6e480685..e7b73771232 100644
--- a/ntoskrnl/fsrtl/notify.c
+++ b/ntoskrnl/fsrtl/notify.c
@@ -681,7 +681,7 @@ FsRtlNotifyCleanup(IN PNOTIFY_SYNC NotifySync,
}
/* Finally, free the notification, as it's not needed anymore */
- ExFreePoolWithTag(NotifyChange, 'FSrN');
+ ExFreePoolWithTag(NotifyChange, 'NrSF');
}
}
}
@@ -842,7 +842,7 @@ FsRtlNotifyFilterChangeDirectory(IN PNOTIFY_SYNC NotifySync,
/* Allocate new notification */
NotifyChange = ExAllocatePoolWithTag(PagedPool |
POOL_RAISE_IF_ALLOCATION_FAILURE,
- sizeof(NOTIFY_CHANGE), 'FSrN');
+ sizeof(NOTIFY_CHANGE), 'NrSF');
RtlZeroMemory(NotifyChange, sizeof(NOTIFY_CHANGE));
/* Set basic information */
@@ -1565,7 +1565,7 @@ FsRtlNotifyInitializeSync(IN PNOTIFY_SYNC *NotifySync)
*NotifySync = NULL;
RealNotifySync = ExAllocatePoolWithTag(NonPagedPool |
POOL_RAISE_IF_ALLOCATION_FAILURE,
- sizeof(REAL_NOTIFY_SYNC), 'FSNS');
+ sizeof(REAL_NOTIFY_SYNC), 'SNSF');
ExInitializeFastMutex(&(RealNotifySync->FastMutex));
RealNotifySync->OwningThread = 0;
RealNotifySync->OwnerCount = 0;
@@ -1640,7 +1640,7 @@ FsRtlNotifyUninitializeSync(IN PNOTIFY_SYNC *NotifySync)
{
if (*NotifySync)
{
- ExFreePoolWithTag(*NotifySync, 'FSNS');
+ ExFreePoolWithTag(*NotifySync, 'SNSF');
*NotifySync = NULL;
}
}
diff --git a/ntoskrnl/fsrtl/stackovf.c b/ntoskrnl/fsrtl/stackovf.c
index c5dda39f7ac..7462b83a733 100644
--- a/ntoskrnl/fsrtl/stackovf.c
+++ b/ntoskrnl/fsrtl/stackovf.c
@@ -61,7 +61,7 @@ FsRtlStackOverflowRead(IN PVOID Context)
/* Otherwise, free the work item */
else
{
- ExFreePoolWithTag(WorkItem, 'FSrs');
+ ExFreePoolWithTag(WorkItem, 'srSF');
}
/* Reset top level */
@@ -81,7 +81,7 @@ FsRtlpPostStackOverflow(IN PVOID Context,
PSTACK_OVERFLOW_WORK_ITEM WorkItem;
/* Try to allocate a work item */
- WorkItem = ExAllocatePoolWithTag(NonPagedPool, sizeof(STACK_OVERFLOW_WORK_ITEM),
'FSrs');
+ WorkItem = ExAllocatePoolWithTag(NonPagedPool, sizeof(STACK_OVERFLOW_WORK_ITEM),
'srSF');
if (WorkItem == NULL)
{
/* If we failed, and we are not a paging file, just raise an error */
diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h
index 4b36524ea5d..9f86c7cb623 100644
--- a/ntoskrnl/include/internal/tag.h
+++ b/ntoskrnl/include/internal/tag.h
@@ -108,7 +108,7 @@
#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 */
-#define TAG_LDR_IMPORTS 'klim' /* klim - kernel ldr imports */
+#define TAG_LDR_IMPORTS 'milk' /* klim - kernel ldr imports */
/* formerly located in lpc/connect */
#define TAG_LPC_CONNECT_MESSAGE 'CCPL'
diff --git a/win32ss/user/ntuser/tags.h b/win32ss/user/ntuser/tags.h
index a7fdfd67243..0cce9da16ff 100644
--- a/win32ss/user/ntuser/tags.h
+++ b/win32ss/user/ntuser/tags.h
@@ -15,7 +15,7 @@
#define TAG_COLORMAP 'MLOC' /* Color map */
#define TAG_GDIHNDTBLE 'bthG' /* GDI handle table */
#define TAG_DIB ' BID' /* Dib */
-#define TAG_INTERNAL_SYNC 'sync' /* Internal synchronization object. Waiting for
a better suggestion than 'sync' */
+#define TAG_INTERNAL_SYNC 'cnys' /* Internal synchronization object. Waiting for
a better suggestion than 'sync' */
/* GDI objects from the handle table */
#define TAG_DC GDITAG_HMGR_LOOKASIDE_DC_TYPE