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

[Zebediah Figura]

From: Zebediah Figura

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

Signed-off-by: Zebediah Figura 
---
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;

[PATCH 2/2] ntdll: Handle UWOP_EPILOG directives in x86_64 unwind info.

[Zebediah Figura]

From: Zebediah Figura

Signed-off-by: Zebediah Figura 
---
 dlls/ntdll/signal_x86_64.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index cc349958e51..11795e562db 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -396,6 +396,7 @@ struct UNWIND_INFO
 #define UWOP_SET_FPREG       3
 #define UWOP_SAVE_NONVOL     4
 #define UWOP_SAVE_NONVOL_FAR 5
+#define UWOP_EPILOG          6
 #define UWOP_SAVE_XMM128     8
 #define UWOP_SAVE_XMM128_FAR 9
 #define UWOP_PUSH_MACHFRAME  10
@@ -484,6 +485,19 @@ static void dump_unwind_info( ULONG64 base, RUNTIME_FUNCTION *function )
             case UWOP_PUSH_MACHFRAME:
                 TRACE( "PUSH_MACHFRAME %u\n", info->opcodes[i].info );
                 break;
+            case UWOP_EPILOG:
+                if (info->version == 2)
+                {
+                    unsigned int offset;
+                    if (info->opcodes[i].info)
+                        offset = info->opcodes[i].offset;
+                    else
+                        offset = (info->opcodes[i+1].info << 8) + info->opcodes[i+1].offset;
+                    TRACE("epilog %p-%p\n", (char *)base + function->EndAddress - offset,
+                            (char *)base + function->EndAddress - offset + info->opcodes[i].offset );
+                    i += 1;
+                    break;
+                }
             default:
                 FIXME( "unknown code %u\n", info->opcodes[i].code );
                 break;
@@ -3669,6 +3683,7 @@ static int get_opcode_size( struct opcode op )
         return 2 + (op.info != 0);
     case UWOP_SAVE_NONVOL:
     case UWOP_SAVE_XMM128:
+    case UWOP_EPILOG:
         return 2;
     case UWOP_SAVE_NONVOL_FAR:
     case UWOP_SAVE_XMM128_FAR:
@@ -3904,6 +3919,9 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc,
             case UWOP_PUSH_MACHFRAME:
                 FIXME( "PUSH_MACHFRAME %u\n", info->opcodes[i].info );
                 break;
+            case UWOP_EPILOG:
+                if (info->version == 2)
+                    break; /* nothing to do */
             default:
                 FIXME( "unknown code %u\n", info->opcodes[i].code );
                 break;