March 2022 - Wine-devel - list.winehq.org

[PATCH] server: Always close previous IRP handle.
by Daniel Lehman 11 Mar '22

11 Mar '22

3 3

[PATCH v5 00/10] Fix sock_send reordering issue (#52401)
by Jinoh Kang 11 Mar '22

11 Mar '22

This fixes the send part of the issue #52401 [1]: "Improper synchronization in sock_recv/sock_send leads to arbitrary reordering of completion of I/O requests", which was initially reported (outside Bugzilla) by Dongwan Kim [2]. Changelog: v1 -> v2: - drop patch "server: Compact struct set_async_direct_result_reply." - add async and fd arguments to async_initial_status_callback - recv_socket_initial_callback: pass OOB flag via private instead of implementing two separate functions for OOB and non-OOB - detect short write in send_socket_initial_callback - preserve the behaviour of returning success if we had a short write and the socket is nonblocking and force_async is unset v2 -> v3: - fix typo in comment v3 -> v4: - fix typo in commit message - address feedback - drop patch "server: Defer postprocessing until after setting initial status in recv_socket handler." v4 -> v5: - drop patch "server: Add async_initial_status_callback." - dorp patch "server: Defer postprocessing until after setting initial status in send_socket handler." - add patch "server: Ensure completion_callback is called before async is destroyed." - add patch "ws2_32/tests: Continue sending remaining data on short write in test_write_events." - add patch "server: Defer clearing events until async is either pending or completed in send_socket handler." - add patch "server: Ensure datagram sockets are bound in send_socket." [1] https://bugs.winehq.org/show_bug.cgi?id=52401 [2] https://www.winehq.org/pipermail/wine-devel/2021-May/186454.html Jinoh Kang (10): server: Actually set initial status in set_async_direct_result handler. server: Ensure initial status is set in async_set_result(). server: Ensure completion_callback is called before async is destroyed. ws2_32/tests: Continue sending remaining data on short write in test_write_events. server: Defer clearing events until async is either pending or completed in send_socket handler. server: Add mark_pending field to set_async_direct_result request. server: Attempt to complete I/O request immediately in send_socket. server: Ensure datagram sockets are bound in send_socket. ntdll: Don't call try_send before server call in sock_send. server: Replace redundant send_socket status fields with force_async boolean field. dlls/ntdll/unix/socket.c | 91 ++++++++++++------ dlls/ntdll/unix/sync.c | 9 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ws2_32/tests/sock.c | 23 ++--- server/async.c | 27 +++--- server/protocol.def | 5 +- server/sock.c | 164 +++++++++++++++++++++++---------- 7 files changed, 213 insertions(+), 108 deletions(-) -- 2.34.1

1 10

[PATCH] winex11: Call XFlush after XRenderComposite.
by Connor McAdams 11 Mar '22

11 Mar '22

Make sure to flush the output buffer after drawing. Helps applications that draw to HWNDs belonging to another process. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- This fixes an issue with Chromium based applications that draw on HWNDs that belong to other processes. Without calling XFlush, we often end up one frame behind, with the XFlush call in free_xrender_picture causing the update. This may not be the correct way to solve the issue I'm dealing with, so if not, I'd also appreciate feedback/ideas on a proper way to solve the problem. --- dlls/winex11.drv/xrender.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 5ede97fb026..fce1b231919 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1508,6 +1508,8 @@ static void xrender_blit( int op, Picture src_pict, Picture mask_pict, Picture d } pXRenderComposite( gdi_display, op, src_pict, mask_pict, dst_pict, x_offset, y_offset, 0, 0, x_dst, y_dst, width_dst, height_dst ); + + XFlush( gdi_display ); } /* Helper function for (stretched) mono->color blitting using xrender */ -- 2.25.1

1 0

[PATCH 1/3] d3d11: Report support for MapNoOverwriteOnDynamicBufferSRV.
by Zebediah Figura 11 Mar '22

11 Mar '22

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b97b495f98d..0b8bd21b5ce 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4093,7 +4093,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 options->ConstantBufferPartialUpdate = FALSE; options->ConstantBufferOffsetting = TRUE; options->MapNoOverwriteOnDynamicConstantBuffer = FALSE; - options->MapNoOverwriteOnDynamicBufferSRV = FALSE; + options->MapNoOverwriteOnDynamicBufferSRV = TRUE; options->MultisampleRTVWithForcedSampleCountOne = FALSE; options->SAD4ShaderInstructions = FALSE; options->ExtendedDoublesShaderInstructions = FALSE; -- 2.35.1

3 7

[PATCH] winhttp: Fix filling TIMEVAL in netconn_create().
by Paul Gofman 11 Mar '22

11 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 19fafb25804..09ed5e222d1 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -229,7 +229,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock if (ret == WSAEWOULDBLOCK || ret == WSAEINPROGRESS) { FD_SET set; - TIMEVAL timeval = { 0, timeout * 1000 }; + TIMEVAL timeval = { timeout / 1000, (timeout % 1000) * 1000 }; int res; FD_ZERO( &set ); -- 2.35.1

1 1

[PATCH 1/3] wined3d: Rename resource_acquire to resource_reference.
by Stefan Dösinger 11 Mar '22

11 Mar '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/cs.c | 106 ++++++++++++++++----------------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5b8c7275693..d0ca29eaedf 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -550,10 +550,10 @@ static inline void wined3d_device_context_finish(struct wined3d_device_context * context->ops->finish(context, queue_id); } -static inline void wined3d_device_context_acquire_resource(struct wined3d_device_context *context, +static inline void wined3d_device_context_reference_resource(struct wined3d_device_context *context, struct wined3d_resource *resource) { - context->ops->acquire_resource(context, resource); + context->ops->reference_resource(context, resource); } static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) @@ -734,10 +734,10 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw pending = InterlockedIncrement(&cs->pending_presents); - wined3d_resource_acquire(&swapchain->front_buffer->resource); + wined3d_resource_reference(&swapchain->front_buffer->resource); for (i = 0; i < swapchain->state.desc.backbuffer_count; ++i) { - wined3d_resource_acquire(&swapchain->back_buffers[i]->resource); + wined3d_resource_reference(&swapchain->back_buffers[i]->resource); } wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); @@ -789,12 +789,12 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * for (i = 0; i < rt_count; ++i) { if ((view = state->fb.render_targets[i])) - wined3d_resource_acquire(view->resource); + wined3d_resource_reference(view->resource); } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = state->fb.depth_stencil; - wined3d_resource_acquire(view->resource); + wined3d_resource_reference(view->resource); } wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); @@ -831,14 +831,14 @@ void wined3d_device_context_emit_clear_rendertarget_view(struct wined3d_device_c op->rect_count = 1; op->rects[0] = *rect; - wined3d_device_context_acquire_resource(context, view->resource); + wined3d_device_context_reference_resource(context, view->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3DCLEAR_SYNCHRONOUS) wined3d_device_context_finish(context, WINED3D_CS_QUEUE_DEFAULT); } -static void acquire_shader_resources(struct wined3d_device_context *context, unsigned int shader_mask) +static void reference_shader_resources(struct wined3d_device_context *context, unsigned int shader_mask) { const struct wined3d_state *state = context->state; struct wined3d_shader_sampler_map_entry *entry; @@ -857,7 +857,7 @@ static void acquire_shader_resources(struct wined3d_device_context *context, uns for (j = 0; j < WINED3D_MAX_CBS; ++j) { if (state->cb[i][j].buffer) - wined3d_device_context_acquire_resource(context, &state->cb[i][j].buffer->resource); + wined3d_device_context_reference_resource(context, &state->cb[i][j].buffer->resource); } for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) @@ -867,12 +867,12 @@ static void acquire_shader_resources(struct wined3d_device_context *context, uns if (!(view = state->shader_resource_view[i][entry->resource_idx])) continue; - wined3d_device_context_acquire_resource(context, view->resource); + wined3d_device_context_reference_resource(context, view->resource); } } } -static void acquire_unordered_access_resources(struct wined3d_device_context *context, +static void reference_unordered_access_resources(struct wined3d_device_context *context, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { unsigned int i; @@ -888,7 +888,7 @@ static void acquire_unordered_access_resources(struct wined3d_device_context *co if (!views[i]) continue; - wined3d_device_context_acquire_resource(context, views[i]->resource); + wined3d_device_context_reference_resource(context, views[i]->resource); } } @@ -903,12 +903,12 @@ static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) cs->c.device->adapter->adapter_ops->adapter_dispatch_compute(cs->c.device, state, &op->parameters); } -static void acquire_compute_pipeline_resources(struct wined3d_device_context *context) +static void reference_compute_pipeline_resources(struct wined3d_device_context *context) { const struct wined3d_state *state = context->state; - acquire_shader_resources(context, 1u << WINED3D_SHADER_TYPE_COMPUTE); - acquire_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], + reference_shader_resources(context, 1u << WINED3D_SHADER_TYPE_COMPUTE); + reference_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); } @@ -925,7 +925,7 @@ void CDECL wined3d_device_context_dispatch(struct wined3d_device_context *contex op->parameters.u.direct.group_count_y = group_count_y; op->parameters.u.direct.group_count_z = group_count_z; - acquire_compute_pipeline_resources(context); + reference_compute_pipeline_resources(context); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); wined3d_device_context_unlock(context); @@ -943,8 +943,8 @@ void CDECL wined3d_device_context_dispatch_indirect(struct wined3d_device_contex op->parameters.u.indirect.buffer = buffer; op->parameters.u.indirect.offset = offset; - acquire_compute_pipeline_resources(context); - wined3d_device_context_acquire_resource(context, &buffer->resource); + reference_compute_pipeline_resources(context); + wined3d_device_context_reference_resource(context, &buffer->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); wined3d_device_context_unlock(context); @@ -1003,38 +1003,38 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) cs->c.device->adapter->adapter_ops->adapter_draw_primitive(cs->c.device, state, &op->parameters); } -static void acquire_graphics_pipeline_resources(struct wined3d_device_context *context, +static void reference_graphics_pipeline_resources(struct wined3d_device_context *context, BOOL indexed, const struct wined3d_d3d_info *d3d_info) { const struct wined3d_state *state = context->state; unsigned int i; if (indexed) - wined3d_device_context_acquire_resource(context, &state->index_buffer->resource); + wined3d_device_context_reference_resource(context, &state->index_buffer->resource); for (i = 0; i < ARRAY_SIZE(state->streams); ++i) { if (state->streams[i].buffer) - wined3d_device_context_acquire_resource(context, &state->streams[i].buffer->resource); + wined3d_device_context_reference_resource(context, &state->streams[i].buffer->resource); } for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { if (state->stream_output[i].buffer) - wined3d_device_context_acquire_resource(context, &state->stream_output[i].buffer->resource); + wined3d_device_context_reference_resource(context, &state->stream_output[i].buffer->resource); } for (i = 0; i < ARRAY_SIZE(state->textures); ++i) { if (state->textures[i]) - wined3d_device_context_acquire_resource(context, &state->textures[i]->resource); + wined3d_device_context_reference_resource(context, &state->textures[i]->resource); } for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb.render_targets[i]) - wined3d_device_context_acquire_resource(context, state->fb.render_targets[i]->resource); + wined3d_device_context_reference_resource(context, state->fb.render_targets[i]->resource); } if (state->fb.depth_stencil) - wined3d_device_context_acquire_resource(context, state->fb.depth_stencil->resource); - acquire_shader_resources(context, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - acquire_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], + wined3d_device_context_reference_resource(context, state->fb.depth_stencil->resource); + reference_shader_resources(context, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); + reference_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } @@ -1058,7 +1058,7 @@ void wined3d_device_context_emit_draw(struct wined3d_device_context *context, op->parameters.u.direct.instance_count = instance_count; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(context, indexed, d3d_info); + reference_graphics_pipeline_resources(context, indexed, d3d_info); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -1080,8 +1080,8 @@ void CDECL wined3d_device_context_draw_indirect(struct wined3d_device_context *c op->parameters.u.indirect.offset = offset; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(context, indexed, d3d_info); - wined3d_device_context_acquire_resource(context, &buffer->resource); + reference_graphics_pipeline_resources(context, indexed, d3d_info); + wined3d_device_context_reference_resource(context, &buffer->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); wined3d_device_context_unlock(context); @@ -2260,7 +2260,7 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context, query->state = QUERY_SIGNALLED; } -static void wined3d_cs_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list) +static void wined3d_cs_reference_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list) { struct wined3d_cs *cs = wined3d_cs_from_context(context); SIZE_T i; @@ -2284,10 +2284,10 @@ static void wined3d_cs_acquire_command_list(struct wined3d_device_context *conte } for (i = 0; i < list->resource_count; ++i) - wined3d_resource_acquire(list->resources[i]); + wined3d_resource_reference(list->resources[i]); for (i = 0; i < list->command_list_count; ++i) - wined3d_cs_acquire_command_list(context, list->command_lists[i]); + wined3d_cs_reference_command_list(context, list->command_lists[i]); for (i = 0; i < list->upload_count; ++i) invalidate_client_address(list->uploads[i].resource); @@ -2309,7 +2309,7 @@ void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_reso op->opcode = WINED3D_CS_OP_PRELOAD_RESOURCE; op->resource = resource; - wined3d_resource_acquire(resource); + wined3d_resource_reference(resource); wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); } @@ -2332,7 +2332,7 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; op->resource = resource; - wined3d_resource_acquire(resource); + wined3d_resource_reference(resource); wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); } @@ -2356,7 +2356,7 @@ static void wined3d_device_context_upload_bo(struct wined3d_device_context *cont op->row_pitch = row_pitch; op->slice_pitch = slice_pitch; - wined3d_device_context_acquire_resource(context, resource); + wined3d_device_context_reference_resource(context, resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2608,9 +2608,9 @@ void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context memset(&op->fx, 0, sizeof(op->fx)); op->filter = filter; - wined3d_device_context_acquire_resource(context, dst_resource); + wined3d_device_context_reference_resource(context, dst_resource); if (src_resource) - wined3d_device_context_acquire_resource(context, src_resource); + wined3d_device_context_reference_resource(context, src_resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3D_BLT_SYNCHRONOUS) @@ -2716,7 +2716,7 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, op->texture = texture; op->layer = layer; - wined3d_resource_acquire(&texture->resource); + wined3d_resource_reference(&texture->resource); wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); } @@ -2743,7 +2743,7 @@ void wined3d_device_context_emit_clear_uav(struct wined3d_device_context *contex op->clear_value = *clear_value; op->fp = fp; - wined3d_device_context_acquire_resource(context, view->resource); + wined3d_device_context_reference_resource(context, view->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2770,7 +2770,7 @@ void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context op->offset = offset; op->view = uav; - wined3d_device_context_acquire_resource(context, &dst_buffer->resource); + wined3d_device_context_reference_resource(context, &dst_buffer->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2795,7 +2795,7 @@ void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context op->opcode = WINED3D_CS_OP_GENERATE_MIPMAPS; op->view = view; - wined3d_device_context_acquire_resource(context, view->resource); + wined3d_device_context_reference_resource(context, view->resource); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2811,9 +2811,9 @@ static void wined3d_cs_emit_stop(struct wined3d_cs *cs) wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_acquire_resource(struct wined3d_device_context *context, struct wined3d_resource *resource) +static void wined3d_cs_reference_resource(struct wined3d_device_context *context, struct wined3d_resource *resource) { - wined3d_resource_acquire(resource); + wined3d_resource_reference(resource); } static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); @@ -2902,7 +2902,7 @@ void wined3d_device_context_emit_execute_command_list(struct wined3d_device_cont op->opcode = WINED3D_CS_OP_EXECUTE_COMMAND_LIST; op->list = list; - context->ops->acquire_command_list(context, list); + context->ops->reference_command_list(context, list); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); @@ -3124,8 +3124,8 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_unmap_upload_bo, wined3d_cs_issue_query, wined3d_cs_flush, - wined3d_cs_acquire_resource, - wined3d_cs_acquire_command_list, + wined3d_cs_reference_resource, + wined3d_cs_reference_command_list, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3253,8 +3253,8 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_unmap_upload_bo, wined3d_cs_issue_query, wined3d_cs_flush, - wined3d_cs_acquire_resource, - wined3d_cs_acquire_command_list, + wined3d_cs_reference_resource, + wined3d_cs_reference_command_list, }; static void poll_queries(struct wined3d_cs *cs) @@ -4143,7 +4143,7 @@ static void wined3d_deferred_context_flush(struct wined3d_device_context *contex FIXME("context %p, stub!\n", context); } -static void wined3d_deferred_context_acquire_resource(struct wined3d_device_context *context, +static void wined3d_deferred_context_reference_resource(struct wined3d_device_context *context, struct wined3d_resource *resource) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); @@ -4156,7 +4156,7 @@ static void wined3d_deferred_context_acquire_resource(struct wined3d_device_cont wined3d_resource_incref(resource); } -static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_context *context, +static void wined3d_deferred_context_reference_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); @@ -4180,8 +4180,8 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_unmap_upload_bo, wined3d_deferred_context_issue_query, wined3d_deferred_context_flush, - wined3d_deferred_context_acquire_resource, - wined3d_deferred_context_acquire_command_list, + wined3d_deferred_context_reference_resource, + wined3d_deferred_context_reference_command_list, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 62f9604ebcc..437f9c9da69 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -253,7 +253,7 @@ void resource_cleanup(struct wined3d_resource *resource) device_resource_released(resource->device, resource); } - wined3d_resource_acquire(resource); + wined3d_resource_reference(resource); wined3d_cs_destroy_object(resource->device->cs, wined3d_resource_destroy_object, resource); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e46b6dfb9e0..088a1fe7188 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4915,8 +4915,8 @@ struct wined3d_device_context_ops unsigned int sub_resource_idx, struct wined3d_box *box, struct upload_bo *upload_bo); void (*issue_query)(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); void (*flush)(struct wined3d_device_context *context); - void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); - void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); + void (*reference_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); + void (*reference_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); }; struct wined3d_device_context @@ -5080,7 +5080,7 @@ void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_conte HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -static inline void wined3d_resource_acquire(struct wined3d_resource *resource) +static inline void wined3d_resource_reference(struct wined3d_resource *resource) { const struct wined3d_cs *cs = resource->device->cs; resource->access_time = cs->queue[WINED3D_CS_QUEUE_DEFAULT].head; -- 2.34.1

2 5

[PATCH 1/6] ws2_32: Manage shorter length for IPV6_MULTICAST_HOPS.
by Paul Gofman 11 Mar '22

11 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a9e0898e2d7..f4e2f8f172c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1828,6 +1828,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT, optval, optlen ); case IPV6_MULTICAST_HOPS: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + if (*optlen < sizeof(DWORD)) *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); case IPV6_MULTICAST_IF: @@ -3193,7 +3199,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT, optval, optlen ); case IPV6_MULTICAST_HOPS: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, (char *)&value, sizeof(value) ); case IPV6_MULTICAST_IF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 66bd5452046..001cfc0e98e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1191,6 +1191,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET6, SOCK_STREAM, IPPROTO_IPV6, IPV6_DONTFRAG, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, }; SOCKET s, s2; int i, j, err, lasterr; -- 2.35.1

3 13

[PATCH 4/5] user32: Use NtUserGetGUIThreadInfo for GetCapture implementation.
by Jacek Caban 11 Mar '22

11 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)

2 1

[PATCH 5/5] win32u: Move NtUserSetCapture implementation from user32.
by Jacek Caban 11 Mar '22

11 Mar '22

2 1

[PATCH 3/5] win32u: Move set_foreground_window implementation from user32.
by Jacek Caban 11 Mar '22

11 Mar '22

2 1