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

Tag wine-9.12 : Alexandre Julliard : Release 9.12
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: refs/tags/wine-9.12 Tag: 81e697ff7c4c5b5195789855a16ab9bb8e96c648 URL: https://gitlab.winehq.org/wine/wine/-/tags/81e697ff7c4c5b5195789855a16ab9bb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 28 22:35:25 2024 +0200 Release 9.12

1 0

Eric Pouech : cmd: Implement semantic for chaining in ||, | and && operators.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: bf9a465e9566578b40c08223436ce53f597bedd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf9a465e9566578b40c08223436ce5… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Jun 27 16:21:35 2024 +0200 cmd: Implement semantic for chaining in ||, | and && operators. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd.exp | 106 +++++++++++++++---------------- programs/cmd/wcmd.h | 2 + programs/cmd/wcmdmain.c | 42 ++++++++++-- 3 files changed, 93 insertions(+), 57 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1799bc795fc..c2dba03b740 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -262,7 +262,7 @@ a2 b1 b2 c1 -(a)todo_wine@--- +--- d1 d2 d3 @@ -271,7 +271,7 @@ e2 e3 f1 f2 -(a)todo_wine@--- +--- g1 g2 g3 @@ -280,19 +280,19 @@ h2 h3 i1 i2 -(a)todo_wine@--- +--- j1 -(a)todo_wine@j3 -(a)todo_wine@--- +j3 +--- k1 -(a)todo_wine@--- +--- l1 -(a)todo_wine@--- +--- --- chain failure a1 a2 b1 -(a)todo_wine@--- +--- c1 c2 d1 @@ -300,24 +300,24 @@ d2 d3 e1 e2 -(a)todo_wine@--- +--- f1 f2 f3 g1 -(a)todo_wine@g3 -(a)todo_wine@--- +g3 +--- h1 -(a)todo_wine@--- +--- i1 -(a)todo_wine@i3 -(a)todo_wine@--- +i3 +--- j1 j2 j3 k1 k2 -(a)todo_wine@--- +--- l1 l2 l3 @@ -330,7 +330,7 @@ b2 b3 c1 c2 -(a)todo_wine@--- +--- d1 d2 d3 @@ -339,34 +339,34 @@ e2 e3 f1 f2 -(a)todo_wine@--- +--- g1 -(a)todo_wine@--- +--- h1 -(a)todo_wine@--- +--- i1 -(a)todo_wine@--- +--- j1 j2 j3 k1 k2 -(a)todo_wine@--- +--- l1 l2 l3 m1 -(a)todo_wine@--- +--- n1 -(a)todo_wine@--- +--- o1 -(a)todo_wine@--- +--- p1 p2 p3 q1 q2 -(a)todo_wine@--- +--- r1 r2 r3 @@ -378,13 +378,13 @@ b2 c1 c3 d1 -(a)todo_wine@--- +--- e1 e3 f2 f3 g2 -(a)todo_wine@--- +--- h2 h3 i3 @@ -398,44 +398,44 @@ f4:[f3:[f2:[f1,f2],f3],f4]@or_broken(a)f4:[f3:[f2:,f3],f4]@or_broken(a)f4:[f3:,f4] --- chain else a1 b2 -(a)todo_wine@--- +--- c3 -(a)todo_wine@--- +--- d3 -(a)todo_wine@--- -(a)todo_wine@--- -(a)todo_wine@--- -(a)todo_wine@--- -(a)todo_wine@--- +--- +--- +--- +--- +--- --- chain else (if true) a1 else echo a2 b2 else echo b3 c1 c2 else echo c3 d1 -(a)todo_wine@--- +--- e1 e2 else echo e3 f3 g1 else echo g2 g3 h1 else echo h2 -(a)todo_wine@--- +--- i1 else echo i2 i3 @todo_wine(a)j2@space@ -(a)todo_wine@--- +--- k1 k2 l1 -(a)todo_wine@--- +--- m1 m2 n1 o1 p1 q1 -(a)todo_wine@--- +--- --- chain else (if false) j3 --- @@ -446,25 +446,25 @@ n3 o2 o3 p2 -(a)todo_wine@--- +--- q2 q3 ------------- Testing internal commands return codes --- call and IF/FOR blocks SUCCESS 0 -(a)todo_wine@FAILURE 33 -(a)todo_wine@foo(a)space@ -(a)todo_wine@SUCCESS 666 -(a)todo_wine@FAILURE 1 +FAILURE 33 +foo(a)space@ SUCCESS 666 -(a)todo_wine@SUCCESS 666 -(a)todo_wine@FAILURE 33 -(a)todo_wine@FAILURE 34 +FAILURE 1 SUCCESS 666 -(a)todo_wine@SUCCESS 666 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 33 -(a)todo_wine@--- +SUCCESS 666 +FAILURE 33 +FAILURE 34 +SUCCESS 666 +SUCCESS 666 +SUCCESS 0 +FAILURE 33 +--- ------------ Testing 'set' ------------ 1 0 @@ -654,13 +654,13 @@ bar2(a)space@ foo2 foobar deleted --- on success conditional and -(a)todo_wine@foo3 not created +foo3 not created bar4(a)space@ foo4 --- on failure conditional or foo5 foo6(a)space@ -(a)todo_wine@------------ Testing cd ------------ +------------ Testing cd ------------ singleFile Current dir: @drive@@path(a)foobar@or_broken(a)Current dir:@space@ @drive@@path(a)foobar diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8dfc89534d6..9f8bdd46044 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -156,6 +156,8 @@ typedef int RETURN_CODE; #define RETURN_CODE_SYNTAX_ERROR 255 #define RETURN_CODE_CANT_LAUNCH 9009 #define RETURN_CODE_ABORTED (-999999) +/* temporary to detect builtin commands not migrated to handle return code */ +#define RETURN_CODE_OLD_CHAINING (-999998) void WCMD_assoc (const WCHAR *, BOOL); void WCMD_batch(WCHAR *, WCHAR *, WCHAR *, HANDLE); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 860ca872ffc..17702f4f277 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1734,7 +1734,7 @@ static BOOL set_std_redirections(CMD_REDIRECTION *redir) */ static RETURN_CODE execute_single_command(const WCHAR *command) { - RETURN_CODE return_code = NO_ERROR; + RETURN_CODE return_code; WCHAR *cmd, *parms_start; int status, cmd_index, count; WCHAR *whichcmd; @@ -1791,6 +1791,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WINE_TRACE("Got directory %s as %s\n", wine_dbgstr_w(envvar), wine_dbgstr_w(cmd)); status = SetCurrentDirectoryW(cmd); if (!status) WCMD_print_error (); + return_code = ERROR_INVALID_FUNCTION; goto cleanup; } @@ -1805,6 +1806,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) } + return_code = RETURN_CODE_OLD_CHAINING; switch (cmd_index) { case WCMD_CALL: @@ -1936,6 +1938,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) default: prev_echo_mode = echo_mode; WCMD_run_program (whichcmd, FALSE); + return_code = errorlevel; echo_mode = prev_echo_mode; } @@ -3659,6 +3662,16 @@ static RETURN_CODE for_control_execute(CMD_FOR_CONTROL *for_ctrl, CMD_NODE *node return return_code; } +static RETURN_CODE temp_fixup_return_code(CMD_NODE *node, RETURN_CODE return_code, RETURN_CODE fallback_return_code) +{ + if (return_code == RETURN_CODE_OLD_CHAINING) + { + FIXME("Not migrated (%ls) used in chaining\n", node->op == CMD_SINGLE ? node->command->command : L"Too complex"); + return_code = fallback_return_code; + } + return return_code; +} + RETURN_CODE node_execute(CMD_NODE *node) { HANDLE old_stdhandles[3] = {GetStdHandle (STD_INPUT_HANDLE), @@ -3674,7 +3687,7 @@ RETURN_CODE node_execute(CMD_NODE *node) { WCMD_print_error(); /* FIXME potentially leaking here (if first redir created ok, and second failed */ - return ERROR_INVALID_FUNCTION; + return errorlevel = ERROR_INVALID_FUNCTION; } switch (node->op) { @@ -3684,11 +3697,27 @@ RETURN_CODE node_execute(CMD_NODE *node) else return_code = NO_ERROR; break; case CMD_CONCAT: + return_code = node_execute(node->left); + if (return_code != RETURN_CODE_ABORTED) + return_code = node_execute(node->right); + break; case CMD_ONSUCCESS: + return_code = node_execute(node->left); + return_code = temp_fixup_return_code(node->left, return_code, NO_ERROR); + if (return_code == NO_ERROR) + { + return_code = node_execute(node->right); + temp_fixup_return_code(node->right, return_code, 0 /* not used */); + } + break; case CMD_ONFAILURE: return_code = node_execute(node->left); - if (return_code != RETURN_CODE_ABORTED) + return_code = temp_fixup_return_code(node->left, return_code, ERROR_INVALID_FUNCTION); + if (return_code != NO_ERROR) + { return_code = node_execute(node->right); + temp_fixup_return_code(node->right, return_code, 0 /* not used */); + } break; case CMD_PIPE: { @@ -3714,11 +3743,13 @@ RETURN_CODE node_execute(CMD_NODE *node) output = redirection_create_file(REDIR_WRITE_TO, 1, filename); if (set_std_redirections(output)) { - return_code = node_execute(node->left); + RETURN_CODE return_code_left = node_execute(node->left); + return_code = NO_ERROR; CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE)); SetStdHandle(STD_OUTPUT_HANDLE, old_stdhandles[1]); + return_code = temp_fixup_return_code(node->left, return_code, NO_ERROR); if (return_code == NO_ERROR) { HANDLE h = CreateFileW(filename, GENERIC_READ, @@ -3728,10 +3759,13 @@ RETURN_CODE node_execute(CMD_NODE *node) { SetStdHandle(STD_INPUT_HANDLE, h); return_code = node_execute(node->right); + temp_fixup_return_code(node->right, return_code, 0 /* not used */); } else return_code = ERROR_INVALID_FUNCTION; } DeleteFileW(filename); + if (return_code_left != NO_ERROR || return_code != NO_ERROR) + errorlevel = ERROR_INVALID_FUNCTION; } else return_code = ERROR_INVALID_FUNCTION; redirection_dispose_list(output);

1 0

Rémi Bernon : win32u: Move layered surface attributes to the window_surface struct.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 8bf839bc24a693b5fdc889e010e53e5ca9c433c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bf839bc24a693b5fdc889e010e53e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 15 21:09:37 2024 +0200 win32u: Move layered surface attributes to the window_surface struct. --- dlls/win32u/dce.c | 3 ++ dlls/wineandroid.drv/window.c | 47 ++++++++++++------------ dlls/winemac.drv/surface.c | 7 ++-- dlls/winex11.drv/bitblt.c | 85 ++++++++++++++++++++++++------------------- include/wine/gdi_driver.h | 3 ++ 5 files changed, 79 insertions(+), 66 deletions(-)

1 0

Rémi Bernon : win32u: Introduce a new helper to update layered window surface attributes.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 2d62cee5d054a7f87b2da7c319ab30c67543ba51 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d62cee5d054a7f87b2da7c319ab30… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 27 16:41:44 2024 +0200 win32u: Introduce a new helper to update layered window surface attributes. --- dlls/win32u/dce.c | 56 ++++++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 53 ++++++---------------------------------- dlls/winemac.drv/surface.c | 15 +++--------- dlls/winemac.drv/window.c | 4 +-- dlls/winex11.drv/bitblt.c | 57 +++---------------------------------------- dlls/winex11.drv/window.c | 4 +-- dlls/winex11.drv/x11drv.h | 1 - include/wine/gdi_driver.h | 1 + 8 files changed, 76 insertions(+), 115 deletions(-)

1 0

Rémi Bernon : win32u: Pass BITMAPINFO and color bits to window surface flush.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 2483ea455edf29ca1e47763cfaaab77b8d1c2abf URL: https://gitlab.winehq.org/wine/wine/-/commit/2483ea455edf29ca1e47763cfaaab7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 6 00:24:44 2024 +0200 win32u: Pass BITMAPINFO and color bits to window surface flush. --- dlls/win32u/dce.c | 12 +++++++++--- dlls/wineandroid.drv/window.c | 7 ++++--- dlls/winemac.drv/surface.c | 8 ++++---- dlls/winewayland.drv/window_surface.c | 14 ++++++++------ dlls/winex11.drv/bitblt.c | 15 +++++++-------- include/wine/gdi_driver.h | 3 ++- 6 files changed, 34 insertions(+), 25 deletions(-)

1 0

Rémi Bernon : win32u: Introduce a new helper to get surface color info and bits.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 5c01d08918ff5151edbc9cda7a0ed5c0632a352e URL: https://gitlab.winehq.org/wine/wine/-/commit/5c01d08918ff5151edbc9cda7a0ed5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 12:13:00 2024 +0200 win32u: Introduce a new helper to get surface color info and bits. --- dlls/win32u/dce.c | 99 ++++++++++++++++------------------- dlls/win32u/dibdrv/dc.c | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/wineandroid.drv/window.c | 15 +----- dlls/winemac.drv/surface.c | 27 +--------- dlls/winewayland.drv/window_surface.c | 17 +----- dlls/winex11.drv/bitblt.c | 16 +----- include/wine/gdi_driver.h | 2 - 8 files changed, 50 insertions(+), 129 deletions(-)

1 0

Rémi Bernon : win32u: Get rid of the unnecessary offscreen window surface struct.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 6f047d8c85a910b18be8967b89d8faacac4b453b URL: https://gitlab.winehq.org/wine/wine/-/commit/6f047d8c85a910b18be8967b89d8fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 12:16:53 2024 +0200 win32u: Get rid of the unnecessary offscreen window surface struct. --- dlls/win32u/dce.c | 51 +++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 4f86e6fb01d..91bcb02a6a8 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -92,34 +92,19 @@ struct window_surface dummy_surface = * Off-screen window surface. */ -struct offscreen_window_surface -{ - struct window_surface header; - BITMAPINFO info; -}; - -static const struct window_surface_funcs offscreen_window_surface_funcs; - -static struct offscreen_window_surface *impl_from_window_surface( struct window_surface *base ) -{ - if (!base || base->funcs != &offscreen_window_surface_funcs) return NULL; - return CONTAINING_RECORD( base, struct offscreen_window_surface, header ); -} - -static void offscreen_window_surface_set_clip( struct window_surface *base, const RECT *rects, UINT count ) +static void offscreen_window_surface_set_clip( struct window_surface *surface, const RECT *rects, UINT count ) { } -static BOOL offscreen_window_surface_flush( struct window_surface *base, const RECT *rect, const RECT *dirty, +static BOOL offscreen_window_surface_flush( struct window_surface *surface, const RECT *rect, const RECT *dirty, const BITMAPINFO *color_info, const void *color_bits ) { return TRUE; } -static void offscreen_window_surface_destroy( struct window_surface *base ) +static void offscreen_window_surface_destroy( struct window_surface *surface ) { - struct offscreen_window_surface *impl = impl_from_window_surface( base ); - free( impl ); + free( surface ); } static const struct window_surface_funcs offscreen_window_surface_funcs = @@ -129,22 +114,19 @@ static const struct window_surface_funcs offscreen_window_surface_funcs = offscreen_window_surface_destroy }; -void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struct window_surface **surface ) +void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struct window_surface **window_surface ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; - struct offscreen_window_surface *impl; + struct window_surface *surface, *previous; - TRACE( "hwnd %p, surface_rect %s, surface %p.\n", hwnd, wine_dbgstr_rect( surface_rect ), surface ); + TRACE( "hwnd %p, surface_rect %s, window_surface %p.\n", hwnd, wine_dbgstr_rect( surface_rect ), window_surface ); /* check that old surface is an offscreen_window_surface, or release it */ - if ((impl = impl_from_window_surface( *surface ))) - { - /* if the rect didn't change, keep the same surface */ - if (EqualRect( surface_rect, &impl->header.rect )) return; - window_surface_release( &impl->header ); - } - else if (*surface) window_surface_release( *surface ); + if ((previous = *window_surface) && previous->funcs == &offscreen_window_surface_funcs && + EqualRect( surface_rect, &previous->rect )) return; + if (previous) window_surface_release( previous ); + *window_surface = NULL; memset( info, 0, sizeof(*info) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); @@ -156,14 +138,11 @@ void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struc info->bmiHeader.biCompression = BI_RGB; /* create a new window surface */ - *surface = NULL; - if (!(impl = calloc(1, sizeof(*impl)))) return; - 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 ); + if (!(surface = calloc(1, sizeof(*surface)))) return; + window_surface_init( surface, &offscreen_window_surface_funcs, hwnd, surface_rect, info, 0 ); - *surface = &impl->header; + TRACE( "created window surface %p\n", surface ); + *window_surface = surface; } /* window surface common helpers */

1 0

Rémi Bernon : winemac: Remove now unnecessary driver surface BITMAPINFO.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: e1b1a97fc828af557a130e40d4bfb813d92a0f60 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1b1a97fc828af557a130e40d4bfb8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 10:43:05 2024 +0200 winemac: Remove now unnecessary driver surface BITMAPINFO. --- dlls/winemac.drv/surface.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 4bc65b957c1..e4f140a898e 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -48,7 +48,6 @@ struct macdrv_window_surface struct window_surface header; macdrv_window window; CGDataProviderRef provider; - BITMAPINFO info; /* variable size, must be last */ }; static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface); @@ -166,9 +165,8 @@ static struct window_surface *create_surface(HWND hwnd, macdrv_window window, co } if (desc.hDeviceDc) NtUserReleaseDC(hwnd, desc.hDeviceDc); - if (!(surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])))) goto failed; + if (!(surface = calloc(1, sizeof(*surface)))) goto failed; if (!window_surface_init(&surface->header, &macdrv_surface_funcs, hwnd, rect, info, bitmap)) goto failed; - memcpy(&surface->info, info, offsetof(BITMAPINFO, bmiColors[3])); surface->window = window; if (old_surface) surface->header.bounds = old_surface->bounds;

1 0

Rémi Bernon : wineandroid: Remove now unnecessary window surface BITMAPINFO.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 1b9e6e6d1f23358fd1ad4bf1e4fa4b0881928b6f URL: https://gitlab.winehq.org/wine/wine/-/commit/1b9e6e6d1f23358fd1ad4bf1e4fa4b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 10:47:36 2024 +0200 wineandroid: Remove now unnecessary window surface BITMAPINFO. --- dlls/wineandroid.drv/window.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 060fa73d15c..1ee542455a3 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -70,16 +70,6 @@ static inline int context_idx( HWND hwnd ) return LOWORD( hwnd ) >> 1; } -/* 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; @@ -564,7 +554,6 @@ struct android_window_surface ANativeWindow *window; UINT clip_count; RECT *clip_rects; - BITMAPINFO info; /* variable size, must be last */ }; static struct android_window_surface *get_android_surface( struct window_surface *surface ) @@ -742,10 +731,8 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, info->bmiHeader.biPlanes = 1; info->bmiHeader.biSizeImage = get_dib_image_size( info ); - surface = calloc( 1, FIELD_OFFSET( struct android_window_surface, info.bmiColors[3] )); - if (!surface) return NULL; + if (!(surface = calloc( 1, sizeof(*surface) ))) return NULL; 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 );

1 0

Rémi Bernon : winewayland: Remove now unnecessary window surface BITMAPINFO.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 7014d04889050a2478fe80315506f8d99d04823a URL: https://gitlab.winehq.org/wine/wine/-/commit/7014d04889050a2478fe80315506f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 30 13:55:13 2024 +0200 winewayland: Remove now unnecessary window surface BITMAPINFO. --- dlls/winewayland.drv/window_surface.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 7cff84a5bf7..084f987df6c 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -45,7 +45,6 @@ struct wayland_window_surface struct window_surface header; struct wayland_surface *wayland_surface; struct wayland_buffer_queue *wayland_buffer_queue; - BITMAPINFO info; }; static struct wayland_window_surface *wayland_window_surface_cast( @@ -460,7 +459,6 @@ 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; - wws->info = *info; TRACE("created %p hwnd %p %s\n", wws, hwnd, wine_dbgstr_rect(rect));

1 0