Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-15 04:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL] Create a define for the common members of HEAP and HEAP_SEGMENT. CORE-14588

Browse source 
The code relies on these members matching up, so it's confusing for them
to be duplicated.
This commit is contained in:
Thomas Faber 2020-02-01 21:34:03 +01:00
parent 2540c3b1e8
commit dd83bcd6ad
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

46
sdk/lib/rtl/heap.h
View file

@ -203,22 +203,25 @@ typedef struct _HEAP_LIST_LOOKUP
PLIST_ENTRY *ListHints; PLIST_ENTRY *ListHints;
} HEAP_LIST_LOOKUP, *PHEAP_LIST_LOOKUP; } HEAP_LIST_LOOKUP, *PHEAP_LIST_LOOKUP;
#define HEAP_SEGMENT_MEMBERS \
HEAP_ENTRY Entry; \
ULONG SegmentSignature; \
ULONG SegmentFlags; \
LIST_ENTRY SegmentListEntry; \
struct _HEAP *Heap; \
PVOID BaseAddress; \
ULONG NumberOfPages; \
PHEAP_ENTRY FirstEntry; \
PHEAP_ENTRY LastValidEntry; \
ULONG NumberOfUnCommittedPages; \
ULONG NumberOfUnCommittedRanges; \
USHORT SegmentAllocatorBackTraceIndex; \
USHORT Reserved; \
LIST_ENTRY UCRSegmentList
typedef struct _HEAP typedef struct _HEAP
{ {
HEAP_ENTRY Entry; HEAP_SEGMENT_MEMBERS;
ULONG SegmentSignature;
ULONG SegmentFlags;
LIST_ENTRY SegmentListEntry;
struct _HEAP *Heap;
PVOID BaseAddress;
ULONG NumberOfPages;
PHEAP_ENTRY FirstEntry;
PHEAP_ENTRY LastValidEntry;
ULONG NumberOfUnCommittedPages;
ULONG NumberOfUnCommittedRanges;
USHORT SegmentAllocatorBackTraceIndex;
USHORT Reserved;
LIST_ENTRY UCRSegmentList;
ULONG Flags; ULONG Flags;
ULONG ForceFlags; ULONG ForceFlags;
@ -271,20 +274,7 @@ typedef struct _HEAP
typedef struct _HEAP_SEGMENT typedef struct _HEAP_SEGMENT
{ {
HEAP_ENTRY Entry; HEAP_SEGMENT_MEMBERS;
ULONG SegmentSignature;
ULONG SegmentFlags;
LIST_ENTRY SegmentListEntry;
PHEAP Heap;
PVOID BaseAddress;
ULONG NumberOfPages;
PHEAP_ENTRY FirstEntry;
PHEAP_ENTRY LastValidEntry;
ULONG NumberOfUnCommittedPages;
ULONG NumberOfUnCommittedRanges;
USHORT SegmentAllocatorBackTraceIndex;
USHORT Reserved;
LIST_ENTRY UCRSegmentList;
} HEAP_SEGMENT, *PHEAP_SEGMENT; } HEAP_SEGMENT, *PHEAP_SEGMENT;
typedef struct _HEAP_UCR_DESCRIPTOR typedef struct _HEAP_UCR_DESCRIPTOR