From bcd314bf3fea79b0c81e9f43c81c51e61bfc8c9d Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 17 Sep 2017 12:33:49 +0000
Subject: [PATCH] [DBGHELP] Sync with Wine Staging 2.16. CORE-13762

00e27186 dbghelp: Silence a noisy FIXME.

svn path=/trunk/; revision=75868
---
 reactos/dll/win32/dbghelp/cpu_arm.c | 13 +++++++++++++
 reactos/dll/win32/dbghelp/dwarf.c   |  2 +-
 reactos/media/doc/README.WINE       |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/win32/dbghelp/cpu_arm.c b/reactos/dll/win32/dbghelp/cpu_arm.c
index 190b3dd41d5..5aae67d34c4 100644
--- a/reactos/dll/win32/dbghelp/cpu_arm.c
+++ b/reactos/dll/win32/dbghelp/cpu_arm.c
@@ -33,7 +33,11 @@ static BOOL arm_get_addr(HANDLE hThread, const CONTEXT* ctx,
 #ifdef __arm__
     case cpu_addr_pc:    addr->Offset = ctx->Pc; return TRUE;
     case cpu_addr_stack: addr->Offset = ctx->Sp; return TRUE;
+#ifdef __REACTOS__
     case cpu_addr_frame: addr->Offset = ctx->R11; return TRUE;
+#else
+    case cpu_addr_frame: addr->Offset = ctx->Fp; return TRUE;
+#endif
 #endif
     default: addr->Mode = -1;
         return FALSE;
@@ -116,7 +120,11 @@ static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CON
     /* set frame information */
     frame->AddrStack.Offset = context->Sp;
     frame->AddrReturn.Offset = context->Lr;
+#ifdef __REACTOS__
     frame->AddrFrame.Offset = context->R11;
+#else
+    frame->AddrFrame.Offset = context->Fp;
+#endif
     frame->AddrPC.Offset = context->Pc;
 
     frame->Far = TRUE;
@@ -169,8 +177,13 @@ static void* arm_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size)
     case CV_ARM_R0 +  8: *size = sizeof(ctx->R8); return &ctx->R8;
     case CV_ARM_R0 +  9: *size = sizeof(ctx->R9); return &ctx->R9;
     case CV_ARM_R0 + 10: *size = sizeof(ctx->R10); return &ctx->R10;
+#ifdef __REACTOS__
     case CV_ARM_R0 + 11: *size = sizeof(ctx->R11); return &ctx->R11;
     case CV_ARM_R0 + 12: *size = sizeof(ctx->R12); return &ctx->R12;
+#else
+    case CV_ARM_R0 + 11: *size = sizeof(ctx->Fp); return &ctx->Fp;
+    case CV_ARM_R0 + 12: *size = sizeof(ctx->Ip); return &ctx->Ip;
+#endif
 
     case CV_ARM_SP: *size = sizeof(ctx->Sp); return &ctx->Sp;
     case CV_ARM_LR: *size = sizeof(ctx->Lr); return &ctx->Lr;
diff --git a/reactos/dll/win32/dbghelp/dwarf.c b/reactos/dll/win32/dbghelp/dwarf.c
index b8a5ec5b367..7b338d17509 100644
--- a/reactos/dll/win32/dbghelp/dwarf.c
+++ b/reactos/dll/win32/dbghelp/dwarf.c
@@ -1790,7 +1790,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm,
 
     if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc))
     {
-        FIXME("no range\n");
+        WARN("no range\n");
         return;
     }
 
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index b54781ea247..6183f11e779 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -63,7 +63,7 @@ reactos/dll/win32/cryptdlg            # Synced to WineStaging-2.9
 reactos/dll/win32/cryptdll            # Synced to WineStaging-2.9
 reactos/dll/win32/cryptnet            # Synced to WineStaging-2.9
 reactos/dll/win32/cryptui             # Synced to WineStaging-2.16
-reactos/dll/win32/dbghelp             # Synced to WineStaging-2.9
+reactos/dll/win32/dbghelp             # Synced to WineStaging-2.16
 reactos/dll/win32/dciman32            # Synced to WineStaging-2.9
 reactos/dll/win32/faultrep            # Synced to WineStaging-2.9
 reactos/dll/win32/fontsub             # Synced to WineStaging-2.9