wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Zhiyi Zhang : explorer: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: c9d2b62926883e7952a4585d09c6aa73335e9ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9d2b62926883e7952a4585d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:16:33 2020 +0800 explorer: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 691db5c8bd..6f1ff54c14 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -889,6 +889,7 @@ static void initialize_display_settings(void) /* Store current display mode in the registry */ ddW.cb = sizeof(ddW); + memset(&dmW, 0, sizeof(dmW)); dmW.dmSize = sizeof(dmW); while (EnumDisplayDevicesW( NULL, i++, &ddW, 0 )) {

1 0

Zhiyi Zhang : winemac.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 6185252bbcd0d871c906d78299a4603f623ba4f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6185252bbcd0d871c906d782… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:16:21 2020 +0800 winemac.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 522ff57d7a..9a80308e89 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -847,6 +847,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (!devname && !devmode) { + memset(&default_mode, 0, sizeof(default_mode)); default_mode.dmSize = sizeof(default_mode); if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) {

1 0

Zhiyi Zhang : winex11.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 440fab3870b3c9ea778031ec51db69f8c3a687f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=440fab3870b3c9ea778031ec… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:16:06 2020 +0800 winex11.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index a64d1de650..2d1fc7220d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -501,6 +501,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, if (!dev_mode) { + memset(&registry_mode, 0, sizeof(registry_mode)); registry_mode.dmSize = sizeof(registry_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_REGISTRY_SETTINGS, &registry_mode, 0)) goto done; @@ -512,6 +513,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, displays[display_idx].desired_mode = *dev_mode; if (!(dev_mode->dmFields & DM_POSITION)) { + memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) goto done; @@ -522,6 +524,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, } else { + memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) goto done;

1 0

Zhiyi Zhang : user32: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 04d1a184e5db3320243afefb0de1f80fbe8436ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d1a184e5db3320243afefb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:15:55 2020 +0800 user32: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 79f938a3c2..0c0f8fac5d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3369,6 +3369,7 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND if (def_mode) { + memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); if (!EnumDisplaySettingsExW(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) { @@ -3428,6 +3429,8 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, if (lpszDeviceName) RtlCreateUnicodeStringFromAsciiz(&nameW, lpszDeviceName); else nameW.Buffer = NULL; + memset(&devmodeW, 0, sizeof(devmodeW)); + devmodeW.dmSize = sizeof(devmodeW); ret = EnumDisplaySettingsExW(nameW.Buffer,iModeNum,&devmodeW,dwFlags); if (ret) { @@ -4808,6 +4811,7 @@ LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCON &type, (BYTE *)device_name, sizeof(device_name), NULL, 0)) goto done; + memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); if (!EnumDisplaySettingsW(device_name, ENUM_CURRENT_SETTINGS, &devmode)) goto done;

1 0

Zhiyi Zhang : user32/tests: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 6d68c38c886a4b7733891e6ab60c800e9187f60a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d68c38c886a4b7733891e6a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:15:28 2020 +0800 user32/tests: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). Zero initialize DEVMODE before passing it to EnumDisplaySettings(), which may write beyond the end of the DEVMODE structure on Windows because the dmDriverExtra field is uninitialized. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 85fb2f080a..57d2ec0008 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -514,6 +514,7 @@ static void test_ChangeDisplaySettingsEx(void) devices[device_count].index = device; lstrcpyA(devices[device_count].name, dd.DeviceName); + memset(&devices[device_count].original_mode, 0, sizeof(devices[device_count].original_mode)); devices[device_count].original_mode.dmSize = sizeof(devices[device_count].original_mode); res = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &devices[device_count].original_mode); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", dd.DeviceName, GetLastError());

1 0

Zhiyi Zhang : gdi32/tests: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: ee1880a756ca0ebd75252bb870c1136ab0e67693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee1880a756ca0ebd75252bb8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 11 18:15:19 2020 +0800 gdi32/tests: Zero initialize DEVMODE before passing it to EnumDisplaySettings(). Zero initialize DEVMODE before passing it to EnumDisplaySettings(), which may write beyond the end of the DEVMODE structure on Windows because the dmDriverExtra field is uninitialized. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 6640134d1f..b4a89b213d 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -242,6 +242,8 @@ static void test_GdiConvertToDevmodeW(void) return; } + memset(&dmA, 0, sizeof(dmA)); + dmA.dmSize = sizeof(dmA); ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA); ok(ret, "EnumDisplaySettingsExA error %u\n", GetLastError()); ok(dmA.dmSize >= FIELD_OFFSET(DEVMODEA, dmICMMethod), "dmSize is too small: %04x\n", dmA.dmSize); @@ -591,6 +593,8 @@ static void test_CreateCompatibleDC(void) bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); bRet = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); ok(bRet, "EnumDisplaySettingsEx failed\n"); dm.u1.s1.dmScale = 200;

1 0

Gijs Vermeulen : wbemprox: Don't crash in IWbemClassObject::Put() when called with empty class object.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: c3bd08b02299e3ac89b708ff3bd4bda262ec6bde URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3bd08b02299e3ac89b708ff… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 11 12:01:47 2020 +0200 wbemprox: Don't crash in IWbemClassObject::Put() when called with empty class object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40945 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 3 +++ dlls/wbemprox/tests/query.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 1a00cfc40a..e048fb3db8 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -460,6 +460,9 @@ static HRESULT WINAPI class_object_Put( if ((hr = get_column_index( co->record->table, wszName, &index )) != S_OK) return hr; return record_set_value( co->record, index, pVal ); } + + if (!ec) return S_OK; + return put_propval( ec->query->view, co->index, wszName, pVal, Type ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index df0c26aa97..17942cd89a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -259,7 +259,7 @@ static void test_Win32_Service( IWbemServices *services ) { BSTR class = SysAllocString( L"Win32_Service.Name=\"Spooler\"" ), empty = SysAllocString( L"" ), method; IWbemClassObject *service, *out; - VARIANT state, retval; + VARIANT state, retval, classvar; CIMTYPE type; HRESULT hr; @@ -339,6 +339,13 @@ static void test_Win32_Service( IWbemServices *services ) hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( !!service, "expected non-NULL service\n" ); + + VariantInit(&classvar); + V_VT(&classvar) = VT_BSTR; + V_BSTR(&classvar) = SysAllocString(L"MyClass"); + hr = IWbemClassObject_Put(service, L"__CLASS", 0, &classvar, 0); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear(&classvar); IWbemClassObject_Release( service ); service = NULL;

1 0

Gijs Vermeulen : wbemprox: Set obj to NULL on error in get_object().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 11f2057768ed2d5416fad30d6e3e18683ffc17cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f2057768ed2d5416fad30d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 11 12:01:46 2020 +0200 wbemprox: Set obj to NULL on error in get_object(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/services.c | 6 +++++- dlls/wbemprox/tests/query.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index c0e535b3a1..3a0963e1f6 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -463,7 +463,11 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) return hr; } hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, obj, &count ); - if (hr == WBEM_S_FALSE) hr = WBEM_E_NOT_FOUND; + if (hr == WBEM_S_FALSE) + { + hr = WBEM_E_NOT_FOUND; + *obj = NULL; + } IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d6c918c08d..df0c26aa97 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -338,19 +338,23 @@ static void test_Win32_Service( IWbemServices *services ) service = NULL; hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - if (service) IWbemClassObject_Release( service ); + ok( !!service, "expected non-NULL service\n" ); + IWbemClassObject_Release( service ); service = NULL; hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - if (service) IWbemClassObject_Release( service ); + ok( !!service, "expected non-NULL service\n" ); + IWbemClassObject_Release( service ); SysFreeString( empty ); SysFreeString( class ); class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); + service = (IWbemClassObject *)0xdeadbeef; hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + ok( service == NULL, "expected NULL service, got %p\n", service ); SysFreeString( class ); }

1 0

Alexandre Julliard : ntdll: Unwind the syscall frame when calling KiRaiseUserExceptionDispatcher().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 9b7f14f1b49e838f5edc74296fd53b7215a8b52d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7f14f1b49e838f5edc7429… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 11 15:25:55 2020 +0200 ntdll: Unwind the syscall frame when calling KiRaiseUserExceptionDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 6 ++++-- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/signal_arm.c | 8 ++++++++ dlls/ntdll/unix/signal_arm64.c | 8 ++++++++ dlls/ntdll/unix/signal_i386.c | 16 ++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 3 ++- 8 files changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index b32665611f..f8aca6dfb7 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -179,10 +179,12 @@ void WINAPI RtlRaiseStatus( NTSTATUS status ) /******************************************************************* * KiRaiseUserExceptionDispatcher (NTDLL.@) */ -void WINAPI KiRaiseUserExceptionDispatcher(void) +NTSTATUS WINAPI KiRaiseUserExceptionDispatcher(void) { - EXCEPTION_RECORD rec = { NtCurrentTeb()->ExceptionCode }; + DWORD code = NtCurrentTeb()->ExceptionCode; + EXCEPTION_RECORD rec = { code }; RtlRaiseException( &rec ); + return code; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 776a22321a..d621d4ef8e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -95,7 +95,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); extern IMAGE_NT_HEADERS __wine_spec_nt_header; void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; -void (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; +NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 3f68e87acb..d867a7fb46 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1650,7 +1650,7 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) if (!NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &port, sizeof(port), NULL) && port) { NtCurrentTeb()->ExceptionCode = ret; - pKiRaiseUserExceptionDispatcher(); + call_raise_user_exception_dispatcher( pKiRaiseUserExceptionDispatcher ); } return ret; } diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 30a1f61969..e619dbd975 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -596,6 +596,14 @@ void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR arg1, } +/*********************************************************************** + * call_raise_user_exception_dispatcher + */ +__ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, + "mov r2, r0\n\t" /* dispatcher */ + "b " __ASM_NAME("call_user_exception_dispatcher") ) + + /*********************************************************************** * call_user_exception_dispatcher */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index b36b75972c..d5ced2172a 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -597,6 +597,14 @@ void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR arg1, } +/*********************************************************************** + * call_raise_user_exception_dispatcher + */ +__ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, + "mov x2, x0\n\t" /* dispatcher */ + "b " __ASM_NAME("call_user_exception_dispatcher") ) + + /*********************************************************************** * call_user_exception_dispatcher */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 00bb422c44..39c154ebbc 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1555,6 +1555,22 @@ void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR arg1, } +/*********************************************************************** + * call_raise_user_exception_dispatcher + */ +__ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, + "movl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ + "pushl (%eax)\n\t" /* frame->prev_frame */ + "popl %fs:0x1f8\n\t" + "movl 4(%eax),%edi\n\t" /* frame->edi */ + "movl 8(%eax),%esi\n\t" /* frame->esi */ + "movl 12(%eax),%ebx\n\t" /* frame->ebx */ + "movl 16(%eax),%ebp\n\t" /* frame->ebp */ + "movl 4(%esp),%edx\n\t" /* dispatcher */ + "leal 24(%eax),%esp\n\t" + "jmp *%edx" ) + + /*********************************************************************** * call_user_exception_dispatcher */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index a1de881845..a1918908fc 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1907,6 +1907,37 @@ void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR arg1, } +/*********************************************************************** + * call_raise_user_exception_dispatcher + */ +__ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, + "movq %gs:0x30,%rdx\n\t" + "movq 0x328(%rdx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ + "pushq (%rax)\n\t" /* frame->prev_frame */ + "popq 0x328(%rdx)\n\t" + "movdqu 0x10(%rax),%xmm6\n\t" /* frame->xmm[0..19 */ + "movdqu 0x20(%rax),%xmm7\n\t" + "movdqu 0x30(%rax),%xmm8\n\t" + "movdqu 0x40(%rax),%xmm9\n\t" + "movdqu 0x50(%rax),%xmm10\n\t" + "movdqu 0x60(%rax),%xmm11\n\t" + "movdqu 0x70(%rax),%xmm12\n\t" + "movdqu 0x80(%rax),%xmm13\n\t" + "movdqu 0x90(%rax),%xmm14\n\t" + "movdqu 0xa0(%rax),%xmm15\n\t" + "ldmxcsr 0xb0(%rax)\n\t" /* frame->mxcsr */ + "movq 0xb8(%rax),%r12\n\t" /* frame->r12 */ + "movq 0xc0(%rax),%r13\n\t" /* frame->r13 */ + "movq 0xc8(%rax),%r14\n\t" /* frame->r14 */ + "movq 0xd0(%rax),%r15\n\t" /* frame->r15 */ + "movq 0xd8(%rax),%rdi\n\t" /* frame->rdi */ + "movq 0xe0(%rax),%rsi\n\t" /* frame->rsi */ + "movq 0xe8(%rax),%rbx\n\t" /* frame->rbx */ + "movq 0xf0(%rax),%rbp\n\t" /* frame->rbp */ + "leaq 0x100(%rax),%rsp\n\t" + "jmpq *%rcx" ) + + /*********************************************************************** * call_user_exception_dispatcher */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7a6bb3c64a..397211957b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -84,7 +84,7 @@ static const SIZE_T signal_stack_size = 0x10000 - 0x3000; /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; -extern void (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; +extern NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; extern void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; @@ -262,6 +262,7 @@ extern void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR ULONG_PTR arg2, PNTAPCFUNC func ) DECLSPEC_HIDDEN; extern void WINAPI DECLSPEC_NORETURN call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; +extern void WINAPI DECLSPEC_NORETURN call_raise_user_exception_dispatcher( NTSTATUS (WINAPI *dispatcher)(void) ) DECLSPEC_HIDDEN; #define TICKSPERSEC 10000000 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)86400)

1 0

Alexandre Julliard : ntdll: Unwind the syscall frame when calling KiUserExceptionDispatcher().
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 1e7e21534e6598782e77c38907573fa0e118e13b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e7e21534e6598782e77c389… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 11 14:49:34 2020 +0200 ntdll: Unwind the syscall frame when calling KiUserExceptionDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 23 ++++++++++++++++++----- dlls/ntdll/unix/signal_arm64.c | 26 +++++++++++++++++++++----- dlls/ntdll/unix/signal_i386.c | 22 ++++++++++++++++------ dlls/ntdll/unix/signal_x86_64.c | 10 +++++----- dlls/ntdll/unix/unix_private.h | 4 ++-- 5 files changed, 62 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a8d25855a1..30a1f61969 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -599,11 +599,24 @@ void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR arg1, /*********************************************************************** * call_user_exception_dispatcher */ -void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, - NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) -{ - dispatcher( rec, context ); -} +__ASM_GLOBAL_FUNC( call_user_exception_dispatcher, + "mov r4, r0\n\t" + "mov r5, r1\n\t" + "mov r6, r2\n\t" + "bl " __ASM_NAME("NtCurrentTeb") "\n\t" + "add r7, r0, #0x1d8\n\t" /* arm_thread_data()->syscall_frame */ + "mov r0, r4\n\t" + "mov r1, r5\n\t" + "mov r2, r6\n\t" + "ldr r3, [r7]\n\t" + "ldr r4, [r3]\n\t" /* frame->prev_frame */ + "str r4, [r7]\n\t" + "add r3, r3, #8\n\t" + "ldm r3, {r5-r11}\n\t" + "ldr r4, [r3, #32]\n\t" + "ldr lr, [r3, #36]\n\t" + "add sp, r3, #40\n\t" + "bx r2" ) /********************************************************************** diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 36f6dfe568..b36b75972c 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -600,11 +600,27 @@ void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR arg1, /*********************************************************************** * call_user_exception_dispatcher */ -void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, - NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) -{ - dispatcher( rec, context ); -} +__ASM_GLOBAL_FUNC( call_user_exception_dispatcher, + "mov x19, x0\n\t" + "mov x20, x1\n\t" + "mov x21, x2\n\t" + "bl " __ASM_NAME("NtCurrentTeb") "\n\t" + "add x4, x0, #0x2f8\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x5, [x4]\n\t" + "ldr x6, [x5, #88]\n\t" /* frame->prev_frame */ + "str x6, [x4]\n\t" + "mov x0, x19\n\t" + "mov x1, x20\n\t" + "mov x2, x21\n\t" + "ldp x19, x20, [x5, #96]\n\t" /* frame->x19,x20 */ + "ldp x21, x22, [x5, #112]\n\t" /* frame->x21,x22 */ + "ldp x23, x24, [x5, #128]\n\t" /* frame->x23,x24 */ + "ldp x25, x26, [x5, #144]\n\t" /* frame->x25,x26 */ + "ldp x27, x28, [x5, #160]\n\t" /* frame->x27,x28 */ + "ldp x29, x30, [x5, #176]\n\t" /* frame->thunk_x29,ret_addr */ + "add sp, x5, #192\n\t" + "br x2" ) + /********************************************************************** * segv_handler diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index b929ae2990..00bb422c44 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1559,13 +1559,23 @@ void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR arg1, * call_user_exception_dispatcher */ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, - "add $4,%esp\n\t" - "movl (%esp),%eax\n\t" /* rec */ - "cmpl $0x80000003,(%eax)\n\t" /* ExceptionCode */ + "movl 4(%esp),%edx\n\t" /* rec */ + "movl 8(%esp),%ecx\n\t" /* context */ + "cmpl $0x80000003,(%edx)\n\t" /* rec->ExceptionCode */ "jne 1f\n\t" - "movl 4(%esp),%eax\n\t" /* context */ - "decl 0xb8(%eax)\n\t" /* Eip */ - "1:\tjmp *8(%esp)") + "decl 0xb8(%ecx)\n" /* context->Eip */ + "1:\tmovl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ + "pushl (%eax)\n\t" /* frame->prev_frame */ + "popl %fs:0x1f8\n\t" + "movl 4(%eax),%edi\n\t" /* frame->edi */ + "movl 8(%eax),%esi\n\t" /* frame->esi */ + "movl 12(%eax),%ebx\n\t" /* frame->ebx */ + "movl 16(%eax),%ebp\n\t" /* frame->ebp */ + "movl %edx,16(%eax)\n\t" + "movl %ecx,20(%eax)\n\t" + "movl 12(%esp),%edx\n\t" /* dispatcher */ + "leal 16(%eax),%esp\n\t" + "jmp *%edx" ) /********************************************************************** * get_fpu_code diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 09e82c1b27..a1de881845 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1926,15 +1926,15 @@ void WINAPI do_call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *c NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*), struct stack_layout *stack ) { + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + memmove(&stack->context, context, sizeof(*context)); memcpy(&stack->rec, rec, sizeof(*rec)); - if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) - { - /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - stack->context.Rip--; - } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (stack->rec.ExceptionCode == EXCEPTION_BREAKPOINT) stack->context.Rip--; + amd64_thread_data()->syscall_frame = frame->prev_frame; user_exception_dispatcher_trampoline( stack, dispatcher ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 68559269f8..7a6bb3c64a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -260,8 +260,8 @@ extern void dbg_init(void) DECLSPEC_HIDDEN; extern void WINAPI call_user_apc( CONTEXT *context_ptr, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2, PNTAPCFUNC func ) DECLSPEC_HIDDEN; -extern void WINAPI call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, - NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; +extern void WINAPI DECLSPEC_NORETURN call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context, + NTSTATUS (WINAPI *dispatcher)(EXCEPTION_RECORD*,CONTEXT*) ) DECLSPEC_HIDDEN; #define TICKSPERSEC 10000000 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)86400)

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
70
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 August 2020