[ros-diffs] [akhaldi] 75868: [DBGHELP] Sync with Wine Staging 2.16. CORE-13762 00e27186 dbghelp: Silence a noisy FIXME.

Author: akhaldi
Date: Sun Sep 17 12:33:49 2017
New Revision: 75868

URL: http://svn.reactos.org/svn/reactos?rev=75868&view=rev
Log:
[DBGHELP] Sync with Wine Staging 2.16. CORE-13762

00e27186 dbghelp: Silence a noisy FIXME.

Modified:
    trunk/reactos/dll/win32/dbghelp/cpu_arm.c
    trunk/reactos/dll/win32/dbghelp/dwarf.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm.…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/cpu_arm.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/cpu_arm.c	[iso-8859-1] Sun Sep 17 12:33:49 2017
@@ -33,7 +33,11 @@
 #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 @@
     /* 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 @@
     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;

Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/dwarf.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/dwarf.c	[iso-8859-1] Sun Sep 17 12:33:49 2017
@@ -1790,7 +1790,7 @@
 
     if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc))
     {
-        FIXME("no range\n");
+        WARN("no range\n");
         return;
     }
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Sep 17 12:33:49 2017
@@ -63,7 +63,7 @@
 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