- Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Use helpers to lock/unlock window surfaces.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 1565d529bab10d8232110498ff3f510cc54d634c URL: https://gitlab.winehq.org/wine/wine/-/commit/1565d529bab10d8232110498ff3f51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 26 14:21:54 2024 +0200 win32u: Use helpers to lock/unlock window surfaces. --- dlls/win32u/dce.c | 44 +++++++++++++---------------------- dlls/win32u/dibdrv/dc.c | 4 ++-- dlls/wineandroid.drv/window.c | 42 ++++++++++----------------------- dlls/winemac.drv/surface.c | 30 +++++------------------- dlls/winemac.drv/window.c | 12 +++++----- dlls/winewayland.drv/window_surface.c | 26 ++++----------------- dlls/winex11.drv/bitblt.c | 34 +++++++-------------------- dlls/winex11.drv/window.c | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 9 files changed, 58 insertions(+), 142 deletions(-)

1 0

Rémi Bernon : win32u: Introduce a new window_surface_init helper.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: ac63239cc01769bad31603798bea59dfbd46392a URL: https://gitlab.winehq.org/wine/wine/-/commit/ac63239cc01769bad31603798bea59… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 09:39:28 2024 +0200 win32u: Introduce a new window_surface_init helper. --- dlls/win32u/dce.c | 25 +++++++++++++++++++++---- dlls/wineandroid.drv/window.c | 5 ++--- dlls/winemac.drv/surface.c | 4 +--- dlls/winewayland.drv/window_surface.c | 5 ++--- dlls/winex11.drv/bitblt.c | 5 ++--- include/wine/gdi_driver.h | 14 +++----------- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 491c21f0ff5..f8e9b0bbe6e 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -219,10 +219,7 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su *surface = NULL; size = surface_rect.right * surface_rect.bottom * 4; if (!(impl = calloc(1, offsetof( struct offscreen_window_surface, info.bmiColors[0] ) + size))) return; - - impl->header.funcs = &offscreen_window_surface_funcs; - impl->header.ref = 1; - impl->header.rect = surface_rect; + window_surface_init( &impl->header, &offscreen_window_surface_funcs, &surface_rect ); pthread_mutex_init( &impl->mutex, NULL ); @@ -242,6 +239,26 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su *surface = &impl->header; } +/* window surface common helpers */ + +W32KAPI void window_surface_init( struct window_surface *surface, const struct window_surface_funcs *funcs, const RECT *rect ) +{ + surface->funcs = funcs; + surface->ref = 1; + surface->rect = *rect; +} + +W32KAPI void window_surface_add_ref( struct window_surface *surface ) +{ + InterlockedIncrement( &surface->ref ); +} + +W32KAPI void window_surface_release( struct window_surface *surface ) +{ + ULONG ret = InterlockedDecrement( &surface->ref ); + if (!ret) surface->funcs->destroy( surface ); +} + /******************************************************************* * register_window_surface * diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 0ba9123c1ba..7397e1758f4 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -905,6 +905,8 @@ 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; + window_surface_init( &surface->header, &android_surface_funcs, rect ); + set_color_info( &surface->info, src_alpha ); surface->info.bmiHeader.biWidth = width; surface->info.bmiHeader.biHeight = -height; /* top-down */ @@ -913,9 +915,6 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, pthread_mutex_init( &surface->mutex, NULL ); - surface->header.funcs = &android_surface_funcs; - surface->header.rect = *rect; - surface->header.ref = 1; surface->hwnd = hwnd; surface->window = get_ioctl_window( hwnd ); surface->alpha = alpha; diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 65da12912c2..5ec83dd9ebb 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -251,6 +251,7 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])); if (!surface) return NULL; + window_surface_init(&surface->header, &macdrv_surface_funcs, rect); if ((err = pthread_mutex_init(&surface->mutex, NULL))) { @@ -272,9 +273,6 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, colors[1] = 0x0000ff00; colors[2] = 0x000000ff; - surface->header.funcs = &macdrv_surface_funcs; - surface->header.rect = *rect; - surface->header.ref = 1; surface->window = window; reset_bounds(&surface->bounds); if (old_mac_surface && old_mac_surface->drawn) diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index cb5e1539072..37858c825ca 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -512,6 +512,8 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect wws = calloc(1, sizeof(*wws)); if (!wws) return NULL; + window_surface_init(&wws->header, &wayland_window_surface_funcs, rect); + wws->info.bmiHeader.biSize = sizeof(wws->info.bmiHeader); wws->info.bmiHeader.biClrUsed = 0; wws->info.bmiHeader.biBitCount = 32; @@ -523,9 +525,6 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect pthread_mutex_init(&wws->mutex, NULL); - wws->header.funcs = &wayland_window_surface_funcs; - wws->header.rect = *rect; - wws->header.ref = 1; wws->hwnd = hwnd; reset_bounds(&wws->bounds); diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 5eccc4a2eb7..a814fdb94b0 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2021,6 +2021,8 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co surface = calloc( 1, FIELD_OFFSET( struct x11drv_window_surface, info.bmiColors[colors] )); if (!surface) return NULL; + window_surface_init( &surface->header, &x11drv_surface_funcs, rect ); + surface->info.bmiHeader.biSize = sizeof(surface->info.bmiHeader); surface->info.bmiHeader.biWidth = width; surface->info.bmiHeader.biHeight = -height; /* top-down */ @@ -2031,9 +2033,6 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co pthread_mutex_init( &surface->mutex, NULL ); - surface->header.funcs = &x11drv_surface_funcs; - surface->header.rect = *rect; - surface->header.ref = 1; surface->window = window; surface->is_argb = (use_alpha && vis->depth == 32 && surface->info.bmiHeader.biCompression == BI_RGB); set_color_key( surface, color_key ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 4639a409dab..e1a7f2bbffc 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -223,17 +223,9 @@ struct window_surface /* driver-specific fields here */ }; -static inline ULONG window_surface_add_ref( struct window_surface *surface ) -{ - return InterlockedIncrement( &surface->ref ); -} - -static inline ULONG window_surface_release( struct window_surface *surface ) -{ - ULONG ret = InterlockedDecrement( &surface->ref ); - if (!ret) surface->funcs->destroy( surface ); - return ret; -} +W32KAPI void window_surface_init( struct window_surface *surface, const struct window_surface_funcs *funcs, const RECT *rect ); +W32KAPI void window_surface_add_ref( struct window_surface *surface ); +W32KAPI void window_surface_release( struct window_surface *surface ); /* display manager interface, used to initialize display device registry data */

1 0

Rémi Bernon : win32u: Move the window surface mutex to the surface header.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 00aec714ddbc125ad37f6e7b793b7c808cccd7b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/00aec714ddbc125ad37f6e7b793b7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 14:42:09 2024 +0200 win32u: Move the window surface mutex to the surface header. --- dlls/win32u/dce.c | 23 +++++++++++------------ dlls/wineandroid.drv/window.c | 14 +++----------- dlls/winemac.drv/surface.c | 21 ++++----------------- dlls/winewayland.drv/window_surface.c | 12 +++--------- dlls/winex11.drv/bitblt.c | 14 +++----------- include/wine/gdi_driver.h | 9 +++++++++ 6 files changed, 33 insertions(+), 60 deletions(-)

1 0

Rémi Bernon : win32u: Move window surface bounds to the window_surface base struct.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 370966f51b004a6ac41f182127ba9ef61a511cfb URL: https://gitlab.winehq.org/wine/wine/-/commit/370966f51b004a6ac41f182127ba9e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 26 14:25:42 2024 +0200 win32u: Move window surface bounds to the window_surface base struct. --- dlls/win32u/dce.c | 27 +++++---------------------- dlls/win32u/dibdrv/dc.c | 2 +- dlls/wineandroid.drv/window.c | 25 ++++++------------------- dlls/winemac.drv/surface.c | 25 ++++++------------------- dlls/winemac.drv/window.c | 6 ++---- dlls/winewayland.drv/window_surface.c | 18 +++--------------- dlls/winex11.drv/bitblt.c | 24 +++++------------------- dlls/winex11.drv/window.c | 2 +- include/wine/gdi_driver.h | 2 +- 9 files changed, 30 insertions(+), 101 deletions(-)

1 0

Rémi Bernon : wineandroid: Hold the lock while reading window surface bits.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: b44730a39e78d692c15624ea45d8c0a41466c7cc URL: https://gitlab.winehq.org/wine/wine/-/commit/b44730a39e78d692c15624ea45d8c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 16:20:52 2024 +0200 wineandroid: Hold the lock while reading window surface bits. To avoid hiding the change in the next commit. --- dlls/wineandroid.drv/window.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 8314876f1c4..d1c93b5ceff 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -695,8 +695,12 @@ static void android_surface_flush( struct window_surface *window_surface ) surface->header.rect.bottom - surface->header.rect.top ); needs_flush = intersect_rect( &rect, &rect, &window_surface->bounds ); reset_bounds( &window_surface->bounds ); - window_surface_unlock( window_surface ); - if (!needs_flush) return; + + if (!needs_flush) + { + window_surface_unlock( window_surface ); + return; + } TRACE( "flushing %p hwnd %p surface %s rect %s bits %p alpha %02x key %08x region %u rects\n", surface, surface->hwnd, wine_dbgstr_rect( &surface->header.rect ), @@ -760,6 +764,8 @@ static void android_surface_flush( struct window_surface *window_surface ) } else TRACE( "Unable to lock surface %p window %p buffer %p\n", surface, surface->hwnd, surface->window ); + + window_surface_unlock( window_surface ); } /***********************************************************************

1 0

Alexandre Julliard : msvcp90: Add missing C++ mangled names for ARM.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 48466d542bb39762224eba418d9b1e3b0e7b8de1 URL: https://gitlab.winehq.org/wine/wine/-/commit/48466d542bb39762224eba418d9b1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:32:20 2024 +0200 msvcp90: Add missing C++ mangled names for ARM. --- dlls/msvcp90/msvcp90.spec | 1381 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1381 insertions(+)

1 0

Alexandre Julliard : msvcp100: Add missing C++ mangled names for ARM.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 6acb31b3b0808b00a98325a3f7bbc7626eb9f1eb URL: https://gitlab.winehq.org/wine/wine/-/commit/6acb31b3b0808b00a98325a3f7bbc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:32:29 2024 +0200 msvcp100: Add missing C++ mangled names for ARM. --- dlls/msvcp100/msvcp100.spec | 943 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 943 insertions(+)

1 0

Alexandre Julliard : msvcirt: Add missing C++ mangled names for ARM.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 1fb8f23e61ce507ccfd0e04eb7180269791f916a URL: https://gitlab.winehq.org/wine/wine/-/commit/1fb8f23e61ce507ccfd0e04eb71802… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:30:34 2024 +0200 msvcirt: Add missing C++ mangled names for ARM. --- dlls/msvcirt/msvcirt.spec | 332 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 320 ++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt40/msvcrt40.spec | 349 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1001 insertions(+)

1 0

Alexandre Julliard : msvcrt: Add missing C++ mangled names for ARM.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: a930c0ab0b83ba4062bc33e02c9f5f20c2b73fc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a930c0ab0b83ba4062bc33e02c9f5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:29:54 2024 +0200 msvcrt: Add missing C++ mangled names for ARM. --- dlls/msvcr100/msvcr100.spec | 171 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr70/msvcr70.spec | 28 ++++++++ dlls/msvcr71/msvcr71.spec | 28 ++++++++ dlls/msvcr80/msvcr80.spec | 23 ++++++ dlls/msvcr90/msvcr90.spec | 23 ++++++ dlls/msvcrtd/msvcrtd.spec | 23 ++++++ 6 files changed, 296 insertions(+)

1 0

Alexandre Julliard : msvcp70: Add missing C++ mangled names for ARM.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 8d84e648ea5b8cf94031be42999ac3f96125c01a URL: https://gitlab.winehq.org/wine/wine/-/commit/8d84e648ea5b8cf94031be42999ac3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:31:51 2024 +0200 msvcp70: Add missing C++ mangled names for ARM. --- dlls/msvcp70/msvcp70.spec | 1928 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1928 insertions(+)

1 0