[reactos] 07/08: [NTOSKRNL] Use IQS_SAME instead of ICI_SQ_SAME - Ros-diffs

2 May 2021

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=207543429ba0c52dd4737…

commit 207543429ba0c52dd473719aa9dff4fb642b8cc5
Author:     George Bișoc &lt;george.bisoc(a)reactos.org&gt;
AuthorDate: Sun May 2 21:00:51 2021 +0200
Commit:     George Bișoc &lt;george.bisoc(a)reactos.org&gt;
CommitDate: Sun May 2 21:00:51 2021 +0200

    [NTOSKRNL] Use IQS_SAME instead of ICI_SQ_SAME
    
    And remove the redundant ICI_SQ_SAME macro as it's no longer needed in the
codebase.
---
 ntoskrnl/dbgk/dbgkobj.c    |  4 ++--
 ntoskrnl/ex/event.c        |  2 +-
 ntoskrnl/ex/mutant.c       |  2 +-
 ntoskrnl/ex/sem.c          |  2 +-
 ntoskrnl/ex/timer.c        |  2 +-
 ntoskrnl/io/iomgr/iocomp.c |  2 +-
 ntoskrnl/se/token.c        | 36 ++++++++++++++++++------------------
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/ntoskrnl/dbgk/dbgkobj.c b/ntoskrnl/dbgk/dbgkobj.c
index 8bc2235faea..b7ae8cfd93a 100644
--- a/ntoskrnl/dbgk/dbgkobj.c
+++ b/ntoskrnl/dbgk/dbgkobj.c
@@ -27,9 +27,9 @@ GENERIC_MAPPING DbgkDebugObjectMapping =
 static const INFORMATION_CLASS_INFO DbgkpDebugObjectInfoClass[] =
 {
     /* DebugObjectUnusedInformation */
-    ICI_SQ_SAME(sizeof(ULONG), sizeof(ULONG), 0),
+    IQS_SAME(ULONG, ULONG, 0),
     /* DebugObjectKillProcessOnExitInformation */
-    ICI_SQ_SAME(sizeof(DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION), sizeof(ULONG),
ICIF_SET),
+    IQS_SAME(DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION, ULONG, ICIF_SET),
 };
 
 /* PRIVATE FUNCTIONS *********************************************************/
diff --git a/ntoskrnl/ex/event.c b/ntoskrnl/ex/event.c
index f8ddee00ad4..0f7d6d3bbd0 100644
--- a/ntoskrnl/ex/event.c
+++ b/ntoskrnl/ex/event.c
@@ -28,7 +28,7 @@ GENERIC_MAPPING ExpEventMapping =
 static const INFORMATION_CLASS_INFO ExEventInfoClass[] =
 {
     /* EventBasicInformation */
-    ICI_SQ_SAME( sizeof(EVENT_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY),
+    IQS_SAME(EVENT_BASIC_INFORMATION, ULONG, ICIF_QUERY),
 };
 
 /* FUNCTIONS *****************************************************************/
diff --git a/ntoskrnl/ex/mutant.c b/ntoskrnl/ex/mutant.c
index de3b1d947a8..ff5772beff2 100644
--- a/ntoskrnl/ex/mutant.c
+++ b/ntoskrnl/ex/mutant.c
@@ -28,7 +28,7 @@ GENERIC_MAPPING ExpMutantMapping =
 static const INFORMATION_CLASS_INFO ExMutantInfoClass[] =
 {
      /* MutantBasicInformation */
-    ICI_SQ_SAME( sizeof(MUTANT_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY),
+    IQS_SAME(MUTANT_BASIC_INFORMATION, ULONG, ICIF_QUERY),
 };
 
 /* FUNCTIONS *****************************************************************/
diff --git a/ntoskrnl/ex/sem.c b/ntoskrnl/ex/sem.c
index 937bc614f3c..ddd79761ac0 100644
--- a/ntoskrnl/ex/sem.c
+++ b/ntoskrnl/ex/sem.c
@@ -28,7 +28,7 @@ GENERIC_MAPPING ExSemaphoreMapping =
 static const INFORMATION_CLASS_INFO ExSemaphoreInfoClass[] =
 {
      /* SemaphoreBasicInformation */
-    ICI_SQ_SAME( sizeof(SEMAPHORE_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY),
+    IQS_SAME(SEMAPHORE_BASIC_INFORMATION, ULONG, ICIF_QUERY),
 };
 
 /* FUNCTIONS *****************************************************************/
diff --git a/ntoskrnl/ex/timer.c b/ntoskrnl/ex/timer.c
index b982b2f71ea..129881dc5d9 100644
--- a/ntoskrnl/ex/timer.c
+++ b/ntoskrnl/ex/timer.c
@@ -33,7 +33,7 @@ static GENERIC_MAPPING ExpTimerMapping =
 static const INFORMATION_CLASS_INFO ExTimerInfoClass[] =
 {
     /* TimerBasicInformation */
-    ICI_SQ_SAME(sizeof(TIMER_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY),
+    IQS_SAME(TIMER_BASIC_INFORMATION, ULONG, ICIF_QUERY),
 };
 
 /* PRIVATE FUNCTIONS *********************************************************/
diff --git a/ntoskrnl/io/iomgr/iocomp.c b/ntoskrnl/io/iomgr/iocomp.c
index cc7581d9a6d..df883d476a5 100644
--- a/ntoskrnl/io/iomgr/iocomp.c
+++ b/ntoskrnl/io/iomgr/iocomp.c
@@ -28,7 +28,7 @@ GENERIC_MAPPING IopCompletionMapping =
 static const INFORMATION_CLASS_INFO IoCompletionInfoClass[] =
 {
      /* IoCompletionBasicInformation */
-    ICI_SQ_SAME(sizeof(IO_COMPLETION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY),
+    IQS_SAME(IO_COMPLETION_BASIC_INFORMATION, ULONG, ICIF_QUERY),
 };
 
 /* PRIVATE FUNCTIONS *********************************************************/
diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c
index 32842ebce99..6c1fa178643 100644
--- a/ntoskrnl/se/token.c
+++ b/ntoskrnl/se/token.c
@@ -41,42 +41,42 @@ static GENERIC_MAPPING SepTokenMapping = {
 static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = {
 
     /* Class 0 not used, blame MS! */
-    ICI_SQ_SAME( 0, 0, 0),
+    IQS_SAME(0, 0, 0),
 
     /* TokenUser */
-    ICI_SQ_SAME( sizeof(TOKEN_USER),                   sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_USER, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE |
ICIF_SET_SIZE_VARIABLE),
     /* TokenGroups */
-    ICI_SQ_SAME( sizeof(TOKEN_GROUPS),                 sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE |
ICIF_SET_SIZE_VARIABLE),
     /* TokenPrivileges */
-    ICI_SQ_SAME( sizeof(TOKEN_PRIVILEGES),             sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE |
ICIF_SET_SIZE_VARIABLE),
     /* TokenOwner */
-    ICI_SQ_SAME( sizeof(TOKEN_OWNER),                  sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_OWNER, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET |
ICIF_SET_SIZE_VARIABLE),
     /* TokenPrimaryGroup */
-    ICI_SQ_SAME( sizeof(TOKEN_PRIMARY_GROUP),          sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_PRIMARY_GROUP, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET
| ICIF_SET_SIZE_VARIABLE),
     /* TokenDefaultDacl */
-    ICI_SQ_SAME( sizeof(TOKEN_DEFAULT_DACL),           sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_DEFAULT_DACL, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET
| ICIF_SET_SIZE_VARIABLE),
     /* TokenSource */
-    ICI_SQ_SAME( sizeof(TOKEN_SOURCE),                 sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_SOURCE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE |
ICIF_SET_SIZE_VARIABLE),
     /* TokenType */
-    ICI_SQ_SAME( sizeof(TOKEN_TYPE),                   sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_TYPE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
     /* TokenImpersonationLevel */
-    ICI_SQ_SAME( sizeof(SECURITY_IMPERSONATION_LEVEL), sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE ),
+    IQS_SAME(SECURITY_IMPERSONATION_LEVEL, ULONG, ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE),
     /* TokenStatistics */
-    ICI_SQ_SAME( sizeof(TOKEN_STATISTICS),             sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_STATISTICS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE |
ICIF_SET_SIZE_VARIABLE),
     /* TokenRestrictedSids */
-    ICI_SQ_SAME( sizeof(TOKEN_GROUPS),                 sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
     /* TokenSessionId */
-    ICI_SQ_SAME( sizeof(ULONG),                        sizeof(ULONG), ICIF_QUERY |
ICIF_SET ),
+    IQS_SAME(ULONG, ULONG, ICIF_QUERY | ICIF_SET),
     /* TokenGroupsAndPrivileges */
-    ICI_SQ_SAME( sizeof(TOKEN_GROUPS_AND_PRIVILEGES),  sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_GROUPS_AND_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
     /* TokenSessionReference */
-    ICI_SQ_SAME( sizeof(ULONG),                        sizeof(ULONG), ICIF_SET |
ICIF_QUERY_SIZE_VARIABLE ),
+    IQS_SAME(ULONG, ULONG, ICIF_SET | ICIF_QUERY_SIZE_VARIABLE),
     /* TokenSandBoxInert */
-    ICI_SQ_SAME( sizeof(ULONG),                        sizeof(ULONG), ICIF_QUERY |
ICIF_QUERY_SIZE_VARIABLE ),
+    IQS_SAME(ULONG, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
     /* TokenAuditPolicy */
-    ICI_SQ_SAME( /* FIXME */0,                         sizeof(ULONG), ICIF_QUERY |
ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ),
+    IQS_SAME(/* FIXME */0, ULONG, ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE),
     /* TokenOrigin */
-    ICI_SQ_SAME( sizeof(TOKEN_ORIGIN),                 sizeof(ULONG), ICIF_QUERY |
ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ),
+    IQS_SAME(TOKEN_ORIGIN, ULONG, ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE),
 };
 
 /* FUNCTIONS *****************************************************************/


    