June 2017 - Wine-commits - list.winehq.org

André Hentschel : ntdll: Add support for relay debugging on ARM64.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 58d527ef93c458eed1ac03234e277a4997acb944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d527ef93c458eed1ac03234… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 14 10:46:32 2017 +0200 ntdll: Add support for relay debugging on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 997de1f..db21872 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) WINE_DECLARE_DEBUG_CHANNEL(timestamp); WINE_DECLARE_DEBUG_CHANNEL(pid); @@ -594,6 +594,65 @@ static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_ { assert(0); /* should never be called */ } +#elif defined(__aarch64__) + +extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args, int flags ); +__ASM_GLOBAL_FUNC( call_entry_point, + "stp x29, x30, [SP,#-16]!\n\t" + "stp x19, x20, [SP,#-16]!\n\t" + "mov x29, SP\n\t" + "mov x19, x2\n\t" + "ldp x8, x9, [x19, #-32]\n\t" + "mov x9, x0\n\t" + "cbz w1, 2f\n\t" + "mov w10, w1\n\t" + "mov x11, x2\n\t" + "mov x12, #0\n\t" + "ldp x0, x1, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x2, x3, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x4, x5, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x6, x7, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "sub w12, w10, #8\n\t" + "lsl w12, w12, #3\n\t" + "sub SP, SP, w12, uxtw\n\t" + "tbz w12, #3, 1f\n\t" + "sub SP, SP, #8\n\t" + "1: sub w12, w12, #8\n\t" + "ldr x13, [x11, x12]\n\t" + "str x13, [SP, x12]\n\t" + "cbnz w12, 1b\n\t" + "2: blr x9\n\t" + "mov SP, x29\n\t" + "ldp x19, x20, [SP], #16\n\t" + "ldp x29, x30, [SP], #16\n\t" + "ret\n" ) + +static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ) +{ + BYTE nb_args = LOBYTE(HIWORD(idx)); + BYTE flags = HIBYTE(HIWORD(idx)); + void *func = relay_trace_entry( descr, idx, stack + 3 ); + LONGLONG ret = call_entry_point( func, nb_args, stack + 4, flags ); + relay_trace_exit( descr, idx, stack + 3, ret ); + return ret; +} + +static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_PTR *stack ) +{ + assert(0); /* should never be called */ +} #elif defined(__x86_64__) @@ -751,7 +810,7 @@ void RELAY_SetupDLL( HMODULE module ) } } -#else /* __i386__ || __x86_64__ || __arm__ */ +#else /* __i386__ || __x86_64__ || __arm__ || __aarch64__ */ FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) @@ -763,7 +822,7 @@ void RELAY_SetupDLL( HMODULE module ) { } -#endif /* __i386__ || __x86_64__ || __arm__ */ +#endif /* __i386__ || __x86_64__ || __arm__ || __aarch64__ */ /***********************************************************************/

1 0

Hans Leidekker : webservices: Add a static builtin dictionary.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 5154290ac0ee8943b0f6295c7885b3b9dd6c976d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5154290ac0ee8943b0f6295c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:26 2017 +0200 webservices: Add a static builtin dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/reader.c | 253 +---------- dlls/webservices/string.c | 767 +++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 15 +- dlls/webservices/webservices_private.h | 4 + 5 files changed, 795 insertions(+), 245 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5154290ac0ee8943b0f62…

1 0

Hans Leidekker : webservices: Support more text record types in the reader.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 14c1cd97e5e6ac9bcf0190bbef891a434b60b8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c1cd97e5e6ac9bcf0190bbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:27 2017 +0200 webservices: Support more text record types in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 334 ++++++++++++++++++++++++++++++--- dlls/webservices/webservices_private.h | 11 ++ dlls/webservices/writer.c | 20 +- 3 files changed, 330 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14c1cd97e5e6ac9bcf019…

1 0

Hans Leidekker : webservices/tests: Add a test for WsCopyNode.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: f2b399784d65ee849314cff2c0db2783e2fa8db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b399784d65ee849314cff2c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:28 2017 +0200 webservices/tests: Add a test for WsCopyNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3bf0886..03a9788 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -136,7 +136,7 @@ static void test_WsCreateWriter(void) bytes.length = 0xdeadbeef; bytes.bytes = (BYTE *)0xdeadbeef; - size = sizeof(buffers); + size = sizeof(bytes); hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( !bytes.length, "got %u\n", bytes.length ); @@ -1971,17 +1971,9 @@ static void test_WsWriteNode(void) static HRESULT set_input( WS_XML_READER *reader, const char *data, ULONG size ) { - WS_XML_READER_TEXT_ENCODING enc; - WS_XML_READER_BUFFER_INPUT input; - - enc.encoding.encodingType = WS_XML_READER_ENCODING_TYPE_TEXT; - enc.charSet = WS_CHARSET_AUTO; - - input.input.inputType = WS_XML_READER_INPUT_TYPE_BUFFER; - input.encodedData = (void *)data; - input.encodedDataSize = size; - - return WsSetInput( reader, &enc.encoding, &input.input, NULL, 0, NULL ); + WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}, WS_CHARSET_AUTO}; + WS_XML_READER_BUFFER_INPUT buf = {{WS_XML_READER_INPUT_TYPE_BUFFER}, (void *)data, size}; + return WsSetInput( reader, &text.encoding, &buf.input, NULL, 0, NULL ); } static void test_WsCopyNode(void) @@ -2090,6 +2082,20 @@ static void test_WsCopyNode(void) ok( bufs.bufferCount == 1, "got %u\n", bufs.bufferCount ); ok( bufs.buffers != NULL, "buffers not set\n" ); + /* reader positioned at BOF, single text node */ + hr = set_input( reader, "text", sizeof("text") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCopyNode( writer, reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap );

1 0

Hans Leidekker : webservices: Restore the current pointer after reading ahead in read_move_to.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 087631bbbca574e718d08f09efc451cb9c2482d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=087631bbbca574e718d08f09e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:29 2017 +0200 webservices: Restore the current pointer after reading ahead in read_move_to. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 125c3bd..cb9dd8c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2999,8 +2999,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found if (!read_end_of_data( reader )) { + struct node *saved_current = reader->current; while (reader->state != READER_STATE_EOF && (hr = read_node( reader )) == S_OK) { /* nothing */ }; if (hr != S_OK) return hr; + reader->current = saved_current; } switch (move) {

1 0

Hans Leidekker : webservices: Implement WsReadXmlBuffer.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 83bdbc1e386afe59c026c1156b77e3bc5797bbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bdbc1e386afe59c026c1156… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:30 2017 +0200 webservices: Implement WsReadXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 69 +++++++++++++ dlls/webservices/tests/reader.c | 198 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 269 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83bdbc1e386afe59c026c…

1 0

Hans Leidekker : webservices: Store buffer encoding and character set.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 1ba18219491aa5a03aceee1d8c2bfecaa7f5f4da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba18219491aa5a03aceee1d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:31 2017 +0200 webservices: Store buffer encoding and character set. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/heap.c | 9 ++++-- dlls/webservices/reader.c | 59 ++++++++++++++-------------------- dlls/webservices/webservices_private.h | 10 +++--- dlls/webservices/writer.c | 42 ++++++++++++++++-------- 4 files changed, 66 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ba18219491aa5a03acee…

1 0

Jacek Caban : wininet/tests: Fixed potential buffer overflow (coverity).
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 19cb65b156a77f0cac09ed755abea50febb2e0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb65b156a77f0cac09ed755… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 14 11:43:51 2017 +0200 wininet/tests: Fixed potential buffer overflow (coverity). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8bb925f..a3a0980 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5212,7 +5212,7 @@ static void test_redirect(int port) "Content-Length: 0\r\n" "\r\n"); - size = server_read_data(buf, sizeof(buf)); + size = server_read_data(buf, sizeof(buf) - 1); buf[size] = 0; p = strstr(buf, "\r\n"); if(p) *p = 0;

1 0

Daniel Lehman : msvcrt: Move exception rethrow handling to call_catch_block.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: ac9db1138c84dc7a0da05a69366ef5316c28b8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9db1138c84dc7a0da05a693… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:58:20 2017 +0200 msvcrt: Move exception rethrow handling to call_catch_block. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 57fce93..baacc94 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -318,7 +318,18 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, unwind_help[0] = last_level; } -static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) +static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs) +{ + EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; + + if (rec->ExceptionCode != CXX_EXCEPTION) + return EXCEPTION_CONTINUE_SEARCH; + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + +static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) { ULONG64 frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; @@ -326,13 +337,23 @@ static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); cxx_frame_info frame_info; - void *ret_addr; + void *ret_addr = NULL; TRACE("calling handler %p\n", handler); - /* FIXME: native does local_unwind here in case of exception rethrow */ __CxxRegisterExceptionObject(&prev_rec, &frame_info); - ret_addr = handler(0, frame); + __TRY + { + ret_addr = handler(0, frame); + } + __EXCEPT(cxx_rethrow_filter) + { + TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } + __ENDTRY __CxxUnregisterExceptionObject(&frame_info, FALSE); unwind_help[0] = -2; unwind_help[1] = -1; @@ -548,19 +569,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } if (!descr->tryblock_count) return ExceptionContinueSearch; - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) - { - *rec = *msvcrt_get_thread_data()->exc_record; - rec->ExceptionFlags &= ~EH_UNWINDING; - if (TRACE_ON(seh)) { - TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); - if (rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); - } - } - if (rec->ExceptionCode == CXX_EXCEPTION) { exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];

1 0

Daniel Lehman : msvcrt: Clean up registered C++ objects in handler.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: wine Branch: master Commit: 57266eec5e6e8f3f064e24fa21b7e0bd92a2f1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57266eec5e6e8f3f064e24fa2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:58:45 2017 +0200 msvcrt: Clean up registered C++ objects in handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 62 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index baacc94..fffabbb 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -110,6 +110,12 @@ typedef struct __cxx_function_descr typedef struct { + cxx_frame_info frame_info; + BOOL rethrow; +} cxx_catch_ctx; + +typedef struct +{ ULONG64 dest_frame; ULONG64 orig_frame; DISPATCHER_CONTEXT *dispatch; @@ -318,17 +324,27 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, unwind_help[0] = last_level; } -static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs) +static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) { EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; + thread_data_t *data = msvcrt_get_thread_data(); + cxx_catch_ctx *ctx = c; if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) return EXCEPTION_EXECUTE_HANDLER; + if (rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]) + ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } +static void CALLBACK cxx_catch_cleanup(BOOL normal, void *c) +{ + cxx_catch_ctx *ctx = c; + __CxxUnregisterExceptionObject(&ctx->frame_info, ctx->rethrow); +} + static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) { ULONG64 frame = rec->ExceptionInformation[1]; @@ -336,25 +352,31 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); - cxx_frame_info frame_info; + cxx_catch_ctx ctx; void *ret_addr = NULL; TRACE("calling handler %p\n", handler); - __CxxRegisterExceptionObject(&prev_rec, &frame_info); + ctx.rethrow = FALSE; + __CxxRegisterExceptionObject(&prev_rec, &ctx.frame_info); __TRY { - ret_addr = handler(0, frame); - } - __EXCEPT(cxx_rethrow_filter) - { - TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + __TRY + { + ret_addr = handler(0, frame); + } + __EXCEPT_CTX(cxx_rethrow_filter, &ctx) + { + TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + ctx.rethrow = TRUE; - RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, - prev_rec->NumberParameters, prev_rec->ExceptionInformation); + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } + __ENDTRY } - __ENDTRY - __CxxUnregisterExceptionObject(&frame_info, FALSE); + __FINALLY_CTX(cxx_catch_cleanup, &ctx) + unwind_help[0] = -2; unwind_help[1] = -1; return ret_addr; @@ -534,10 +556,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, { if (cxx_is_consolidate(rec)) { - EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; - thread_data_t *data = msvcrt_get_thread_data(); - frame_info *cur; - if (rec->ExceptionFlags & EH_TARGET_UNWIND) { const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; @@ -548,18 +566,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } else if(frame == orig_frame) cxx_local_unwind(frame, dispatch, descr, -1); - - /* FIXME: we should only unregister frames registered by call_catch_block here */ - for (cur = data->frame_info_head; cur; cur = cur->next) - { - if ((ULONG64)cur <= frame) - { - __CxxUnregisterExceptionObject((cxx_frame_info*)cur, - new_rec->ExceptionCode == CXX_EXCEPTION && - data->exc_record->ExceptionCode == CXX_EXCEPTION && - new_rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]); - } - } return ExceptionContinueSearch; }

1 0