[NTOS][CLASS2][FFS][WIN32SS] Fix some pool tags so that they correctly appear in...
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 1 Nov 2019 18:05:20 +0000 (19:05 +0100)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 1 Nov 2019 18:12:27 +0000 (19:12 +0100)
Reminder: in the code they are defined using reverse byte order
(Windows/ReactOS are little-endian OSes).

drivers/filesystems/ffs/src/init.c
drivers/storage/class/class2/class2.c
ntoskrnl/fsrtl/filelock.c
ntoskrnl/fsrtl/largemcb.c
ntoskrnl/fsrtl/notify.c
ntoskrnl/fsrtl/stackovf.c
ntoskrnl/include/internal/tag.h
win32ss/user/ntuser/tags.h

index df9189e..bf867a2 100644 (file)
@@ -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
index 5107c45..bf67de9 100644 (file)
@@ -5120,7 +5120,7 @@ Return Value:
                                     NULL,
                                     NonPagedPoolMustSucceed,
                                     SCSI_REQUEST_BLOCK_SIZE,
-                                    'ScsH',
+                                    'HscS',
                                     (USHORT)NumberElements);
 
 }
index d42e35b..9cb46e0 100644 (file)
@@ -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 *********************************************************/
 
index 8e00766..a70584b 100644 (file)
@@ -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');
     }
 }
 
index 73f6e48..e7b7377 100644 (file)
@@ -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;
     }
 }
index c5dda39..7462b83 100644 (file)
@@ -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 */
index 4b36524..9f86c7c 100644 (file)
 #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'
index a7fdfd6..0cce9da 100644 (file)
@@ -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