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

Hans Leidekker : msi/tests: Use the helpers from utils.h in more modules.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: b3f11ceb7a0ddcf5fe742377f99c947b0b56a051 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3f11ceb7a0ddcf5fe742377f99c94… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 4 14:40:24 2024 +0200 msi/tests: Use the helpers from utils.h in more modules. --- dlls/msi/tests/automation.c | 85 ++---------------------- dlls/msi/tests/db.c | 73 +++++--------------- dlls/msi/tests/package.c | 158 +++++++++++--------------------------------- dlls/msi/tests/patch.c | 68 ++----------------- 4 files changed, 65 insertions(+), 319 deletions(-)

1 0

Rémi Bernon : mf/tests: Test D3D awareness handling in the topology loader.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: b0935b929184e3baaa453f59ccef53546f56f05e URL: https://gitlab.winehq.org/wine/wine/-/commit/b0935b929184e3baaa453f59ccef53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 9 11:05:53 2024 +0200 mf/tests: Test D3D awareness handling in the topology loader. --- dlls/mf/tests/topology.c | 485 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 485 insertions(+)

1 0

Rémi Bernon : mf/tests: Test device manager handling in the topology loader.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: c1fb54addef0f0b460279fe0e386c01742e98210 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1fb54addef0f0b460279fe0e386c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 8 17:43:35 2024 +0200 mf/tests: Test device manager handling in the topology loader. --- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/topology.c | 619 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 615 insertions(+), 6 deletions(-)

1 0

Rémi Bernon : include: Add MFTOPOLOGY_DXVA_MODE enum definition.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: c43655d8ed576d23022ce107288d9bcd8982ee58 URL: https://gitlab.winehq.org/wine/wine/-/commit/c43655d8ed576d23022ce107288d9b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 8 17:17:22 2024 +0200 include: Add MFTOPOLOGY_DXVA_MODE enum definition. --- include/mfidl.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index b3201b12d84..666af53c6e3 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -131,6 +131,13 @@ typedef enum _MF_VIDEO_PROCESSOR_ALGORITHM_TYPE MF_VIDEO_PROCESSOR_ALGORITHM_MRF_CRF_444 = 1, } MF_VIDEO_PROCESSOR_ALGORITHM_TYPE; +typedef enum MFTOPOLOGY_DXVA_MODE +{ + MFTOPOLOGY_DXVA_DEFAULT = 0, + MFTOPOLOGY_DXVA_NONE = 1, + MFTOPOLOGY_DXVA_FULL = 2, +} MFTOPOLOGY_DXVA_MODE; + [ object, uuid(2eb1e945-18b8-4139-9b1a-d5d584818530),

1 0

Rémi Bernon : mf/tests: Fix printf format warning.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: dcab600eef9e86fe2e0a7ac8998002c5bbf4713b URL: https://gitlab.winehq.org/wine/wine/-/commit/dcab600eef9e86fe2e0a7ac8998002… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 14:50:46 2024 +0200 mf/tests: Fix printf format warning. --- dlls/mf/tests/mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fece60d37a7..b3cd355f49d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4179,7 +4179,7 @@ static void test_topology_loader(void) { IMFTopology_GetTopologyID(topology, &oldtopoid); IMFTopology_GetTopologyID(full_topology, &newtopoid); - ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid); + ok(oldtopoid == newtopoid, "Expected the same topology id. %I64u == %I64u\n", oldtopoid, newtopoid); ok(topology != full_topology, "Expected a different object for the resolved topology.\n"); hr = IMFTopology_GetCount(full_topology, &count); @@ -4331,7 +4331,7 @@ todo_wine { ok(full_topology != topology2, "Unexpected instance.\n"); IMFTopology_GetTopologyID(topology2, &oldtopoid); IMFTopology_GetTopologyID(full_topology, &newtopoid); - ok(oldtopoid == newtopoid, "Expected the same topology id. %llu == %llu\n", oldtopoid, newtopoid); + ok(oldtopoid == newtopoid, "Expected the same topology id. %I64u == %I64u\n", oldtopoid, newtopoid); hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : mf/tests: Split topology loader tests to a new file.
by Alexandre Julliard April 9, 2024

April 9, 2024

Module: wine Branch: master Commit: 120f870a762f86b0d0b4ee45f76f22682d190e5f URL: https://gitlab.winehq.org/wine/wine/-/commit/120f870a762f86b0d0b4ee45f76f22… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 9 11:00:30 2024 +0200 mf/tests: Split topology loader tests to a new file. --- dlls/mf/tests/Makefile.in | 1 + dlls/mf/tests/mf.c | 5369 +++++++++++++++------------------------------ dlls/mf/tests/topology.c | 2688 +++++++++++++++++++++++ 3 files changed, 4462 insertions(+), 3596 deletions(-)

1 0

Tag wine-9.6 : Alexandre Julliard : Release 9.6
by Alexandre Julliard April 5, 2024

April 5, 2024

Module: wine Branch: refs/tags/wine-9.6 Tag: a8cb8def2ca4d9a05d1a158c3bf55b057246296b URL: https://gitlab.winehq.org/wine/wine/-/tags/a8cb8def2ca4d9a05d1a158c3bf55b05… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 19:03:05 2024 +0200 Release 9.6

1 0

Rémi Bernon : winex11: Introduce a new destroy_client_window helper.
by Alexandre Julliard April 5, 2024

April 5, 2024

Module: wine Branch: master Commit: d38c7b94f0feef6dfcbaca3f415ee25711ea1b34 URL: https://gitlab.winehq.org/wine/wine/-/commit/d38c7b94f0feef6dfcbaca3f415ee2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 30 14:56:57 2023 +0100 winex11: Introduce a new destroy_client_window helper. --- dlls/winex11.drv/opengl.c | 4 +++- dlls/winex11.drv/vulkan.c | 16 ++++++---------- dlls/winex11.drv/window.c | 23 +++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 97618daef65..68c8214b835 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -221,6 +221,7 @@ struct gl_drawable { LONG ref; /* reference count */ enum dc_gl_type type; /* type of GL surface */ + HWND hwnd; GLXDrawable drawable; /* drawable for rendering with GL */ Window window; /* window if drawable is a GLXWindow */ Colormap colormap; /* colormap for the client window */ @@ -1158,7 +1159,7 @@ static void release_gl_drawable( struct gl_drawable *gl ) case DC_GL_CHILD_WIN: TRACE( "destroying %lx drawable %lx\n", gl->window, gl->drawable ); pglXDestroyWindow( gdi_display, gl->drawable ); - XDestroyWindow( gdi_display, gl->window ); + destroy_client_window( gl->hwnd, gl->window ); XFreeColormap( gdi_display, gl->colormap ); break; case DC_GL_PIXMAP_WIN: @@ -1328,6 +1329,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel gl->refresh_swap_interval = TRUE; gl->format = format; gl->ref = 1; + gl->hwnd = hwnd; gl->mutable_pf = mutable_pf; if (!known_child && !NtUserGetWindowRelative( hwnd, GW_CHILD ) && diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 6f43164b074..4ff319c7ae2 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -101,9 +101,7 @@ static void wine_vk_surface_release( struct wine_vk_surface *surface ) pthread_mutex_unlock(&vulkan_mutex); } - if (surface->window) - XDestroyWindow(gdi_display, surface->window); - + destroy_client_window( surface->hwnd, surface->window ); free(surface); } @@ -193,8 +191,8 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, ERR("Failed to allocate client window for hwnd=%p\n", create_info->hwnd); /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + free(x11_surface); + return VK_ERROR_OUT_OF_HOST_MEMORY; } create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; @@ -207,7 +205,9 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, if (res != VK_SUCCESS) { ERR("Failed to create Xlib surface, res=%d\n", res); - goto err; + destroy_client_window( x11_surface->hwnd, x11_surface->window ); + free(x11_surface); + return res; } pthread_mutex_lock(&vulkan_mutex); @@ -218,10 +218,6 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, TRACE("Created surface=0x%s\n", wine_dbgstr_longlong(*surface)); return VK_SUCCESS; - -err: - wine_vk_surface_release(x11_surface); - return res; } static void X11DRV_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 031d754a3ef..23391b069dd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1613,6 +1613,29 @@ static void detach_client_window( struct x11drv_win_data *data, Window client_wi } +/********************************************************************** + * destroy_client_window + */ +void destroy_client_window( HWND hwnd, Window client_window ) +{ + struct x11drv_win_data *data; + + TRACE( "%p destroying client window %lx\n", hwnd, client_window ); + + if ((data = get_win_data( hwnd ))) + { + if (data->client_window == client_window) + { + if (data->whole_window) client_window_events_disable( data, client_window ); + data->client_window = 0; + } + release_win_data( data ); + } + + XDestroyWindow( gdi_display, client_window ); +} + + /********************************************************************** * create_client_window */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ef736c86522..af2fe18fb26 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -650,6 +650,7 @@ extern void read_net_wm_states( Display *display, struct x11drv_win_data *data ) extern void update_net_wm_states( struct x11drv_win_data *data ); extern void make_window_embedded( struct x11drv_win_data *data ); extern Window create_client_window( HWND hwnd, const XVisualInfo *visual, Colormap colormap ); +extern void destroy_client_window( HWND hwnd, Window client_window ); extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ); extern void change_systray_owner( Display *display, Window systray_window ); extern HWND create_foreign_window( Display *display, Window window );

1 0

Alexandre Julliard : Release 9.6.
by Alexandre Julliard April 5, 2024

April 5, 2024

Module: wine Branch: master Commit: 8a3b0d7bc317aada750769af8f82762c7001acad URL: https://gitlab.winehq.org/wine/wine/-/commit/8a3b0d7bc317aada750769af8f8276… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 19:03:05 2024 +0200 Release 9.6. --- ANNOUNCE.md | 592 +++++++++++++++++++++++------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 235 insertions(+), 378 deletions(-)

1 0

Rémi Bernon : winex11: Introduce a new attach_client_window helper.
by Alexandre Julliard April 5, 2024

April 5, 2024

Module: wine Branch: master Commit: 28cf663e2b746701378f129ac69a886be20da4e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/28cf663e2b746701378f129ac69a88… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 30 17:29:36 2023 +0100 winex11: Introduce a new attach_client_window helper. --- dlls/winex11.drv/window.c | 50 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 23391b069dd..26cfee427ab 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1587,6 +1587,13 @@ Window get_dummy_parent(void) return dummy_parent; } +static void client_window_events_enable( struct x11drv_win_data *data, Window client_window ) +{ + XSaveContext( data->display, client_window, winContext, (char *)data->hwnd ); + XSync( data->display, False ); /* make sure client_window is known from data->display */ + XSelectInput( data->display, client_window, ExposureMask ); +} + static void client_window_events_disable( struct x11drv_win_data *data, Window client_window ) { XSelectInput( data->display, client_window, 0 ); @@ -1613,6 +1620,28 @@ static void detach_client_window( struct x11drv_win_data *data, Window client_wi } +/********************************************************************** + * attach_client_window + */ +static void attach_client_window( struct x11drv_win_data *data, Window client_window ) +{ + if (data->client_window == client_window || !client_window) return; + + TRACE( "%p/%lx attaching client window %lx\n", data->hwnd, data->whole_window, client_window ); + + detach_client_window( data, data->client_window ); + + if (data->whole_window) + { + client_window_events_enable( data, client_window ); + XReparentWindow( gdi_display, client_window, data->whole_window, data->client_rect.left - data->whole_rect.left, + data->client_rect.top - data->whole_rect.top ); + } + + data->client_window = client_window; +} + + /********************************************************************** * destroy_client_window */ @@ -1682,9 +1711,7 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual, Colormap colo if (data->whole_window) { XFlush( gdi_display ); /* make sure client_window is created for XSelectInput */ - XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd ); - XSync( data->display, False ); /* make sure client_window is known from data->display */ - XSelectInput( data->display, data->client_window, ExposureMask ); + client_window_events_enable( data, data->client_window ); } TRACE( "%p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); } @@ -1832,7 +1859,6 @@ void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BO { BOOL same_visual = (data->vis.visualid == vis->visualid); Window client_window = data->client_window; - Window whole_window = data->whole_window; if (!data->use_alpha == !use_alpha && same_visual) return; if (data->surface) window_surface_release( data->surface ); @@ -1840,18 +1866,14 @@ void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BO data->use_alpha = use_alpha; if (same_visual) return; - data->client_window = 0; - destroy_whole_window( data, client_window != 0 /* don't destroy whole_window until reparented */ ); + client_window = data->client_window; + /* detach the client before re-creating whole_window */ + detach_client_window( data, client_window ); + destroy_whole_window( data, FALSE ); data->vis = *vis; create_whole_window( data ); - if (!client_window) return; - /* move the client to the new parent */ - XReparentWindow( gdi_display, client_window, data->whole_window, - data->client_rect.left - data->whole_rect.left, - data->client_rect.top - data->whole_rect.top ); - data->client_window = client_window; - XSync( gdi_display, False ); /* make sure XReparentWindow requests have completed before destroying whole_window */ - XDestroyWindow( data->display, whole_window ); + /* attach the client back to the re-created whole_window */ + attach_client_window( data, client_window ); }

1 0