Brendan Shanks : ntdll: Pad HEAP structure so 'flags' offset matches recent Windows.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: f1bb5e6a5d09a4c1990f4cd2f95b856c24852f60
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f1bb5e6a5d09a4c1990f4cd2f...

Author: Brendan Shanks <bshanks(a)codeweavers.com>
Date:   Fri Aug  7 11:40:52 2020 -0700

ntdll: Pad HEAP structure so 'flags' offset matches recent Windows.

Needed for Red Dead Redemption 2 to pass anti-debugger checks, it
accesses 'flags' and 'force_flags' at a fixed offset of the ProcessHeap.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49666
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit fd80e0300cbec55fe637714d3b02128616cdd570)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/ntdll/heap.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index d7232b47d66..2d6b6d3aac0 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -151,7 +151,13 @@ typedef struct tagSUBHEAP
 typedef struct tagHEAP
 {
     DWORD_PTR        unknown1[2];
-    DWORD            unknown2;
+    DWORD            unknown2[2];
+    DWORD_PTR        unknown3[4];
+    DWORD            unknown4;
+    DWORD_PTR        unknown5[2];
+    DWORD            unknown6[3];
+    DWORD_PTR        unknown7[2];
+    /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */
     DWORD            flags;         /* Heap flags */
     DWORD            force_flags;   /* Forced heap flags for debugging */
     SUBHEAP          subheap;       /* First sub-heap */