Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:EX] ExUuidCreate(): Correctly fill Uuid->Data4

Browse source 
ROSTESTS-359

Co-authored-by: Nguyen Trung Khanh <nguyentrungkhanh97@gmail.com>
This commit is contained in:
Serge Gautherie 2020-09-09 03:46:56 +02:00 committed by Timo Kreuzer
parent 24833a6dde
commit 7790670dd8
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ntoskrnl/ex/uuid.c
View file

@ -42,7 +42,7 @@ LARGE_INTEGER ExpUuidLastTimeAllocated;
ULONG ExpUuidSequenceNumber = 0;
BOOLEAN ExpUuidSequenceNumberValid;
BOOLEAN ExpUuidSequenceNumberNotSaved = FALSE;
UUID_CACHED_VALUES_STRUCT ExpUuidCachedValues = {0ULL, 0xFFFFFFFF, 0, 0, { 0x80, 0x6E, 0x6F, 0x6E, 0x69, 0x63}};
UUID_CACHED_VALUES_STRUCT ExpUuidCachedValues = {0ULL, 0xFFFFFFFF, {{0, 0, {0x80, 0x6E, 0x6F, 0x6E, 0x69, 0x63}}}};
BOOLEAN ExpUuidCacheValid = FALSE;
ULONG ExpLuidIncrement = 1;
LARGE_INTEGER ExpLuid = {{0x3e9, 0x0}};
@ -400,9 +400,11 @@ ExUuidCreate(OUT UUID *Uuid)
{
Time.QuadPart = ExpUuidCachedValues.Time;
RtlCopyMemory(&Uuid->Data4[0],
&ExpUuidCachedValues.NodeId[0],
SEED_BUFFER_SIZE);
C_ASSERT(sizeof(ExpUuidCachedValues.GuidInit) == sizeof(Uuid->Data4));
RtlCopyMemory(Uuid->Data4,
ExpUuidCachedValues.GuidInit,
sizeof(Uuid->Data4));
Valid = ExpUuidCacheValid;
AllocatedCount = InterlockedDecrement(&ExpUuidCachedValues.AllocatedCount);
}

13
ntoskrnl/include/internal/ex.h
View file

@ -171,9 +171,16 @@ typedef struct _UUID_CACHED_VALUES_STRUCT
{
ULONGLONG Time;
LONG AllocatedCount;
UCHAR ClockSeqHiAndReserved;
UCHAR ClockSeqLow;
UCHAR NodeId [ 6 ] ;
union
{
struct
{
UCHAR ClockSeqHiAndReserved;
UCHAR ClockSeqLow;
UCHAR NodeId[6 /*SEED_BUFFER_SIZE*/];
};
UCHAR GuidInit[8]; /* Match GUID.Data4 */
};
} UUID_CACHED_VALUES_STRUCT, *PUUID_CACHED_VALUES_STRUCT;
/* INITIALIZATION FUNCTIONS *************************************************/