wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Alexandre Julliard : vssapi: Undefine __thiscall before redefining it.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 71d9791e1c85a35b2f96f1eb4ccf04487794046f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d9791e1c85a35b2f96f1eb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 16:09:41 2016 +0900 vssapi: Undefine __thiscall before redefining it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vssapi/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 133f4c5..9234544 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func

1 0

Sebastian Lackner : setupapi: Fix parsing of inf files containing garbage at the beginning of the file.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: e8aa851fe438a2c5e254879fe6170df7866b98c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8aa851fe438a2c5e254879fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 05:34:14 2016 +0100 setupapi: Fix parsing of inf files containing garbage at the beginning of the file. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 14 +++++++++++++- dlls/setupapi/tests/parser.c | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index e8c8fd3..5cc3ef5 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -114,6 +114,7 @@ struct parser int cur_section; /* index of section being parsed*/ struct line *line; /* current line */ unsigned int line_pos; /* current line position in file */ + unsigned int broken_line; /* first line containing invalid data (if any) */ unsigned int error; /* error code */ unsigned int token_len; /* current token len */ WCHAR token[MAX_FIELD_LEN+1]; /* current token */ @@ -600,12 +601,15 @@ static const WCHAR *line_start_state( struct parser *parser, const WCHAR *pos ) set_state( parser, SECTION_NAME ); return p + 1; default: - if (!isspaceW(*p)) + if (isspaceW(*p)) break; + if (parser->cur_section != -1) { parser->start = p; set_state( parser, KEY_NAME ); return p; } + if (!parser->broken_line) + parser->broken_line = parser->line_pos; break; } } @@ -886,6 +890,7 @@ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCH parser.stack_pos = 0; parser.cur_section = -1; parser.line_pos = 1; + parser.broken_line = 0; parser.error = 0; parser.token_len = 0; @@ -916,6 +921,13 @@ static DWORD parse_buffer( struct inf_file *file, const WCHAR *buffer, const WCH /* find the [strings] section */ file->strings_section = find_section( file, Strings ); + + if (file->strings_section == -1 && parser.broken_line) + { + if (error_line) *error_line = parser.broken_line; + return ERROR_EXPECTED_SECTION_NAME; + } + return 0; } diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index f929f01..67c9887 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -133,6 +133,18 @@ static const struct { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { "garbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { "garbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { ";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { ";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { " \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { " \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { "garbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { "garbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, + { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, + { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, }; static void test_invalid_files(void)

1 0

Sebastian Lackner : services: Pass a process argument to wait_for_startup function.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: ed54b881738c616674d7025b32f704a159decd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed54b881738c616674d7025b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:33:09 2016 +0100 services: Pass a process argument to wait_for_startup function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 47 ++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 325e7f3..8f53e7e 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -714,7 +714,7 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, return ERROR_SUCCESS; } -static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +static DWORD service_start_process(struct service_entry *service_entry) { PROCESS_INFORMATION pi; STARTUPINFOW si; @@ -765,37 +765,30 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * service_entry->status.dwProcessId = pi.dwProcessId; service_entry->process->process = pi.hProcess; - *process = pi.hProcess; CloseHandle( pi.hThread ); return ERROR_SUCCESS; } -static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDLE process_handle) +static DWORD process_wait_for_startup(struct process_entry *process) { - HANDLE handles[2] = { service_entry->process->status_changed_event, process_handle }; - DWORD state, ret; - - WINE_TRACE("%p\n", service_entry); + HANDLE handles[2] = { process->status_changed_event, process->process }; + DWORD ret; ret = WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ); - if (ret != WAIT_OBJECT_0) - return ERROR_SERVICE_REQUEST_TIMEOUT; - service_lock(service_entry); - state = service_entry->status.dwCurrentState; - service_unlock(service_entry); - if (state == SERVICE_START_PENDING) - { - WINE_TRACE("Service state changed to SERVICE_START_PENDING\n"); - return ERROR_SUCCESS; - } - else if (state == SERVICE_RUNNING) - { - WINE_TRACE("Service started successfully\n"); - return ERROR_SUCCESS; - } + return (ret == WAIT_OBJECT_0) ? ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; +} + +static DWORD service_is_running(struct service_entry *service) +{ + DWORD state; + + service_lock(service); + state = service->status.dwCurrentState; + service_unlock(service); - return ERROR_SERVICE_REQUEST_TIMEOUT; + return (state == SERVICE_START_PENDING || state == SERVICE_RUNNING) ? + ERROR_SUCCESS : ERROR_SERVICE_REQUEST_TIMEOUT; } /****************************************************************************** @@ -874,7 +867,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * struct process_entry *process = service->process; DWORD err; LPWSTR name; - HANDLE process_handle = NULL; err = scmdatabase_lock_startup(service->db); if (err != ERROR_SUCCESS) @@ -907,7 +899,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * } else { - err = service_start_process(service, &process_handle); + err = service_start_process(service); if (err == ERROR_SUCCESS) { if (!process_send_start_message(process, service->name, service_argv, service_argc)) @@ -915,7 +907,10 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * } if (err == ERROR_SUCCESS) - err = service_wait_for_startup(service, process_handle); + err = process_wait_for_startup(process); + + if (err == ERROR_SUCCESS) + err = service_is_running(service); } if (err == ERROR_SUCCESS)

1 0

Sebastian Lackner : services: Pass a process argument to send_control function.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: fa593d4d87ca2938ef706a5a782744e38738eae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa593d4d87ca2938ef706a5a7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:32:34 2016 +0100 services: Pass a process argument to send_control function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index cdac948..59bbe7f 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1035,25 +1035,25 @@ BOOL process_send_command(struct process_entry *process, const void *data, DWORD } /****************************************************************************** - * service_send_control + * process_send_control */ -static BOOL service_send_control(struct service_entry *service, DWORD dwControl, DWORD *result) +static BOOL process_send_control(struct process_entry *process, const WCHAR *name, DWORD dwControl, DWORD *result) { service_start_info *ssi; DWORD len; BOOL r; /* calculate how much space we need to send the startup info */ - len = strlenW(service->name) + 1; + len = strlenW(name) + 1; ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, data[len])); ssi->cmd = WINESERV_SENDCONTROL; ssi->control = dwControl; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); - ssi->name_size = strlenW(service->name) + 1; - strcpyW( ssi->data, service->name ); + ssi->name_size = strlenW(name) + 1; + strcpyW(ssi->data, name); - r = process_send_command(service->process, ssi, ssi->total_size, result); + r = process_send_command(process, ssi, ssi->total_size, result); HeapFree( GetProcessHeap(), 0, ssi ); return r; } @@ -1176,7 +1176,7 @@ DWORD __cdecl svcctl_ControlService( if (ret != WAIT_OBJECT_0) return ERROR_SERVICE_REQUEST_TIMEOUT; - service_send_control(service->service_entry, dwControl, &result); + process_send_control(service->service_entry->process, service->service_entry->name, dwControl, &result); if (lpServiceStatus) {

1 0

Sebastian Lackner : services: Pass a process argument to send_start_message function.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 7e2176459da316347dd1a62b4bab974258513f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2176459da316347dd1a62b4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:32:08 2016 +0100 services: Pass a process argument to send_start_message function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1119b25..325e7f3 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -799,19 +799,18 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL } /****************************************************************************** - * service_send_start_message + * process_send_start_message */ -static BOOL service_send_start_message(struct service_entry *service, HANDLE process_handle, +static BOOL process_send_start_message(struct process_entry *process, const WCHAR *name, LPCWSTR *argv, DWORD argc) { - struct process_entry *process = service->process; OVERLAPPED overlapped; DWORD i, len, result; service_start_info *ssi; LPWSTR p; BOOL r; - WINE_TRACE("%s %p %d\n", wine_dbgstr_w(service->name), argv, argc); + WINE_TRACE("%p %s %p %d\n", process, wine_dbgstr_w(name), argv, argc); overlapped.hEvent = process->overlapped_event; if (!ConnectNamedPipe(process->control_pipe, &overlapped)) @@ -820,12 +819,12 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro { HANDLE handles[2]; handles[0] = process->overlapped_event; - handles[1] = process_handle; + handles[1] = process->process; if (WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ) != WAIT_OBJECT_0) CancelIo(process->control_pipe); if (!HasOverlappedIoCompleted( &overlapped )) { - WINE_ERR( "service %s failed to start\n", wine_dbgstr_w( service->name )); + WINE_ERR("service %s failed to start\n", wine_dbgstr_w(name)); return FALSE; } } @@ -837,7 +836,7 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro } /* calculate how much space do we need to send the startup info */ - len = strlenW(service->name) + 1; + len = strlenW(name) + 1; for (i=0; i<argc; i++) len += strlenW(argv[i])+1; len++; @@ -846,8 +845,8 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro ssi->cmd = WINESERV_STARTINFO; ssi->control = 0; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); - ssi->name_size = strlenW(service->name) + 1; - strcpyW( ssi->data, service->name ); + ssi->name_size = strlenW(name) + 1; + strcpyW(ssi->data, name); /* copy service args into a single buffer*/ p = &ssi->data[ssi->name_size]; @@ -911,7 +910,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * err = service_start_process(service, &process_handle); if (err == ERROR_SUCCESS) { - if (!service_send_start_message(service, process_handle, service_argv, service_argc)) + if (!process_send_start_message(process, service->name, service_argv, service_argc)) err = ERROR_SERVICE_REQUEST_TIMEOUT; }

1 0

Sebastian Lackner : services: Introduce refcounting for processes.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 6617ff24f206335d595c585b96289542ead9cbe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6617ff24f206335d595c585b9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:31:31 2016 +0100 services: Introduce refcounting for processes. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 9 ++++++++- programs/services/services.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 03df852..1119b25 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -73,6 +73,7 @@ static DWORD process_create(struct process_entry **entry) *entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**entry)); if (!*entry) return ERROR_NOT_ENOUGH_SERVER_MEMORY; + (*entry)->ref_count = 1; (*entry)->control_pipe = INVALID_HANDLE_VALUE; /* all other fields are zero */ return ERROR_SUCCESS; @@ -126,7 +127,7 @@ void free_service_entry(struct service_entry *entry) HeapFree(GetProcessHeap(), 0, entry->description); HeapFree(GetProcessHeap(), 0, entry->dependOnServices); HeapFree(GetProcessHeap(), 0, entry->dependOnGroups); - free_process_entry(entry->process); + release_process(entry->process); HeapFree(GetProcessHeap(), 0, entry); } @@ -455,6 +456,12 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase return NULL; } +void release_process(struct process_entry *process) +{ + if (InterlockedDecrement(&process->ref_count) == 0) + free_process_entry(process); +} + void release_service(struct service_entry *service) { struct scmdatabase *db = service->db; diff --git a/programs/services/services.h b/programs/services/services.h index 206d655..b8f4774 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -33,6 +33,7 @@ struct scmdatabase struct process_entry { + LONG ref_count; HANDLE process; HANDLE control_mutex; HANDLE control_pipe; @@ -87,6 +88,7 @@ void service_terminate(struct service_entry *service); /* Process functions */ +void release_process(struct process_entry *process); BOOL process_send_command(struct process_entry *process, const void *data, DWORD size, DWORD *result); extern HANDLE g_hStartedEvent;

1 0

Sebastian Lackner : services: Initialize service ref_count directly in service_create.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 7fc3107b4c107e86bdb167bc1fc875784bf41f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc3107b4c107e86bdb167bc1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:30:56 2016 +0100 services: Initialize service ref_count directly in service_create. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 1 - programs/services/services.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 933f18d..cdac948 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -507,7 +507,6 @@ static DWORD create_serviceW( return err; } - entry->ref_count = 1; entry->is_wow64 = is_wow64; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType; entry->config.dwStartType = dwStartType; diff --git a/programs/services/services.c b/programs/services/services.c index 9f7e889..03df852 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -107,6 +107,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) HeapFree(GetProcessHeap(), 0, *entry); return err; } + (*entry)->ref_count = 1; (*entry)->status.dwCurrentState = SERVICE_STOPPED; (*entry)->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; (*entry)->preshutdown_timeout = default_preshutdown_timeout; @@ -557,6 +558,7 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) entry->db = db; list_add_tail(&db->services, &entry->entry); + release_service(entry); } return ERROR_SUCCESS; }

1 0

Sebastian Lackner : services: Hold scmdatabase lock while checking marked_for_delete.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 38a09f9c7bb2b29287bb24dc9cb7053ca0c5303c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a09f9c7bb2b29287bb24dc9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:30:39 2016 +0100 services: Hold scmdatabase lock while checking marked_for_delete. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 78baaf2..9f7e889 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -456,13 +456,15 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase void release_service(struct service_entry *service) { + struct scmdatabase *db = service->db; + + scmdatabase_lock(db); if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service)) { - scmdatabase_lock(service->db); - scmdatabase_remove_service(service->db, service); - scmdatabase_unlock(service->db); + scmdatabase_remove_service(db, service); free_service_entry(service); } + scmdatabase_unlock(db); } static DWORD scmdatabase_create(struct scmdatabase **db)

1 0

Sebastian Lackner : services: Fix a typo.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: 4a3d712608e3651394d952730bac89f4ffbd8c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3d712608e3651394d952730… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:28:32 2016 +0100 services: Fix a typo. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index c49dad3..78baaf2 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -103,7 +103,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) } if ((err = process_create(&(*entry)->process)) != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, (*entry)->process); + HeapFree(GetProcessHeap(), 0, (*entry)->name); HeapFree(GetProcessHeap(), 0, *entry); return err; }

1 0

Piotr Caban : msvcrt: Destroy exception object when frame storing it is unwound.
by Alexandre Julliard 16 Mar '16

16 Mar '16

Module: wine Branch: master Commit: f085be3028e86ebc6666d20a4802831bf7b3f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f085be3028e86ebc6666d20a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 13:41:20 2016 +0100 msvcrt: Destroy exception object when frame storing it is unwound. Thrown object was incorrectly freed in following situation: try { throw obj; } catch(object &obj) { try { throw 1; } catch(...) {} //use object here } Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 56165c0..78ce488 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -131,6 +131,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ); +BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void*); /* call a function with a given ebp */ static inline void *call_ebp_func( void *func, void *ebp ) @@ -361,9 +362,18 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; + PEXCEPTION_RECORD prev_rec = nested_frame->rec; if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { + if (prev_rec->ExceptionCode == CXX_EXCEPTION) + { + void *object = (void*)prev_rec->ExceptionInformation[1]; + cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; + if (info && info->destructor && _IsExceptionObjectToBeDestroyed(object)) + call_dtor( info->destructor, object); + } + msvcrt_get_thread_data()->exc_record = nested_frame->prev_rec; return ExceptionContinueSearch; } @@ -372,7 +382,6 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(rec->ExceptionCode == CXX_EXCEPTION) { - PEXCEPTION_RECORD prev_rec = nested_frame->rec; if((rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) || (prev_rec->ExceptionCode == CXX_EXCEPTION && rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && @@ -388,22 +397,6 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } - else if (nested_frame->prev_rec && nested_frame->prev_rec->ExceptionCode == CXX_EXCEPTION && - nested_frame->prev_rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && - nested_frame->prev_rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2]) - { - TRACE("detect threw new exception in catch block - not owning old(obj: %lx type: %lx)\n", - prev_rec->ExceptionInformation[1], prev_rec->ExceptionInformation[2]); - } - else if (prev_rec->ExceptionCode == CXX_EXCEPTION) { - /* new exception in exception handler, destroy old */ - void *object = (void*)prev_rec->ExceptionInformation[1]; - cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; - TRACE("detect threw new exception in catch block - destroy old(obj: %p type: %p)\n", - object, info); - if(info && info->destructor) - call_dtor( info->destructor, object ); - } else { TRACE("detect threw new exception in catch block\n");

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016