@@ -203,22 +203,25 @@ typedef struct _HEAP_LIST_LOOKUP
203
203
PLIST_ENTRY * ListHints ;
204
204
} HEAP_LIST_LOOKUP , * PHEAP_LIST_LOOKUP ;
205
205
206
+ #define HEAP_SEGMENT_MEMBERS \
207
+ HEAP_ENTRY Entry; \
208
+ ULONG SegmentSignature; \
209
+ ULONG SegmentFlags; \
210
+ LIST_ENTRY SegmentListEntry; \
211
+ struct _HEAP *Heap; \
212
+ PVOID BaseAddress; \
213
+ ULONG NumberOfPages; \
214
+ PHEAP_ENTRY FirstEntry; \
215
+ PHEAP_ENTRY LastValidEntry; \
216
+ ULONG NumberOfUnCommittedPages; \
217
+ ULONG NumberOfUnCommittedRanges; \
218
+ USHORT SegmentAllocatorBackTraceIndex; \
219
+ USHORT Reserved; \
220
+ LIST_ENTRY UCRSegmentList
221
+
206
222
typedef struct _HEAP
207
223
{
208
- HEAP_ENTRY Entry ;
209
- ULONG SegmentSignature ;
210
- ULONG SegmentFlags ;
211
- LIST_ENTRY SegmentListEntry ;
212
- struct _HEAP * Heap ;
213
- PVOID BaseAddress ;
214
- ULONG NumberOfPages ;
215
- PHEAP_ENTRY FirstEntry ;
216
- PHEAP_ENTRY LastValidEntry ;
217
- ULONG NumberOfUnCommittedPages ;
218
- ULONG NumberOfUnCommittedRanges ;
219
- USHORT SegmentAllocatorBackTraceIndex ;
220
- USHORT Reserved ;
221
- LIST_ENTRY UCRSegmentList ;
224
+ HEAP_SEGMENT_MEMBERS ;
222
225
223
226
ULONG Flags ;
224
227
ULONG ForceFlags ;
@@ -271,20 +274,7 @@ typedef struct _HEAP
271
274
272
275
typedef struct _HEAP_SEGMENT
273
276
{
274
- HEAP_ENTRY Entry ;
275
- ULONG SegmentSignature ;
276
- ULONG SegmentFlags ;
277
- LIST_ENTRY SegmentListEntry ;
278
- PHEAP Heap ;
279
- PVOID BaseAddress ;
280
- ULONG NumberOfPages ;
281
- PHEAP_ENTRY FirstEntry ;
282
- PHEAP_ENTRY LastValidEntry ;
283
- ULONG NumberOfUnCommittedPages ;
284
- ULONG NumberOfUnCommittedRanges ;
285
- USHORT SegmentAllocatorBackTraceIndex ;
286
- USHORT Reserved ;
287
- LIST_ENTRY UCRSegmentList ;
277
+ HEAP_SEGMENT_MEMBERS ;
288
278
} HEAP_SEGMENT , * PHEAP_SEGMENT ;
289
279
290
280
typedef struct _HEAP_UCR_DESCRIPTOR
0 commit comments