From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/dce.c | 101 ++++++++++++-------------- dlls/win32u/dibdrv/dc.c | 2 +- dlls/wineandroid.drv/window.c | 16 +--- dlls/winemac.drv/surface.c | 25 +------ dlls/winewayland.drv/window_surface.c | 18 +---- dlls/winex11.drv/bitblt.c | 17 +---- include/wine/gdi_driver.h | 3 +- 7 files changed, 58 insertions(+), 124 deletions(-)
diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 4020fb833ac..5481246faa3 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -56,24 +56,6 @@ static pthread_mutex_t surfaces_lock = PTHREAD_MUTEX_INITIALIZER; * Dummy window surface for windows that shouldn't get painted. */
-static void *dummy_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) -{ - static DWORD dummy_data; - - info->bmiHeader.biSize = sizeof( info->bmiHeader ); - info->bmiHeader.biWidth = dummy_surface.rect.right; - info->bmiHeader.biHeight = dummy_surface.rect.bottom; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = 32; - info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = 0; - info->bmiHeader.biXPelsPerMeter = 0; - info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; - info->bmiHeader.biClrImportant = 0; - return &dummy_data; -} - static void dummy_surface_set_clip( struct window_surface *window_surface, const RECT *rects, UINT count ) { /* nothing to do */ @@ -93,7 +75,6 @@ static void dummy_surface_destroy( struct window_surface *window_surface )
static const struct window_surface_funcs dummy_surface_funcs = { - dummy_surface_get_bitmap_info, dummy_surface_set_clip, dummy_surface_flush, dummy_surface_destroy @@ -125,13 +106,6 @@ static struct offscreen_window_surface *impl_from_window_surface( struct window_ return CONTAINING_RECORD( base, struct offscreen_window_surface, header ); }
-static void *offscreen_window_surface_get_bitmap_info( struct window_surface *base, BITMAPINFO *info ) -{ - struct offscreen_window_surface *impl = impl_from_window_surface( base ); - info->bmiHeader = impl->info.bmiHeader; - return base->color_bits; -} - static void offscreen_window_surface_set_clip( struct window_surface *base, const RECT *rects, UINT count ) { } @@ -150,7 +124,6 @@ static void offscreen_window_surface_destroy( struct window_surface *base )
static const struct window_surface_funcs offscreen_window_surface_funcs = { - offscreen_window_surface_get_bitmap_info, offscreen_window_surface_set_clip, offscreen_window_surface_flush, offscreen_window_surface_destroy @@ -224,10 +197,6 @@ static COLORREF get_color_key( const BITMAPINFO *info, COLORREF color_key ) W32KAPI BOOL window_surface_init( struct window_surface *surface, const struct window_surface_funcs *funcs, HWND hwnd, const RECT *rect, BITMAPINFO *info, HBITMAP bitmap ) { - struct bitblt_coords coords = {0}; - struct gdi_image_bits bits; - BITMAPOBJ *bmp; - surface->funcs = funcs; surface->ref = 1; surface->hwnd = hwnd; @@ -239,10 +208,7 @@ W32KAPI BOOL window_surface_init( struct window_surface *surface, const struct w reset_bounds( &surface->bounds );
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 ); + if (!(surface->color_bitmap = bitmap)) return FALSE;
return TRUE; } @@ -276,6 +242,31 @@ W32KAPI void window_surface_unlock( struct window_surface *surface ) pthread_mutex_unlock( &surface->mutex ); }
+W32KAPI BOOL window_surface_get_color( struct window_surface *surface, BITMAPINFO *info, void **bits ) +{ + struct bitblt_coords coords = {0}; + struct gdi_image_bits gdi_bits; + BITMAPOBJ *bmp; + + if (surface == &dummy_surface) + { + static BITMAPINFOHEADER header = {.biSize = sizeof(header), .biWidth = 1, .biHeight = 1, + .biPlanes = 1, .biBitCount = 32, .biCompression = BI_RGB}; + static DWORD dummy_data; + + info->bmiHeader = header; + if (bits) *bits = &dummy_data; + return TRUE; + } + + if (!(bmp = GDI_GetObjPtr( surface->color_bitmap, NTGDI_OBJ_BITMAP ))) return FALSE; + get_image_from_bitmap( bmp, info, &gdi_bits, &coords ); + if (bits) *bits = gdi_bits.ptr; + GDI_ReleaseObj( surface->color_bitmap ); + + return TRUE; +} + W32KAPI void window_surface_flush( struct window_surface *surface ) { char color_buf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -284,10 +275,9 @@ W32KAPI void window_surface_flush( struct window_surface *surface ) void *color_bits;
window_surface_lock( surface ); - color_bits = surface->funcs->get_info( surface, color_info );
OffsetRect( &dirty, -dirty.left, -dirty.top ); - if (intersect_rect( &dirty, &dirty, &surface->bounds )) + if (intersect_rect( &dirty, &dirty, &surface->bounds ) && window_surface_get_color( surface, color_info, &color_bits )) { TRACE( "Flushing hwnd %p, surface %p %s, bounds %s, dirty %s\n", surface->hwnd, surface, wine_dbgstr_rect( &surface->rect ), wine_dbgstr_rect( &surface->bounds ), wine_dbgstr_rect( &dirty ) ); @@ -301,27 +291,28 @@ W32KAPI void window_surface_set_layered( struct window_surface *surface, COLORRE { char color_buf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *color_info = (BITMAPINFO *)color_buf; + void *color_bits;
window_surface_lock( surface ); - surface->funcs->get_info( surface, color_info ); - - color_key = get_color_key( color_info, color_key ); - if (color_key != surface->color_key) - { - surface->color_key = color_key; - surface->bounds = surface->rect; - } - if (alpha_bits != surface->alpha_bits) + if (window_surface_get_color( surface, color_info, &color_bits )) { - surface->alpha_bits = alpha_bits; - surface->bounds = surface->rect; - } - if (alpha_mask != surface->alpha_mask) - { - surface->alpha_mask = alpha_mask; - surface->bounds = surface->rect; + color_key = get_color_key( color_info, color_key ); + if (color_key != surface->color_key) + { + surface->color_key = color_key; + surface->bounds = surface->rect; + } + if (alpha_bits != surface->alpha_bits) + { + surface->alpha_bits = alpha_bits; + surface->bounds = surface->rect; + } + if (alpha_mask != surface->alpha_mask) + { + surface->alpha_mask = alpha_mask; + surface->bounds = surface->rect; + } } - window_surface_unlock( surface );
window_surface_flush( surface ); @@ -1293,8 +1284,8 @@ void move_window_bits_surface( HWND hwnd, const RECT *window_rect, struct window 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 ); + window_surface_get_color( old_surface, info, &bits ); 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, diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index ea7512b01ca..51750098a7f 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -816,7 +816,7 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) physdev->surface = surface;
dibdrv = physdev->dibdrv; - bits = surface->funcs->get_info( surface, info ); + window_surface_get_color( surface, info, &bits ); init_dib_info_from_bitmapinfo( &dibdrv->dib, info, bits ); dibdrv->dib.rect = dc->attr->vis_rect; OffsetRect( &dibdrv->dib.rect, -dc->device_rect.left, -dc->device_rect.top ); diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 225c6668103..f8bfa5ae5ac 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -614,17 +614,6 @@ static void apply_line_region( DWORD *dst, int width, int x, int y, const RECT * if (width > 0) memset( dst, 0, width * sizeof(*dst) ); }
-/*********************************************************************** - * android_surface_get_bitmap_info - */ -static void *android_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) -{ - struct android_window_surface *surface = get_android_surface( window_surface ); - - memcpy( info, &surface->info, get_dib_info_size( &surface->info, DIB_RGB_COLORS )); - return window_surface->color_bits; -} - /*********************************************************************** * android_surface_set_clip */ @@ -725,7 +714,6 @@ static void android_surface_destroy( struct window_surface *window_surface )
static const struct window_surface_funcs android_surface_funcs = { - android_surface_get_bitmap_info, android_surface_set_clip, android_surface_flush, android_surface_destroy @@ -746,6 +734,7 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, int width = rect->right - rect->left, height = rect->bottom - rect->top; char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; + void *bits;
memset( info, 0, sizeof(*info) ); set_color_info( info, src_alpha ); @@ -757,12 +746,13 @@ 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, rect, info, 0 )) goto failed; + if (!window_surface_get_color( &surface->header, info, &bits )) goto failed; memcpy( &surface->info, info, get_dib_info_size( info, DIB_RGB_COLORS ) );
surface->window = get_ioctl_window( hwnd );
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 ); + bits, (char *)bits + info->bmiHeader.biSizeImage );
if (src_alpha) window_surface_set_layered( &surface->header, color_key, -1, 0xff000000 ); else window_surface_set_layered( &surface->header, color_key, alpha << 24, 0 ); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index bfd0cb25414..2f135dc6d7f 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -31,17 +31,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(bitblt);
- -/* only for use on sanitized BITMAPINFO structures */ -static inline int get_dib_info_size(const BITMAPINFO *info, UINT coloruse) -{ - if (info->bmiHeader.biCompression == BI_BITFIELDS) - return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); - if (coloruse == DIB_PAL_COLORS) - return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); - return FIELD_OFFSET(BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed]); -} - static inline int get_dib_stride(int width, int bpp) { return ((width * bpp + 31) >> 3) & ~3; @@ -79,18 +68,6 @@ static CGDataProviderRef data_provider_create(size_t size, void **bits) return provider; }
-/*********************************************************************** - * macdrv_surface_get_bitmap_info - */ -static void *macdrv_surface_get_bitmap_info(struct window_surface *window_surface, - BITMAPINFO *info) -{ - struct macdrv_window_surface *surface = get_mac_surface(window_surface); - - memcpy(info, &surface->info, get_dib_info_size(&surface->info, DIB_RGB_COLORS)); - return window_surface->color_bits; -} - /*********************************************************************** * macdrv_surface_set_clip */ @@ -135,7 +112,6 @@ static void macdrv_surface_destroy(struct window_surface *window_surface)
static const struct window_surface_funcs macdrv_surface_funcs = { - macdrv_surface_get_bitmap_info, macdrv_surface_set_clip, macdrv_surface_flush, macdrv_surface_destroy, @@ -192,6 +168,7 @@ static struct window_surface *create_surface(HWND hwnd, macdrv_window window, co
if (!(surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])))) goto failed; if (!window_surface_init(&surface->header, &macdrv_surface_funcs, hwnd, rect, info, bitmap)) goto failed; + if (!window_surface_get_color(&surface->header, info, &bits)) 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 5523e18e4f6..19fecf8aa3c 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -209,19 +209,6 @@ static void wayland_buffer_queue_add_damage(struct wayland_buffer_queue *queue, } }
-/*********************************************************************** - * wayland_window_surface_get_bitmap_info - */ -static void *wayland_window_surface_get_bitmap_info(struct window_surface *window_surface, - BITMAPINFO *info) -{ - struct wayland_window_surface *surface = wayland_window_surface_cast(window_surface); - /* We don't store any additional information at the end of our BITMAPINFO, so - * just copy the structure itself. */ - memcpy(info, &surface->info, sizeof(*info)); - return window_surface->color_bits; -} - /*********************************************************************** * wayland_window_surface_set_clip */ @@ -443,7 +430,6 @@ static void wayland_window_surface_destroy(struct window_surface *window_surface
static const struct window_surface_funcs wayland_window_surface_funcs = { - wayland_window_surface_get_bitmap_info, wayland_window_surface_set_clip, wayland_window_surface_flush, wayland_window_surface_destroy @@ -459,6 +445,7 @@ static struct window_surface *wayland_window_surface_create(HWND hwnd, const REC struct wayland_window_surface *wws; int width = rect->right - rect->left; int height = rect->bottom - rect->top; + void *bits;
TRACE("hwnd %p rect %s\n", hwnd, wine_dbgstr_rect(rect));
@@ -474,10 +461,11 @@ static struct window_surface *wayland_window_surface_create(HWND hwnd, const REC wws = calloc(1, sizeof(*wws)); if (!wws) return NULL; if (!window_surface_init(&wws->header, &wayland_window_surface_funcs, hwnd, rect, info, 0)) goto failed; + if (!window_surface_get_color(&wws->header, info, &bits)) goto failed; wws->info = *info;
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); + bits, (char *)bits + info->bmiHeader.biSizeImage);
return &wws->header;
diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8ac1ffead17..068517a0161 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1905,17 +1905,6 @@ failed: return NULL; }
-/*********************************************************************** - * x11drv_surface_get_bitmap_info - */ -static void *x11drv_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) -{ - struct x11drv_window_surface *surface = get_x11_surface( window_surface ); - - memcpy( info, &surface->info, get_dib_info_size( &surface->info, DIB_RGB_COLORS )); - return window_surface->color_bits; -} - static XRectangle *xrectangles_from_rects( const RECT *rects, UINT count ) { XRectangle *xrects; @@ -2024,7 +2013,6 @@ static void x11drv_surface_destroy( struct window_surface *window_surface )
static const struct window_surface_funcs x11drv_surface_funcs = { - x11drv_surface_get_bitmap_info, x11drv_surface_set_clip, x11drv_surface_flush, x11drv_surface_destroy @@ -2046,6 +2034,7 @@ static struct window_surface *create_surface( HWND hwnd, Window window, const XV D3DDDIFORMAT d3d_format; HBITMAP bitmap = 0; BOOL byteswap; + void *bits; UINT size, status;
memset( info, 0, sizeof(*info) ); @@ -2096,6 +2085,7 @@ static struct window_surface *create_surface( HWND hwnd, Window window, const XV surface->byteswap = byteswap;
if (!window_surface_init( &surface->header, &x11drv_surface_funcs, hwnd, rect, info, bitmap )) goto failed; + if (!window_surface_get_color( &surface->header, info, &bits )) goto failed; memcpy( &surface->info, info, get_dib_info_size( info, DIB_RGB_COLORS ) );
surface->window = window; @@ -2103,8 +2093,7 @@ static struct window_surface *create_surface( HWND hwnd, Window window, const XV XSetSubwindowMode( gdi_display, surface->gc, IncludeInferiors );
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 ); + bits, (char *)bits + info->bmiHeader.biSizeImage, surface->image->ximage->data );
if (use_alpha) window_surface_set_layered( &surface->header, color_key, -1, 0xff000000 ); else window_surface_set_layered( &surface->header, color_key, -1, 0 ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 4b1ea3c7e33..87ced3f8296 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -211,7 +211,6 @@ struct window_surface;
struct window_surface_funcs { - void* (*get_info)( struct window_surface *surface, BITMAPINFO *info ); void (*set_clip)( struct window_surface *surface, const RECT *rects, UINT count ); BOOL (*flush)( struct window_surface *surface, const RECT *rect, const RECT *dirty, const BITMAPINFO *color_info, const void *color_bits ); @@ -234,7 +233,6 @@ struct window_surface UINT alpha_bits; /* layered window global alpha bits, invalid if -1 */ UINT alpha_mask; /* layered window per-pixel alpha mask, invalid if 0 */ HBITMAP color_bitmap; /* bitmap for the surface colors */ - void *color_bits; /* pixel bits of the color bitmap */ /* driver-specific fields here */ };
@@ -244,6 +242,7 @@ 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 ); W32KAPI void window_surface_unlock( struct window_surface *surface ); +W32KAPI BOOL window_surface_get_color( struct window_surface *surface, BITMAPINFO *info, void **bits ); W32KAPI void window_surface_set_layered( struct window_surface *surface, COLORREF color_key, UINT alpha_bits, UINT alpha_mask ); W32KAPI void window_surface_flush( struct window_surface *surface ); W32KAPI void window_surface_set_clip( struct window_surface *surface, HRGN clip_region );