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

Rémi Bernon : win32u: Restore surface rect, which may offsetted from the window rect.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: 09b9c1b5fe002c0d55f53f68b474acb02310018f URL: https://gitlab.winehq.org/wine/wine/-/commit/09b9c1b5fe002c0d55f53f68b474ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 4 10:22:40 2024 +0200 win32u: Restore surface rect, which may offsetted from the window rect. Some drivers only create surfaces over the visible part of the window, and the surface rect has an offset. Fixes a regression from 5d0efbcc6e88e2b7886f2a0cfb58c9100b452160, which causes XSHM errors with partially offscreen windows. --- dlls/win32u/dce.c | 7 ++++--- dlls/wineandroid.drv/window.c | 2 +- dlls/winemac.drv/surface.c | 2 +- dlls/winewayland.drv/window_surface.c | 2 +- dlls/winex11.drv/bitblt.c | 2 +- include/wine/gdi_driver.h | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index f6726b49aa1..34acb1d10f6 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -188,7 +188,7 @@ void create_offscreen_window_surface( HWND hwnd, const RECT *visible_rect, struc /* create a new window surface */ *surface = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return; - window_surface_init( &impl->header, &offscreen_window_surface_funcs, hwnd, info, 0 ); + window_surface_init( &impl->header, &offscreen_window_surface_funcs, hwnd, &surface_rect, info, 0 ); impl->info = *info; TRACE( "created window surface %p\n", &impl->header ); @@ -199,7 +199,7 @@ void create_offscreen_window_surface( HWND hwnd, const RECT *visible_rect, struc /* window surface common helpers */ W32KAPI BOOL window_surface_init( struct window_surface *surface, const struct window_surface_funcs *funcs, - HWND hwnd, BITMAPINFO *info, HBITMAP bitmap ) + HWND hwnd, const RECT *rect, BITMAPINFO *info, HBITMAP bitmap ) { struct bitblt_coords coords = {0}; struct gdi_image_bits bits; @@ -208,7 +208,7 @@ W32KAPI BOOL window_surface_init( struct window_surface *surface, const struct w surface->funcs = funcs; surface->ref = 1; surface->hwnd = hwnd; - SetRect( &surface->rect, 0, 0, info->bmiHeader.biWidth, abs( info->bmiHeader.biHeight ) ); + surface->rect = *rect; pthread_mutex_init( &surface->mutex, NULL ); reset_bounds( &surface->bounds ); @@ -256,6 +256,7 @@ W32KAPI void window_surface_flush( struct window_surface *surface ) window_surface_lock( surface ); + OffsetRect( &dirty, -dirty.left, -dirty.top ); if (intersect_rect( &dirty, &dirty, &surface->bounds )) { TRACE( "Flushing hwnd %p, surface %p %s, bounds %s, dirty %s\n", surface->hwnd, surface, diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index fa7b87522c5..7b7d680fe2e 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -792,7 +792,7 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, surface = calloc( 1, FIELD_OFFSET( struct android_window_surface, info.bmiColors[3] )); if (!surface) return NULL; - if (!window_surface_init( &surface->header, &android_surface_funcs, hwnd, info, 0 )) goto failed; + if (!window_surface_init( &surface->header, &android_surface_funcs, hwnd, rect, info, 0 )) goto failed; memcpy( &surface->info, info, get_dib_info_size( info, DIB_RGB_COLORS ) ); surface->window = get_ioctl_window( hwnd ); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 82b7a382ec4..37e2c466926 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -147,7 +147,7 @@ struct window_surface *create_surface(HWND hwnd, macdrv_window window, const REC surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])); if (!surface) return NULL; - if (!window_surface_init(&surface->header, &macdrv_surface_funcs, hwnd, info, 0)) goto failed; + if (!window_surface_init(&surface->header, &macdrv_surface_funcs, hwnd, rect, info, 0)) goto failed; memcpy(&surface->info, info, offsetof(BITMAPINFO, bmiColors[3])); surface->window = window; diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index c0b516c9288..fb3b8750001 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -470,7 +470,7 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect wws = calloc(1, sizeof(*wws)); if (!wws) return NULL; - if (!window_surface_init(&wws->header, &wayland_window_surface_funcs, hwnd, info, 0)) goto failed; + if (!window_surface_init(&wws->header, &wayland_window_surface_funcs, hwnd, rect, info, 0)) goto failed; wws->info = *info; TRACE("created %p hwnd %p %s bits [%p,%p)\n", wws, hwnd, wine_dbgstr_rect(rect), diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index ec6250048cf..8a001606420 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2098,7 +2098,7 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn surface->image = image; surface->byteswap = byteswap; - if (!window_surface_init( &surface->header, &x11drv_surface_funcs, hwnd, info, bitmap )) goto failed; + if (!window_surface_init( &surface->header, &x11drv_surface_funcs, hwnd, rect, info, bitmap )) goto failed; memcpy( &surface->info, info, get_dib_info_size( info, DIB_RGB_COLORS ) ); surface->window = window; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index ce954a7f4d8..701e3031dc3 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -235,7 +235,7 @@ struct window_surface }; W32KAPI BOOL window_surface_init( struct window_surface *surface, const struct window_surface_funcs *funcs, - HWND hwnd, BITMAPINFO *info, HBITMAP bitmap ); + HWND hwnd, const RECT *rect, BITMAPINFO *info, HBITMAP bitmap ); W32KAPI void window_surface_add_ref( struct window_surface *surface ); W32KAPI void window_surface_release( struct window_surface *surface ); W32KAPI void window_surface_lock( struct window_surface *surface );

1 0

Rémi Bernon : win32u: Use a dedicated helper to move bits from a previous surface.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: feff51071726c1b543ed6cabd997a52b5d93304a URL: https://gitlab.winehq.org/wine/wine/-/commit/feff51071726c1b543ed6cabd997a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 4 09:14:04 2024 +0200 win32u: Use a dedicated helper to move bits from a previous surface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56766 --- dlls/win32u/dce.c | 98 ++++++++++++++++++++++---------------------- dlls/win32u/win32u_private.h | 6 +-- dlls/win32u/window.c | 6 ++- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 34acb1d10f6..04c0fdfa248 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1194,62 +1194,72 @@ static BOOL send_erase( HWND hwnd, UINT flags, HRGN client_rgn, * * Copy bits from a window surface; helper for move_window_bits and move_window_bits_parent. */ -static void copy_bits_from_surface( HWND hwnd, struct window_surface *surface, - const RECT *dst, const RECT *src, BOOL same ) +static void copy_bits_from_surface( HWND hwnd, const RECT *dst, const RECT *src ) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)buffer; - void *bits; UINT flags = UPDATE_NOCHILDREN | UPDATE_CLIPCHILDREN; HRGN rgn = get_update_region( hwnd, &flags, NULL ); HDC hdc = NtUserGetDCEx( hwnd, rgn, DCX_CACHE | DCX_WINDOW | DCX_EXCLUDERGN ); - if (same) - { - RECT rect = *src; - NtGdiStretchBlt( hdc, dst->left, dst->top, dst->right - dst->left, dst->bottom - dst->top, - hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SRCCOPY, 0 ); - } - else - { - bits = surface->funcs->get_info( surface, info ); - window_surface_lock( surface ); - NtGdiSetDIBitsToDeviceInternal( hdc, dst->left, dst->top, dst->right - dst->left, dst->bottom - dst->top, - src->left - surface->rect.left, surface->rect.bottom - src->bottom, - 0, surface->rect.bottom - surface->rect.top, - bits, info, DIB_RGB_COLORS, 0, 0, FALSE, NULL ); - window_surface_unlock( surface ); - } - + NtGdiStretchBlt( hdc, dst->left, dst->top, dst->right - dst->left, dst->bottom - dst->top, + hdc, src->left, src->top, src->right - src->left, src->bottom - src->top, SRCCOPY, 0 ); NtUserReleaseDC( hwnd, hdc ); } /*********************************************************************** * move_window_bits * - * Move the window bits when a window is resized or its surface recreated. + * Move the window bits when a window is resized. */ -void move_window_bits( HWND hwnd, struct window_surface *old_surface, - struct window_surface *new_surface, - const RECT *visible_rect, const RECT *old_visible_rect, +void move_window_bits( HWND hwnd, const RECT *visible_rect, const RECT *old_visible_rect, const RECT *window_rect, const RECT *valid_rects ) { RECT dst = valid_rects[0]; RECT src = valid_rects[1]; - if (new_surface != old_surface || - src.left - old_visible_rect->left != dst.left - visible_rect->left || + if (src.left - old_visible_rect->left != dst.left - visible_rect->left || src.top - old_visible_rect->top != dst.top - visible_rect->top) { TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); - if (new_surface != old_surface) OffsetRect( &src, -old_visible_rect->left, -old_visible_rect->top ); - else OffsetRect( &src, -window_rect->left, -window_rect->top ); + OffsetRect( &src, -window_rect->left, -window_rect->top ); OffsetRect( &dst, -window_rect->left, -window_rect->top ); - copy_bits_from_surface( hwnd, old_surface, &dst, &src, new_surface == old_surface ); + copy_bits_from_surface( hwnd, &dst, &src ); } } +/*********************************************************************** + * move_window_bits_surface + * + * Move the window bits from a previous window surface when its surface is recreated. + */ +void move_window_bits_surface( HWND hwnd, const RECT *window_rect, struct window_surface *old_surface, + const RECT *old_visible_rect, const RECT *valid_rects ) +{ + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + UINT flags = UPDATE_NOCHILDREN | UPDATE_CLIPCHILDREN; + HRGN rgn = get_update_region( hwnd, &flags, NULL ); + HDC hdc = NtUserGetDCEx( hwnd, rgn, DCX_CACHE | DCX_WINDOW | DCX_EXCLUDERGN ); + void *bits; + + RECT dst = valid_rects[0]; + RECT src = valid_rects[1]; + + TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); + OffsetRect( &src, -old_visible_rect->left, -old_visible_rect->top ); + OffsetRect( &dst, -window_rect->left, -window_rect->top ); + + bits = old_surface->funcs->get_info( old_surface, info ); + window_surface_lock( old_surface ); + NtGdiSetDIBitsToDeviceInternal( hdc, dst.left, dst.top, dst.right - dst.left, dst.bottom - dst.top, + src.left - old_surface->rect.left, old_surface->rect.bottom - src.bottom, + 0, old_surface->rect.bottom - old_surface->rect.top, + bits, info, DIB_RGB_COLORS, 0, 0, FALSE, NULL ); + window_surface_unlock( old_surface ); + NtUserReleaseDC( hwnd, hdc ); +} + + /*********************************************************************** * move_window_bits_parent * @@ -1257,30 +1267,18 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, */ void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ) { - struct window_surface *surface; RECT dst = valid_rects[0]; RECT src = valid_rects[1]; - WND *win; - - if (src.left == dst.left && src.top == dst.top) return; - if (!(win = get_win_ptr( parent ))) return; - if (win == WND_DESKTOP || win == WND_OTHER_PROCESS) return; - if (!(surface = win->surface)) + if (src.left != dst.left || src.top != dst.top) { - release_win_ptr( win ); - return; - } - - TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); - map_window_points( NtUserGetAncestor( hwnd, GA_PARENT ), parent, (POINT *)&src, 2, get_thread_dpi() ); - OffsetRect( &src, -window_rect->left, -window_rect->top ); - OffsetRect( &dst, -window_rect->left, -window_rect->top ); - window_surface_add_ref( surface ); - release_win_ptr( win ); + TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); + map_window_points( NtUserGetAncestor( hwnd, GA_PARENT ), parent, (POINT *)&src, 2, get_thread_dpi() ); + OffsetRect( &src, -window_rect->left, -window_rect->top ); + OffsetRect( &dst, -window_rect->left, -window_rect->top ); - copy_bits_from_surface( hwnd, surface, &dst, &src, TRUE ); - window_surface_release( surface ); + copy_bits_from_surface( hwnd, &dst, &src ); + } } /*********************************************************************** diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 8aed662d2d8..54b3798d8fb 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -49,10 +49,10 @@ extern void create_offscreen_window_surface( HWND hwnd, const RECT *visible_rect struct window_surface **surface ); extern void erase_now( HWND hwnd, UINT rdw_flags ); extern void flush_window_surfaces( BOOL idle ); -extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, - struct window_surface *new_surface, - const RECT *visible_rect, const RECT *old_visible_rect, +extern void move_window_bits( HWND hwnd, const RECT *visible_rect, const RECT *old_visible_rect, const RECT *window_rect, const RECT *valid_rects ); +extern void move_window_bits_surface( HWND hwnd, const RECT *window_rect, struct window_surface *old_surface, + const RECT *old_visible_rect, const RECT *valid_rects ); extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ); extern void register_window_surface( struct window_surface *old, diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 12f2a9027f0..22e9e326d6e 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1929,8 +1929,10 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { if (valid_rects) { - move_window_bits( hwnd, old_surface, new_surface, &visible_rect, - &old_visible_rect, window_rect, valid_rects ); + if (old_surface != new_surface) + move_window_bits_surface( hwnd, window_rect, old_surface, &old_visible_rect, valid_rects ); + else + move_window_bits( hwnd, &visible_rect, &old_visible_rect, window_rect, valid_rects ); valid_rects = NULL; /* prevent the driver from trying to also move the bits */ } window_surface_release( old_surface );

1 0

Eric Pouech : cmd: Introduce structure CMD_REDIRECTION.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: a899caac7b0468c9a5f9953828cf6b5ecbe70e33 URL: https://gitlab.winehq.org/wine/wine/-/commit/a899caac7b0468c9a5f9953828cf6b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Apr 25 18:00:05 2024 +0200 cmd: Introduce structure CMD_REDIRECTION. This structure will hold information for a redirection, and can be chained in a list when multiple redirections are listed. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 2 +- programs/cmd/wcmd.h | 21 +++- programs/cmd/wcmdmain.c | 322 +++++++++++++++++++++++++++--------------------- 3 files changed, 200 insertions(+), 145 deletions(-)

1 0

Hans Leidekker : ntdll: Provide fallback values for DMI fields only readable by root.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: e39a973778198c638c5062d4e2e436bfa24a13c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e39a973778198c638c5062d4e2e436… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 3 15:06:21 2024 +0200 ntdll: Provide fallback values for DMI fields only readable by root. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56744 --- dlls/ntdll/unix/system.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b0d87dbc6bd..eb5e60af7b9 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1700,6 +1700,32 @@ static GUID *get_system_uuid( GUID *uuid ) return uuid; } +static const char *get_system_serial( char *str, size_t size ) +{ + get_smbios_string( "/sys/class/dmi/id/product_serial", str, size ); + if (!str[0]) strcpy( str, "System Serial Number" ); + return str; +} + +static const char *get_chassis_serial( char *str, size_t size ) +{ + get_smbios_string( "/sys/class/dmi/id/chassis_serial", str, size ); + if (!str[0]) strcpy( str, "Chassis Serial Number" ); + return str; +} + +static const char *get_board_serial( char *str, size_t size, const GUID *uuid ) +{ + get_smbios_string( "/sys/class/dmi/id/board_serial", str, size ); + if (!str[0]) + { + const BYTE *p = (const BYTE *)uuid; + snprintf( str, 33, "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", p[0], p[1], + p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15] ); + } + return str; +} + static struct smbios_prologue *create_smbios_data(void) { char vendor[128], version[128], date[128], product[128], serial[128]; @@ -1718,7 +1744,7 @@ static struct smbios_prologue *create_smbios_data(void) get_smbios_string( "/sys/class/dmi/id/sys_vendor", S(vendor) ), get_smbios_string( "/sys/class/dmi/id/product_name", S(product) ), get_smbios_string( "/sys/class/dmi/id/product_version", S(version) ), - get_smbios_string( "/sys/class/dmi/id/product_serial", S(serial) ), + get_system_serial( S(serial) ), get_smbios_string( "/sys/class/dmi/id/product_sku", S(sku) ), get_smbios_string( "/sys/class/dmi/id/product_family", S(family) ), get_system_uuid( &uuid )); @@ -1727,14 +1753,14 @@ static struct smbios_prologue *create_smbios_data(void) chassis = append_smbios_chassis( &buf, atoi(type), get_smbios_string( "/sys/class/dmi/id/chassis_vendor", S(vendor) ), get_smbios_string( "/sys/class/dmi/id/chassis_version", S(version) ), - get_smbios_string( "/sys/class/dmi/id/chassis_serial", S(serial) ), + get_chassis_serial( S(serial) ), get_smbios_string( "/sys/class/dmi/id/chassis_tag", S(asset_tag) )); append_smbios_board( &buf, chassis, get_smbios_string( "/sys/class/dmi/id/board_vendor", S(vendor) ), get_smbios_string( "/sys/class/dmi/id/board_name", S(product) ), get_smbios_string( "/sys/class/dmi/id/board_version", S(version) ), - get_smbios_string( "/sys/class/dmi/id/board_serial", S(serial) ), + get_board_serial( S(serial), &uuid ), get_smbios_string( "/sys/class/dmi/id/board_asset_tag", S(asset_tag) )); #undef S

1 0

Eric Pouech : cmd: Create helper to execute a command.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: 855642d565639f133abe0afd96f697ba22bdee24 URL: https://gitlab.winehq.org/wine/wine/-/commit/855642d565639f133abe0afd96f697… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Apr 26 17:10:53 2024 +0200 cmd: Create helper to execute a command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 183 +++++++++++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 72 deletions(-)

1 0

Eric Pouech : cmd: Introduce a helper to set std handles.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: 18d8c6fe5220978105c71e66776c2c18f902c9ec URL: https://gitlab.winehq.org/wine/wine/-/commit/18d8c6fe5220978105c71e66776c2c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Apr 17 16:15:24 2024 +0200 cmd: Introduce a helper to set std handles. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 185 ++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 94 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2c5cf4a3196..764811fffd7 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1295,6 +1295,83 @@ void WCMD_run_program (WCHAR *command, BOOL called) } +static BOOL set_std_redirections(WCHAR *new_redir, WCHAR *in_pipe) +{ + SECURITY_ATTRIBUTES sa = {.nLength = sizeof(sa), .lpSecurityDescriptor = NULL, .bInheritHandle = TRUE}; + WCHAR *pos, *redir; + HANDLE h; + + /* STDIN could come from a preceding pipe, so delete on close if it does */ + if (in_pipe) + { + TRACE("Input coming from %s\n", wine_dbgstr_w(in_pipe)); + h = CreateFileW(in_pipe, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); + if (h == INVALID_HANDLE_VALUE) return FALSE; + SetStdHandle(STD_INPUT_HANDLE, h); + /* Otherwise STDIN could come from a '<' redirect */ + } + else if ((pos = wcschr(new_redir,'<')) != NULL) + { + h = CreateFileW(WCMD_parameter(++pos, 0, NULL, FALSE, FALSE), GENERIC_READ, FILE_SHARE_READ, + &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (h == INVALID_HANDLE_VALUE) return FALSE; + SetStdHandle(STD_INPUT_HANDLE, h); + } + + redir = new_redir; + /* Scan the whole command looking for > and 2> */ + while (redir != NULL && ((pos = wcschr(redir,'>')) != NULL)) + { + DWORD disposition; + int std_idx; + + if (pos > redir && (*(pos-1)=='2')) + std_idx = STD_ERROR_HANDLE; + else + /* FIXME what if a number different from 1 & 2 is present? */ + std_idx = STD_OUTPUT_HANDLE; + + pos++; + if ('>' == *pos) + { + disposition = OPEN_ALWAYS; + pos++; + } + else + disposition = CREATE_ALWAYS; + + /* Add support for 2>&1 */ + redir = pos; + if (*pos == '&') + { + int idx = *(pos+1) - '0'; + + /* FIXME what if a number different from 1 & 2 is present? */ + if (!DuplicateHandle(GetCurrentProcess(), + GetStdHandle(idx == 2 ? STD_ERROR_HANDLE : STD_OUTPUT_HANDLE), + GetCurrentProcess(), + &h, + 0, TRUE, DUPLICATE_SAME_ACCESS)) + { + FIXME("Duplicating handle failed with gle %ld\n", GetLastError()); + } + } + else + { + WCHAR *param = WCMD_parameter(pos, 0, NULL, FALSE, FALSE); + h = CreateFileW(param, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, + &sa, disposition, FILE_ATTRIBUTE_NORMAL, NULL); + if (h == INVALID_HANDLE_VALUE) return FALSE; + if (SetFilePointer(h, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) + WCMD_print_error(); + } + SetStdHandle(std_idx, h); + } + return TRUE; +} + /***************************************************************************** * Process one command. If the command is EXIT this routine does not return. * We will recurse through here executing batch files. @@ -1305,21 +1382,16 @@ void WCMD_run_program (WCHAR *command, BOOL called) void WCMD_execute (const WCHAR *command, const WCHAR *redirects, CMD_NODE **cmdList, BOOL retrycall) { - WCHAR *cmd, *parms_start, *redir; - WCHAR *pos; + WCHAR *cmd, *parms_start; int status, i, cmd_index; - DWORD count, creationDisposition; - HANDLE h; + DWORD count; WCHAR *whichcmd; - SECURITY_ATTRIBUTES sa; WCHAR *new_cmd = NULL; WCHAR *new_redir = NULL; HANDLE old_stdhandles[3] = {GetStdHandle (STD_INPUT_HANDLE), GetStdHandle (STD_OUTPUT_HANDLE), GetStdHandle (STD_ERROR_HANDLE)}; - DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE, - STD_OUTPUT_HANDLE, - STD_ERROR_HANDLE}; + static DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE}; BOOL prev_echo_mode, piped = FALSE; WINE_TRACE("command on entry:%s (%p)\n", @@ -1332,7 +1404,6 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, /* Move copy of the redirects onto the heap so it can be expanded */ new_redir = xalloc(MAXSTRING * sizeof(WCHAR)); - redir = new_redir; /* Strip leading whitespaces, and a '@' if supplied */ whichcmd = WCMD_skip_leading_spaces(cmd); @@ -1381,7 +1452,6 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, } else { lstrcpyW(new_redir, redirects); } - /* Expand variables in command line mode only (batch mode will be expanded as the line is read in, except for 'for' loops) */ handleExpansion(new_cmd, (context != NULL), delayedsubst); @@ -1417,97 +1487,24 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, return; } - sa.nLength = sizeof(sa); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = TRUE; - /* * Redirect stdin, stdout and/or stderr if required. * Note: Do not do this for a for or if statement as the pipe is for * the individual statements, not the for or if itself. */ if (!(cmd_index == WCMD_FOR || cmd_index == WCMD_IF)) { - /* STDIN could come from a preceding pipe, so delete on close if it does */ - if (cmdList && CMD_node_get_command(*cmdList)->pipeFile[0] != 0x00) { - WINE_TRACE("Input coming from %s\n", wine_dbgstr_w(CMD_node_get_command(*cmdList)->pipeFile)); - h = CreateFileW(CMD_node_get_command(*cmdList)->pipeFile, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); - if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); - free(cmd); - free(new_redir); - return; - } - SetStdHandle (STD_INPUT_HANDLE, h); - - /* No need to remember the temporary name any longer once opened */ - CMD_node_get_command(*cmdList)->pipeFile[0] = 0x00; - - /* Otherwise STDIN could come from a '<' redirect */ - } else if ((pos = wcschr(new_redir,'<')) != NULL) { - h = CreateFileW(WCMD_parameter(++pos, 0, NULL, FALSE, FALSE), GENERIC_READ, FILE_SHARE_READ, - &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); - free(cmd); - free(new_redir); - return; - } - SetStdHandle (STD_INPUT_HANDLE, h); - } - - /* Scan the whole command looking for > and 2> */ - while (redir != NULL && ((pos = wcschr(redir,'>')) != NULL)) { - int handle = 0; - - if (pos > redir && (*(pos-1)=='2')) - handle = 2; - else - handle = 1; - - pos++; - if ('>' == *pos) { - creationDisposition = OPEN_ALWAYS; - pos++; - } - else { - creationDisposition = CREATE_ALWAYS; - } - - /* Add support for 2>&1 */ - redir = pos; - if (*pos == '&') { - int idx = *(pos+1) - '0'; - - if (DuplicateHandle(GetCurrentProcess(), - GetStdHandle(idx_stdhandles[idx]), - GetCurrentProcess(), - &h, - 0, TRUE, DUPLICATE_SAME_ACCESS) == 0) { - WINE_FIXME("Duplicating handle failed with gle %ld\n", GetLastError()); - } - WINE_TRACE("Redirect %d (%p) to %d (%p)\n", handle, GetStdHandle(idx_stdhandles[idx]), idx, h); - - } else { - WCHAR *param = WCMD_parameter(pos, 0, NULL, FALSE, FALSE); - h = CreateFileW(param, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, - &sa, creationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); - if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); - free(cmd); - free(new_redir); - return; - } - if (SetFilePointer (h, 0, NULL, FILE_END) == - INVALID_SET_FILE_POINTER) { - WCMD_print_error (); - } - WINE_TRACE("Redirect %d to '%s' (%p)\n", handle, wine_dbgstr_w(param), h); - } - - SetStdHandle (idx_stdhandles[handle], h); + WCHAR *in_pipe = NULL; + if (cmdList && CMD_node_get_command(*cmdList)->pipeFile[0] != 0x00) + in_pipe = CMD_node_get_command(*cmdList)->pipeFile; + if (!set_std_redirections(new_redir, in_pipe)) { + WCMD_print_error (); + free(cmd); + free(new_redir); + return; } + if (in_pipe) + /* No need to remember the temporary name any longer once opened */ + in_pipe[0] = 0x00; } else { WINE_TRACE("Not touching redirects for a FOR or IF command\n"); }

1 0

Alexandre Julliard : msvcrt: Consistently use the rtti_rva() helper.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: bc76e9cfe0bb7049407526ef220167dc2d726322 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc76e9cfe0bb7049407526ef220167… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 13:35:30 2024 +0200 msvcrt: Consistently use the rtti_rva() helper. --- dlls/msvcrt/except_x86_64.c | 25 +++++++---------- dlls/msvcrt/handler4.c | 65 +++++++++++++++++++-------------------------- 2 files changed, 38 insertions(+), 52 deletions(-)

1 0

Alexandre Julliard : msvcrt: Share the common part of _fpieee_flt between platforms.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: b8edf6d92082ea755bc473e7891235a6cfac9cd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8edf6d92082ea755bc473e7891235… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 12:30:13 2024 +0200 msvcrt: Share the common part of _fpieee_flt between platforms. --- dlls/msvcrt/cppexcept.h | 3 +++ dlls/msvcrt/except.c | 19 +++++++++++++++++++ dlls/msvcrt/except_arm.c | 6 +++--- dlls/msvcrt/except_arm64.c | 6 +++--- dlls/msvcrt/except_arm64ec.c | 6 +++--- dlls/msvcrt/except_i386.c | 22 +++++----------------- dlls/msvcrt/except_x86_64.c | 6 +++--- 7 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index cb0ce03c960..10b3a200b66 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -21,6 +21,7 @@ #ifndef __MSVCRT_CPPEXCEPT_H #define __MSVCRT_CPPEXCEPT_H +#include <fpieee.h> #include "cxx.h" #define CXX_FRAME_MAGIC_VC6 0x19930520 @@ -276,6 +277,8 @@ extern void dump_function_descr( const cxx_function_descr *descr, uintptr_t base extern void *find_catch_handler( void *object, uintptr_t frame, uintptr_t exc_base, const tryblock_info *tryblock, cxx_exception_type *exc_type, uintptr_t image_base ); +extern int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ); #if _MSVCR_VER >= 80 #define EXCEPTION_MANGLED_NAME ".?AVexception(a)std@@" diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 4bdfefd49ef..074d6051a78 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -448,6 +448,25 @@ BOOL CDECL __uncaught_exception(void) return msvcrt_get_thread_data()->processing_throw != 0; } +/********************************************************************* + * _fpieee_flt (MSVCRT.@) + */ +int __cdecl _fpieee_flt( __msvcrt_ulong code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ) +{ + switch (code) + { + case STATUS_FLOAT_DIVIDE_BY_ZERO: + case STATUS_FLOAT_INEXACT_RESULT: + case STATUS_FLOAT_INVALID_OPERATION: + case STATUS_FLOAT_OVERFLOW: + case STATUS_FLOAT_UNDERFLOW: + return handle_fpieee_flt( code, ep, handler ); + default: + return EXCEPTION_CONTINUE_SEARCH; + } +} + #if _MSVCR_VER>=70 && _MSVCR_VER<=71 /********************************************************************* diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 93511728138..69dbd7324b0 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -51,10 +51,10 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, DWORD frame /********************************************************************* - * _fpieee_flt (MSVCRT.@) + * handle_fpieee_flt */ -int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, - int (__cdecl *handler)(_FPIEEE_RECORD*)) +int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ) { FIXME("(%lx %p %p)\n", exception_code, ep, handler); return EXCEPTION_CONTINUE_SEARCH; diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 2a5a67ef7c8..8d4465744bc 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -58,10 +58,10 @@ __ASM_GLOBAL_FUNC( _setjmp, "b _setjmpex" ); /********************************************************************* - * _fpieee_flt (MSVCRT.@) + * handle_fpieee_flt */ -int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, - int (__cdecl *handler)(_FPIEEE_RECORD*)) +int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ) { FIXME("(%lx %p %p)\n", exception_code, ep, handler); return EXCEPTION_CONTINUE_SEARCH; diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index 779cf077bbe..5b03000a323 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -51,10 +51,10 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr /********************************************************************* - * _fpieee_flt (MSVCRT.@) + * handle_fpieee_flt */ -int __cdecl _fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, - int (__cdecl *handler)(_FPIEEE_RECORD*) ) +int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ) { FIXME("(%lx %p %p)\n", exception_code, ep, handler); return EXCEPTION_CONTINUE_SEARCH; diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index abea9b28fd1..7d1faa95272 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -856,28 +856,15 @@ void __stdcall _seh_longjmp_unwind4(_JUMP_BUFFER *jmp) } /********************************************************************* - * _fpieee_flt (MSVCRT.@) + * handle_fpieee_flt */ -int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, - int (__cdecl *handler)(_FPIEEE_RECORD*)) +int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ) { FLOATING_SAVE_AREA *ctx = &ep->ContextRecord->FloatSave; _FPIEEE_RECORD rec; int ret; - TRACE("(%lx %p %p)\n", exception_code, ep, handler); - - switch(exception_code) { - case STATUS_FLOAT_DIVIDE_BY_ZERO: - case STATUS_FLOAT_INEXACT_RESULT: - case STATUS_FLOAT_INVALID_OPERATION: - case STATUS_FLOAT_OVERFLOW: - case STATUS_FLOAT_UNDERFLOW: - break; - default: - return EXCEPTION_CONTINUE_SEARCH; - } - memset(&rec, 0, sizeof(rec)); rec.RoundingMode = ctx->ControlWord >> 10; switch((ctx->ControlWord >> 8) & 0x3) { @@ -902,7 +889,8 @@ int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, rec.Cause.Underflow = rec.Enable.Underflow & rec.Status.Underflow; rec.Cause.Inexact = rec.Enable.Inexact & rec.Status.Inexact; - TRACE("opcode: %lx\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + TRACE("code %lx handler %p opcode %lx\n", exception_code, handler, + *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); if(*(WORD*)ctx->ErrorOffset == 0x35dc) { /* fdiv m64fp */ if(exception_code==STATUS_FLOAT_DIVIDE_BY_ZERO || exception_code==STATUS_FLOAT_INVALID_OPERATION) { diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 23369599e61..15ca416d34b 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -454,10 +454,10 @@ void __cdecl _local_unwind( void *frame, void *target ) } /********************************************************************* - * _fpieee_flt (MSVCRT.@) + * handle_fpieee_flt */ -int __cdecl _fpieee_flt(__msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, - int (__cdecl *handler)(_FPIEEE_RECORD*)) +int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ) { FIXME("(%lx %p %p) opcode: %#I64x\n", exception_code, ep, handler, *(ULONG64*)ep->ContextRecord->Rip);

1 0

Alexandre Julliard : msvcrt: Share the __CxxExceptionFilter implementation between platforms.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: 8f2d3e8396cd45267c387387087bb0ffa22d5b05 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f2d3e8396cd45267c387387087bb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 11:00:16 2024 +0200 msvcrt: Share the __CxxExceptionFilter implementation between platforms. --- dlls/msvcrt/except.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/except_arm.c | 11 ----------- dlls/msvcrt/except_arm64.c | 11 ----------- dlls/msvcrt/except_arm64ec.c | 11 ----------- dlls/msvcrt/except_i386.c | 33 --------------------------------- dlls/msvcrt/except_x86_64.c | 10 ---------- 6 files changed, 34 insertions(+), 76 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index dd45defbbeb..4bdfefd49ef 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -389,6 +389,40 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) return (msvcrt_get_thread_data()->exc_record == rec); } +/********************************************************************* + * __CxxExceptionFilter (MSVCRT.@) + */ +int CDECL __CxxExceptionFilter( EXCEPTION_POINTERS *ptrs, const type_info *ti, UINT flags, void **copy) +{ + const cxx_type_info *type; + EXCEPTION_RECORD *rec; + uintptr_t exc_base; + + TRACE( "%p %p %x %p\n", ptrs, ti, flags, copy ); + + if (!ptrs) return EXCEPTION_CONTINUE_SEARCH; + + /* handle catch(...) */ + if (!ti) return EXCEPTION_EXECUTE_HANDLER; + + rec = ptrs->ExceptionRecord; + if (!is_cxx_exception( rec )) return EXCEPTION_CONTINUE_SEARCH; + + if (rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) + { + rec = msvcrt_get_thread_data()->exc_record; + if (!rec) return EXCEPTION_CONTINUE_SEARCH; + } + + exc_base = rec->ExceptionInformation[3]; + type = find_caught_type( (cxx_exception_type *)rec->ExceptionInformation[2], exc_base, ti, flags ); + if (!type) return EXCEPTION_CONTINUE_SEARCH; + + if (copy) copy_exception( (void *)rec->ExceptionInformation[1], copy, flags, type, exc_base ); + + return EXCEPTION_EXECUTE_HANDLER; +} + /********************************************************************* * __CxxQueryExceptionSize (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 47194b4e8ae..93511728138 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -31,7 +31,6 @@ #include "winbase.h" #include "winternl.h" #include "msvcrt.h" -#include "wine/exception.h" #include "excpt.h" #include "wine/debug.h" @@ -40,16 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); -/********************************************************************* - * __CxxExceptionFilter (MSVCRT.@) - */ -int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, - const type_info *ti, int flags, void **copy ) -{ - FIXME( "%p %p %x %p: not implemented\n", ptrs, ti, flags, copy ); - return EXCEPTION_CONTINUE_SEARCH; -} - /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index bbff0f618cc..2a5a67ef7c8 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -32,7 +32,6 @@ #include "winbase.h" #include "winternl.h" #include "msvcrt.h" -#include "wine/exception.h" #include "excpt.h" #include "wine/debug.h" @@ -41,16 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); -/********************************************************************* - * __CxxExceptionFilter (MSVCRT.@) - */ -int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, - const type_info *ti, int flags, void **copy ) -{ - FIXME( "%p %p %x %p: not implemented\n", ptrs, ti, flags, copy ); - return EXCEPTION_CONTINUE_SEARCH; -} - /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index 5ef9dae809b..779cf077bbe 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -32,7 +32,6 @@ #include "winbase.h" #include "winternl.h" #include "msvcrt.h" -#include "wine/exception.h" #include "excpt.h" #include "wine/debug.h" @@ -40,16 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); -/********************************************************************* - * __CxxExceptionFilter (MSVCRT.@) - */ -int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, - const type_info *ti, int flags, void **copy ) -{ - FIXME( "%p %p %x %p: not implemented\n", ptrs, ti, flags, copy ); - return EXCEPTION_CONTINUE_SEARCH; -} - /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 0c5d805721d..abea9b28fd1 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -285,39 +285,6 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, data->processing_throw--; } -/********************************************************************* - * __CxxExceptionFilter (MSVCRT.@) - */ -int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, - const type_info *ti, int flags, void **copy) -{ - const cxx_type_info *type; - PEXCEPTION_RECORD rec; - - TRACE( "%p %p %x %p\n", ptrs, ti, flags, copy ); - - if (!ptrs) return EXCEPTION_CONTINUE_SEARCH; - - /* handle catch(...) */ - if (!ti) return EXCEPTION_EXECUTE_HANDLER; - - rec = ptrs->ExceptionRecord; - if (!is_cxx_exception( rec )) return EXCEPTION_CONTINUE_SEARCH; - - if (rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) - { - rec = msvcrt_get_thread_data()->exc_record; - if (!rec) return EXCEPTION_CONTINUE_SEARCH; - } - - type = find_caught_type( (cxx_exception_type*)rec->ExceptionInformation[2], 0, ti, flags ); - if (!type) return EXCEPTION_CONTINUE_SEARCH; - - if (copy) copy_exception( (void *)rec->ExceptionInformation[1], copy, flags, type, 0 ); - - return EXCEPTION_EXECUTE_HANDLER; -} - static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) { se_translator_ctx *ctx = (se_translator_ctx *)c; diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 13bb0fa6fbd..23369599e61 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -410,16 +410,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } -/********************************************************************* - * __CxxExceptionFilter (MSVCRT.@) - */ -int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, - const type_info *ti, int flags, void **copy ) -{ - FIXME( "%p %p %x %p: not implemented\n", ptrs, ti, flags, copy ); - return EXCEPTION_CONTINUE_SEARCH; -} - /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */

1 0

Alexandre Julliard : msvcrt: Use the copy_exception() helper in __CxxExceptionFilter.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: 91fab7330997be5b1d18980e1237a33a022fb6e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/91fab7330997be5b1d18980e1237a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 4 10:48:00 2024 +0200 msvcrt: Use the copy_exception() helper in __CxxExceptionFilter. --- dlls/msvcrt/cppexcept.h | 10 ++-------- dlls/msvcrt/except.c | 9 ++++++--- dlls/msvcrt/except_i386.c | 23 +---------------------- dlls/msvcrt/handler4.c | 9 ++++++--- 4 files changed, 15 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 690c1f5817f..cb0ce03c960 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -231,15 +231,9 @@ static inline const cxx_type_info *find_caught_type( cxx_exception_type *exc_typ } /* copy the exception object where the catch block wants it */ -static inline void copy_exception( void *object, uintptr_t frame, int offset, UINT catch_flags, - const type_info *catch_ti, const cxx_type_info *type, uintptr_t base ) +static inline void copy_exception( void *object, void **dest, UINT catch_flags, + const cxx_type_info *type, uintptr_t base ) { - void **dest; - - if (!catch_ti || !catch_ti->mangled[0]) return; - if (!offset) return; - dest = (void **)(frame + offset); - if (catch_flags & TYPE_FLAG_REFERENCE) { *dest = get_this_pointer( &type->offsets, object ); diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index b6f2bb8784d..dd45defbbeb 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -111,9 +111,12 @@ void *find_catch_handler( void *object, uintptr_t frame, uintptr_t exc_base, TRACE( "matched type %p in catchblock %d\n", type, i ); - /* copy the exception to its destination on the stack */ - copy_exception( object, frame, catchblock[i].offset, catchblock[i].flags, - catch_ti, type, exc_base ); + if (catch_ti && catch_ti->mangled[0] && catchblock[i].offset) + { + /* copy the exception to its destination on the stack */ + void **dest = (void **)(frame + catchblock[i].offset); + copy_exception( object, dest, catchblock[i].flags, type, exc_base ); + } } else { diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index f76762d3cb0..0c5d805721d 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -313,29 +313,8 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, type = find_caught_type( (cxx_exception_type*)rec->ExceptionInformation[2], 0, ti, flags ); if (!type) return EXCEPTION_CONTINUE_SEARCH; - if (copy) - { - void *object = (void *)rec->ExceptionInformation[1]; + if (copy) copy_exception( (void *)rec->ExceptionInformation[1], copy, flags, type, 0 ); - if (flags & TYPE_FLAG_REFERENCE) - { - *copy = get_this_pointer( &type->offsets, object ); - } - else if (type->flags & CLASS_IS_SIMPLE_TYPE) - { - memmove( copy, object, type->size ); - /* if it is a pointer, adjust it */ - if (type->size == sizeof(void*)) *copy = get_this_pointer( &type->offsets, *copy ); - } - else /* copy the object */ - { - if (type->copy_ctor) - call_copy_ctor( type->copy_ctor, copy, get_this_pointer(&type->offsets,object), - (type->flags & CLASS_HAS_VIRTUAL_BASE_CLASS) ); - else - memmove( copy, get_this_pointer(&type->offsets,object), type->size ); - } - } return EXCEPTION_EXECUTE_HANDLER; } diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c index 0f54ddd9f1f..2e6870ff645 100644 --- a/dlls/msvcrt/handler4.c +++ b/dlls/msvcrt/handler4.c @@ -528,9 +528,12 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, TRACE("matched type %p in tryblock %d catchblock %d\n", type, i, j); - /* copy the exception to its destination on the stack */ - copy_exception( (void *)rec->ExceptionInformation[1], orig_frame, - ci.offset, ci.flags, catch_ti, type, exc_base ); + if (catch_ti && catch_ti->mangled[0] && ci.offset) + { + /* copy the exception to its destination on the stack */ + void **dest = (void **)(orig_frame + ci.offset); + copy_exception( (void *)rec->ExceptionInformation[1], dest, ci.flags, type, exc_base ); + } } else {

1 0