wine-commits December 2023

wine-commits@winehq.org

1 participants
418 discussions

Zebediah Figura : wined3d: Introduce an API for creating an identity SRV on a texture.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 1698fd40cd3bb88874a9ad0d93fdaa6d3b2e3ca3 URL: https://gitlab.winehq.org/wine/wine/-/commit/1698fd40cd3bb88874a9ad0d93fdaa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 30 18:13:57 2022 -0600 wined3d: Introduce an API for creating an identity SRV on a texture. --- dlls/wined3d/texture.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 27 ++++++++++++++++++++++----- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 4 ++++ 6 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3dfecc949d1..09eea050d9c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1648,6 +1648,12 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) { bool in_cs_thread = GetCurrentThreadId() == texture->resource.device->cs->thread_id; + if (texture->identity_srv) + { + assert(!in_cs_thread); + wined3d_shader_resource_view_destroy(texture->identity_srv); + } + /* This is called from the CS thread to destroy temporary textures. */ if (!in_cs_thread) wined3d_mutex_lock(); @@ -4667,6 +4673,42 @@ void wined3d_texture_update_sub_resource(struct wined3d_texture *texture, unsign wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } +struct wined3d_shader_resource_view * CDECL wined3d_texture_acquire_identity_srv(struct wined3d_texture *texture) +{ + struct wined3d_view_desc desc; + HRESULT hr; + + TRACE("texture %p.\n", texture); + + if (texture->identity_srv) + return texture->identity_srv; + + desc.format_id = texture->resource.format->id; + /* The texture owns a reference to the SRV, so we can't have the SRV hold + * a reference to the texture. + * At the same time, a view must be destroyed before its texture, and we + * need a bound SRV to keep the texture alive even if it doesn't have any + * other references. + * In order to achieve this we have the objects share reference counts. + * This means the view doesn't hold a reference to the resource, but any + * references to the view are forwarded to the resource instead. The view + * is destroyed manually when all references are released. */ + desc.flags = WINED3D_VIEW_FORWARD_REFERENCE; + desc.u.texture.level_idx = 0; + desc.u.texture.level_count = texture->level_count; + desc.u.texture.layer_idx = 0; + desc.u.texture.layer_count = texture->layer_count; + if (FAILED(hr = wined3d_shader_resource_view_create(&desc, &texture->resource, + NULL, &wined3d_null_parent_ops, &texture->identity_srv))) + { + ERR("Failed to create shader resource view, hr %#lx.\n", hr); + return NULL; + } + wined3d_shader_resource_view_decref(texture->identity_srv); + + return texture->identity_srv; +} + static void wined3d_texture_no3d_upload_data(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 05a0ab36af8..e833bdc8d90 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4918,6 +4918,7 @@ const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const str VIEW_FLAG_TO_STR(WINED3D_VIEW_TEXTURE_ARRAY); VIEW_FLAG_TO_STR(WINED3D_VIEW_READ_ONLY_DEPTH); VIEW_FLAG_TO_STR(WINED3D_VIEW_READ_ONLY_STENCIL); + VIEW_FLAG_TO_STR(WINED3D_VIEW_FORWARD_REFERENCE); #undef VIEW_FLAG_TO_STR if (flags) FIXME("Unrecognised view flag(s) %#x.\n", flags); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 76b6e66b82e..5174075cdd2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -959,8 +959,12 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view) { - unsigned int refcount = InterlockedIncrement(&view->refcount); + unsigned int refcount; + + if (view->desc.flags & WINED3D_VIEW_FORWARD_REFERENCE) + return wined3d_resource_incref(view->resource); + refcount = InterlockedIncrement(&view->refcount); TRACE("%p increasing refcount to %u.\n", view, refcount); return refcount; @@ -971,10 +975,21 @@ void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *v view->parent_ops->wined3d_object_destroyed(view->parent); } +void wined3d_shader_resource_view_destroy(struct wined3d_shader_resource_view *view) +{ + wined3d_mutex_lock(); + view->resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); + wined3d_mutex_unlock(); +} + ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) { - unsigned int refcount = InterlockedDecrement(&view->refcount); + unsigned int refcount; + + if (view->desc.flags & WINED3D_VIEW_FORWARD_REFERENCE) + return wined3d_resource_decref(view->resource); + refcount = InterlockedDecrement(&view->refcount); TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) @@ -986,9 +1001,7 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v * device, which the resource implicitly provides. * - We shouldn't free buffer resources until after we've removed the * view from its bo_user list. */ - wined3d_mutex_lock(); - resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); - wined3d_mutex_unlock(); + wined3d_shader_resource_view_destroy(view); wined3d_resource_decref(resource); } @@ -1091,6 +1104,10 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ return E_INVALIDARG; view->desc = *desc; + /* If WINED3D_VIEW_FORWARD_REFERENCE, the view shouldn't take a reference + * to the resource. However, the reference to the view returned by this + * function should translate to a resource reference, so we increment the + * resource's reference count anyway. */ wined3d_resource_incref(view->resource = resource); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2eaf83160c1..72e0e3fd8fa 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -298,6 +298,7 @@ @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) +@ cdecl wined3d_texture_acquire_identity_srv(ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_create(ptr ptr long long long ptr ptr ptr ptr) @ cdecl wined3d_texture_decref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index adbb755ec4c..cb1d5100d76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3335,6 +3335,8 @@ struct wined3d_texture unsigned int row_pitch; unsigned int slice_pitch; + struct wined3d_shader_resource_view *identity_srv; + /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async { @@ -3935,6 +3937,7 @@ struct wined3d_shader_resource_view }; void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *view); +void wined3d_shader_resource_view_destroy(struct wined3d_shader_resource_view *view); static inline struct wined3d_texture *wined3d_state_get_ffp_texture(const struct wined3d_state *state, unsigned int idx) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c2f7950ad3f..d7a3dd1e0fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1583,6 +1583,9 @@ enum wined3d_memory_segment_group #define WINED3D_VIEW_TEXTURE_ARRAY 0x00000010 #define WINED3D_VIEW_READ_ONLY_DEPTH 0x00000020 #define WINED3D_VIEW_READ_ONLY_STENCIL 0x00000040 +/* The view shares a reference count with its resource. + * See wined3d_texture_acquire_identity_srv(). */ +#define WINED3D_VIEW_FORWARD_REFERENCE 0x00000080 #define WINED3D_MAX_VIEWPORTS 16 @@ -2866,6 +2869,7 @@ HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_s HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); +struct wined3d_shader_resource_view * __cdecl wined3d_texture_acquire_identity_srv(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc,

1 0

Zebediah Figura : wined3d: Release the view's resource after destroying the view.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: d8782a9b8ec2d5c41280a249570b5df88e51d3a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8782a9b8ec2d5c41280a249570b5d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 24 22:52:41 2023 -0600 wined3d: Release the view's resource after destroying the view. Allow us to avoid grabbing a temporary reference. This becomes a problem with the next patch, where we would otherwise grab a reference while a texture is being destroyed, and hence destroy it twice. --- dlls/wined3d/adapter_gl.c | 20 -------------------- dlls/wined3d/adapter_vk.c | 20 -------------------- dlls/wined3d/view.c | 33 +++++++++++++++++++++------------ 3 files changed, 21 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a103fbe1107..4bc7312ea8f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4920,12 +4920,8 @@ static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_vie TRACE("view_gl %p.\n", view_gl); - /* Take a reference to the resource, in case releasing the resource - * would cause the device to be destroyed. */ - wined3d_resource_incref(resource); wined3d_rendertarget_view_cleanup(&view_gl->v); wined3d_view_gl_destroy(resource->device, &view_gl->gl_view, NULL, NULL, view_gl); - wined3d_resource_decref(resource); } static HRESULT adapter_gl_create_shader_resource_view(const struct wined3d_view_desc *desc, @@ -4961,16 +4957,8 @@ static void adapter_gl_destroy_shader_resource_view(struct wined3d_shader_resour TRACE("view_gl %p.\n", view_gl); - /* Take a reference to the resource. There are two reasons for this: - * - Releasing the resource could in turn cause the device to be - * destroyed, but we still need the device for - * wined3d_view_vk_destroy(). - * - We shouldn't free buffer resources until after we've removed the - * view from its bo_user list. */ - wined3d_resource_incref(resource); wined3d_shader_resource_view_cleanup(&view_gl->v); wined3d_view_gl_destroy(resource->device, &view_gl->gl_view, &view_gl->bo_user, NULL, view_gl); - wined3d_resource_decref(resource); } static HRESULT adapter_gl_create_unordered_access_view(const struct wined3d_view_desc *desc, @@ -5006,16 +4994,8 @@ static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_ac TRACE("view_gl %p.\n", view_gl); - /* Take a reference to the resource. There are two reasons for this: - * - Releasing the resource could in turn cause the device to be - * destroyed, but we still need the device for - * wined3d_view_vk_destroy(). - * - We shouldn't free buffer resources until after we've removed the - * view from its bo_user list. */ - wined3d_resource_incref(resource); wined3d_unordered_access_view_cleanup(&view_gl->v); wined3d_view_gl_destroy(resource->device, &view_gl->gl_view, &view_gl->bo_user, &view_gl->counter_bo, view_gl); - wined3d_resource_decref(resource); } static HRESULT adapter_gl_create_sampler(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 96eeeb3472a..d6f4449ce06 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1522,13 +1522,9 @@ static void adapter_vk_destroy_rendertarget_view(struct wined3d_rendertarget_vie TRACE("view_vk %p.\n", view_vk); - /* Take a reference to the resource, in case releasing the resource - * would cause the device to be destroyed. */ - wined3d_resource_incref(resource); wined3d_rendertarget_view_cleanup(&view_vk->v); wined3d_view_vk_destroy(resource->device, NULL, &view_vk->vk_image_view, NULL, NULL, NULL, &view_vk->command_buffer_id, view_vk); - wined3d_resource_decref(resource); } static HRESULT adapter_vk_create_shader_resource_view(const struct wined3d_view_desc *desc, @@ -1567,13 +1563,6 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour TRACE("srv_vk %p.\n", srv_vk); - /* Take a reference to the resource. There are two reasons for this: - * - Releasing the resource could in turn cause the device to be - * destroyed, but we still need the device for - * wined3d_view_vk_destroy(). - * - We shouldn't free buffer resources until after we've removed the - * view from its bo_user list. */ - wined3d_resource_incref(resource); if (resource->type == WINED3D_RTYPE_BUFFER) vk_buffer_view = &view_vk->u.vk_buffer_view; else @@ -1581,7 +1570,6 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour wined3d_shader_resource_view_cleanup(&srv_vk->v); wined3d_view_vk_destroy(resource->device, vk_buffer_view, vk_image_view, &view_vk->bo_user, NULL, NULL, &view_vk->command_buffer_id, srv_vk); - wined3d_resource_decref(resource); } static HRESULT adapter_vk_create_unordered_access_view(const struct wined3d_view_desc *desc, @@ -1620,13 +1608,6 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac TRACE("uav_vk %p.\n", uav_vk); - /* Take a reference to the resource. There are two reasons for this: - * - Releasing the resource could in turn cause the device to be - * destroyed, but we still need the device for - * wined3d_view_vk_destroy(). - * - We shouldn't free buffer resources until after we've removed the - * view from its bo_user list. */ - wined3d_resource_incref(resource); if (resource->type == WINED3D_RTYPE_BUFFER) vk_buffer_view = &view_vk->u.vk_buffer_view; else @@ -1634,7 +1615,6 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac wined3d_unordered_access_view_cleanup(&uav_vk->v); wined3d_view_vk_destroy(resource->device, vk_buffer_view, vk_image_view, &view_vk->bo_user, &uav_vk->counter_bo, &uav_vk->vk_counter_view, &view_vk->command_buffer_id, uav_vk); - wined3d_resource_decref(resource); } static HRESULT adapter_vk_create_sampler(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4b0ccea7bb2..76b6e66b82e 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -373,10 +373,7 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v void wined3d_rendertarget_view_cleanup(struct wined3d_rendertarget_view *view) { - /* Call wined3d_object_destroyed() before releasing the resource, - * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); } ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) @@ -387,9 +384,14 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v if (!refcount) { + struct wined3d_resource *resource = view->resource; + + /* Release the resource after destroying the view. + * See wined3d_shader_resource_view_decref(). */ wined3d_mutex_lock(); - view->resource->device->adapter->adapter_ops->adapter_destroy_rendertarget_view(view); + resource->device->adapter->adapter_ops->adapter_destroy_rendertarget_view(view); wined3d_mutex_unlock(); + wined3d_resource_decref(resource); } return refcount; @@ -966,10 +968,7 @@ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_v void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *view) { - /* Call wined3d_object_destroyed() before releasing the resource, - * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); } ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) @@ -980,9 +979,17 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { + struct wined3d_resource *resource = view->resource; + + /* Release the resource after destroying the view: + * - adapter_destroy_shader_resource_view() needs a reference to the + * device, which the resource implicitly provides. + * - We shouldn't free buffer resources until after we've removed the + * view from its bo_user list. */ wined3d_mutex_lock(); - view->resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); + resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); wined3d_mutex_unlock(); + wined3d_resource_decref(resource); } return refcount; @@ -1511,10 +1518,7 @@ ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) { - /* Call wined3d_object_destroyed() before releasing the resource, - * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); } ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view) @@ -1525,9 +1529,14 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access if (!refcount) { + struct wined3d_resource *resource = view->resource; + + /* Release the resource after destroying the view. + * See wined3d_shader_resource_view_decref(). */ wined3d_mutex_lock(); - view->resource->device->adapter->adapter_ops->adapter_destroy_unordered_access_view(view); + resource->device->adapter->adapter_ops->adapter_destroy_unordered_access_view(view); wined3d_mutex_unlock(); + wined3d_resource_decref(resource); } return refcount;

1 0

Zebediah Figura : wined3d: Explicitly bind 0 for a NULL SRV.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: ef2908462d37951761f2f820b6fdb6446787543c URL: https://gitlab.winehq.org/wine/wine/-/commit/ef2908462d37951761f2f820b6fdb6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 20 17:36:03 2023 -0600 wined3d: Explicitly bind 0 for a NULL SRV. Currently we invalidate STATE_SAMPLER whenever an SRV is bound, and hence rely on sampler() to do this for us, which is a bit obscure and won't work with the next patch. --- dlls/wined3d/context_gl.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index bdea2879a51..0cfe26170eb 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3966,6 +3966,7 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { + const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int bind_idx, shader_sampler_count, base, count, i; const struct wined3d_device *device = context_gl->c.device; struct wined3d_shader_sampler_map_entry *entry; @@ -3993,18 +3994,23 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl * if (tex_unit_map) bind_idx = tex_unit_map[bind_idx]; - if (!(view = state->shader_resource_view[shader_type][entry->resource_idx])) + if ((view = state->shader_resource_view[shader_type][entry->resource_idx])) + { + if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) + sampler = device->default_sampler; + else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) + sampler = device->null_sampler; + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), + bind_idx, wined3d_sampler_gl(sampler), context_gl); + } + else { WARN("No resource view bound at index %u, %u.\n", shader_type, entry->resource_idx); - continue; + wined3d_context_gl_active_texture(context_gl, gl_info, bind_idx); + wined3d_context_gl_bind_texture(context_gl, GL_NONE, 0); + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + GL_EXTCALL(glBindSampler(bind_idx, 0)); } - - if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler = device->default_sampler; - else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) - sampler = device->null_sampler; - wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), - bind_idx, wined3d_sampler_gl(sampler), context_gl); } }

1 0

Vijay Kiran Kamuju : gdiplus: Add GdipDrawImageFX stub.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: d95a04b4ebda236bbb07ce67c7df38ec5291743d URL: https://gitlab.winehq.org/wine/wine/-/commit/d95a04b4ebda236bbb07ce67c7df38… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Dec 1 11:50:01 2023 +0100 gdiplus: Add GdipDrawImageFX stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55945 --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 9 +++++++++ include/gdiplusflat.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d4545abf319..178592e35d9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -623,7 +623,7 @@ 623 stdcall GdipBitmapConvertFormat(ptr long long long ptr float) 624 stdcall GdipImageSetAbort(ptr ptr) 625 stdcall GdipGraphicsSetAbort(ptr ptr) -626 stub GdipDrawImageFX +626 stdcall GdipDrawImageFX(ptr ptr ptr ptr ptr ptr long) 627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long wstr ptr) 628 stdcall GdipConvertToEmfPlusToFile(ptr ptr ptr wstr long wstr ptr) 629 stub GdipConvertToEmfPlusToStream diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 16316285cf7..6659a390d77 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2947,6 +2947,15 @@ GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, 0.0, 0.0, (REAL)width, (REAL)height, UnitPixel); } +GpStatus WINGDIPAPI GdipDrawImageFX(GpGraphics *graphics, GpImage *image, GpRectF *src, + GpMatrix *transform, CGpEffect *effect, GpImageAttributes *imageattr, + GpUnit srcUnit) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %d): stub\n", graphics, image, src, transform, effect, imageattr, srcUnit); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, INT y) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8950ab3258b..372cf6b1ea2 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -174,6 +174,7 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics*,GDIPCONST UINT16*,INT, GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL); +GpStatus WINGDIPAPI GdipDrawImageFX(GpGraphics*,GpImage*,GpRectF*,GpMatrix*,CGpEffect*,GpImageAttributes*,GpUnit); GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT); GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL,REAL,REAL,GpUnit); GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics*,GpImage*,INT,INT,INT,INT,INT,INT,GpUnit);

1 0

Fabian Maurer : server: Initialize pe image struct padding to avoid Valgrind warning.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: c55cce6fcbadca3d5b5fd4e2a434ada2c2012479 URL: https://gitlab.winehq.org/wine/wine/-/commit/c55cce6fcbadca3d5b5fd4e2a434ad… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 16 19:54:07 2023 +0100 server: Initialize pe image struct padding to avoid Valgrind warning. --- include/wine/server_protocol.h | 3 ++- server/mapping.c | 1 + server/protocol.def | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 15156a12353..139a7bca69e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -844,6 +844,7 @@ typedef struct unsigned char contains_code : 1; unsigned char wine_builtin : 1; unsigned char wine_fakedll : 1; + unsigned char padding : 5; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size; @@ -6506,7 +6507,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 785 +#define SERVER_PROTOCOL_VERSION 786 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index a795dc4b38b..b5684c484d2 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -842,6 +842,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s return STATUS_INVALID_IMAGE_FORMAT; } + mapping->image.padding = 0; mapping->image.map_addr = get_fd_map_address( mapping->fd ); mapping->image.image_charact = nt.FileHeader.Characteristics; mapping->image.machine = nt.FileHeader.Machine; diff --git a/server/protocol.def b/server/protocol.def index b4d6d74d6fc..5d60e7fcda3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -860,6 +860,7 @@ typedef struct unsigned char contains_code : 1; unsigned char wine_builtin : 1; unsigned char wine_fakedll : 1; + unsigned char padding : 5; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size;

1 0

Zebediah Figura : winegstreamer: Allow videoconvert to parallelize in the parser.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 49a157b1f2342634c2b931a3ac7dd5b47c053996 URL: https://gitlab.winehq.org/wine/wine/-/commit/49a157b1f2342634c2b931a3ac7dd5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 30 22:10:32 2023 -0600 winegstreamer: Allow videoconvert to parallelize in the parser. We already do this for the transform. --- dlls/winegstreamer/wg_parser.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index b73dde18d55..dde469bac69 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -870,6 +870,9 @@ static bool stream_create_post_processing_elements(GstPad *pad, struct wg_parser || !append_element(parser->container, element, &first, &last)) return false; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); + /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ if (!(element = create_element("videoflip", "good")) || !append_element(parser->container, element, &first, &last)) @@ -882,6 +885,9 @@ static bool stream_create_post_processing_elements(GstPad *pad, struct wg_parser || !append_element(parser->container, element, &first, &last)) return false; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); + if (!link_src_to_element(pad, first) || !link_element_to_sink(last, stream->my_sink)) return false; }

1 0

Daniel Lehman : msxml3: Handle null prefix in get_item.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 0b31c53ebc53a90b3813efdd3cb2cacdf489e77b URL: https://gitlab.winehq.org/wine/wine/-/commit/0b31c53ebc53a90b3813efdd3cb2ca… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Nov 28 21:51:28 2023 -0800 msxml3: Handle null prefix in get_item. --- dlls/msxml3/element.c | 13 +++++++++---- dlls/msxml3/tests/domdoc.c | 6 ++++-- dlls/msxml4/tests/domdoc.c | 7 +++++-- dlls/msxml6/tests/domdoc.c | 6 ++++-- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 302849aced6..d2a14fdabcd 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1827,11 +1827,16 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode * if (attrIndex < index) return S_FALSE; - xmlns = xmlNewNs(NULL, BAD_CAST "http://www.w3.org/2000/xmlns/", BAD_CAST "xmlns"); - if (!xmlns) - return E_OUTOFMEMORY; + if (!ns->prefix) { + xmlns = NULL; + curr = xmlNewProp(NULL, BAD_CAST "xmlns", ns->href); + } else { + xmlns = xmlNewNs(NULL, BAD_CAST "http://www.w3.org/2000/xmlns/", BAD_CAST "xmlns"); + if (!xmlns) + return E_OUTOFMEMORY; - curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + } if (!curr) { xmlFreeNs(xmlns); return E_OUTOFMEMORY; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d9dfa1d1be6..23a114db713 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13773,9 +13773,7 @@ static void test_namespaces_as_attributes(void) { item = NULL; hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); - todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr != S_OK) continue; str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); @@ -13787,8 +13785,10 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_prefix(item, &str); if (test->prefixes[i]) { + todo_wine_if(test->todo) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + } SysFreeString(str); } else @@ -13797,6 +13797,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine_if(test->todo) ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -13804,6 +13805,7 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_namespaceURI(item, &str); if (test->uris[i]) { + todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) ok(!SysStringLen(str), "got %s\n", wine_dbgstr_w(str)); diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index d294732283f..67f37b6966b 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -256,9 +256,7 @@ static void test_namespaces_as_attributes(void) { item = NULL; hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); - todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr != S_OK) continue; str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); @@ -271,9 +269,11 @@ static void test_namespaces_as_attributes(void) if (test->prefixes[i]) { /* MSXML4 can report different results with different service packs */ + todo_wine_if(test->todo) { ok(hr == S_OK || broken(hr == S_FALSE), "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(str, test->prefixes[i]) || broken(!str), "got %s\n", wine_dbgstr_w(str)); + } SysFreeString(str); } else @@ -283,6 +283,7 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_baseName(item, &str); /* MSXML4 can report different results with different service packs */ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine_if(test->todo) ok(!lstrcmpW(str, test->basenames[i]) || broken(!lstrcmpW(str, L"xmlns")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -291,11 +292,13 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_namespaceURI(item, &str); if (test->uris[i]) { + todo_wine_if(test->todo) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (test->prefixes[i] && !lstrcmpW(test->prefixes[i], L"xmlns")) ok(!lstrcmpW(str, L""), "got %s\n", wine_dbgstr_w(str)); else ok(!lstrcmpW(str, test->uris[i]), "got %s\n", wine_dbgstr_w(str)); + } SysFreeString(str); } else diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index 1eabe97dd79..9283379731d 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -263,9 +263,7 @@ static void test_namespaces_as_attributes(void) { item = NULL; hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); - todo_wine_if(test->todo) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr != S_OK) continue; str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); @@ -277,8 +275,10 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_prefix(item, &str); if (test->prefixes[i]) { + todo_wine_if(test->todo) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(str, test->prefixes[i]), "got %s\n", wine_dbgstr_w(str)); + } SysFreeString(str); } else @@ -294,12 +294,14 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_namespaceURI(item, &str); if (test->uris[i]) { + todo_wine_if(test->todo) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (test->prefixes[i] && !lstrcmpW(test->prefixes[i], L"xmlns")) ok(!lstrcmpW(str, L"http://www.w3.org/2000/xmlns/"), "got %s\n", wine_dbgstr_w(str)); else ok(!lstrcmpW(str, test->uris[i]), "got %s\n", wine_dbgstr_w(str)); + } SysFreeString(str); } else

1 0

Aida Jonikienė : dsdmo: Only print effect_inplace_Process() FIXME once.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: d81df26f7ccf0515a143ba6cb85e596a386c5ec2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d81df26f7ccf0515a143ba6cb85e59… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Sun Nov 26 11:04:58 2023 +0200 dsdmo: Only print effect_inplace_Process() FIXME once. GTA San Andreas really spams this message in certain situations. --- dlls/dsdmo/main.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 0879c4e0516..769f040c790 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -399,8 +399,19 @@ static ULONG WINAPI effect_inplace_Release(IMediaObjectInPlace *iface) static HRESULT WINAPI effect_inplace_Process(IMediaObjectInPlace *iface, ULONG size, BYTE *data, REFERENCE_TIME start, DWORD flags) { - FIXME("iface %p, size %lu, data %p, start %s, flags %#lx, stub!\n", - iface, size, data, wine_dbgstr_longlong(start), flags); + static unsigned int once; + + if (!once++) + { + FIXME("iface %p, size %lu, data %p, start %s, flags %#lx, stub!\n", + iface, size, data, wine_dbgstr_longlong(start), flags); + } + else + { + WARN("iface %p, size %lu, data %p, start %s, flags %#lx, stub!\n", + iface, size, data, wine_dbgstr_longlong(start), flags); + } + return E_NOTIMPL; }

1 0

Aida Jonikienė : comctl32: Only print TREEVIEW_HandleTimer() ERR once.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: 602f68f23c31a82bf1fec2d9576478db278519ea URL: https://gitlab.winehq.org/wine/wine/-/commit/602f68f23c31a82bf1fec2d9576478… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Sun Nov 26 11:01:26 2023 +0200 comctl32: Only print TREEVIEW_HandleTimer() ERR once. Older versions of Roblox trigger this quite a bit and it's annoying to me so let's only print it once. --- dlls/comctl32/treeview.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c531ad75370..036afd15c69 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4116,9 +4116,11 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) static LRESULT TREEVIEW_HandleTimer(TREEVIEW_INFO *infoPtr, WPARAM wParam) { + static unsigned int once; + if (wParam != TV_EDIT_TIMER) { - ERR("got unknown timer\n"); + if (!once++) ERR("got unknown timer %Id\n", wParam); return 1; }

1 0

Alex Henrie : uxtheme/tests: Add some tests for OpenThemeFile.
by Alexandre Julliard 01 Dec '23

01 Dec '23

Module: wine Branch: master Commit: b9714336ea26cd06880f2b9e8895baa3944a8348 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9714336ea26cd06880f2b9e8895ba… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 30 00:03:26 2023 -0700 uxtheme/tests: Add some tests for OpenThemeFile. The tests show that the first argument must not be null, that the handle returned via the fourth argument is not an HTHEME, and that that handle can be passed to CloseThemeFile without error. --- dlls/uxtheme/tests/system.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c79a6c85a35..36740fe2664 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -38,6 +38,8 @@ static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); static HTHEME (WINAPI *pOpenThemeDataForDpi)(HWND, LPCWSTR, UINT); +static HRESULT (WINAPI *pOpenThemeFile)(const WCHAR *, const WCHAR *, const WCHAR *, HANDLE, DWORD); +static HRESULT (WINAPI *pCloseThemeFile)(HANDLE); static HPAINTBUFFER (WINAPI *pBeginBufferedPaint)(HDC, const RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC *); static HRESULT (WINAPI *pBufferedPaintClear)(HPAINTBUFFER, const RECT *); static HRESULT (WINAPI *pDrawThemeBackgroundEx)(HTHEME, HDC, int, int, const RECT *, const DTBGOPTS *); @@ -76,6 +78,8 @@ static void init_funcs(void) HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); HMODULE uxtheme = GetModuleHandleA("uxtheme.dll"); + pOpenThemeFile = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(2)); + pCloseThemeFile = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(3)); pShouldSystemUseDarkMode = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(138)); pShouldAppsUseDarkMode = (void *)GetProcAddress(uxtheme, MAKEINTRESOURCEA(132)); @@ -874,6 +878,48 @@ static void test_CloseThemeData(void) ok(hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx\n", hRes); } +static void test_OpenThemeFile(void) +{ + WCHAR currentThemePath[MAX_PATH]; + DWORD pathSize = sizeof(currentThemePath); + HANDLE htf; + LSTATUS ls; + HRESULT hr; + SIZE partSize; + + if (!pOpenThemeFile) + { + win_skip("OpenThemeFile is unavailable.\n"); + return; + } + + ls = RegGetValueW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\ThemeManager", L"DllName", + RRF_RT_REG_SZ, NULL, currentThemePath, &pathSize); + if (ls == ERROR_FILE_NOT_FOUND) + { + win_skip("DllName registry value not found.\n"); + return; + } + ok(ls == ERROR_SUCCESS, "RegGetValueW failed: %ld\n", ls); + + htf = (void *)0xdeadbeef; + hr = pOpenThemeFile(NULL, NULL, NULL, &htf, 0); + todo_wine ok(hr == E_POINTER, "Expected E_POINTER, got 0x%08lx\n", hr); + ok(!htf, "Expected NULL, got %p\n", htf); + + htf = (void *)0xdeadbeef; + hr = pOpenThemeFile(currentThemePath, NULL, NULL, &htf, 0); + ok(hr == S_OK, "Expected S_OK, got 0x%08lx\n", hr); + ok(htf != (void *)0xdeadbeef && htf != NULL && htf != INVALID_HANDLE_VALUE, "got %p\n", htf); + + hr = GetThemePartSize(htf, NULL, BP_CHECKBOX, CBS_CHECKEDNORMAL, NULL, TS_DRAW, &partSize); + todo_wine ok(hr == E_HANDLE, "Expected E_HANDLE, got 0x%08lx\n", hr); + + hr = pCloseThemeFile(htf); + ok(hr == S_OK, "Expected S_OK, got 0x%08lx\n", hr); +} + static void test_buffer_dc_props(HDC hdc, const RECT *rect) { static const XFORM ident = { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f }; @@ -2704,6 +2750,7 @@ START_TEST(system) test_OpenThemeData(); test_OpenThemeDataEx(); test_OpenThemeDataForDpi(); + test_OpenThemeFile(); test_GetCurrentThemeName(); test_GetThemePartSize(); test_CloseThemeData();

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 December 2023