[ros-diffs] [reactos] 03/06: [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to call_catch_block.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4df4baa391ee4f9801ffd6b50617bc1a416effbb

commit 4df4baa391ee4f9801ffd6b50617bc1a416effbb
Author:     winesync <ros-...@reactos.org>
AuthorDate: Mon Jan 9 22:08:05 2023 +0200
Commit:     Timo Kreuzer <timo.kreu...@reactos.org>
CommitDate: Sat Aug 19 23:50:52 2023 +0300

    [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to call_catch_block.
    
    Signed-off-by: Piotr Caban <pi...@codeweavers.com>
    Signed-off-by: Alexandre Julliard <julli...@winehq.org>
    
    wine commit id 48a447c5eb238d673ce5db4eeacf3ba4c1a9da90 by Piotr Caban 
<pi...@codeweavers.com>
---
 sdk/lib/crt/wine/except_i386.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c
index 5c1c9df3368..d3bcc3aaadd 100644
--- a/sdk/lib/crt/wine/except_i386.c
+++ b/sdk/lib/crt/wine/except_i386.c
@@ -110,7 +110,7 @@ typedef struct
 {
     cxx_exception_frame *frame;
     const cxx_function_descr *descr;
-    EXCEPTION_REGISTRATION_RECORD *nested_frame;
+    catch_func_nested_frame *nested_frame;
 } se_translator_ctx;
 
 typedef struct _SCOPETABLE
@@ -390,7 +390,7 @@ static DWORD catch_function_nested_handler( 
EXCEPTION_RECORD *rec, EXCEPTION_REG
 static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context,
                                      cxx_exception_frame *frame,
                                      const cxx_function_descr *descr, int 
nested_trylevel,
-                                     EXCEPTION_REGISTRATION_RECORD 
*catch_frame,
+                                     catch_func_nested_frame *catch_frame,
                                      cxx_exception_type *info )
 {
     UINT i;
@@ -440,7 +440,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, 
CONTEXT *context,
                     (void*)rec->ExceptionInformation[1]);
 
             /* unwind the stack */
-            RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 );
+            RtlUnwind( catch_frame ? &catch_frame->frame : &frame->frame, 0, 
rec, 0 );
             cxx_local_unwind( frame, descr, tryblock->start_level );
             frame->trylevel = tryblock->end_level + 1;
 
@@ -627,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, 
cxx_exception_frame* frame
 
             ctx.frame = frame;
             ctx.descr = descr;
-            ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL;
+            ctx.nested_frame = nested_frame;
             __TRY
             {
                 except_ptrs.ExceptionRecord = rec;
@@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, 
cxx_exception_frame* frame
     }
 
     call_catch_block( rec, context, frame, descr,
-            frame->trylevel, nested_frame ? &nested_frame->frame : NULL, 
exc_type );
+            frame->trylevel, nested_frame, exc_type );
     return ExceptionContinueSearch;
 }