[PATCH 1/2] ntdll: Handle version 2 unwind info on x86_64.

Zebediah Figura zfigura at codeweavers.com
Fri Aug 16 18:31:49 CDT 2019


From: Zebediah Figura <z.figura12 at gmail.com>

It seems this is identical to version 1, but with an additional UWOP_EPILOG
opcode.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
Encountered while debugging <https://bugs.winehq.org/show_bug.cgi?id=40285>;
this doesn't help the application at all, but at least lets us get to the
unhandled exception filter instead of livelocking.

 dlls/ntdll/signal_x86_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 886d69790d0..cc349958e51 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -3840,7 +3840,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc,
         info = (struct UNWIND_INFO *)((char *)base + function->UnwindData);
         handler_data = (union handler_data *)&info->opcodes[(info->count + 1) & ~1];
 
-        if (info->version != 1)
+        if (info->version != 1 && info->version != 2)
         {
             FIXME( "unknown unwind info version %u at %p\n", info->version, info );
             return NULL;
-- 
2.20.1




More information about the wine-devel mailing list