[DBGHELP]

Fix 64 bit compilation. "Should be sent to wine"(tm)

svn path=/trunk/; revision=56259

diff --git a/reactos/dll/win32/dbghelp/cpu_x86_64.c b/reactos/dll/win32/dbghelp/cpu_x86_64.c
index 95570b6..a2b3e18 100644 (file)
--- a/reactos/dll/win32/dbghelp/cpu_x86_64.c
+++ b/reactos/dll/win32/dbghelp/cpu_x86_64.c
@@ -281,10 +281,10 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc)
     if ((op0 & 0xf8) == 0x48)
     {
         if (!sw_read_mem(csw, pc + 1, &op1, 1)) return FALSE;
+        if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
         switch (op1)
         {
         case 0x81: /* add $nnnn,%rsp */
-            if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
             if (op0 == 0x48 && op2 == 0xc4)
             {
                 pc += 7;

diff --git a/reactos/dll/win32/dbghelp/dbghelp_ros.diff b/reactos/dll/win32/dbghelp/dbghelp_ros.diff
index 3392311..b5b9671 100644 (file)
--- a/reactos/dll/win32/dbghelp/dbghelp_ros.diff
+++ b/reactos/dll/win32/dbghelp/dbghelp_ros.diff
@@ -3,9 +3,9 @@ Index: stabs.c
 --- stabs.c    (revision 35085)
 +++ stabs.c    (working copy)
 @@ -64,6 +64,8 @@
- 
+
  WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs);
- 
+
 +#define strtoull _strtoui64
 +
  /* Masks for n_type field */
@@ -16,11 +16,27 @@ Index: cpu_sparc.c
 --- cpu_sparc.c        (revision 35085)
 +++ cpu_sparc.c        (working copy)
 @@ -29,6 +29,8 @@
- 
+
  WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
- 
+
 +#define IMAGE_FILE_MACHINE_SPARC   0x2000
 +
  static unsigned sparc_get_addr(HANDLE hThread, const CONTEXT* ctx,
                               enum cpu_addr ca, ADDRESS64* addr)
  {
+Index: cpu_x86_64.c
+===================================================================
+--- cpu_x86_64.c       (Revision 56237)
++++ cpu_x86_64.c       (Arbeitskopie)
+@@ -281,10 +281,10 @@
+     if ((op0 & 0xf8) == 0x48)
+     {
+         if (!sw_read_mem(csw, pc + 1, &op1, 1)) return FALSE;
++        if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
+         switch (op1)
+         {
+         case 0x81: /* add $nnnn,%rsp */
+-            if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
+             if (op0 == 0x48 && op2 == 0xc4)
+             {
+                 pc += 7;