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

Ziqing Hui : qasf/dmowrapper: Introduce release_output_samples.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 50485e0db4d143f05edbef6c473bc44c50e611a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/50485e0db4d143f05edbef6c473bc4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 4 11:12:59 2024 +0800 qasf/dmowrapper: Introduce release_output_samples. --- dlls/qasf/dmowrapper.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index b98b18a7cac..1d4ad7f75e6 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -202,6 +202,20 @@ static void dmo_wrapper_sink_disconnect(struct strmbase_sink *iface) IMediaObject_Release(dmo); } +static void release_output_samples(struct dmo_wrapper *filter) +{ + DWORD i; + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].buffer.sample) + { + IMediaSample_Release(filter->sources[i].buffer.sample); + filter->sources[i].buffer.sample = NULL; + } + } +} + static HRESULT get_output_samples(struct dmo_wrapper *filter) { HRESULT hr; @@ -215,6 +229,7 @@ static HRESULT get_output_samples(struct dmo_wrapper *filter) &filter->sources[i].buffer.sample, NULL, NULL, 0))) { ERR("Failed to get sample for source %lu, hr %#lx.\n", i, hr); + release_output_samples(filter); return hr; } filter->buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; @@ -235,7 +250,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) HRESULT hr; if (FAILED(hr = get_output_samples(filter))) - goto out; + return hr; do { @@ -275,7 +290,8 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) if (FAILED(hr = IMemInputPin_Receive(filter->sources[i].pin.pMemInputPin, sample))) { WARN("Downstream sink returned %#lx.\n", hr); - goto out; + release_output_samples(filter); + return hr; } IMediaSample_SetActualDataLength(sample, 0); } @@ -283,16 +299,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) } } while (more_data); -out: - for (i = 0; i < filter->source_count; ++i) - { - if (filter->sources[i].buffer.sample) - { - IMediaSample_Release(filter->sources[i].buffer.sample); - filter->sources[i].buffer.sample = NULL; - } - } - + release_output_samples(filter); return hr; }

1 0

Rémi Bernon : win32u: Introduce new helpers to convert server rectangle_t.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 9e9d2d43c1d1931fd3450543b4913d339687d24c URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9d2d43c1d1931fd3450543b4913d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 10:37:26 2024 +0200 win32u: Introduce new helpers to convert server rectangle_t. --- dlls/win32u/dce.c | 15 ++++---------- dlls/win32u/input.c | 47 +++++++++---------------------------------- dlls/win32u/message.c | 5 +---- dlls/win32u/window.c | 31 +++++----------------------- dlls/wineandroid.drv/window.c | 5 +---- dlls/winex11.drv/event.c | 5 +---- dlls/winex11.drv/mouse.c | 5 +---- dlls/winex11.drv/window.c | 5 +---- include/wine/server.h | 26 ++++++++++++++++++++++++ 9 files changed, 49 insertions(+), 95 deletions(-)

1 0

Rémi Bernon : win32u: Introduce NtUserAdjustWindowRect call for AdjustWindowRect*.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 9afb3057af99b6442302e3b11f12f66d303db370 URL: https://gitlab.winehq.org/wine/wine/-/commit/9afb3057af99b6442302e3b11f12f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 10:37:57 2024 +0200 win32u: Introduce NtUserAdjustWindowRect call for AdjustWindowRect*. --- dlls/user32/nonclient.c | 78 -------------------------------------------- dlls/user32/sysparams.c | 30 +++++++++++++++++ dlls/win32u/defwnd.c | 13 +++----- dlls/win32u/sysparams.c | 6 ++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- dlls/winemac.drv/window.c | 21 +++++++++--- dlls/winex11.drv/window.c | 13 +++++++- include/ntuser.h | 21 ++++++++++++ 9 files changed, 93 insertions(+), 92 deletions(-)

1 0

Rémi Bernon : win32u: Pass desired DPI to NtUserGet(Client|Window)Rect.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 64639c93c8cf03dc232b19365c1d0bc43969037c URL: https://gitlab.winehq.org/wine/wine/-/commit/64639c93c8cf03dc232b19365c1d0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 11:14:04 2024 +0200 win32u: Pass desired DPI to NtUserGet(Client|Window)Rect. --- dlls/user32/win.c | 6 ++++-- dlls/win32u/dce.c | 2 +- dlls/win32u/defwnd.c | 6 +++--- dlls/win32u/input.c | 2 +- dlls/win32u/menu.c | 2 +- dlls/win32u/scroll.c | 6 +++--- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 23 ++++++++++++----------- dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/window.c | 2 +- dlls/winemac.drv/window.c | 4 ++-- dlls/winevulkan/vulkan.c | 19 +++++++++++++++---- dlls/winex11.drv/event.c | 7 ++++--- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/window.c | 5 ++--- dlls/winex11.drv/x11drv.h | 1 + dlls/wow64win/user.c | 16 ++++++++++++++++ include/ntuser.h | 20 ++++++++++++++------ 19 files changed, 84 insertions(+), 44 deletions(-)

1 0

Rémi Bernon : win32u: Introduce a new get_monitor_rect helper.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: e02685f86eea2882397fc05f86ccd73551d71c24 URL: https://gitlab.winehq.org/wine/wine/-/commit/e02685f86eea2882397fc05f86ccd7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 1 15:26:47 2024 +0200 win32u: Introduce a new get_monitor_rect helper. --- dlls/win32u/sysparams.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 796c330ddad..365ca158788 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2102,6 +2102,11 @@ UINT get_monitor_dpi( HMONITOR monitor ) return system_dpi; } +static RECT get_monitor_rect( struct monitor *monitor, UINT dpi ) +{ + return map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), dpi ); +} + /********************************************************************** * get_win_monitor_dpi */ @@ -2303,9 +2308,7 @@ static BOOL is_window_rect_full_screen( const RECT *rect ) if (!is_monitor_active( monitor ) || monitor->is_clone) continue; - monrect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), - get_thread_dpi() ); - + monrect = get_monitor_rect( monitor, get_thread_dpi() ); if (rect->left <= monrect.left && rect->right >= monrect.right && rect->top <= monrect.top && rect->bottom >= monrect.bottom) { @@ -3502,8 +3505,7 @@ static BOOL should_enumerate_monitor( struct monitor *monitor, const POINT *orig if (!is_monitor_active( monitor )) return FALSE; if (monitor->is_clone) return FALSE; - *rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), - get_thread_dpi() ); + *rect = get_monitor_rect( monitor, get_thread_dpi() ); OffsetRect( rect, -origin->x, -origin->y ); return intersect_rect( rect, rect, limit ); } @@ -3656,7 +3658,7 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) if (!is_monitor_active( monitor ) || monitor->is_clone) continue; - monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi ); + monitor_rect = get_monitor_rect( monitor, system_dpi ); if (intersect_rect( &intersect, &monitor_rect, &r )) { /* check for larger intersecting area */

1 0

Rémi Bernon : win32u: Pass the rect DPI to NtUserIsWindowRectFullScreen.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 979d36969c6280b26585e1fdc366b8c08acef4cd URL: https://gitlab.winehq.org/wine/wine/-/commit/979d36969c6280b26585e1fdc366b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 11:59:24 2024 +0200 win32u: Pass the rect DPI to NtUserIsWindowRectFullScreen. --- dlls/win32u/input.c | 6 ++++-- dlls/win32u/sysparams.c | 10 +++++----- dlls/winewayland.drv/window.c | 12 +++++++++++- dlls/winex11.drv/event.c | 5 +++-- dlls/winex11.drv/window.c | 7 ++++--- include/ntuser.h | 12 ++++++------ 6 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 5c43f004991..a58a8369559 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2500,6 +2500,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) RECT rect; HMONITOR monitor; DWORD style; + UINT dpi; BOOL ret; if (hwnd == NtUserGetDesktopWindow()) return FALSE; @@ -2511,8 +2512,9 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) /* maximized windows don't count as full screen */ if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; - if (!NtUserGetWindowRect( hwnd, &rect, get_thread_dpi() )) return FALSE; - if (!NtUserIsWindowRectFullScreen( &rect )) return FALSE; + dpi = get_dpi_for_window( hwnd ); + if (!NtUserGetWindowRect( hwnd, &rect, dpi )) return FALSE; + if (!NtUserIsWindowRectFullScreen( &rect, dpi )) return FALSE; if (is_captured_by_system()) return FALSE; if (NtGetTickCount() - thread_info->clipping_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_info->clipping_cursor) return FALSE; /* already clipping */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 365ca158788..006c8820b7b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2295,7 +2295,7 @@ RECT get_virtual_screen_rect( UINT dpi ) return rect; } -static BOOL is_window_rect_full_screen( const RECT *rect ) +static BOOL is_window_rect_full_screen( const RECT *rect, UINT dpi ) { struct monitor *monitor; BOOL ret = FALSE; @@ -2308,7 +2308,7 @@ static BOOL is_window_rect_full_screen( const RECT *rect ) if (!is_monitor_active( monitor ) || monitor->is_clone) continue; - monrect = get_monitor_rect( monitor, get_thread_dpi() ); + monrect = get_monitor_rect( monitor, dpi ); if (rect->left <= monrect.left && rect->right >= monrect.right && rect->top <= monrect.top && rect->bottom >= monrect.bottom) { @@ -6421,9 +6421,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_GetSysColor: return get_sys_color( arg ); - case NtUserCallOneParam_IsWindowRectFullScreen: - return is_window_rect_full_screen( (const RECT *)arg ); - case NtUserCallOneParam_RealizePalette: return realize_palette( UlongToHandle(arg) ); @@ -6513,6 +6510,9 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return adjust_window_rect( (RECT *)arg1, params->style, params->menu, params->ex_style, params->dpi ); } + case NtUserCallTwoParam_IsWindowRectFullScreen: + return is_window_rect_full_screen( (const RECT *)arg1, arg2 ); + /* temporary exports */ case NtUserAllocWinProc: return (UINT_PTR)alloc_winproc( (WNDPROC)arg1, arg2 ); diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 906dcbc42df..cd8ca76b679 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -36,6 +36,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); + +/********************************************************************** + * get_win_monitor_dpi + */ +static UINT get_win_monitor_dpi(HWND hwnd) +{ + return NtUserGetSystemDpiForProcess(NULL); /* FIXME: get monitor dpi */ +} + + /* private window data */ struct wayland_win_data { @@ -171,7 +181,7 @@ static void wayland_win_data_get_config(struct wayland_win_data *data, TRACE("window=%s style=%#lx\n", wine_dbgstr_rect(&conf->rect), (long)style); /* The fullscreen state is implied by the window position and style. */ - if (NtUserIsWindowRectFullScreen(&conf->rect)) + if (NtUserIsWindowRectFullScreen(&conf->rect, get_win_monitor_dpi(data->hwnd))) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) window_state |= WAYLAND_SURFACE_CONFIG_STATE_MAXIMIZED; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 7ba3be8d95e..88863e62dd1 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1046,7 +1046,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) struct x11drv_win_data *data; RECT rect; POINT pos; - UINT flags; + UINT flags, dpi; HWND parent; BOOL root_coords; int cx, cy, x = event->x, y = event->y; @@ -1068,6 +1068,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) /* Get geometry */ + dpi = get_win_monitor_dpi( data->hwnd ); parent = NtUserGetAncestor( hwnd, GA_PARENT ); root_coords = event->send_event; /* synthetic events are always in root coords */ @@ -1119,7 +1120,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) (int)(data->window_rect.bottom - data->window_rect.top), cx, cy ); style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE ); - if ((style & WS_CAPTION) == WS_CAPTION || !NtUserIsWindowRectFullScreen( &data->whole_rect )) + if ((style & WS_CAPTION) == WS_CAPTION || !NtUserIsWindowRectFullScreen( &data->whole_rect, dpi )) { read_net_wm_states( event->display, data ); if ((data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED))) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index de0322a77ca..ef2f80ba02f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -297,7 +297,7 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl { if (style & WS_THICKFRAME) return TRUE; /* Metacity needs the window to be resizable to make it fullscreen */ - return NtUserIsWindowRectFullScreen( &data->whole_rect ); + return NtUserIsWindowRectFullScreen( &data->whole_rect, get_win_monitor_dpi( data->hwnd ) ); } /*********************************************************************** @@ -1089,7 +1089,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE ); if (style & WS_MINIMIZE) new_state |= data->net_wm_state & ((1 << NET_WM_STATE_FULLSCREEN)|(1 << NET_WM_STATE_MAXIMIZED)); - if (NtUserIsWindowRectFullScreen( &data->whole_rect )) + if (NtUserIsWindowRectFullScreen( &data->whole_rect, get_win_monitor_dpi( data->hwnd ) )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); @@ -2761,7 +2761,8 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, { release_win_data( data ); unmap_window( hwnd ); - if (NtUserIsWindowRectFullScreen( &old_window_rect )) NtUserClipCursor( NULL ); + if (NtUserIsWindowRectFullScreen( &old_window_rect, get_win_monitor_dpi( hwnd ) )) + NtUserClipCursor( NULL ); if (!(data = get_win_data( hwnd ))) return; } } diff --git a/include/ntuser.h b/include/ntuser.h index 8eddb4a4aa8..507ed2e47ec 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -904,7 +904,6 @@ enum NtUserCallOneParam_GetSysColorPen, NtUserCallOneParam_GetSystemMetrics, NtUserCallOneParam_GetVirtualScreenRect, - NtUserCallOneParam_IsWindowRectFullScreen, NtUserCallOneParam_MessageBeep, NtUserCallOneParam_RealizePalette, NtUserCallOneParam_ReplyMessage, @@ -1006,11 +1005,6 @@ static inline RECT NtUserGetVirtualScreenRect(void) return virtual; } -static inline BOOL NtUserIsWindowRectFullScreen( const RECT *rect ) -{ - return NtUserCallOneParam( (UINT_PTR)rect, NtUserCallOneParam_IsWindowRectFullScreen ); -} - static inline BOOL NtUserMessageBeep( UINT i ) { return NtUserCallOneParam( i, NtUserCallOneParam_MessageBeep ); @@ -1055,6 +1049,7 @@ enum NtUserCallTwoParam_SetIconParam, NtUserCallTwoParam_UnhookWindowsHook, NtUserCallTwoParam_AdjustWindowRect, + NtUserCallTwoParam_IsWindowRectFullScreen, /* temporary exports */ NtUserAllocWinProc, }; @@ -1122,6 +1117,11 @@ static inline BOOL NtUserAdjustWindowRect( RECT *rect, DWORD style, BOOL menu, D return NtUserCallTwoParam( (ULONG_PTR)rect, (ULONG_PTR)&params, NtUserCallTwoParam_AdjustWindowRect ); } +static inline BOOL NtUserIsWindowRectFullScreen( const RECT *rect, UINT dpi ) +{ + return NtUserCallTwoParam( (UINT_PTR)rect, dpi, NtUserCallTwoParam_IsWindowRectFullScreen ); +} + /* NtUserCallHwnd codes, not compatible with Windows */ enum {

1 0

Alexandre Julliard : ntdll: Fix stack alignment in __C_ExecuteExceptionFilter on ARM.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 3151b9f309bf8be566b54591ae4775a22b8e7aa0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3151b9f309bf8be566b54591ae4775… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 10:47:31 2024 +0200 ntdll: Fix stack alignment in __C_ExecuteExceptionFilter on ARM. --- dlls/ntdll/signal_arm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 751ab744f35..cfc986d0898 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -594,12 +594,12 @@ ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) * __C_ExecuteExceptionFilter */ __ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, - "push {r4-r11,lr}\n\t" - ".seh_save_regs_w {r4-r11,lr}\n\t" + "push {r3-r11,lr}\n\t" + ".seh_save_regs_w {r3-r11,lr}\n\t" ".seh_endprologue\n\t" - "ldm r3, {r4-r11,lr}\n\t" + "ldm r3, {r4-r11}\n\t" "blx r2\n\t" - "pop {r4-r11,pc}\n\t" ) + "pop {r3-r11,pc}\n\t" ) /***********************************************************************

1 0

Alexandre Julliard : ntdll: Fix a couple of compiler warnings on ARM64EC.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: b236ce576438b339715e53fe64f6b0ad3d71e2d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b236ce576438b339715e53fe64f6b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 10:47:16 2024 +0200 ntdll: Fix a couple of compiler warnings on ARM64EC. --- dlls/ntdll/unwind.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 04c843baefd..91b07a7cc8c 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -894,7 +894,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, void * if (table->ScopeRecord[i].HandlerAddress != EXCEPTION_EXECUTE_HANDLER) { - EXCEPTION_POINTERS ptrs = { rec, context }; + EXCEPTION_POINTERS ptrs = { rec, (CONTEXT *)context }; handler = (void *)(base + table->ScopeRecord[i].HandlerAddress); TRACE( "scope %u calling filter %p ptrs %p frame %p\n", i, handler, &ptrs, frame ); @@ -910,7 +910,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, void * } TRACE( "unwinding to target %Ix\n", base + table->ScopeRecord[i].JumpTarget ); RtlUnwindEx( frame, (char *)base + table->ScopeRecord[i].JumpTarget, - rec, 0, dispatch->ContextRecord, dispatch->HistoryTable ); + rec, 0, (CONTEXT *)dispatch->ContextRecord, dispatch->HistoryTable ); } } return ExceptionContinueSearch;

1 0

Alexandre Julliard : ntdll: Fix inverted floating point masks on ARM64EC.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: be77f0c83f5268285dc1f35d089c9278342fbf3c URL: https://gitlab.winehq.org/wine/wine/-/commit/be77f0c83f5268285dc1f35d089c92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 10:47:02 2024 +0200 ntdll: Fix inverted floating point masks on ARM64EC. --- dlls/ntdll/unwind.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unwind.h b/dlls/ntdll/unwind.h index 78a2df8f41e..5b29969eb81 100644 --- a/dlls/ntdll/unwind.h +++ b/dlls/ntdll/unwind.h @@ -83,16 +83,16 @@ static inline UINT64 mxcsr_to_fpcsr( UINT mxcsr ) if (mxcsr & 0x0010) fpsr |= 0x0008; /* underflow */ if (mxcsr & 0x0020) fpsr |= 0x0010; /* precision */ - if (mxcsr & 0x0040) fpcr |= 0x0001; /* denormals are zero */ - if (mxcsr & 0x0080) fpcr |= 0x0100; /* invalid operation mask */ - if (mxcsr & 0x0100) fpcr |= 0x8000; /* denormal mask */ - if (mxcsr & 0x0200) fpcr |= 0x0200; /* zero-divide mask */ - if (mxcsr & 0x0400) fpcr |= 0x0400; /* overflow mask */ - if (mxcsr & 0x0800) fpcr |= 0x0800; /* underflow mask */ - if (mxcsr & 0x1000) fpcr |= 0x1000; /* precision mask */ - if (mxcsr & 0x2000) fpcr |= 0x800000; /* round down */ - if (mxcsr & 0x4000) fpcr |= 0x400000; /* round up */ - if (mxcsr & 0x8000) fpcr |= 0x1000000; /* flush to zero */ + if (mxcsr & 0x0040) fpcr |= 0x80000; /* denormals are zero */ + if (!(mxcsr & 0x0080)) fpcr |= 0x0100; /* invalid operation mask */ + if (!(mxcsr & 0x0100)) fpcr |= 0x8000; /* denormal mask */ + if (!(mxcsr & 0x0200)) fpcr |= 0x0200; /* zero-divide mask */ + if (!(mxcsr & 0x0400)) fpcr |= 0x0400; /* overflow mask */ + if (!(mxcsr & 0x0800)) fpcr |= 0x0800; /* underflow mask */ + if (!(mxcsr & 0x1000)) fpcr |= 0x1000; /* precision mask */ + if (mxcsr & 0x2000) fpcr |= 0x800000; /* round down */ + if (mxcsr & 0x4000) fpcr |= 0x400000; /* round up */ + if (mxcsr & 0x8000) fpcr |= 0x1000000; /* flush to zero */ return fpcr | ((UINT64)fpsr << 32); } @@ -107,16 +107,16 @@ static inline UINT fpcsr_to_mxcsr( UINT fpcr, UINT fpsr ) if (fpsr & 0x0010) ret |= 0x0020; /* precision */ if (fpsr & 0x0080) ret |= 0x0002; /* denormal */ - if (fpcr & 0x0000001) ret |= 0x0040; /* denormals are zero */ - if (fpcr & 0x0000100) ret |= 0x0080; /* invalid operation mask */ - if (fpcr & 0x0000200) ret |= 0x0200; /* zero-divide mask */ - if (fpcr & 0x0000400) ret |= 0x0400; /* overflow mask */ - if (fpcr & 0x0000800) ret |= 0x0800; /* underflow mask */ - if (fpcr & 0x0001000) ret |= 0x1000; /* precision mask */ - if (fpcr & 0x0008000) ret |= 0x0100; /* denormal mask */ - if (fpcr & 0x0400000) ret |= 0x4000; /* round up */ - if (fpcr & 0x0800000) ret |= 0x2000; /* round down */ - if (fpcr & 0x1000000) ret |= 0x8000; /* flush to zero */ + if (fpcr & 0x0080000) ret |= 0x0040; /* denormals are zero */ + if (!(fpcr & 0x0000100)) ret |= 0x0080; /* invalid operation mask */ + if (!(fpcr & 0x0000200)) ret |= 0x0200; /* zero-divide mask */ + if (!(fpcr & 0x0000400)) ret |= 0x0400; /* overflow mask */ + if (!(fpcr & 0x0000800)) ret |= 0x0800; /* underflow mask */ + if (!(fpcr & 0x0001000)) ret |= 0x1000; /* precision mask */ + if (!(fpcr & 0x0008000)) ret |= 0x0100; /* denormal mask */ + if (fpcr & 0x0400000) ret |= 0x4000; /* round up */ + if (fpcr & 0x0800000) ret |= 0x2000; /* round down */ + if (fpcr & 0x1000000) ret |= 0x8000; /* flush to zero */ return ret; }

1 0

Alexandre Julliard : ntdll: Support x87 control word in __os_arm64x_get_x64_information().
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 32585b11d59782f752c11e337cca1d723b4be6f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/32585b11d59782f752c11e337cca1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 11:08:14 2024 +0200 ntdll: Support x87 control word in __os_arm64x_get_x64_information(). --- dlls/ntdll/signal_arm64ec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index a79996f8b48..cf280714277 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1486,6 +1486,9 @@ static NTSTATUS WINAPI LdrpGetX64Information( ULONG type, void *output, void *ex *(UINT *)output = fpcsr_to_mxcsr( fpcr, fpsr ); return STATUS_SUCCESS; } + case 2: + *(UINT *)output = 0x27f; /* hard-coded x87 control word */ + return STATUS_SUCCESS; default: FIXME( "not implemented type %u\n", type ); return STATUS_INVALID_PARAMETER;

1 0