wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Zhiyi Zhang : winex11.drv: Make screen helpers independent of Xinerama.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 25167fb286822c93582457815bcf069fef040976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25167fb286822c9358245781… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:23:55 2019 +0800 winex11.drv: Make screen helpers independent of Xinerama. So that other display device handlers such as XRandR can be introduced because they might report a virtual screen size with different top-left corner and the primary screen may be different as well. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xinerama.c | 33 --------------------- 2 files changed, 70 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a0f8489..f96fd93 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,6 +104,34 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; +static RECT virtual_screen_rect; +static RECT primary_monitor_rect; + +POINT virtual_screen_to_root(INT x, INT y) +{ + POINT pt; + pt.x = x - virtual_screen_rect.left; + pt.y = y - virtual_screen_rect.top; + return pt; +} + +POINT root_to_virtual_screen(INT x, INT y) +{ + POINT pt; + pt.x = x + virtual_screen_rect.left; + pt.y = y + virtual_screen_rect.top; + return pt; +} + +RECT get_virtual_screen_rect(void) +{ + return virtual_screen_rect; +} + +RECT get_primary_monitor_rect(void) +{ + return primary_monitor_rect; +} void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { @@ -293,6 +321,9 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; + UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); + if (video_index == 0) + primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -317,6 +348,9 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; + SetRectEmpty(&virtual_screen_rect); + SetRectEmpty(&primary_monitor_rect); + /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -365,6 +399,36 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } +/* Initialize virtual screen rect and primary monitor rect for current process */ +static void init_screen_rects(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + RECT rect; + + /* Already initialized */ + if (!IsRectEmpty(&virtual_screen_rect)) + return; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, + sizeof(rect), NULL, 0)) + ERR("Failed to get monitor size property\n"); + + UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); + if (i == 1) + primary_monitor_rect = rect; + } + SetupDiDestroyDeviceInfoList(devinfo); + + TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), + wine_dbgstr_rect(&primary_monitor_rect)); +} + void X11DRV_DisplayDevices_Init(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; @@ -393,7 +457,10 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) + { + init_screen_rects(); goto done; + } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -440,6 +507,9 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } + TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), + wine_dbgstr_rect(&primary_monitor_rect)); + done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 75ef3a2..370d34e 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -static RECT virtual_screen_rect; - static MONITORINFOEXW default_monitor = { sizeof(default_monitor), /* cbSize */ @@ -161,32 +159,6 @@ static inline int query_screens(void) #endif /* SONAME_LIBXINERAMA */ -POINT virtual_screen_to_root( INT x, INT y ) -{ - POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; - return pt; -} - -POINT root_to_virtual_screen( INT x, INT y ) -{ - POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; - return pt; -} - -RECT get_virtual_screen_rect(void) -{ - return virtual_screen_rect; -} - -RECT get_primary_monitor_rect(void) -{ - return get_primary()->rcMonitor; -} - static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -349,7 +321,6 @@ void xinerama_init( unsigned int width, unsigned int height ) } primary = get_primary(); - SetRectEmpty( &virtual_screen_rect ); /* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); @@ -357,7 +328,6 @@ void xinerama_init( unsigned int width, unsigned int height ) { OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); - UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); TRACE( "monitor 0x%x: %s work %s%s\n", i, wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), @@ -373,7 +343,4 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.pFreeAdapters = xinerama_free_adapters; handler.pFreeMonitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); - - TRACE( "virtual size: %s primary: %s\n", - wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); }

1 0

Zhiyi Zhang : winex11.drv: Add xrandr_get_screen_resources() helper.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 95a0a5c755cecdedd111c57f128a0150280316f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a0a5c755cecdedd111c57f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:22:01 2019 +0800 winex11.drv: Add xrandr_get_screen_resources() helper. Getting screen resources will be used in multiple places. So put it in a function. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 9f63310..288b83f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -274,6 +274,20 @@ static void xrandr10_init_modes(void) #ifdef HAVE_XRRGETSCREENRESOURCES +static XRRScreenResources *xrandr_get_screen_resources(void) +{ + XRRScreenResources *resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ); + if (resources && !resources->ncrtc) + { + pXRRFreeScreenResources( resources ); + resources = pXRRGetScreenResources( gdi_display, root_window ); + } + + if (!resources) + ERR("Failed to get screen resources.\n"); + return resources; +} + static int xrandr12_get_current_mode(void) { XRRScreenResources *resources; @@ -448,21 +462,8 @@ static int xrandr12_init_modes(void) int ret = -1; int i, j; - if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); + if (!(resources = xrandr_get_screen_resources())) return ret; - } - - if (!resources->ncrtc) - { - pXRRFreeScreenResources( resources ); - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); - return ret; - } - } if (!(crtc_info = xrandr12_get_primary_crtc_info( resources, &primary_crtc ))) {

1 0

Zhiyi Zhang : user32: Wait for graphics driver to be ready in EnumDisplayDevicesW.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 8f45d9a991cbc739fafde55811524eaf742282b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f45d9a991cbc739fafde558… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:21:06 2019 +0800 user32: Wait for graphics driver to be ready in EnumDisplayDevicesW. It's possible that EnumDisplayDevicesW gets called before graphics driver is loaded. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index cdeea65..09cebc2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -736,6 +736,18 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +/* Wait until graphics driver is loaded by explorer */ +static void wait_graphics_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW( GetDesktopWindow(), WM_NULL, 0, 0 ); + ready = TRUE; + } +} + /* map value from system dpi to standard 96 dpi for storing in the registry */ static int map_from_system_dpi( int val ) { @@ -4048,6 +4060,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + wait_graphics_driver_ready(); mutex = get_display_device_init_mutex(); /* Find adapter */

1 0

Alexandre Julliard : msvcrt: Simplify stack layout in __crtCapturePreviousContext().
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: ed6aa17d9880f5c5e1fe47fe725bfe96d4ed681f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed6aa17d9880f5c5e1fe47fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 13:54:46 2019 +0200 msvcrt: Simplify stack layout in __crtCapturePreviousContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 1aa04ab..09eddfb 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -732,9 +732,6 @@ void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) TRACE("(%p)\n", ctx); - ctx->Rip = rip; - ctx->Rsp += 3*8; /* Rip, Rcx, return address */ - rf = RtlLookupFunctionEntry(ctx->Rip, &image_base, NULL); if(!rf) { FIXME("RtlLookupFunctionEntry failed\n"); @@ -746,16 +743,14 @@ void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) } __ASM_GLOBAL_FUNC( __crtCapturePreviousContext, - "pushq (%rsp)\n\t" /* save Rip */ - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") - "pushq %rcx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") - "call " __ASM_NAME("RtlCaptureContext") "\n\t" - "popq %rcx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") - "popq %rdx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") - "jmp " __ASM_NAME("get_prev_context") ); + "movq %rcx,8(%rsp)\n\t" + "call " __ASM_NAME("RtlCaptureContext") "\n\t" + "movq 8(%rsp),%rcx\n\t" /* context */ + "leaq 8(%rsp),%rax\n\t" + "movq %rax,0x98(%rcx)\n\t" /* context->Rsp */ + "movq (%rsp),%rax\n\t" + "movq %rax,0xf8(%rcx)\n\t" /* context->Rip */ + "jmp " __ASM_NAME("get_prev_context") ) #endif #endif /* __x86_64__ */

1 0

Alexandre Julliard : vcomp: Add .seh annotations for x86_64.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 451c8592b97388d7f243f0f3b5c0861ae3121694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=451c8592b97388d7f243f0f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 11:28:32 2019 +0200 vcomp: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 288806b..fe87ca0 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -157,13 +157,18 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "pushq %rsi\n\t" + __ASM_SEH(".seh_pushreg %rsi\n\t") __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") "pushq %rdi\n\t" + __ASM_SEH(".seh_pushreg %rdi\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") "movq %rcx,%rax\n\t" "movq $4,%rcx\n\t"

1 0

Alexandre Julliard : rpcrt4: Add .seh annotations for x86_64.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 7592b406d2e1f426cbc65421fe4f0b4bd8da6a08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7592b406d2e1f426cbc65421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 11:28:26 2019 +0200 rpcrt4: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 16 +++++++++------- dlls/rpcrt4/ndr_stubless.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 36612be..3b94677 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -104,19 +104,21 @@ static inline void init_thunk( struct thunk *thunk, unsigned int index ) extern void call_stubless_func(void); __ASM_GLOBAL_FUNC(call_stubless_func, - "movq %rcx,0x8(%rsp)\n\t" - "movq %rdx,0x10(%rsp)\n\t" - "movq %r8,0x18(%rsp)\n\t" - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x8(%rsp),%r8\n\t" /* &This */ + "subq $0x38,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x38\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x38\n\t") + "movq %rcx,0x40(%rsp)\n\t" + "movq %rdx,0x48(%rsp)\n\t" + "movq %r8,0x50(%rsp)\n\t" + "movq %r9,0x58(%rsp)\n\t" + "leaq 0x40(%rsp),%r8\n\t" /* &This */ "movq (%rcx),%rcx\n\t" /* This->lpVtbl */ "movq -0x10(%rcx),%rcx\n\t" /* MIDL_STUBLESS_PROXY_INFO */ "movq 0x10(%rcx),%rdx\n\t" /* info->FormatStringOffset */ "movzwq (%rdx,%r10,2),%rdx\n\t" /* FormatStringOffset[index] */ "addq 8(%rcx),%rdx\n\t" /* info->ProcFormatString + offset */ "movq (%rcx),%rcx\n\t" /* info->pStubDesc */ - "subq $0x38,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 0x38\n\t") "movq %xmm1,0x20(%rsp)\n\t" "movq %xmm2,0x28(%rsp)\n\t" "movq %xmm3,0x30(%rsp)\n\t" diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 287b0fa..b47ffa9 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1092,13 +1092,18 @@ __ASM_GLOBAL_FUNC(call_server_func, LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned int stack_size); __ASM_GLOBAL_FUNC( call_server_func, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "pushq %rsi\n\t" + __ASM_SEH(".seh_pushreg %rsi\n\t") __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") "pushq %rdi\n\t" + __ASM_SEH(".seh_pushreg %rdi\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") "movq %rcx,%rax\n\t" /* function to call */ "movq $32,%rcx\n\t" /* allocate max(32,stack_size) bytes of stack space */ @@ -1854,11 +1859,13 @@ cleanup: #ifdef __x86_64__ __ASM_GLOBAL_FUNC( NdrAsyncClientCall, - "movq %r8,0x18(%rsp)\n\t" - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x18(%rsp),%r8\n\t" "subq $0x28,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x28\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq %r8,0x40(%rsp)\n\t" + "movq %r9,0x48(%rsp)\n\t" + "leaq 0x40(%rsp),%r8\n\t" "call " __ASM_NAME("ndr_async_client_call") "\n\t" "addq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")

1 0

Alexandre Julliard : oleaut32: Add .seh annotations for x86_64.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 7b82fa1990c1c9e6ccdd7b635f6fcdaa54ad7c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b82fa1990c1c9e6ccdd7b63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 10:43:19 2019 +0200 oleaut32: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 09b669e..b13f6dc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6358,14 +6358,19 @@ extern DWORD_PTR CDECL call_method( void *func, int nb_args, const DWORD_PTR *ar extern double CDECL call_double_method( void *func, int nb_args, const DWORD_PTR *args ); __ASM_GLOBAL_FUNC( call_method, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "pushq %rsi\n\t" + __ASM_SEH(".seh_pushreg %rsi\n\t") __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") "pushq %rdi\n\t" + __ASM_SEH(".seh_pushreg %rdi\n\t") __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") + __ASM_SEH(".seh_endprologue\n\t") "movq %rcx,%rax\n\t" "movq $4,%rcx\n\t" "cmp %rcx,%rdx\n\t"

1 0

Alexandre Julliard : ntdll: Add .seh annotations for x86_64.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: b96d15e1b0914002dc37d55fcd35e2de4094d4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=b96d15e1b0914002dc37d55f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 11:28:52 2019 +0200 ntdll: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 5 ++++- dlls/ntdll/signal_x86_64.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 1deb2b7..04957ac 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -777,9 +777,12 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne extern INT_PTR WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ); __ASM_GLOBAL_FUNC( relay_call, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "leaq -0x48(%rbp),%rsp\n\t" "andq $~15,%rsp\n\t" @@ -831,7 +834,7 @@ __ASM_GLOBAL_FUNC( relay_call, __ASM_CFI(".cfi_same_value %rsi\n\t") "movq -8(%rbp),%rdi\n\t" __ASM_CFI(".cfi_same_value %rdi\n\t") - "movq %rbp,%rsp\n\t" + "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 2c26bd5..bf30815 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1797,6 +1797,8 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, extern void set_full_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_full_cpu_context, "subq $40,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x40\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 40\n\t") "ldmxcsr 0x34(%rdi)\n\t" /* context->MxCsr */ "movw 0x38(%rdi),%ax\n\t" /* context->SegCs */ @@ -3733,11 +3735,15 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec ); __ASM_GLOBAL_FUNC( call_consolidate_callback, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "subq $0x20,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x20\n\t") + __ASM_SEH(".seh_endprologue\n\t") "movq %rcx,0x10(%rbp)\n\t" __ASM_CFI(".cfi_remember_state\n\t") __ASM_CFI(".cfi_escape 0x0f,0x07,0x76,0x10,0x06,0x23,0x98,0x01,0x06\n\t") /* CFA */ @@ -3763,7 +3769,7 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, "movq %r8,%rcx\n\t" "callq *%rdx\n\t" __ASM_CFI(".cfi_restore_state\n\t") - "movq %rbp,%rsp\n\t" + "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") @@ -4110,9 +4116,11 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, * RtlRaiseException (NTDLL.@) */ __ASM_GLOBAL_FUNC( RtlRaiseException, - "movq %rcx,8(%rsp)\n\t" "sub $0x4f8,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x4f8\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 0x4f8\n\t") + "movq %rcx,0x500(%rsp)\n\t" "leaq 0x20(%rsp),%rcx\n\t" "call " __ASM_NAME("RtlCaptureContext") "\n\t" "leaq 0x20(%rsp),%rdx\n\t" /* context pointer */ @@ -4269,6 +4277,8 @@ extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void * void *relay ); __ASM_GLOBAL_FUNC( start_thread, "subq $56,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 56\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") "movq %rbp,48(%rsp)\n\t" __ASM_CFI(".cfi_rel_offset %rbp,48\n\t")

1 0

Alexandre Julliard : kernel32: Add .seh annotations for x86_64.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 3ca42e0a9795e271558472e43fda09a93853634c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ca42e0a9795e271558472e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 11:28:59 2019 +0200 kernel32: Add .seh annotations for x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index acfc365..24fb9e3 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -980,11 +980,15 @@ extern FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ); __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "subq $0x40,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x40\n\t") + __ASM_SEH(".seh_endprologue\n\t") "movaps %xmm0,-0x10(%rbp)\n\t" "movaps %xmm1,-0x20(%rbp)\n\t" "movaps %xmm2,-0x30(%rbp)\n\t" @@ -994,7 +998,7 @@ __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "movaps -0x30(%rbp), %xmm2\n\t" "movaps -0x20(%rbp), %xmm1\n\t" "movaps -0x10(%rbp), %xmm0\n\t" - "movq %rbp,%rsp\n\t" + "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t")

1 0

Alexandre Julliard : winecrt0: Add .seh annotations for x86_64.
by Alexandre Julliard 21 Aug '19

21 Aug '19

Module: wine Branch: master Commit: 8af4e177f3c6f0e8df35cfebb7221665012250e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8af4e177f3c6f0e8df35cfeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 10:48:25 2019 +0200 winecrt0: Add .seh annotations for x86_64. Based on a patch by Rémi Bernon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index df7315e..3a0ecfe 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -117,11 +117,15 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, __ASM_GLOBAL_FUNC( __wine_rtl_unwind, "pushq %rbp\n\t" + __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") "movq %rsp,%rbp\n\t" + __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") "subq $0x20,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x20\n\t") + __ASM_SEH(".seh_endprologue\n\t") "movq %r8,%r9\n\t" /* retval = final target */ "movq %rdx,%r8\n\t" /* record */ "leaq __wine_unwind_trampoline(%rip),%rdx\n\t" /* target = trampoline */

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
71
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 2019