wine-commits

wine-commits@winehq.org

1 participants
185885 discussions

Rémi Bernon : winewayland: Stop using a recursive mutex for the window surfaces.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 3c21f175b84105d5f49a6fc81bbf3bf51614f9de URL: https://gitlab.winehq.org/wine/wine/-/commit/3c21f175b84105d5f49a6fc81bbf3b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 4 17:10:08 2024 +0100 winewayland: Stop using a recursive mutex for the window surfaces. --- dlls/winewayland.drv/window_surface.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 67cb2fe2d0b..cb5e1539072 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -507,7 +507,6 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect struct wayland_window_surface *wws; int width = rect->right - rect->left; int height = rect->bottom - rect->top; - pthread_mutexattr_t mutexattr; TRACE("hwnd %p rect %s\n", hwnd, wine_dbgstr_rect(rect)); @@ -522,10 +521,7 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect wws->info.bmiHeader.biPlanes = 1; wws->info.bmiHeader.biSizeImage = width * height * 4; - pthread_mutexattr_init(&mutexattr); - pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE); - pthread_mutex_init(&wws->mutex, &mutexattr); - pthread_mutexattr_destroy(&mutexattr); + pthread_mutex_init(&wws->mutex, NULL); wws->header.funcs = &wayland_window_surface_funcs; wws->header.rect = *rect;

1 0

Rémi Bernon : winemac: Stop using a recursive mutex for the window surfaces.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 07600c7f37f741af747e351f8149eaeefabe9d84 URL: https://gitlab.winehq.org/wine/wine/-/commit/07600c7f37f741af747e351f8149ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 4 17:10:08 2024 +0100 winemac: Stop using a recursive mutex for the window surfaces. --- dlls/winemac.drv/surface.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 8b238ff4853..65da12912c2 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -246,22 +246,13 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, struct macdrv_window_surface *old_mac_surface = get_mac_surface(old_surface); int width = rect->right - rect->left, height = rect->bottom - rect->top; DWORD *colors; - pthread_mutexattr_t attr; int err; DWORD window_background; surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])); if (!surface) return NULL; - err = pthread_mutexattr_init(&attr); - if (!err) - { - err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - if (!err) - err = pthread_mutex_init(&surface->mutex, &attr); - pthread_mutexattr_destroy(&attr); - } - if (err) + if ((err = pthread_mutex_init(&surface->mutex, NULL))) { free(surface); return NULL;

1 0

Rémi Bernon : wineandroid: Stop using a recursive mutex for the window surfaces.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: ecb72cf826b00955e014d5e7ee05b5229ff8e06c URL: https://gitlab.winehq.org/wine/wine/-/commit/ecb72cf826b00955e014d5e7ee05b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 4 17:10:08 2024 +0100 wineandroid: Stop using a recursive mutex for the window surfaces. --- dlls/wineandroid.drv/window.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 584af060700..027c8880edd 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -807,6 +807,7 @@ static void android_surface_destroy( struct window_surface *window_surface ) if (surface->region) NtGdiDeleteObjectApp( surface->region ); release_ioctl_window( surface->window ); free( surface->bits ); + pthread_mutex_destroy( &surface->mutex ); free( surface ); } @@ -901,7 +902,6 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, { struct android_window_surface *surface; int width = rect->right - rect->left, height = rect->bottom - rect->top; - pthread_mutexattr_t attr; surface = calloc( 1, FIELD_OFFSET( struct android_window_surface, info.bmiColors[3] )); if (!surface) return NULL; @@ -911,10 +911,7 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, surface->info.bmiHeader.biPlanes = 1; surface->info.bmiHeader.biSizeImage = get_dib_image_size( &surface->info ); - pthread_mutexattr_init( &attr ); - pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); - pthread_mutex_init( &surface->mutex, &attr ); - pthread_mutexattr_destroy( &attr ); + pthread_mutex_init( &surface->mutex, NULL ); surface->header.funcs = &android_surface_funcs; surface->header.rect = *rect;

1 0

Rémi Bernon : win32u: Stop using a recursive mutex for the offscreen surface.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 0afa484b50c50a459da7ed28eb1cfd46f920ed57 URL: https://gitlab.winehq.org/wine/wine/-/commit/0afa484b50c50a459da7ed28eb1cfd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 4 17:10:08 2024 +0100 win32u: Stop using a recursive mutex for the offscreen surface. --- dlls/win32u/dce.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index d304074c427..491c21f0ff5 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -179,6 +179,7 @@ static void offscreen_window_surface_flush( struct window_surface *base ) static void offscreen_window_surface_destroy( struct window_surface *base ) { struct offscreen_window_surface *impl = impl_from_window_surface( base ); + pthread_mutex_destroy( &impl->mutex ); free( impl ); } @@ -198,7 +199,6 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su struct offscreen_window_surface *impl; SIZE_T size; RECT surface_rect = *visible_rect; - pthread_mutexattr_t attr; TRACE( "visible_rect %s, surface %p.\n", wine_dbgstr_rect( visible_rect ), surface ); @@ -224,10 +224,7 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su impl->header.ref = 1; impl->header.rect = surface_rect; - pthread_mutexattr_init( &attr ); - pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); - pthread_mutex_init( &impl->mutex, &attr ); - pthread_mutexattr_destroy( &attr ); + pthread_mutex_init( &impl->mutex, NULL ); reset_bounds( &impl->bounds );

1 0

Rémi Bernon : win32u: Remove surface recursive locking requirement.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 0d2fa879d735cd39e72c15014686001c13a089b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d2fa879d735cd39e72c1501468600… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 16:58:49 2024 +0200 win32u: Remove surface recursive locking requirement. --- dlls/win32u/dce.c | 36 +++++++++++++++++++++++------------- dlls/win32u/dibdrv/dc.c | 4 ++-- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 5c4f691b460..d304074c427 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -1140,7 +1140,7 @@ 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 ) + const RECT *dst, const RECT *src, BOOL same ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; @@ -1149,13 +1149,23 @@ static void copy_bits_from_surface( HWND hwnd, struct window_surface *surface, HRGN rgn = get_update_region( hwnd, &flags, NULL ); HDC hdc = NtUserGetDCEx( hwnd, rgn, DCX_CACHE | DCX_WINDOW | DCX_EXCLUDERGN ); - bits = surface->funcs->get_info( surface, info ); - surface->funcs->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 ); - surface->funcs->unlock( surface ); + 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 ); + surface->funcs->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 ); + surface->funcs->unlock( surface ); + } + NtUserReleaseDC( hwnd, hdc ); } @@ -1177,9 +1187,10 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, src.top - old_visible_rect->top != dst.top - visible_rect->top) { TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); - OffsetRect( &src, -old_visible_rect->left, -old_visible_rect->top ); + 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( &dst, -window_rect->left, -window_rect->top ); - copy_bits_from_surface( hwnd, old_surface, &dst, &src ); + copy_bits_from_surface( hwnd, old_surface, &dst, &src, new_surface == old_surface ); } } @@ -1208,13 +1219,12 @@ void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, c 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, win->client_rect.left - win->visible_rect.left, - win->client_rect.top - win->visible_rect.top ); + 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 ); - copy_bits_from_surface( hwnd, surface, &dst, &src ); + copy_bits_from_surface( hwnd, surface, &dst, &src, TRUE ); window_surface_release( surface ); } diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index e1b2f66cb25..48cbe51d708 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -749,9 +749,9 @@ static inline void lock_surface( struct windrv_physdev *dev ) { struct window_surface *surface = dev->surface; - surface->funcs->lock( surface ); if (!dev->lock_count++) { + surface->funcs->lock( surface ); if (IsRectEmpty( dev->dibdrv->bounds ) || !surface->draw_start_ticks) surface->draw_start_ticks = NtGetTickCount(); } @@ -761,10 +761,10 @@ static inline void unlock_surface( struct windrv_physdev *dev ) { struct window_surface *surface = dev->surface; - surface->funcs->unlock( surface ); if (!--dev->lock_count) { DWORD ticks = NtGetTickCount() - surface->draw_start_ticks; + surface->funcs->unlock( surface ); if (ticks > FLUSH_PERIOD) surface->funcs->flush( dev->surface ); } }

1 0

Rémi Bernon : win32u: Flush window surface when it is fully unlocked.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: ec700bb712c0bf3b051333754c8faf0f9b4de1ad URL: https://gitlab.winehq.org/wine/wine/-/commit/ec700bb712c0bf3b051333754c8faf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 4 17:10:08 2024 +0100 win32u: Flush window surface when it is fully unlocked. --- dlls/win32u/dibdrv/dc.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 38039e7d6ae..e1b2f66cb25 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -734,6 +734,7 @@ struct windrv_physdev struct gdi_physdev dev; struct dibdrv_physdev *dibdrv; struct window_surface *surface; + UINT lock_count; }; static const struct gdi_dc_funcs window_driver; @@ -743,25 +744,34 @@ static inline struct windrv_physdev *get_windrv_physdev( PHYSDEV dev ) return (struct windrv_physdev *)dev; } +/* gdi_lock should not be locked */ static inline void lock_surface( struct windrv_physdev *dev ) { - /* gdi_lock should not be locked */ - dev->surface->funcs->lock( dev->surface ); - if (IsRectEmpty( dev->dibdrv->bounds ) || dev->surface->draw_start_ticks == 0) - dev->surface->draw_start_ticks = NtGetTickCount(); + struct window_surface *surface = dev->surface; + + surface->funcs->lock( surface ); + if (!dev->lock_count++) + { + if (IsRectEmpty( dev->dibdrv->bounds ) || !surface->draw_start_ticks) + surface->draw_start_ticks = NtGetTickCount(); + } } static inline void unlock_surface( struct windrv_physdev *dev ) { - BOOL should_flush = NtGetTickCount() - dev->surface->draw_start_ticks > FLUSH_PERIOD; - dev->surface->funcs->unlock( dev->surface ); - if (should_flush) dev->surface->funcs->flush( dev->surface ); + struct window_surface *surface = dev->surface; + + surface->funcs->unlock( surface ); + if (!--dev->lock_count) + { + DWORD ticks = NtGetTickCount() - surface->draw_start_ticks; + if (ticks > FLUSH_PERIOD) surface->funcs->flush( dev->surface ); + } } -static void unlock_bits_surface( struct gdi_image_bits *bits ) +static void unlock_windrv_bits( struct gdi_image_bits *bits ) { - struct window_surface *surface = bits->param; - surface->funcs->unlock( surface ); + unlock_surface( bits->param ); } void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) @@ -964,8 +974,8 @@ static DWORD windrv_GetImage( PHYSDEV dev, BITMAPINFO *info, { /* use the freeing callback to unlock the surface */ assert( !bits->free ); - bits->free = unlock_bits_surface; - bits->param = physdev->surface; + bits->free = unlock_windrv_bits; + bits->param = physdev; } else unlock_surface( physdev ); return ret;

1 0

Rémi Bernon : wineandroid: Use DWORD for pixel pointers.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 8cc16edc592a6a8dccf523b4c26427109079cf26 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cc16edc592a6a8dccf523b4c26427… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 25 19:42:54 2024 +0200 wineandroid: Use DWORD for pixel pointers. --- dlls/wineandroid.drv/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 1f998c0b2ae..584af060700 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -743,7 +743,7 @@ static void android_surface_flush( struct window_surface *window_surface ) if (!surface->window->perform( surface->window, NATIVE_WINDOW_LOCK, &buffer, &rc )) { const RECT *rgn_rect = NULL, *end = NULL; - unsigned int *src, *dst; + DWORD *src, *dst; int x, y, width; rect.left = rc.left; @@ -757,10 +757,10 @@ static void android_surface_flush( struct window_surface *window_surface ) rgn_rect = (RECT *)surface->region_data->Buffer; end = rgn_rect + surface->region_data->rdh.nCount; } - src = (unsigned int *)surface->bits + src = (DWORD *)surface->bits + (rect.top - surface->header.rect.top) * surface->info.bmiHeader.biWidth + (rect.left - surface->header.rect.left); - dst = (unsigned int *)buffer.bits + rect.top * buffer.stride + rect.left; + dst = (DWORD *)buffer.bits + rect.top * buffer.stride + rect.left; width = min( rect.right - rect.left, buffer.stride ); for (y = rect.top; y < min( buffer.height, rect.bottom); y++)

1 0

Rémi Bernon : wineandroid: Fix NtUserSendHardwareInput parameter order.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: e9ec634b62fe485f0413ccdee3444750ac5c283e URL: https://gitlab.winehq.org/wine/wine/-/commit/e9ec634b62fe485f0413ccdee34447… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 25 18:45:59 2024 +0200 wineandroid: Fix NtUserSendHardwareInput parameter order. --- dlls/wineandroid.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 3e900aa6f4d..1f998c0b2ae 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -514,7 +514,7 @@ static int process_events( DWORD mask ) } SERVER_END_REQ; } - NtUserSendHardwareInput( capture ? capture : event->data.motion.hwnd, &event->data.motion.input, 0, 0 ); + NtUserSendHardwareInput( capture ? capture : event->data.motion.hwnd, 0, &event->data.motion.input, 0 ); } break;

1 0

Krzysztof Bogacki : win32u: Remove unused variable from add_vulkan_only_gpus.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 2a9db2a10c80df808d46735c8a4e7b8554bfb953 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a9db2a10c80df808d46735c8a4e7b… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:54:55 2024 +0200 win32u: Remove unused variable from add_vulkan_only_gpus. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3a22d8c73db..26ed8b1d1ac 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1996,7 +1996,6 @@ static UINT update_display_devices( struct device_manager_ctx *ctx ) static void add_vulkan_only_gpus( struct device_manager_ctx *ctx ) { - struct list gpus = LIST_INIT(gpus); struct vulkan_gpu *gpu, *next; LIST_FOR_EACH_ENTRY_SAFE( gpu, next, &ctx->vulkan_gpus, struct vulkan_gpu, entry )

1 0

Krzysztof Bogacki : win32u: Log Vulkan UUIDs when adding GPUs.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 3c211c6a07019cef9766e932b62a2d55632f23af URL: https://gitlab.winehq.org/wine/wine/-/commit/3c211c6a07019cef9766e932b62a2d… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:53:27 2024 +0200 win32u: Log Vulkan UUIDs when adding GPUs. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9d765545d26..3a22d8c73db 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1217,8 +1217,8 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * HKEY hkey, subkey; DWORD len; - TRACE( "%s %04X %04X %08X %02X\n", debugstr_a( name ), pci_id->vendor, pci_id->device, - pci_id->subsystem, pci_id->revision ); + TRACE( "%s %04X %04X %08X %02X %s\n", debugstr_a( name ), pci_id->vendor, pci_id->device, + pci_id->subsystem, pci_id->revision, debugstr_guid( vulkan_uuid ) ); if (!enum_key && !(enum_key = reg_create_ascii_key( NULL, enum_keyA, 0, NULL ))) return;

1 0

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