[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 213e8a8ef338ee358461c03c1d128c14a80f1317
Author: Eric Pouech <eric.pouech at orange.fr>
Date:   Sat May 12 18:11:31 2012 +0200

    winedbg: Also recognize 'rep ret' as a valid return insn for i386 as we did for x86_64.
    (cherry picked from commit 18986ee013d856bbf26aa910128be8425ed7345e)

diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c
index d9fb67c..5dc00ed 100644
--- a/programs/winedbg/be_i386.c
+++ b/programs/winedbg/be_i386.c
@@ -354,6 +354,11 @@ static unsigned be_i386_is_function_return(const void* insn)
     BYTE ch;
 
     if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE;
+    if (ch == 0xF3) /* REP */
+    {
+        insn = (const char*)insn + 1;
+        if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE;
+    }
     return (ch == 0xC2) || (ch == 0xC3);
 }
 

-- 
Debian Wine packaging