[ros-diffs] [reactos] 03/05: [NTOS:EX] Move the C_ASSERT UUID_CACHED_VALUES_STRUCT.GuidInit to a better place, where the structure is defined.

[Hermès Bélusca-Maïto]

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

commit ce55fef1e5c98c146d187c5fa5011fd3a5cce425
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Thu Nov 5 19:03:30 2020 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Fri Nov 6 01:06:12 2020 +0100

    [NTOS:EX] Move the C_ASSERT UUID_CACHED_VALUES_STRUCT.GuidInit to a better place,
where the structure is defined.
---
 ntoskrnl/ex/uuid.c             | 1 -
 ntoskrnl/include/internal/ex.h | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ntoskrnl/ex/uuid.c b/ntoskrnl/ex/uuid.c
index b196d6e9833..07530161d29 100644
--- a/ntoskrnl/ex/uuid.c
+++ b/ntoskrnl/ex/uuid.c
@@ -394,7 +394,6 @@ ExUuidCreate(OUT UUID *Uuid)
         {
             Time.QuadPart = ExpUuidCachedValues.Time;
 
-            C_ASSERT(sizeof(ExpUuidCachedValues.GuidInit) == sizeof(Uuid->Data4));
             RtlCopyMemory(Uuid->Data4,
                           ExpUuidCachedValues.GuidInit,
                           sizeof(Uuid->Data4));
diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h
index 5ec4a8434f5..fae2026fc1c 100644
--- a/ntoskrnl/include/internal/ex.h
+++ b/ntoskrnl/include/internal/ex.h
@@ -183,6 +183,8 @@ typedef struct _UUID_CACHED_VALUES_STRUCT
     };
 } UUID_CACHED_VALUES_STRUCT, *PUUID_CACHED_VALUES_STRUCT;
 
+C_ASSERT(RTL_FIELD_SIZE(UUID_CACHED_VALUES_STRUCT, GuidInit) == RTL_FIELD_SIZE(UUID,
Data4));
+
 /* INITIALIZATION FUNCTIONS *************************************************/
 
 BOOLEAN