August 2016 - Wine-Commits - list.winehq.org

Bruno Jesus : dinput: Properly fill the HID information for the controller in the event driver.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 30ae73542567be9e3dfa2ca636bd53828a0f18a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ae73542567be9e3dfa2ca63… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Aug 17 21:50:06 2016 -0300 dinput: Properly fill the HID information for the controller in the event driver. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index aaed701..6fa5997 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -110,7 +110,7 @@ struct JoyDev { /* data returned by the EVIOCGABS() ioctl */ struct wine_input_absinfo axes[ABS_MAX]; - WORD vendor_id, product_id; + WORD vendor_id, product_id, bus_type; }; struct JoystickImpl @@ -315,6 +315,7 @@ static void find_joydevs(void) { joydev.vendor_id = device_id.vendor; joydev.product_id = device_id.product; + joydev.bus_type = device_id.bustype; /* Concatenate product_id with vendor_id to mimic Windows behaviour */ joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; @@ -356,6 +357,18 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver else lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ + if (joydevs[id].bus_type == BUS_USB && + joydevs[id].vendor_id && joydevs[id].product_id) + { + lpddi->dwDevType |= DIDEVTYPE_HID; + lpddi->wUsagePage = 0x01; /* Desktop */ + if (lpddi->dwDevType == DI8DEVTYPE_JOYSTICK || lpddi->dwDevType == DIDEVTYPE_JOYSTICK) + lpddi->wUsage = 0x04; /* Joystick */ + else + lpddi->wUsage = 0x05; /* Game Pad */ + } + MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszProductName, MAX_PATH); }

1 0

Piotr Caban : ntdll: Print fixme message in case of nested exception.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 10fa7c6e45da1921d941cf03782751e498a9a690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fa7c6e45da1921d941cf037… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 12:48:17 2016 +0200 ntdll: Print fixme message in case of nested exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 062a40c..5633e0b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2250,6 +2250,15 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO return func; } +static DWORD nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) return ExceptionContinueSearch; + + /* FIXME */ + return ExceptionNestedException; +} + /********************************************************************** * call_handler * @@ -2258,12 +2267,18 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO */ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { + EXCEPTION_REGISTRATION_RECORD frame; DWORD res; + frame.Handler = nested_exception_handler; + __wine_push_frame( &frame ); + TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + + __wine_pop_frame( &frame ); return res; } @@ -2392,7 +2407,9 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex *orig_context = *dispatch.ContextRecord; return STATUS_SUCCESS; case ExceptionContinueSearch: + break; case ExceptionNestedException: + FIXME( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame; @@ -2421,7 +2438,9 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex *orig_context = *dispatch.ContextRecord; return STATUS_SUCCESS; case ExceptionContinueSearch: + break; case ExceptionNestedException: + FIXME( "nested exception\n" ); break; case ExceptionCollidedUnwind: { ULONG64 frame;

1 0

Piotr Caban : ntdll: Add support for collided unwinds.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 66567dbdf183d8a08453a3efb2fd87527ec0d9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=66567dbdf183d8a08453a3efb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 12:48:00 2016 +0200 ntdll: Add support for collided unwinds. Based on work by Alexandre Julliard. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 90 +++++++++++++++++++++++++++++++++++++--------- include/wine/exception.h | 1 + 2 files changed, 75 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 4c88536..79ca846 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3376,35 +3376,69 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, return (char *)base + handler_data->handler; } +struct unwind_exception_frame +{ + EXCEPTION_REGISTRATION_RECORD frame; + DISPATCHER_CONTEXT *dispatch; +}; + +/********************************************************************** + * unwind_exception_handler + * + * Handler for exceptions happening while calling an unwind handler. + */ +static DWORD unwind_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + struct unwind_exception_frame *unwind_frame = (struct unwind_exception_frame *)frame; + DISPATCHER_CONTEXT *dispatch = (DISPATCHER_CONTEXT *)dispatcher; + + /* copy the original dispatcher into the current one, except for the TargetIp */ + dispatch->ControlPc = unwind_frame->dispatch->ControlPc; + dispatch->ImageBase = unwind_frame->dispatch->ImageBase; + dispatch->FunctionEntry = unwind_frame->dispatch->FunctionEntry; + dispatch->EstablisherFrame = unwind_frame->dispatch->EstablisherFrame; + dispatch->ContextRecord = unwind_frame->dispatch->ContextRecord; + dispatch->LanguageHandler = unwind_frame->dispatch->LanguageHandler; + dispatch->HandlerData = unwind_frame->dispatch->HandlerData; + dispatch->HistoryTable = unwind_frame->dispatch->HistoryTable; + dispatch->ScopeIndex = unwind_frame->dispatch->ScopeIndex; + TRACE( "detected collided unwind\n" ); + return ExceptionCollidedUnwind; +} /********************************************************************** * call_unwind_handler * * Call a single unwind handler. - * FIXME: Handle nested exceptions. */ -static void call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) +static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) { + struct unwind_exception_frame frame; DWORD res; - dispatch->ControlPc = dispatch->ContextRecord->Rip; + frame.frame.Handler = unwind_exception_handler; + frame.dispatch = dispatch; + __wine_push_frame( &frame.frame ); TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res ); + __wine_pop_frame( &frame.frame ); + switch (res) { case ExceptionContinueSearch: - break; case ExceptionCollidedUnwind: - FIXME( "ExceptionCollidedUnwind not supported yet\n" ); break; default: raise_status( STATUS_INVALID_DISPOSITION, rec ); break; } + + return res; } @@ -3412,30 +3446,28 @@ static void call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *disp * call_teb_unwind_handler * * Call a single unwind handler from the TEB chain. - * FIXME: Handle nested exceptions. */ -static void call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, +static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, EXCEPTION_REGISTRATION_RECORD *teb_frame ) { - EXCEPTION_REGISTRATION_RECORD *dispatcher; DWORD res; - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatcher=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, &dispatcher ); - res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, &dispatcher ); + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); + res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); switch (res) { case ExceptionContinueSearch: - break; case ExceptionCollidedUnwind: - FIXME( "ExceptionCollidedUnwind not supported yet\n" ); break; default: raise_status( STATUS_INVALID_DISPOSITION, rec ); break; } + + return res; } @@ -3588,7 +3620,8 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec /* FIXME: should use the history table to make things faster */ dispatch.ImageBase = 0; - dispatch.ScopeIndex = 0; /* FIXME */ + dispatch.ScopeIndex = 0; + dispatch.ControlPc = context->Rip; /* first look for PE exception information */ @@ -3674,7 +3707,19 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EH_TARGET_UNWIND; - call_unwind_handler( rec, &dispatch ); + if (call_unwind_handler( rec, &dispatch ) == ExceptionCollidedUnwind) + { + ULONG64 frame; + + *context = new_context = *dispatch.ContextRecord; + dispatch.ContextRecord = context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, + dispatch.ControlPc, dispatch.FunctionEntry, + &new_context, NULL, &frame, NULL ); + rec->ExceptionFlags |= EH_COLLIDED_UNWIND; + goto unwind_done; + } + rec->ExceptionFlags &= ~EH_COLLIDED_UNWIND; } else /* hack: call builtin handlers registered in the tib list */ { @@ -3683,7 +3728,20 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; - call_teb_unwind_handler( rec, &dispatch, teb_frame ); + if (call_teb_unwind_handler( rec, &dispatch, teb_frame ) == ExceptionCollidedUnwind) + { + ULONG64 frame; + + teb_frame = __wine_pop_frame( teb_frame ); + + *context = new_context = *dispatch.ContextRecord; + dispatch.ContextRecord = context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, + dispatch.ControlPc, dispatch.FunctionEntry, + &new_context, NULL, &frame, NULL ); + rec->ExceptionFlags |= EH_COLLIDED_UNWIND; + goto unwind_done; + } teb_frame = __wine_pop_frame( teb_frame ); } if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame < new_context.Rsp) break; diff --git a/include/wine/exception.h b/include/wine/exception.h index 8b807c1..f275568 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -253,6 +253,7 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EH_STACK_INVALID 0x08 #define EH_NESTED_CALL 0x10 #define EH_TARGET_UNWIND 0x20 +#define EH_COLLIDED_UNWIND 0x40 /* Wine-specific exceptions codes */

1 0

Sebastian Lackner : services: Hold startup lock before calling service_start.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 4c01feb7146a47df41eedd1da0bb540a37d7d7de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c01feb7146a47df41eedd1da… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 18 09:30:33 2016 +0200 services: Hold startup lock before calling service_start. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 9 ++++++--- programs/services/services.c | 15 ++++----------- programs/services/services.h | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 977ddb6..4cab79e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1071,8 +1071,12 @@ DWORD __cdecl svcctl_StartServiceW( if (service->service_entry->config.dwStartType == SERVICE_DISABLED) return ERROR_SERVICE_DISABLED; + if (!scmdatabase_lock_startup(service->service_entry->db)) + return ERROR_SERVICE_DATABASE_LOCKED; + err = service_start(service->service_entry, dwNumServiceArgs, lpServiceArgVectors); + scmdatabase_unlock_startup(service->service_entry->db); return err; } @@ -1226,9 +1230,8 @@ DWORD __cdecl svcctl_LockServiceDatabase( if ((err = validate_scm_handle(hSCManager, SC_MANAGER_LOCK, &manager)) != ERROR_SUCCESS) return err; - err = scmdatabase_lock_startup(manager->db); - if (err != ERROR_SUCCESS) - return err; + if (!scmdatabase_lock_startup(manager->db)) + return ERROR_SERVICE_DATABASE_LOCKED; lock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock)); if (!lock) diff --git a/programs/services/services.c b/programs/services/services.c index 177acf1..9156dbc 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -352,6 +352,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) size = i; scmdatabase_unlock(db); + while (!scmdatabase_lock_startup(db)) Sleep(10); for (i = 0; i < size; i++) { @@ -364,6 +365,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) release_service(service); } + scmdatabase_unlock_startup(db); HeapFree(GetProcessHeap(), 0, services_list); } @@ -608,11 +610,9 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) return ERROR_SUCCESS; } -DWORD scmdatabase_lock_startup(struct scmdatabase *db) +BOOL scmdatabase_lock_startup(struct scmdatabase *db) { - if (InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE)) - return ERROR_SERVICE_DATABASE_LOCKED; - return ERROR_SUCCESS; + return !InterlockedCompareExchange(&db->service_start_lock, TRUE, FALSE); } void scmdatabase_unlock_startup(struct scmdatabase *db) @@ -904,10 +904,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * struct process_entry *process = NULL; DWORD err; - err = scmdatabase_lock_startup(service->db); - if (err != ERROR_SUCCESS) - return err; - err = service_start_process(service, &process); if (err == ERROR_SUCCESS) { @@ -928,10 +924,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * release_process(process); } - scmdatabase_unlock_startup(service->db); - WINE_TRACE("returning %d\n", err); - return err; } diff --git a/programs/services/services.h b/programs/services/services.h index a3ecdf2..fb1374e 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -72,7 +72,7 @@ struct service_entry *scmdatabase_find_service(struct scmdatabase *db, LPCWSTR n struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase *db, LPCWSTR name); DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *entry); -DWORD scmdatabase_lock_startup(struct scmdatabase *db); +BOOL scmdatabase_lock_startup(struct scmdatabase *db); void scmdatabase_unlock_startup(struct scmdatabase *db); void scmdatabase_lock(struct scmdatabase *db);

1 0

Iván Matellanes : msvcirt: Implement ios:: sync_with_stdio.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 9be41b5b6b702891beb0c383797428e6c89cf264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be41b5b6b702891beb0c3837… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 20:36:03 2016 +0100 msvcirt: Implement ios::sync_with_stdio. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 57 +++++++++++++++++--- dlls/msvcirt/msvcirt.spec | 2 +- dlls/msvcirt/tests/msvcirt.c | 120 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 5 files changed, 174 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9be41b5b6b702891beb0c…

1 0

Iván Matellanes : msvcirt: Add predefined streams.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 5a2bac8d120db2368ae8c256a3fafa269cc6cea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2bac8d120db2368ae8c256a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 20:36:02 2016 +0100 msvcirt: Add predefined streams. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 63 +++++++++++++++++++++++++++++++++++-- dlls/msvcirt/msvcirt.spec | 8 ++--- dlls/msvcirt/tests/msvcirt.c | 75 +++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt20/msvcrt20.spec | 8 ++--- dlls/msvcrt40/msvcrt40.spec | 8 ++--- 5 files changed, 143 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a2bac8d120db2368ae8c…

1 0

Józef Kucia : user32/tests: Add more tests for setting window styles.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 412b8dcafb53616b61796511951740c792f37b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412b8dcafb53616b617965119… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 17 13:56:08 2016 +0200 user32/tests: Add more tests for setting window styles. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 00885d9..f7ed6d5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6265,6 +6265,103 @@ static void test_SetWindowLong(void) } } +static LRESULT WINAPI check_style_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + const STYLESTRUCT *expected = (STYLESTRUCT *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + const STYLESTRUCT *got = (STYLESTRUCT *)lParam; + + if (message == WM_STYLECHANGING && wParam == GWL_STYLE) + { + ok(got->styleOld == expected[0].styleOld, "expected old style %#x, got %#x\n", + expected[0].styleOld, got->styleOld); + ok(got->styleNew == expected[0].styleNew, "expected new style %#x, got %#x\n", + expected[0].styleNew, got->styleNew); + } + else if (message == WM_STYLECHANGED && wParam == GWL_STYLE) + { + ok(got->styleOld == expected[1].styleOld, "expected old style %#x, got %#x\n", + expected[1].styleOld, got->styleOld); + todo_wine_if(expected[0].styleOld & WS_MINIMIZE) + ok(got->styleNew == expected[1].styleNew, "expected new style %#x, got %#x\n", + expected[1].styleNew, got->styleNew); + } + + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void test_set_window_style(void) +{ + LONG expected_style, new_style, old_style; + STYLESTRUCT expected_stylestruct[2]; + unsigned int i; + WNDCLASSA cls; + HWND hwnd; + + static const struct + { + LONG creation_style; + LONG style; + } + tests[] = + { + { WS_MINIMIZE | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, + WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX }, + { WS_MINIMIZE | WS_CLIPSIBLINGS | WS_CAPTION, + WS_CLIPSIBLINGS | WS_CAPTION }, + { WS_MAXIMIZE | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, + WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX }, + { WS_MAXIMIZE | WS_CLIPSIBLINGS | WS_CAPTION, + WS_CLIPSIBLINGS | WS_CAPTION }, + { WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, + WS_MINIMIZE | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX }, + { WS_CLIPSIBLINGS | WS_CAPTION, + WS_MINIMIZE | WS_CLIPSIBLINGS | WS_CAPTION }, + { WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, + WS_MAXIMIZE | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX }, + { WS_CLIPSIBLINGS | WS_CAPTION, + WS_MAXIMIZE | WS_CLIPSIBLINGS | WS_CAPTION }, + }; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = check_style_wnd_proc; + cls.hInstance = GetModuleHandleA(0); + cls.lpszClassName = "TestSetWindowStylesClass"; + ok(RegisterClassA(&cls), "RegisterClass failed\n"); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + BOOL todo = FALSE; + expected_style = tests[i].style; + if ((tests[i].creation_style & WS_MINIMIZE) && !(tests[i].style & WS_MINIMIZE)) + { + todo = TRUE; + expected_style |= WS_MINIMIZE; + } + + expected_stylestruct[0].styleOld = tests[i].creation_style; + expected_stylestruct[0].styleNew = tests[i].style; + expected_stylestruct[1].styleOld = tests[i].creation_style; + expected_stylestruct[1].styleNew = expected_style; + + hwnd = CreateWindowA(cls.lpszClassName, "Test set styles", + tests[i].creation_style, 100, 100, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)&expected_stylestruct); + + old_style = SetWindowLongA(hwnd, GWL_STYLE, tests[i].style); + ok(old_style == tests[i].creation_style, "expected old style %#x, got %#x\n", + tests[i].creation_style, old_style); + new_style = GetWindowLongA(hwnd, GWL_STYLE); + todo_wine_if(todo) ok(new_style == expected_style, "expected new style %#x, got %#x\n", + expected_style, new_style); + + SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0); + DestroyWindow(hwnd); + } + + UnregisterClassA(cls.lpszClassName, cls.hInstance); +} + static void test_ShowWindow(void) { HWND hwnd; @@ -9355,6 +9452,7 @@ START_TEST(win) test_redrawnow(); test_csparentdc(); test_SetWindowLong(); + test_set_window_style(); test_ShowWindow(); test_gettext(); test_GetUpdateRect();

1 0

Piotr Caban : ntdll: Pass updated context inside dispatch.ContextRecord in call_stack_handlers.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: 4af2012729b7ad656fe240838697eeb2ce5c924e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af2012729b7ad656fe240838… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 12:48:24 2016 +0200 ntdll: Pass updated context inside dispatch.ContextRecord in call_stack_handlers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 5633e0b..f5ecf80 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2312,7 +2312,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; - CONTEXT context, new_context; + CONTEXT context; LDR_MODULE *module; NTSTATUS status; @@ -2322,8 +2322,6 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.HistoryTable = &table; for (;;) { - new_context = context; - /* FIXME: should use the history table to make things faster */ dispatch.ImageBase = 0; @@ -2332,11 +2330,11 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* first look for PE exception information */ - if ((dispatch.FunctionEntry = lookup_function_info( context.Rip, &dispatch.ImageBase, &module ))) + if ((dispatch.FunctionEntry = lookup_function_info( dispatch.ControlPc, &dispatch.ImageBase, &module ))) { dispatch.LanguageHandler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, dispatch.ImageBase, - context.Rip, dispatch.FunctionEntry, - &new_context, &dispatch.HandlerData, + dispatch.ControlPc, dispatch.FunctionEntry, + &context, &dispatch.HandlerData, &dispatch.EstablisherFrame, NULL ); goto unwind_done; } @@ -2347,11 +2345,11 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex { BOOL got_info = FALSE; struct dwarf_eh_bases bases; - const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases ); + const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(dispatch.ControlPc - 1), &bases ); if (fde) { - status = dwarf_virtual_unwind( context.Rip, &dispatch.EstablisherFrame, &new_context, + status = dwarf_virtual_unwind( dispatch.ControlPc, &dispatch.EstablisherFrame, &context, fde, &bases, &dispatch.LanguageHandler, &dispatch.HandlerData ); if (status != STATUS_SUCCESS) return status; got_info = TRUE; @@ -2359,7 +2357,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex #ifdef HAVE_LIBUNWIND_H else { - status = libunwind_virtual_unwind( context.Rip, &got_info, &dispatch.EstablisherFrame, &new_context, + status = libunwind_virtual_unwind( dispatch.ControlPc, &got_info, &dispatch.EstablisherFrame, &context, &dispatch.LanguageHandler, &dispatch.HandlerData ); if (status != STATUS_SUCCESS) return status; } @@ -2378,11 +2376,9 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex } else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); - /* no exception information, treat as a leaf function */ - - new_context.Rip = *(ULONG64 *)context.Rsp; - new_context.Rsp = context.Rsp + sizeof(ULONG64); - dispatch.EstablisherFrame = new_context.Rsp; + context.Rip = *(ULONG64 *)context.Rsp; + context.Rsp = context.Rsp + sizeof(ULONG64); + dispatch.EstablisherFrame = context.Rsp; dispatch.LanguageHandler = NULL; unwind_done: @@ -2426,10 +2422,10 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex } } /* hack: call wine handlers registered in the tib list */ - else while ((ULONG64)teb_frame < new_context.Rsp) + else while ((ULONG64)teb_frame < context.Rsp) { TRACE( "found wine frame %p rsp %lx handler %p\n", - teb_frame, new_context.Rsp, teb_frame->Handler ); + teb_frame, context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) { @@ -2459,8 +2455,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex teb_frame = teb_frame->Prev; } - if (new_context.Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; - context = new_context; + if (context.Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; } return STATUS_UNHANDLED_EXCEPTION; }

1 0

Piotr Caban : ntdll: Add support for exceptions inside termination handlers in __C_specific_handler.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: b23de3cd4a2c0ab0fd3f54369a2786e008c79539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23de3cd4a2c0ab0fd3f54369… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 12:48:13 2016 +0200 ntdll: Add support for exceptions inside termination handlers in __C_specific_handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 16 ++++----- dlls/ntdll/tests/exception.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e50c8ed..062a40c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3787,7 +3787,6 @@ void WINAPI _local_unwind( void *frame, void *target_ip ) RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); } - /******************************************************************* * __C_specific_handler (NTDLL.@) */ @@ -3804,10 +3803,10 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { - for (i = 0; i < table->Count; i++) + for (i = dispatch->ScopeIndex; i < table->Count; i++) { - if (context->Rip >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && - context->Rip < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + if (dispatch->ControlPc >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + dispatch->ControlPc < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) { TERMINATION_HANDLER handler; @@ -3821,6 +3820,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, } handler = (TERMINATION_HANDLER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); + dispatch->ScopeIndex = i+1; TRACE( "calling __finally %p frame %lx\n", handler, frame ); handler( 1, frame ); @@ -3829,10 +3829,10 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, return ExceptionContinueSearch; } - for (i = 0; i < table->Count; i++) + for (i = dispatch->ScopeIndex; i < table->Count; i++) { - if (context->Rip >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && - context->Rip < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + if (dispatch->ControlPc >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + dispatch->ControlPc < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) { if (!table->ScopeRecord[i].JumpTarget) continue; if (table->ScopeRecord[i].HandlerAddress != EXCEPTION_EXECUTE_HANDLER) @@ -3856,7 +3856,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, } TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); RtlUnwindEx( (void *)frame, (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget, - rec, 0, context, dispatch->HistoryTable ); + rec, 0, dispatch->ContextRecord, dispatch->HistoryTable ); } } return ExceptionContinueSearch; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a086436..f1bfee6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -53,10 +53,37 @@ static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PV static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); #if defined(__x86_64__) +typedef struct +{ + ULONG Count; + struct + { + ULONG BeginAddress; + ULONG EndAddress; + ULONG HandlerAddress; + ULONG JumpTarget; + } ScopeRecord[1]; +} SCOPE_TABLE; + +typedef struct +{ + ULONG64 ControlPc; + ULONG64 ImageBase; + PRUNTIME_FUNCTION FunctionEntry; + ULONG64 EstablisherFrame; + ULONG64 TargetIp; + PCONTEXT ContextRecord; + void* /*PEXCEPTION_ROUTINE*/ LanguageHandler; + PVOID HandlerData; + PUNWIND_HISTORY_TABLE HistoryTable; + ULONG ScopeIndex; +} DISPATCHER_CONTEXT; + static BOOLEAN (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64); static BOOLEAN (CDECL *pRtlDeleteFunctionTable)(RUNTIME_FUNCTION*); static BOOLEAN (CDECL *pRtlInstallFunctionTableCallback)(DWORD64, DWORD64, DWORD, PGET_RUNTIME_FUNCTION_CALLBACK, PVOID, PCWSTR); static PRUNTIME_FUNCTION (WINAPI *pRtlLookupFunctionEntry)(ULONG64, ULONG64*, UNWIND_HISTORY_TABLE*); +static EXCEPTION_DISPOSITION (WINAPI *p__C_specific_handler)(EXCEPTION_RECORD*, ULONG64, CONTEXT*, DISPATCHER_CONTEXT*); #endif #ifdef __i386__ @@ -1747,6 +1774,59 @@ static void test_dynamic_unwind(void) } +static int termination_handler_called; +static void WINAPI termination_handler(ULONG flags, ULONG64 frame) +{ + termination_handler_called++; + + ok(flags == 1 || broken(flags == 0x401), "flags = %x\n", flags); + ok(frame == 0x1234, "frame = %p\n", (void*)frame); +} + +static void test___C_specific_handler(void) +{ + DISPATCHER_CONTEXT dispatch; + EXCEPTION_RECORD rec; + CONTEXT context; + ULONG64 frame; + EXCEPTION_DISPOSITION ret; + SCOPE_TABLE scope_table; + + if (!p__C_specific_handler) + { + win_skip("__C_specific_handler not available\n"); + return; + } + + memset(&rec, 0, sizeof(rec)); + rec.ExceptionFlags = 2; /* EH_UNWINDING */ + frame = 0x1234; + memset(&dispatch, 0, sizeof(dispatch)); + dispatch.ImageBase = (ULONG_PTR)GetModuleHandleA(NULL); + dispatch.ControlPc = dispatch.ImageBase + 0x200; + dispatch.HandlerData = &scope_table; + dispatch.ContextRecord = &context; + scope_table.Count = 1; + scope_table.ScopeRecord[0].BeginAddress = 0x200; + scope_table.ScopeRecord[0].EndAddress = 0x400; + scope_table.ScopeRecord[0].HandlerAddress = (ULONG_PTR)termination_handler-dispatch.ImageBase; + scope_table.ScopeRecord[0].JumpTarget = 0; + memset(&context, 0, sizeof(context)); + + termination_handler_called = 0; + ret = p__C_specific_handler(&rec, frame, &context, &dispatch); + ok(ret == ExceptionContinueSearch, "__C_specific_handler returned %x\n", ret); + ok(termination_handler_called == 1, "termination_handler_called = %d\n", + termination_handler_called); + ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %d\n", dispatch.ScopeIndex); + + ret = p__C_specific_handler(&rec, frame, &context, &dispatch); + ok(ret == ExceptionContinueSearch, "__C_specific_handler returned %x\n", ret); + ok(termination_handler_called == 1, "termination_handler_called = %d\n", + termination_handler_called); + ok(dispatch.ScopeIndex == 1, "dispatch.ScopeIndex = %d\n", dispatch.ScopeIndex); +} + #endif /* __x86_64__ */ #if defined(__i386__) || defined(__x86_64__) @@ -2267,6 +2347,8 @@ START_TEST(exception) "RtlInstallFunctionTableCallback" ); pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); + p__C_specific_handler = (void *)GetProcAddress( hntdll, + "__C_specific_handler" ); test_debug_registers(); test_outputdebugstring(1, FALSE); @@ -2275,6 +2357,7 @@ START_TEST(exception) test_breakpoint(1); test_vectored_continue_handler(); test_virtual_unwind(); + test___C_specific_handler(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Piotr Caban : ntdll: Add support for ExceptionCollidedUnwind return from exception handler.
by Alexandre Julliard Aug. 18, 2016

Aug. 18, 2016

Module: wine Branch: master Commit: abebb8141264ee5e1b701f4e28f5275426ed0a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abebb8141264ee5e1b701f4e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 12:48:05 2016 +0200 ntdll: Add support for ExceptionCollidedUnwind return from exception handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 99 +++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 79ca846..e54f162 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2256,31 +2256,15 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO * Call a single exception handler. * FIXME: Handle nested exceptions. */ -static NTSTATUS call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, CONTEXT *orig_context ) +static DWORD call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) { DWORD res; - dispatch->ControlPc = dispatch->ContextRecord->Rip; - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); - - switch (res) - { - case ExceptionContinueExecution: - if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; - *orig_context = *dispatch->ContextRecord; - return STATUS_SUCCESS; - case ExceptionContinueSearch: - break; - case ExceptionNestedException: - break; - default: - return STATUS_INVALID_DISPOSITION; - } - return STATUS_UNHANDLED_EXCEPTION; + return res; } @@ -2290,31 +2274,16 @@ static NTSTATUS call_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatc * Call a single exception handler from the TEB chain. * FIXME: Handle nested exceptions. */ -static NTSTATUS call_teb_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, - EXCEPTION_REGISTRATION_RECORD *teb_frame, CONTEXT *orig_context ) +static DWORD call_teb_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, + EXCEPTION_REGISTRATION_RECORD *teb_frame ) { - EXCEPTION_REGISTRATION_RECORD *dispatcher; DWORD res; - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatcher=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, &dispatcher ); - res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, &dispatcher ); + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); + res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); TRACE( "handler at %p returned %u\n", teb_frame->Handler, res ); - - switch (res) - { - case ExceptionContinueExecution: - if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; - *orig_context = *dispatch->ContextRecord; - return STATUS_SUCCESS; - case ExceptionContinueSearch: - break; - case ExceptionNestedException: - break; - default: - return STATUS_INVALID_DISPOSITION; - } - return STATUS_UNHANDLED_EXCEPTION; + return res; } @@ -2336,7 +2305,6 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.TargetIp = 0; dispatch.ContextRecord = &context; dispatch.HistoryTable = &table; - dispatch.ScopeIndex = 0; /* FIXME */ for (;;) { new_context = context; @@ -2344,6 +2312,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* FIXME: should use the history table to make things faster */ dispatch.ImageBase = 0; + dispatch.ControlPc = context.Rip; + dispatch.ScopeIndex = 0; /* first look for PE exception information */ @@ -2415,8 +2385,28 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex if (dispatch.LanguageHandler) { - status = call_handler( rec, &dispatch, orig_context ); - if (status != STATUS_UNHANDLED_EXCEPTION) return status; + switch (call_handler( rec, &dispatch )) + { + case ExceptionContinueExecution: + if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; + *orig_context = *dispatch.ContextRecord; + return STATUS_SUCCESS; + case ExceptionContinueSearch: + case ExceptionNestedException: + break; + case ExceptionCollidedUnwind: { + ULONG64 frame; + + context = *dispatch.ContextRecord; + dispatch.ContextRecord = &context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, + dispatch.ControlPc, dispatch.FunctionEntry, + &context, NULL, &frame, NULL ); + goto unwind_done; + } + default: + return STATUS_INVALID_DISPOSITION; + } } /* hack: call wine handlers registered in the tib list */ else while ((ULONG64)teb_frame < new_context.Rsp) @@ -2425,8 +2415,29 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex teb_frame, new_context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; context = *orig_context; - status = call_teb_handler( rec, &dispatch, teb_frame, orig_context ); - if (status != STATUS_UNHANDLED_EXCEPTION) return status; + switch (call_teb_handler( rec, &dispatch, teb_frame )) + { + case ExceptionContinueExecution: + if (rec->ExceptionFlags & EH_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; + *orig_context = *dispatch.ContextRecord; + return STATUS_SUCCESS; + case ExceptionContinueSearch: + case ExceptionNestedException: + break; + case ExceptionCollidedUnwind: { + ULONG64 frame; + + context = *dispatch.ContextRecord; + dispatch.ContextRecord = &context; + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, + dispatch.ControlPc, dispatch.FunctionEntry, + &context, NULL, &frame, NULL ); + teb_frame = teb_frame->Prev; + goto unwind_done; + } + default: + return STATUS_INVALID_DISPOSITION; + } teb_frame = teb_frame->Prev; }

1 0