Improve macro usage

dmex · dmex · commit f859257d8c44 · 2019-02-17T02:19:46.000+01:00
diff --git a/phlib/filepool.c b/phlib/filepool.c
@@ -1277,7 +1277,7 @@ VOID PhFppFreeBlocks(
     RtlInitializeBitMap(&bitmap, SegmentHeader->Bitmap, PH_FP_BLOCK_COUNT);
 
     // Mark the blocks as free.
-    startIndex = (ULONG)((PCHAR)BlockHeader - (PCHAR)FirstBlock) >> Pool->BlockShift;
+    startIndex = PtrToUlong(PTR_SUB_OFFSET(BlockHeader, FirstBlock)) >> Pool->BlockShift;
     blockSpan = BlockHeader->Span;
     RtlClearBits(&bitmap, startIndex, blockSpan);
     SegmentHeader->FreeBlocks += blockSpan;
@@ -1480,7 +1480,7 @@ ULONG PhFppEncodeRva(
     _In_ PVOID Address
     )
 {
-    return (SegmentIndex << Pool->SegmentShift) + (ULONG)((PCHAR)Address - (PCHAR)FirstBlock);
+    return (SegmentIndex << Pool->SegmentShift) + PtrToUlong(PTR_SUB_OFFSET(Address, FirstBlock));
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1277,7 +1277,7 @@ VOID PhFppFreeBlocks(`
`1277`	`1277`	`RtlInitializeBitMap(&bitmap, SegmentHeader->Bitmap, PH_FP_BLOCK_COUNT);`
`1278`	`1278`
`1279`	`1279`	`// Mark the blocks as free.`
`1280`		`- startIndex = (ULONG)((PCHAR)BlockHeader - (PCHAR)FirstBlock) >> Pool->BlockShift;`
	`1280`	`+ startIndex = PtrToUlong(PTR_SUB_OFFSET(BlockHeader, FirstBlock)) >> Pool->BlockShift;`
`1281`	`1281`	`blockSpan = BlockHeader->Span;`
`1282`	`1282`	`RtlClearBits(&bitmap, startIndex, blockSpan);`
`1283`	`1283`	`SegmentHeader->FreeBlocks += blockSpan;`
`@@ -1480,7 +1480,7 @@ ULONG PhFppEncodeRva(`
`1480`	`1480`	`_In_ PVOID Address`
`1481`	`1481`	`)`
`1482`	`1482`	`{`
`1483`		`- return (SegmentIndex << Pool->SegmentShift) + (ULONG)((PCHAR)Address - (PCHAR)FirstBlock);`
	`1483`	`+ return (SegmentIndex << Pool->SegmentShift) + PtrToUlong(PTR_SUB_OFFSET(Address, FirstBlock));`
`1484`	`1484`	`}`
`1485`	`1485`
`1486`	`1486`	`/**`