February 2022 - Wine-commits

Jacek Caban : user32: Use NtUserGetGUIThreadInfo in GetActiveWindow.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: fa2f52578bf1d9e386fa47c89e90671f9f9a8e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa2f52578bf1d9e386fa47c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 01:28:38 2022 +0100 user32: Use NtUserGetGUIThreadInfo in GetActiveWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index d699dd7eecd..42787bac60a 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -342,15 +342,9 @@ BOOL WINAPI SetForegroundWindow( HWND hwnd ) */ HWND WINAPI GetActiveWindow(void) { - HWND ret = 0; - - SERVER_START_REQ( get_thread_input ) - { - req->tid = GetCurrentThreadId(); - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->active ); - } - SERVER_END_REQ; - return ret; + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndActive : 0; }

1 0

Jacek Caban : user32: Use NtUserGetGUIThreadInfo in GetFocus.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: ab45fed26af328aa32708ba1cbfe6e463af59073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab45fed26af328aa32708ba1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 01:28:44 2022 +0100 user32: Use NtUserGetGUIThreadInfo in GetFocus. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 42787bac60a..f0b5ea2552e 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -353,15 +353,9 @@ HWND WINAPI GetActiveWindow(void) */ HWND WINAPI GetFocus(void) { - HWND ret = 0; - - SERVER_START_REQ( get_thread_input ) - { - req->tid = GetCurrentThreadId(); - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->focus ); - } - SERVER_END_REQ; - return ret; + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndFocus : 0; }

1 0

Zebediah Figura : wined3d: Introduce a wined3d_texture_get_bo_address() helper.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 71b8ec3fd202cb3cf3a59660ad1ce41dc34fa3d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71b8ec3fd202cb3cf3a59660… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:35 2022 -0600 wined3d: Introduce a wined3d_texture_get_bo_address() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/surface.c | 15 +++++----- dlls/wined3d/texture.c | 63 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 49 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71b8ec3fd202cb3cf3a5…

1 0

Zebediah Figura : wined3d: Remove the now redundant "locations" parameter from wined3d_texture_get_memory().
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 23fbec27223eabc79455073f2bf801d1f96ee1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23fbec27223eabc79455073f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:36 2022 -0600 wined3d: Remove the now redundant "locations" parameter from wined3d_texture_get_memory(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 35b41a2f70b..b6908dac891 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -847,8 +847,11 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } static void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_bo_address *data, DWORD locations) + struct wined3d_bo_address *data) { + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + DWORD locations = sub_resource->locations; + TRACE("texture %p, sub_resource_idx %u, data %p, locations %s.\n", texture, sub_resource_idx, data, wined3d_debug_location(locations)); @@ -3227,7 +3230,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g wined3d_texture_set_map_binding(&texture_gl->t, WINED3D_LOCATION_SYSMEM); } - wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data, sub_resource->locations); + wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data); if (conversion) { width = src_box.right - src_box.left; @@ -4497,8 +4500,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); src_level = src_sub_resource_idx % src_texture->level_count; - wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, - src_texture->sub_resources[src_sub_resource_idx].locations); + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), @@ -5126,7 +5128,7 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v } level = sub_resource_idx % texture_vk->t.level_count; - wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data, sub_resource->locations); + wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data); wined3d_texture_get_level_box(&texture_vk->t, level, &src_box); wined3d_texture_get_pitch(&texture_vk->t, level, &row_pitch, &slice_pitch); wined3d_texture_vk_upload_data(context, wined3d_const_bo_address(&data), texture_vk->t.resource.format,

1 0

Zebediah Figura : wined3d: Handle WINED3D_LOCATION_CLEARED in wined3d_texture_load_location().
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 3a67b7f2fbdd2a902a29f1395535ba45d2477388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a67b7f2fbdd2a902a29f139… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:37 2022 -0600 wined3d: Handle WINED3D_LOCATION_CLEARED in wined3d_texture_load_location(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b6908dac891..6a11f613732 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -815,6 +815,23 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, return TRUE; } + if (current & WINED3D_LOCATION_CLEARED) + { + struct wined3d_bo_address addr; + + /* FIXME: Clear textures on the GPU if possible. */ + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + wined3d_texture_get_bo_address(texture, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, texture->sub_resources[sub_resource_idx].size); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + current |= WINED3D_LOCATION_SYSMEM; + + if (current & location) + return TRUE; + } + if (!current) { ERR("Sub-resource %u of texture %p does not have any up to date location.\n",

1 0

Zebediah Figura : wined3d: Handle DISCARDED and CLEARED locations in wined3d_texture_get_memory().
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: f4e65025b6d3c47aac429a8ea6844c5ba2f7bbcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4e65025b6d3c47aac429a8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:38 2022 -0600 wined3d: Handle DISCARDED and CLEARED locations in wined3d_texture_get_memory(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6a11f613732..00146cf32d1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -864,14 +864,24 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } static void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_bo_address *data) + struct wined3d_context *context, struct wined3d_bo_address *data) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; DWORD locations = sub_resource->locations; - TRACE("texture %p, sub_resource_idx %u, data %p, locations %s.\n", - texture, sub_resource_idx, data, wined3d_debug_location(locations)); + TRACE("texture %p, context %p, sub_resource_idx %u, data %p, locations %s.\n", + texture, context, sub_resource_idx, data, wined3d_debug_location(locations)); + if (locations & (WINED3D_LOCATION_DISCARDED | WINED3D_LOCATION_CLEARED)) + { + locations = (wined3d_texture_use_pbo(texture, context->d3d_info) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); + if (!wined3d_texture_load_location(texture, sub_resource_idx, context, locations)) + { + data->buffer_object = 0; + data->addr = NULL; + return; + } + } if (locations & WINED3D_LOCATION_BUFFER) { wined3d_texture_get_bo_address(texture, sub_resource_idx, data, WINED3D_LOCATION_BUFFER); @@ -3247,7 +3257,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g wined3d_texture_set_map_binding(&texture_gl->t, WINED3D_LOCATION_SYSMEM); } - wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data); + wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &context_gl->c, &data); if (conversion) { width = src_box.right - src_box.left; @@ -4517,7 +4527,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); src_level = src_sub_resource_idx % src_texture->level_count; - wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data); + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, context, &data); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), @@ -5145,7 +5155,7 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v } level = sub_resource_idx % texture_vk->t.level_count; - wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data); + wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, context, &data); wined3d_texture_get_level_box(&texture_vk->t, level, &src_box); wined3d_texture_get_pitch(&texture_vk->t, level, &row_pitch, &slice_pitch); wined3d_texture_vk_upload_data(context, wined3d_const_bo_address(&data), texture_vk->t.resource.format,

1 0

Zebediah Figura : wined3d: Consider WINED3D_LOCATION_CLEARED to be a CPU-accessible location.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 4103a7085c1643bcbc7b59ed2419b6b03b1882cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4103a7085c1643bcbc7b59ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:39 2022 -0600 wined3d: Consider WINED3D_LOCATION_CLEARED to be a CPU-accessible location. For the purposes of texture2d_blt(). The main goal here is to allow uploading from WINED3D_LOCATION_CLEARED to a multisample texture (and hence initializing it). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8c931d0b225..f9cc2a1cf0c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -32,7 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER; +static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM + | WINED3D_LOCATION_BUFFER | WINED3D_LOCATION_CLEARED; /* Works correctly only for <= 4 bpp formats. */ static void get_color_masks(const struct wined3d_format *format, uint32_t *masks)

1 0

Zebediah Figura : wined3d: Use WINED3D_LOCATION_CLEARED for the initial location of textures.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 1632b8e7a419ebf256c4a356a58d505ef918f2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1632b8e7a419ebf256c4a356… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:40 2022 -0600 wined3d: Use WINED3D_LOCATION_CLEARED for the initial location of textures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 00146cf32d1..13c26692f77 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3918,16 +3918,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (wined3d_texture_use_pbo(texture, d3d_info)) texture->resource.map_binding = WINED3D_LOCATION_BUFFER; - if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D - || !wined3d_texture_use_pbo(texture, d3d_info)) - { - if (!wined3d_resource_prepare_sysmem(&texture->resource)) - { - wined3d_texture_cleanup_sync(texture); - return E_OUTOFMEMORY; - } - } - sub_count = level_count * layer_count; if (sub_count / layer_count != level_count) { @@ -3956,12 +3946,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[i]; - sub_resource->locations = WINED3D_LOCATION_DISCARDED; - if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D) - { - wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_SYSMEM); - wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM); - } + sub_resource->locations = WINED3D_LOCATION_CLEARED; if (FAILED(hr = device_parent->ops->texture_sub_resource_created(device_parent, desc->resource_type, texture, i, &sub_resource->parent, &sub_resource->parent_ops)))

1 0

Zebediah Figura : wined3d: Allocate texture BOs from heap.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: aa9b1fb3a3bb344b0f4f697203bac34a420aed4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9b1fb3a3bb344b0f4f6972… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 23 20:21:41 2022 -0600 wined3d: Allocate texture BOs from heap. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 45 +++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 7 +------ 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 13c26692f77..75997914d77 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -745,7 +745,7 @@ void wined3d_texture_get_bo_address(const struct wined3d_texture *texture, if (location == WINED3D_LOCATION_BUFFER) { data->addr = NULL; - data->buffer_object = &sub_resource->bo.b; + data->buffer_object = sub_resource->bo; } else { @@ -903,12 +903,15 @@ static void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl) { - struct wined3d_bo_gl *bo = &texture->sub_resources[sub_resource_idx].bo.gl; + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_bo_gl *bo_gl = wined3d_bo_gl(sub_resource->bo); TRACE("texture %p, sub_resource_idx %u, context_gl %p.\n", texture, sub_resource_idx, context_gl); - wined3d_context_gl_destroy_bo(context_gl, bo); + wined3d_context_gl_destroy_bo(context_gl, bo_gl); wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); + sub_resource->bo = NULL; + heap_free(bo_gl); } static void wined3d_texture_unload_location(struct wined3d_texture *texture, @@ -2059,16 +2062,23 @@ static void wined3d_texture_gl_prepare_buffer_object(struct wined3d_texture_gl * struct wined3d_bo_gl *bo; sub_resource = &texture_gl->t.sub_resources[sub_resource_idx]; - bo = &sub_resource->bo.gl; - if (bo->id) + + if (sub_resource->bo) + return; + + if (!(bo = heap_alloc(sizeof(*bo)))) return; if (!wined3d_device_gl_create_bo(wined3d_device_gl(texture_gl->t.resource.device), context_gl, sub_resource->size, GL_PIXEL_UNPACK_BUFFER, GL_STREAM_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo)) + { + heap_free(bo); return; + } TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", bo->id, texture_gl, sub_resource_idx); + sub_resource->bo = &bo->b; } static void wined3d_texture_force_reload(struct wined3d_texture *texture) @@ -3249,7 +3259,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is * getting called. */ - if (conversion && sub_resource->bo.gl.id) + if (conversion && sub_resource->bo) { TRACE("Removing the pbo attached to texture %p, %u.\n", texture_gl, sub_resource_idx); @@ -3386,7 +3396,7 @@ static void wined3d_texture_gl_unload_location(struct wined3d_texture *texture, sub_count = texture->level_count * texture->layer_count; for (i = 0; i < sub_count; ++i) { - if (texture_gl->t.sub_resources[i].bo.gl.id) + if (texture_gl->t.sub_resources[i].bo) wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl); } break; @@ -5294,18 +5304,24 @@ static BOOL wined3d_texture_vk_prepare_buffer_object(struct wined3d_texture_vk * struct wined3d_bo_vk *bo; sub_resource = &texture_vk->t.sub_resources[sub_resource_idx]; - bo = &sub_resource->bo.vk; - if (bo->vk_buffer) + if (sub_resource->bo) return TRUE; + if (!(bo = heap_alloc(sizeof(*bo)))) + return FALSE; + if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) + { + heap_free(bo); return FALSE; + } /* Texture buffer objects receive a barrier to HOST_READ in wined3d_texture_vk_download_data(), * so they don't need it when they are mapped for reading. */ bo->host_synced = true; + sub_resource->bo = &bo->b; TRACE("Created buffer object %p for texture %p, sub-resource %u.\n", bo, texture_vk, sub_resource_idx); return TRUE; } @@ -5380,10 +5396,15 @@ static void wined3d_texture_vk_unload_location(struct wined3d_texture *texture, sub_count = texture->level_count * texture->layer_count; for (i = 0; i < sub_count; ++i) { - if (texture->sub_resources[i].bo.vk.vk_buffer) + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; + + if (sub_resource->bo) { - wined3d_context_vk_destroy_bo(context_vk, &texture->sub_resources[i].bo.vk); - texture->sub_resources[i].bo.vk.vk_buffer = VK_NULL_HANDLE; + struct wined3d_bo_vk *bo_vk = wined3d_bo_vk(sub_resource->bo); + + wined3d_context_vk_destroy_bo(context_vk, bo_vk); + heap_free(bo_vk); + sub_resource->bo = NULL; } } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6fd51b77e2a..a9837911ea6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4532,12 +4532,7 @@ struct wined3d_texture unsigned int map_count; uint32_t map_flags; DWORD locations; - union - { - struct wined3d_bo b; - struct wined3d_bo_gl gl; - struct wined3d_bo_vk vk; - } bo; + struct wined3d_bo *bo; void *user_memory; } *sub_resources;

1 0

Jacek Caban : mshtml: Don't try to bind custom events to Gecko event target.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Module: wine Branch: master Commit: 680d7e4846b08656ca95cb214e2b4c6a4374cb8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=680d7e4846b08656ca95cb21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 21:02:22 2022 +0100 mshtml: Don't try to bind custom events to Gecko event target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1663fba3ba3..a44c1189b93 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -242,10 +242,10 @@ static listener_container_t *get_listener_container(EventTarget *event_target, c memcpy(container->type, type, (type_len + 1) * sizeof(WCHAR)); list_init(&container->listeners); vtbl = dispex_get_vtbl(&event_target->dispex); - if(vtbl->bind_event) - vtbl->bind_event(&event_target->dispex, eid); - else + if (!vtbl->bind_event) FIXME("Unsupported event binding on target %p\n", event_target); + else if(eid != EVENTID_LAST) + vtbl->bind_event(&event_target->dispex, eid); wine_rb_put(&event_target->handler_map, container->type, &container->entry); return container;

1 0