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

Elizabeth Figura : include: Add more types to windows.networking.connectivity.idl.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: 325c3657867ae2ebc943c45b500c02f30c723c34 URL: https://gitlab.winehq.org/wine/wine/-/commit/325c3657867ae2ebc943c45b500c02… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 28 12:34:37 2021 +1000 include: Add more types to windows.networking.connectivity.idl. Based on a patch by Alistair Leslie-Hughes. --- dlls/windows.networking.hostname/classes.idl | 11 + dlls/windows.networking.hostname/private.h | 2 +- dlls/windows.networking.hostname/tests/hostname.c | 2 +- include/windows.foundation.idl | 5 + include/windows.networking.connectivity.idl | 409 +++++++++++++++++++++- include/windows.networking.idl | 7 + 6 files changed, 428 insertions(+), 8 deletions(-)

1 0

Rémi Bernon : winex11: Create a HBITMAP for the allocated surface pixels.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 6ace92e0cafcc381f324fc831f3006fb15db4b4e URL: https://gitlab.winehq.org/wine/wine/-/commit/6ace92e0cafcc381f324fc831f3006… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 17:48:30 2024 +0200 winex11: Create a HBITMAP for the allocated surface pixels. --- dlls/winex11.drv/bitblt.c | 77 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 58 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index dead700d63c..fe71e4de18f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1588,6 +1588,7 @@ struct x11drv_window_surface Window window; GC gc; struct x11drv_image *image; + HBITMAP bitmap; /* bitmap exposed to win32u */ BOOL byteswap; BOOL is_argb; DWORD alpha_bits; @@ -1874,6 +1875,29 @@ static BOOL put_shm_image( XImage *image, x11drv_xshm_info_t *shminfo, Window wi #endif /* HAVE_LIBXXSHM */ +static UINT get_dib_d3dddifmt( const BITMAPINFO *info ) +{ + if (info->bmiHeader.biCompression == BI_RGB) + { + if (info->bmiHeader.biBitCount == 8) return D3DDDIFMT_P8; + if (info->bmiHeader.biBitCount == 24) return D3DDDIFMT_R8G8B8; + if (info->bmiHeader.biBitCount == 32) return D3DDDIFMT_A8R8G8B8; + return D3DDDIFMT_UNKNOWN; + } + + if (info->bmiHeader.biCompression == BI_BITFIELDS) + { + DWORD *colors = (DWORD *)info->bmiColors; + if (info->bmiHeader.biBitCount != 16) return D3DDDIFMT_UNKNOWN; + if (colors[0] == 0x0000f800 && colors[1] == 0x000007e0 && colors[2] == 0x0000001f) return D3DDDIFMT_R5G6B5; + if (colors[0] == 0x00007c00 && colors[1] == 0x000003e0 && colors[2] == 0x0000001f) return D3DDDIFMT_A1R5G5B5; + if (colors[0] == 0x00000f00 && colors[1] == 0x000000f0 && colors[2] == 0x0000000f) return D3DDDIFMT_A4R4G4B4; + return D3DDDIFMT_UNKNOWN; + } + + return D3DDDIFMT_UNKNOWN; +} + static void x11drv_image_destroy( struct x11drv_image *image ) { if (!destroy_shm_image( image->ximage, &image->shminfo )) @@ -2004,13 +2028,8 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) TRACE( "freeing %p bits %p\n", surface, window_surface->color_bits ); if (surface->gc) XFreeGC( gdi_display, surface->gc ); - if (surface->image) - { - if (surface->image->ximage->data != window_surface->color_bits) - free( window_surface->color_bits ); - x11drv_image_destroy( surface->image ); - } - + if (surface->image) x11drv_image_destroy( surface->image ); + if (surface->bitmap) NtGdiDeleteObjectApp( surface->bitmap ); free( surface ); } @@ -2035,6 +2054,9 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn int width = rect->right - rect->left, height = rect->bottom - rect->top; int colors = format->bits_per_pixel <= 8 ? 1 << format->bits_per_pixel : 3; struct x11drv_image *image; + D3DDDIFORMAT d3d_format; + HBITMAP bitmap = 0; + BOOL byteswap; UINT size; memset( info, 0, sizeof(*info) ); @@ -2048,14 +2070,40 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn size = FIELD_OFFSET( struct x11drv_window_surface, info.bmiColors[colors] ); if (!(image = x11drv_image_create( info, vis ))) return NULL; - if (!(surface = calloc( 1, size ))) + + /* wrap the XImage data in a HBITMAP if we can write to the surface pixels directly */ + if (!(byteswap = image_needs_byteswap( image->ximage, is_r8g8b8( vis ), info->bmiHeader.biBitCount )) && + info->bmiHeader.biBitCount > 8 && (d3d_format = get_dib_d3dddifmt( info ))) + { + D3DKMT_CREATEDCFROMMEMORY desc = + { + .Width = info->bmiHeader.biWidth, + .Height = info->bmiHeader.biHeight, + .Pitch = info->bmiHeader.biWidth * info->bmiHeader.biBitCount / 8, + .Format = d3d_format, + .pMemory = image->ximage->data, + }; + + if (!NtGdiDdDDICreateDCFromMemory( &desc )) + { + bitmap = desc.hBitmap; + NtGdiDeleteObjectApp( desc.hDc ); + } + } + + if (!bitmap) bitmap = NtGdiCreateDIBSection( 0, NULL, 0, info, DIB_RGB_COLORS, 0, 0, 0, NULL ); + + if (!bitmap || !(surface = calloc( 1, size ))) { + if (bitmap) NtGdiDeleteObjectApp( bitmap ); x11drv_image_destroy( image ); return NULL; } surface->image = image; + surface->bitmap = bitmap; + surface->byteswap = byteswap; - if (!window_surface_init( &surface->header, &x11drv_surface_funcs, hwnd, info, 0 )) goto failed; + if (!window_surface_init( &surface->header, &x11drv_surface_funcs, hwnd, info, bitmap )) goto failed; memcpy( &surface->info, info, get_dib_info_size( info, DIB_RGB_COLORS ) ); surface->window = window; @@ -2064,20 +2112,11 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn surface->gc = XCreateGC( gdi_display, window, 0, NULL ); XSetSubwindowMode( gdi_display, surface->gc, IncludeInferiors ); - surface->byteswap = image_needs_byteswap( surface->image->ximage, is_r8g8b8(vis), format->bits_per_pixel ); if (vis->depth == 32 && !surface->is_argb) surface->alpha_bits = ~(vis->red_mask | vis->green_mask | vis->blue_mask); - if (surface->byteswap || format->bits_per_pixel == 4 || format->bits_per_pixel == 8) - { - /* allocate separate surface bits if byte swapping or palette mapping is required */ - if (!(surface->header.color_bits = calloc( 1, info->bmiHeader.biSizeImage ))) - goto failed; - } - else surface->header.color_bits = surface->image->ximage->data; - - TRACE( "created %p for %lx %s color_bits %p-%p image %p\n", surface, window, wine_dbgstr_rect(rect), + TRACE( "created %p for %lx %s bits %p-%p image %p\n", surface, window, wine_dbgstr_rect(rect), surface->header.color_bits, (char *)surface->header.color_bits + info->bmiHeader.biSizeImage, surface->image->ximage->data );

1 0

Rémi Bernon : win32u: Create a HBITMAP backing the window surface pixels.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: b6abacbb7b0ed2fb3557d23f716878214b156c8c URL: https://gitlab.winehq.org/wine/wine/-/commit/b6abacbb7b0ed2fb3557d23f716878… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 17:54:04 2024 +0200 win32u: Create a HBITMAP backing the window surface pixels. --- dlls/win32u/dce.c | 11 ++++------- dlls/wineandroid.drv/window.c | 8 ++------ dlls/winemac.drv/surface.c | 6 ++---- dlls/winewayland.drv/window_surface.c | 6 +----- dlls/winex11.drv/bitblt.c | 9 ++------- include/wine/gdi_driver.h | 3 ++- 6 files changed, 13 insertions(+), 30 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 8e6fab478d1..f6726b49aa1 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -159,7 +159,6 @@ void create_offscreen_window_surface( HWND hwnd, const RECT *visible_rect, struc char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; struct offscreen_window_surface *impl; - SIZE_T size; RECT surface_rect = *visible_rect; TRACE( "hwnd %p, visible_rect %s, surface %p.\n", hwnd, wine_dbgstr_rect( visible_rect ), surface ); @@ -188,11 +187,8 @@ void create_offscreen_window_surface( HWND hwnd, const RECT *visible_rect, struc /* create a new window surface */ *surface = NULL; - size = info->bmiHeader.biSizeImage; - if (!(impl = calloc(1, offsetof( struct offscreen_window_surface, info.bmiColors[0] ) + size))) return; + if (!(impl = calloc(1, sizeof(*impl)))) return; window_surface_init( &impl->header, &offscreen_window_surface_funcs, hwnd, info, 0 ); - - impl->header.color_bits = (char *)&impl->info.bmiColors[0]; impl->info = *info; TRACE( "created window surface %p\n", &impl->header ); @@ -216,8 +212,8 @@ W32KAPI BOOL window_surface_init( struct window_surface *surface, const struct w pthread_mutex_init( &surface->mutex, NULL ); reset_bounds( &surface->bounds ); - if (!bitmap) return TRUE; - if (!(bmp = GDI_GetObjPtr( bitmap, NTGDI_OBJ_BITMAP ))) return FALSE; + if (!bitmap) bitmap = NtGdiCreateDIBSection( 0, NULL, 0, info, DIB_RGB_COLORS, 0, 0, 0, NULL ); + if (!(surface->color_bitmap = bitmap) || !(bmp = GDI_GetObjPtr( bitmap, NTGDI_OBJ_BITMAP ))) return FALSE; get_image_from_bitmap( bmp, info, &bits, &coords ); surface->color_bits = bits.ptr; GDI_ReleaseObj( bitmap ); @@ -237,6 +233,7 @@ W32KAPI void window_surface_release( struct window_surface *surface ) { if (surface != &dummy_surface) pthread_mutex_destroy( &surface->mutex ); if (surface->clip_region) NtGdiDeleteObjectApp( surface->clip_region ); + if (surface->color_bitmap) NtGdiDeleteObjectApp( surface->color_bitmap ); surface->funcs->destroy( surface ); } } diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 83e39528273..fa7b87522c5 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -732,11 +732,10 @@ static void android_surface_destroy( struct window_surface *window_surface ) { struct android_window_surface *surface = get_android_surface( window_surface ); - TRACE( "freeing %p bits %p\n", surface, window_surface->color_bits ); + TRACE( "freeing %p\n", surface ); free( surface->clip_rects ); release_ioctl_window( surface->window ); - free( window_surface->color_bits ); free( surface ); } @@ -800,10 +799,7 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, surface->alpha = alpha; set_color_key( surface, color_key ); - if (!(surface->header.color_bits = malloc( info->bmiHeader.biSizeImage ))) - goto failed; - - TRACE( "created %p hwnd %p %s color_bits %p-%p\n", surface, hwnd, wine_dbgstr_rect(rect), + TRACE( "created %p hwnd %p %s bits %p-%p\n", surface, hwnd, wine_dbgstr_rect(rect), surface->header.color_bits, (char *)surface->header.color_bits + info->bmiHeader.biSizeImage ); return &surface->header; diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 16e1629f993..82b7a382ec4 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -106,8 +106,7 @@ static void macdrv_surface_destroy(struct window_surface *window_surface) { struct macdrv_window_surface *surface = get_mac_surface(window_surface); - TRACE("freeing %p bits %p\n", surface, window_surface->color_bits); - free(window_surface->color_bits); + TRACE("freeing %p\n", surface); free(surface); } @@ -154,8 +153,7 @@ struct window_surface *create_surface(HWND hwnd, macdrv_window window, const REC surface->window = window; if (old_surface) surface->header.bounds = old_surface->bounds; surface->use_alpha = use_alpha; - surface->header.color_bits = malloc(info->bmiHeader.biSizeImage); - if (!surface->header.color_bits) goto failed; + window_background = macdrv_window_background_color(); memset_pattern4(surface->header.color_bits, &window_background, info->bmiHeader.biSizeImage); diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 636c681a25a..c0b516c9288 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -435,7 +435,6 @@ static void wayland_window_surface_destroy(struct window_surface *window_surface if (wws->wayland_buffer_queue) wayland_buffer_queue_destroy(wws->wayland_buffer_queue); - free(window_surface->color_bits); free(wws); } @@ -474,10 +473,7 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect if (!window_surface_init(&wws->header, &wayland_window_surface_funcs, hwnd, info, 0)) goto failed; wws->info = *info; - if (!(wws->header.color_bits = malloc(wws->info.bmiHeader.biSizeImage))) - goto failed; - - TRACE("created %p hwnd %p %s color_bits [%p,%p)\n", wws, hwnd, wine_dbgstr_rect(rect), + TRACE("created %p hwnd %p %s bits [%p,%p)\n", wws, hwnd, wine_dbgstr_rect(rect), wws->header.color_bits, (char *)wws->header.color_bits + wws->info.bmiHeader.biSizeImage); return &wws->header; diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index fe71e4de18f..ec6250048cf 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1588,7 +1588,6 @@ struct x11drv_window_surface Window window; GC gc; struct x11drv_image *image; - HBITMAP bitmap; /* bitmap exposed to win32u */ BOOL byteswap; BOOL is_argb; DWORD alpha_bits; @@ -2026,10 +2025,9 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); - TRACE( "freeing %p bits %p\n", surface, window_surface->color_bits ); + TRACE( "freeing %p\n", surface ); if (surface->gc) XFreeGC( gdi_display, surface->gc ); if (surface->image) x11drv_image_destroy( surface->image ); - if (surface->bitmap) NtGdiDeleteObjectApp( surface->bitmap ); free( surface ); } @@ -2091,16 +2089,13 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn } } - if (!bitmap) bitmap = NtGdiCreateDIBSection( 0, NULL, 0, info, DIB_RGB_COLORS, 0, 0, 0, NULL ); - - if (!bitmap || !(surface = calloc( 1, size ))) + if (!(surface = calloc( 1, size ))) { if (bitmap) NtGdiDeleteObjectApp( bitmap ); x11drv_image_destroy( image ); return NULL; } surface->image = image; - surface->bitmap = bitmap; surface->byteswap = byteswap; if (!window_surface_init( &surface->header, &x11drv_surface_funcs, hwnd, info, bitmap )) goto failed; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 556e33d1fa2..ce954a7f4d8 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -229,7 +229,8 @@ struct window_surface RECT bounds; /* dirty area rectangle */ HRGN clip_region; /* visible region of the surface, fully visible if 0 */ DWORD draw_start_ticks; /* start ticks of fresh draw */ - void *color_bits; /* pixel bits of the surface color */ + HBITMAP color_bitmap; /* bitmap for the surface colors */ + void *color_bits; /* pixel bits of the color bitmap */ /* driver-specific fields here */ };

1 0

Rémi Bernon : winex11: Simplify the XSHM extension function calls.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: d9aa239c43f282e93528febe6038d91e33a79e48 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9aa239c43f282e93528febe6038d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 17:36:10 2024 +0200 winex11: Simplify the XSHM extension function calls. --- dlls/winex11.drv/bitblt.c | 75 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 74ba28cfc37..f23cda3bfd2 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1570,6 +1570,11 @@ DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo return ret; } +#ifdef HAVE_X11_EXTENSIONS_XSHM_H +typedef XShmSegmentInfo x11drv_xshm_info_t; +#else +typedef struct { int shmid; } x11drv_xshm_info_t; +#endif struct x11drv_window_surface { @@ -1581,9 +1586,7 @@ struct x11drv_window_surface BOOL is_argb; DWORD alpha_bits; COLORREF color_key; -#ifdef HAVE_LIBXXSHM - XShmSegmentInfo shminfo; -#endif + x11drv_xshm_info_t shminfo; BITMAPINFO info; /* variable size, must be last */ }; @@ -1786,7 +1789,7 @@ static int xshm_error_handler( Display *display, XErrorEvent *event, void *arg ) return 1; /* FIXME: should check event contents */ } -static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, XShmSegmentInfo *shminfo ) +static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, x11drv_xshm_info_t *shminfo ) { XImage *image; @@ -1822,6 +1825,48 @@ failed: XDestroyImage( image ); return NULL; } + +static BOOL destroy_shm_image( XImage *image, x11drv_xshm_info_t *shminfo ) +{ + if (shminfo->shmid == -1) return FALSE; + + XShmDetach( gdi_display, shminfo ); + shmdt( shminfo->shmaddr ); + + return TRUE; +} + +static BOOL put_shm_image( XImage *image, x11drv_xshm_info_t *shminfo, Window window, + GC gc, const RECT *rect, const RECT *dirty ) +{ + if (shminfo->shmid == -1) return FALSE; + + XShmPutImage( gdi_display, window, gc, image, dirty->left, + dirty->top, rect->left + dirty->left, rect->top + dirty->top, + dirty->right - dirty->left, dirty->bottom - dirty->top, False ); + + return TRUE; +} + +#else /* HAVE_LIBXXSHM */ + +static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, x11drv_xshm_info_t *shminfo ) +{ + shminfo->shmid = -1; + return NULL; +} + +static BOOL destroy_shm_image( XImage *image ) +{ + return FALSE; +} + +static BOOL put_shm_image( XImage *image, x11drv_xshm_info_t *shminfo, Window window, + GC gc, const RECT *rect, const RECT *dirty ) +{ + return FALSE; +} + #endif /* HAVE_LIBXXSHM */ /*********************************************************************** @@ -1903,16 +1948,11 @@ static BOOL x11drv_surface_flush( struct window_surface *window_surface, const R ptr[x] |= surface->alpha_bits; } -#ifdef HAVE_LIBXXSHM - if (surface->shminfo.shmid != -1) - XShmPutImage( gdi_display, surface->window, surface->gc, surface->image, dirty->left, - dirty->top, rect->left + dirty->left, rect->top + dirty->top, - dirty->right - dirty->left, dirty->bottom - dirty->top, False ); - else -#endif + if (!put_shm_image( surface->image, &surface->shminfo, surface->window, surface->gc, rect, dirty )) XPutImage( gdi_display, surface->window, surface->gc, surface->image, dirty->left, dirty->top, rect->left + dirty->left, rect->top + dirty->top, dirty->right - dirty->left, dirty->bottom - dirty->top ); + XFlush( gdi_display ); return TRUE; @@ -1930,15 +1970,8 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) if (surface->image) { if (surface->image->data != window_surface->color_bits) free( window_surface->color_bits ); -#ifdef HAVE_LIBXXSHM - if (surface->shminfo.shmid != -1) - { - XShmDetach( gdi_display, &surface->shminfo ); - shmdt( surface->shminfo.shmaddr ); - } - else -#endif - free( surface->image->data ); + if (!destroy_shm_image( surface->image, &surface->shminfo )) + free( surface->image->data ); surface->image->data = NULL; XDestroyImage( surface->image ); } @@ -1985,10 +2018,8 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn surface->is_argb = (use_alpha && vis->depth == 32 && info->bmiHeader.biCompression == BI_RGB); set_color_key( surface, color_key ); -#ifdef HAVE_LIBXXSHM surface->image = create_shm_image( vis, width, height, &surface->shminfo ); if (!surface->image) -#endif { surface->image = XCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, 0, NULL, width, height, 32, 0 );

1 0

Rémi Bernon : winex11: Create XImage before initializing the window surface.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: cacafddea2b6273bca3bbb279262fb1cbe606963 URL: https://gitlab.winehq.org/wine/wine/-/commit/cacafddea2b6273bca3bbb279262fb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 17:39:16 2024 +0200 winex11: Create XImage before initializing the window surface. --- dlls/winex11.drv/bitblt.c | 90 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index f23cda3bfd2..dead700d63c 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1576,17 +1576,22 @@ typedef XShmSegmentInfo x11drv_xshm_info_t; typedef struct { int shmid; } x11drv_xshm_info_t; #endif +struct x11drv_image +{ + XImage *ximage; /* XImage used for X11 drawing */ + x11drv_xshm_info_t shminfo; /* XSHM extension info */ +}; + struct x11drv_window_surface { struct window_surface header; Window window; GC gc; - XImage *image; + struct x11drv_image *image; BOOL byteswap; BOOL is_argb; DWORD alpha_bits; COLORREF color_key; - x11drv_xshm_info_t shminfo; BITMAPINFO info; /* variable size, must be last */ }; @@ -1869,6 +1874,37 @@ static BOOL put_shm_image( XImage *image, x11drv_xshm_info_t *shminfo, Window wi #endif /* HAVE_LIBXXSHM */ +static void x11drv_image_destroy( struct x11drv_image *image ) +{ + if (!destroy_shm_image( image->ximage, &image->shminfo )) + free( image->ximage->data ); + + image->ximage->data = NULL; + XDestroyImage( image->ximage ); + free( image ); +} + +static struct x11drv_image *x11drv_image_create( const BITMAPINFO *info, const XVisualInfo *vis ) +{ + UINT width = info->bmiHeader.biWidth, height = abs( info->bmiHeader.biHeight ); + struct x11drv_image *image; + + if (!(image = calloc( 1, sizeof(*image) ))) return NULL; + + if (!(image->ximage = create_shm_image( vis, width, height, &image->shminfo ))) + { + if (!(image->ximage = XCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, + 0, NULL, width, height, 32, 0 ))) goto failed; + if (!(image->ximage->data = malloc( info->bmiHeader.biSizeImage ))) goto failed; + } + + return image; + +failed: + x11drv_image_destroy( image ); + return NULL; +} + /*********************************************************************** * x11drv_surface_get_bitmap_info */ @@ -1923,15 +1959,16 @@ static void x11drv_surface_set_clip( struct window_surface *window_surface, cons static BOOL x11drv_surface_flush( struct window_surface *window_surface, const RECT *rect, const RECT *dirty ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); + XImage *ximage = surface->image->ximage; unsigned char *src = window_surface->color_bits; - unsigned char *dst = (unsigned char *)surface->image->data; + unsigned char *dst = (unsigned char *)ximage->data; if (surface->is_argb || surface->color_key != CLR_INVALID) update_surface_region( surface, window_surface->color_bits ); if (src != dst) { - int map[256], *mapping = get_window_surface_mapping( surface->image->bits_per_pixel, map ); - int width_bytes = surface->image->bytes_per_line; + int map[256], *mapping = get_window_surface_mapping( ximage->bits_per_pixel, map ); + int width_bytes = ximage->bytes_per_line; src += dirty->top * width_bytes; dst += dirty->top * width_bytes; @@ -1940,7 +1977,7 @@ static BOOL x11drv_surface_flush( struct window_surface *window_surface, const R } else if (surface->alpha_bits) { - int x, y, stride = surface->image->bytes_per_line / sizeof(ULONG); + int x, y, stride = ximage->bytes_per_line / sizeof(ULONG); ULONG *ptr = (ULONG *)dst + dirty->top * stride; for (y = dirty->top; y < dirty->bottom; y++, ptr += stride) @@ -1948,8 +1985,8 @@ static BOOL x11drv_surface_flush( struct window_surface *window_surface, const R ptr[x] |= surface->alpha_bits; } - if (!put_shm_image( surface->image, &surface->shminfo, surface->window, surface->gc, rect, dirty )) - XPutImage( gdi_display, surface->window, surface->gc, surface->image, dirty->left, + if (!put_shm_image( ximage, &surface->image->shminfo, surface->window, surface->gc, rect, dirty )) + XPutImage( gdi_display, surface->window, surface->gc, ximage, dirty->left, dirty->top, rect->left + dirty->left, rect->top + dirty->top, dirty->right - dirty->left, dirty->bottom - dirty->top ); @@ -1969,11 +2006,9 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) if (surface->gc) XFreeGC( gdi_display, surface->gc ); if (surface->image) { - if (surface->image->data != window_surface->color_bits) free( window_surface->color_bits ); - if (!destroy_shm_image( surface->image, &surface->shminfo )) - free( surface->image->data ); - surface->image->data = NULL; - XDestroyImage( surface->image ); + if (surface->image->ximage->data != window_surface->color_bits) + free( window_surface->color_bits ); + x11drv_image_destroy( surface->image ); } free( surface ); @@ -1999,6 +2034,8 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn struct x11drv_window_surface *surface; int width = rect->right - rect->left, height = rect->bottom - rect->top; int colors = format->bits_per_pixel <= 8 ? 1 << format->bits_per_pixel : 3; + struct x11drv_image *image; + UINT size; memset( info, 0, sizeof(*info) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); @@ -2009,8 +2046,15 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn info->bmiHeader.biSizeImage = get_dib_image_size( info ); if (format->bits_per_pixel > 8) set_color_info( vis, info, use_alpha ); - surface = calloc( 1, FIELD_OFFSET( struct x11drv_window_surface, info.bmiColors[colors] )); - if (!surface) return NULL; + size = FIELD_OFFSET( struct x11drv_window_surface, info.bmiColors[colors] ); + if (!(image = x11drv_image_create( info, vis ))) return NULL; + if (!(surface = calloc( 1, size ))) + { + x11drv_image_destroy( image ); + return NULL; + } + surface->image = image; + if (!window_surface_init( &surface->header, &x11drv_surface_funcs, hwnd, info, 0 )) goto failed; memcpy( &surface->info, info, get_dib_info_size( info, DIB_RGB_COLORS ) ); @@ -2018,19 +2062,9 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn surface->is_argb = (use_alpha && vis->depth == 32 && info->bmiHeader.biCompression == BI_RGB); set_color_key( surface, color_key ); - surface->image = create_shm_image( vis, width, height, &surface->shminfo ); - if (!surface->image) - { - surface->image = XCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, 0, NULL, - width, height, 32, 0 ); - if (!surface->image) goto failed; - surface->image->data = malloc( info->bmiHeader.biSizeImage ); - if (!surface->image->data) goto failed; - } - surface->gc = XCreateGC( gdi_display, window, 0, NULL ); XSetSubwindowMode( gdi_display, surface->gc, IncludeInferiors ); - surface->byteswap = image_needs_byteswap( surface->image, is_r8g8b8(vis), format->bits_per_pixel ); + surface->byteswap = image_needs_byteswap( surface->image->ximage, is_r8g8b8(vis), format->bits_per_pixel ); if (vis->depth == 32 && !surface->is_argb) surface->alpha_bits = ~(vis->red_mask | vis->green_mask | vis->blue_mask); @@ -2041,11 +2075,11 @@ struct window_surface *create_surface( HWND hwnd, Window window, const XVisualIn if (!(surface->header.color_bits = calloc( 1, info->bmiHeader.biSizeImage ))) goto failed; } - else surface->header.color_bits = surface->image->data; + else surface->header.color_bits = surface->image->ximage->data; TRACE( "created %p for %lx %s color_bits %p-%p image %p\n", surface, window, wine_dbgstr_rect(rect), surface->header.color_bits, (char *)surface->header.color_bits + info->bmiHeader.biSizeImage, - surface->image->data ); + surface->image->ximage->data ); return &surface->header;

1 0

Rémi Bernon : win32u: Move the window surface color bits to the common struct.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 3c7dc5f132eec377edeb2fcca02b7367abf1d68e URL: https://gitlab.winehq.org/wine/wine/-/commit/3c7dc5f132eec377edeb2fcca02b73… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 23:54:17 2024 +0200 win32u: Move the window surface color bits to the common struct. --- dlls/win32u/dce.c | 5 ++--- dlls/wineandroid.drv/window.c | 15 +++++++-------- dlls/winemac.drv/surface.c | 21 ++++++++++----------- dlls/winewayland.drv/window_surface.c | 28 +++++++++++++--------------- dlls/winex11.drv/bitblt.c | 29 ++++++++++++++--------------- include/wine/gdi_driver.h | 5 +++-- 6 files changed, 49 insertions(+), 54 deletions(-)

1 0

Rémi Bernon : win32u: Pass BITMAPINFO and a HBITMAP to window_surface_init.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 444436abfd858c93db24446e8d826ff072bb98e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/444436abfd858c93db24446e8d826f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 20:22:45 2024 +0200 win32u: Pass BITMAPINFO and a HBITMAP to window_surface_init. --- dlls/win32u/dce.c | 40 +++++++++++++++++++++++++---------- dlls/wineandroid.drv/window.c | 22 +++++++++++-------- dlls/winemac.drv/surface.c | 35 ++++++++++++++---------------- dlls/winewayland.drv/window_surface.c | 23 +++++++++++--------- dlls/winex11.drv/bitblt.c | 30 ++++++++++++++------------ include/wine/gdi_driver.h | 3 ++- 6 files changed, 90 insertions(+), 63 deletions(-)

1 0

Hans Leidekker : wmic: Sort the alias list.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: a293b2f23a454c9c36dc64ff36b0e2739b811102 URL: https://gitlab.winehq.org/wine/wine/-/commit/a293b2f23a454c9c36dc64ff36b0e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 3 11:40:44 2024 +0200 wmic: Sort the alias list. --- programs/wmic/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index f996d8018f4..6fa90981521 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -43,17 +43,17 @@ static const struct } alias_map[] = { + { L"baseboard", L"Win32_BaseBoard" }, { L"bios", L"Win32_BIOS" }, { L"computersystem", L"Win32_ComputerSystem" }, { L"cpu", L"Win32_Processor" }, - { L"LogicalDisk", L"Win32_LogicalDisk" }, - { L"nic", L"Win32_NetworkAdapter" }, - { L"os", L"Win32_OperatingSystem" }, - { L"process", L"Win32_Process" }, - { L"baseboard", L"Win32_BaseBoard" }, { L"diskdrive", L"Win32_DiskDrive" }, + { L"logicaldisk", L"Win32_LogicalDisk" }, { L"memorychip", L"Win32_PhysicalMemory" }, + { L"nic", L"Win32_NetworkAdapter" }, { L"nicconfig", L"Win32_NetworkAdapterConfiguration" }, + { L"os", L"Win32_OperatingSystem" }, + { L"process", L"Win32_Process" }, }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Hans Leidekker : wmic: Add csproduct and systemenclosure aliases.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: cd780fe609baacbba389f5f63b823542cdcbc4c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd780fe609baacbba389f5f63b8235… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 3 09:41:37 2024 +0200 wmic: Add csproduct and systemenclosure aliases. --- programs/wmic/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 6fa90981521..02a07f03d2e 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -47,6 +47,7 @@ alias_map[] = { L"bios", L"Win32_BIOS" }, { L"computersystem", L"Win32_ComputerSystem" }, { L"cpu", L"Win32_Processor" }, + { L"csproduct", L"Win32_ComputerSystemProduct" }, { L"diskdrive", L"Win32_DiskDrive" }, { L"logicaldisk", L"Win32_LogicalDisk" }, { L"memorychip", L"Win32_PhysicalMemory" }, @@ -54,6 +55,7 @@ alias_map[] = { L"nicconfig", L"Win32_NetworkAdapterConfiguration" }, { L"os", L"Win32_OperatingSystem" }, { L"process", L"Win32_Process" }, + { L"systemenclosure", L"Win32_SystemEnclosure" }, }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Danyil Blyschak : wineps.drv: Call ResetDCW() to update Devmode in the Unix interface.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: a3e33d40a846e570f673294fa523b52925e80d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/a3e33d40a846e570f673294fa523b5… Author: Danyil Blyschak <dblyschak(a)codeweavers.com> Date: Mon Jun 3 09:58:17 2024 -0500 wineps.drv: Call ResetDCW() to update Devmode in the Unix interface. Previously, PSDRV_ResetDC() only updated the devmode contained in the print context, which could cause the devmode in the unix interface to be inconsistent with the print context's devmode. This can cause problems later when PostScript is being outputted, as get_device_caps() in the unix interface would reference this inconsistent devmode. By calling ResetDCW() in PSDRV_ResetDC(), these two devmodes remain in-sync. --- dlls/wineps.drv/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 10e8e77e52d..ec4dc174cf9 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -467,7 +467,7 @@ BOOL PSDRV_ResetDC( print_ctx *ctx, const DEVMODEW *devmode ) dump_devmode( devmode ); PSDRV_MergeDevmodes( ctx->Devmode, devmode, ctx->pi ); } - return TRUE; + return !!ResetDCW( ctx->hdc, devmode ); } static PRINTER_ENUM_VALUESW *load_font_sub_table( HANDLE printer, DWORD *num_entries )

1 0