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

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:01:47 UTC 2012


The following commit has been merged in the wheezy branch:
commit b3cd5fd7c594f7a461f272de7a824dd4ce64ffb8
Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Mar 30 14:42:55 2012 +0200

    ntdll: Also call the unwind handler for the target frame.
    (cherry picked from commit a777676bc48d4575a0bafb40bad1fe85d269e352)

diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 5470a59..6677fed 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -3049,7 +3049,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec
             dispatch.EstablisherFrame = new_context.Rsp;
         }
 
-        if (dispatch.EstablisherFrame == (ULONG64)end_frame) break;
+        if (context->Rsp == (ULONG64)end_frame) break;
         *context = new_context;
     }
 

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list