- Wine-Devel - list.winehq.org

Re: [PATCH v4 0/1] MR105: winegstreamer: reintroduce flushing for wg_parser
by zlice (＠zlice) June 8, 2022

June 8, 2022

On Tue Jun 7 21:56:17 2022 +0000, **** wrote: > Zebediah Figura replied on the mailing list: > ``` > On 6/1/22 20:58, zlice wrote: > > From: zlice <zlice555(a)gmail.com> > > > > Previous commit removed flushing but this causes issues in some games. > > > > - add flushing back > > - move variable creation after initial condition returns in > wm_reader_get_stream_sample. This caused some slow down. > > - Remove EOS sets. Some are not what flushing did before. Had some seg > faults on exiting Fallout 3 with them in. > As stated in my original reply to this patch [1]: > I don't think "reintroduce flushing" is the right answer here, not > without understanding why it matters. > The point of 5144b2766 is that flushing should not make a difference. It > allows wg_parser_stream_get_event() to return more quickly, but that > same cost is added to the subsequent seek or stop request, so > GST_Seeking_SetPositions() or parser_cleanup_stream() will end up taking > just as long. > If flushing does make a difference, I think we need to understand why, > and quite likely solve this a different way. > [1] https://www.winehq.org/pipermail/wine-devel/2022-May/217461.html > ``` I guess the problem is in seek somewhere then? That's what I was originally looking for but nothing stood out. I'm not really sure, not really an audio wizard. If there's an alternative I can test it out. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/105#note_1701

1 0

[PATCH 1/6] include: Add UI Automation Control Type ID definitions.
by Connor McAdams June 8, 2022

June 8, 2022

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationclient.idl | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index 917d3456ebf..43ac6b0752f 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -253,4 +253,53 @@ library UIAutomationClient { /* } */ + /* FIXME: Uncomment when properly supported in widl + [dllname("<no entry points>")] + module UIA_ControlTypeIds + { + */ + const long UIA_ButtonControlTypeId = 50000; + const long UIA_CalendarControlTypeId = 50001; + const long UIA_CheckBoxControlTypeId = 50002; + const long UIA_ComboBoxControlTypeId = 50003; + const long UIA_EditControlTypeId = 50004; + const long UIA_HyperlinkControlTypeId = 50005; + const long UIA_ImageControlTypeId = 50006; + const long UIA_ListItemControlTypeId = 50007; + const long UIA_ListControlTypeId = 50008; + const long UIA_MenuControlTypeId = 50009; + const long UIA_MenuBarControlTypeId = 50010; + const long UIA_MenuItemControlTypeId = 50011; + const long UIA_ProgressBarControlTypeId = 50012; + const long UIA_RadioButtonControlTypeId = 50013; + const long UIA_ScrollBarControlTypeId = 50014; + const long UIA_SliderControlTypeId = 50015; + const long UIA_SpinnerControlTypeId = 50016; + const long UIA_StatusBarControlTypeId = 50017; + const long UIA_TabControlTypeId = 50018; + const long UIA_TabItemControlTypeId = 50019; + const long UIA_TextControlTypeId = 50020; + const long UIA_ToolBarControlTypeId = 50021; + const long UIA_ToolTipControlTypeId = 50022; + const long UIA_TreeControlTypeId = 50023; + const long UIA_TreeItemControlTypeId = 50024; + const long UIA_CustomControlTypeId = 50025; + const long UIA_GroupControlTypeId = 50026; + const long UIA_ThumbControlTypeId = 50027; + const long UIA_DataGridControlTypeId = 50028; + const long UIA_DataItemControlTypeId = 50029; + const long UIA_DocumentControlTypeId = 50030; + const long UIA_SplitButtonControlTypeId = 50031; + const long UIA_WindowControlTypeId = 50032; + const long UIA_PaneControlTypeId = 50033; + const long UIA_HeaderControlTypeId = 50034; + const long UIA_HeaderItemControlTypeId = 50035; + const long UIA_TableControlTypeId = 50036; + const long UIA_TitleBarControlTypeId = 50037; + const long UIA_SeparatorControlTypeId = 50038; + const long UIA_SemanticZoomControlTypeId = 50039; + const long UIA_AppBarControlTypeId = 50040; + /* + }; + */ } -- 2.25.1

2 12

[PATCH vkd3d v5 01/14] vkd3d-shader/hlsl: Split matrices into multiple variables in append_output_copy().
by Zebediah Figura June 8, 2022

June 8, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 47 +++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 78b229101..b4fcfd278 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -21,6 +21,22 @@ #include "hlsl.h" #include <stdio.h> +static unsigned int minor_size(const struct hlsl_type *type) +{ + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimx; + else + return type->dimy; +} + +static unsigned int major_size(const struct hlsl_type *type) +{ + if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) + return type->dimy; + else + return type->dimx; +} + /* Split uniforms into two variables representing the constant and temp * registers, and copy the former to the latter, so that writes to uniforms * work. */ @@ -141,6 +157,21 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_ir_var *output; struct hlsl_ir_load *load; + if (type->type == HLSL_CLASS_MATRIX) + { + struct hlsl_type *vector_type = hlsl_get_vector_type(ctx, type->base_type, minor_size(type)); + struct hlsl_semantic vector_semantic = *semantic; + unsigned int i; + + for (i = 0; i < major_size(type); ++i) + { + append_output_copy(ctx, instrs, var, vector_type, 4 * i, modifiers, &vector_semantic); + ++vector_semantic.index; + } + + return; + } + if (!(name = hlsl_get_string_buffer(ctx))) return; vkd3d_string_buffer_printf(name, "<output-%s%u>", semantic->name, semantic->index); @@ -847,22 +878,6 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } -static unsigned int minor_size(const struct hlsl_type *type) -{ - if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) - return type->dimx; - else - return type->dimy; -} - -static unsigned int major_size(const struct hlsl_type *type) -{ - if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR) - return type->dimy; - else - return type->dimx; -} - static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { const struct hlsl_ir_node *rhs; -- 2.36.1

4 25

[PATCH 0/3] MR206: windows.gaming.input: Implement stub IGamepad2 interface.
by Rémi Bernon June 8, 2022

June 8, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/206

2 6

[PATCH v2 0/7] MR195: winhttp: Abort web socket receive operations when the socket handle is closed
by Paul Gofman (＠gofman) June 8, 2022

June 8, 2022

I think somewhat similar should happen with normal winhttp requests (I was doing some brief tests around that back then) and that should hopefully be easy to add incrementally after this patchset. Then, sends for websockets should most likely also be cancelled the same way although that is a bit harder to test as most of the time sends are processed right away before returing from WinHttpWebSocketSend (although should be possible as out of tree test which might be flaky). The patches here address cancelling web socket receive operation (including receiving web socket close status). -- v2: winhttp/tests: Add tests for closing web socket with pending operations. winhttp: Support abort in task_socket_close(). winhttp: Abort websocket IO on handle close. winhttp: Replace pending read cancel in WinHttpWebSocketClose() with a generic cancel_queue(). winhttp: Fix dwResult field in websocket receive error result. winhttp: Implement reference counting for tasks. winhttp: Keep task in queue until completion. https://gitlab.winehq.org/wine/wine/-/merge_requests/195

3 9

[PATCH 0/7] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions
by Piotr Caban (＠piotr) June 8, 2022

June 8, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/205

2 7

[PATCH 0/5] MR204: win32u: Avoid calling PE code with user lock
by Jacek Caban (＠jacek) June 8, 2022

June 8, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/204

4 8

[PATCH 0/1] MR196: winegstreamer: Return void from align_video_info_planes.
by Rémi Bernon June 7, 2022

June 7, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/196

2 2

[PATCH 0/1] MR203: ws2_32: Check for valid socket in WSAGetOverlappedResult().
by Paul Gofman (＠gofman) June 7, 2022

June 7, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/203

2 1

[PATCH] ntdll: Add support for FileReplaceCompletionInformation
by Andrew Buck June 7, 2022

June 7, 2022

FileReplaceCompletionInformation is the officially-documented way of changing or removing completion objects from a file descriptor. --- Generally, as long as one has already been created with CreateIoCompletionPort, the function will succeed. This is used in some libraries that wrap sockets and use overlapped I/O upon releasing the native handle. Signed-off-by: Andrew Buck <mrelectrify(a)warsaw-revamped.com> --- dlls/ntdll/unix/file.c | 16 ++++++++++++++++ include/wine/server_protocol.h | 22 +++++++++++++++++++++- server/fd.c | 22 ++++++++++++++++++++++ server/protocol.def | 10 ++++++++++ server/request.h | 6 ++++++ server/trace.c | 10 ++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cc8bf0c6e82..ecedf070a05 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4603,6 +4603,22 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, else status = STATUS_INVALID_PARAMETER_3; break; + case FileReplaceCompletionInformation: + if (len >= sizeof(FILE_COMPLETION_INFORMATION)) + { + FILE_COMPLETION_INFORMATION *info = ptr; + SERVER_START_REQ( replace_completion_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->chandle = wine_server_obj_handle( info->CompletionPort ); + req->ckey = info->CompletionKey; + status = wine_server_call( req ); + } + SERVER_END_REQ; + } + else status = STATUS_INVALID_PARAMETER_3; + break; + default: FIXME("Unsupported class (%d)\n", class); status = STATUS_NOT_IMPLEMENTED; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 868add58abf..f098f6af0c0 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5066,6 +5066,23 @@ struct set_completion_info_reply + +struct replace_completion_info_request +{ + struct request_header __header; + obj_handle_t handle; + apc_param_t ckey; + obj_handle_t chandle; + char __pad_28[4]; +}; +struct replace_completion_info_reply +{ + struct reply_header __header; +}; + + + + struct add_fd_completion_request { struct request_header __header; @@ -5697,6 +5714,7 @@ enum request REQ_remove_completion, REQ_query_completion, REQ_set_completion_info, + REQ_replace_completion_info, REQ_add_fd_completion, REQ_set_fd_completion_mode, REQ_set_fd_disp_info, @@ -5979,6 +5997,7 @@ union generic_request struct remove_completion_request remove_completion_request; struct query_completion_request query_completion_request; struct set_completion_info_request set_completion_info_request; + struct replace_completion_info_request replace_completion_info_request; struct add_fd_completion_request add_fd_completion_request; struct set_fd_completion_mode_request set_fd_completion_mode_request; struct set_fd_disp_info_request set_fd_disp_info_request; @@ -6259,6 +6278,7 @@ union generic_reply struct remove_completion_reply remove_completion_reply; struct query_completion_reply query_completion_reply; struct set_completion_info_reply set_completion_info_reply; + struct replace_completion_info_reply replace_completion_info_reply; struct add_fd_completion_reply add_fd_completion_reply; struct set_fd_completion_mode_reply set_fd_completion_mode_reply; struct set_fd_disp_info_reply set_fd_disp_info_reply; @@ -6288,7 +6308,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 751 +#define SERVER_PROTOCOL_VERSION 752 /* ### protocol_version end ### */ diff --git a/server/fd.c b/server/fd.c index 1b4b98b0e76..00314589825 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2912,6 +2912,28 @@ DECL_HANDLER(set_completion_info) } } +/* replace completion object for a fd */ +DECL_HANDLER(replace_completion_info) +{ + struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); + struct completion *old_completion; + + if (fd) + { + if (is_fd_overlapped( fd ) && fd->completion) + { + old_completion = fd->completion; + if (req->chandle) + fd->completion = get_completion_obj( current->process, req->chandle, IO_COMPLETION_MODIFY_STATE ); + else + fd->completion = 0; + fd->comp_key = req->ckey; + release_object( old_completion ); + } + release_object( fd ); + } +} + /* push new completion msg into a completion queue attached to the fd */ DECL_HANDLER(add_fd_completion) { diff --git a/server/protocol.def b/server/protocol.def index 2be1658fca2..912da634797 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3530,6 +3530,16 @@ struct handle_info @END + +/* associate object with completion port */ +(a)REQ(replace_completion_info) + obj_handle_t handle; /* object handle */ + apc_param_t ckey; /* completion key */ + obj_handle_t chandle; /* port handle */ +(a)END + + + /* check for associated completion and push msg */ @REQ(add_fd_completion) obj_handle_t handle; /* async' object */ diff --git a/server/request.h b/server/request.h index 7fd63905e0e..64da1c319b1 100644 --- a/server/request.h +++ b/server/request.h @@ -369,6 +369,7 @@ DECL_HANDLER(add_completion); DECL_HANDLER(remove_completion); DECL_HANDLER(query_completion); DECL_HANDLER(set_completion_info); +DECL_HANDLER(replace_completion_info); DECL_HANDLER(add_fd_completion); DECL_HANDLER(set_fd_completion_mode); DECL_HANDLER(set_fd_disp_info); @@ -650,6 +651,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_remove_completion, (req_handler)req_query_completion, (req_handler)req_set_completion_info, + (req_handler)req_replace_completion_info, (req_handler)req_add_fd_completion, (req_handler)req_set_fd_completion_mode, (req_handler)req_set_fd_disp_info, @@ -2146,6 +2148,10 @@ C_ASSERT( FIELD_OFFSET(struct set_completion_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_completion_info_request, ckey) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_completion_info_request, chandle) == 24 ); C_ASSERT( sizeof(struct set_completion_info_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct replace_completion_info_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct replace_completion_info_request, ckey) == 16 ); +C_ASSERT( FIELD_OFFSET(struct replace_completion_info_request, chandle) == 24 ); +C_ASSERT( sizeof(struct replace_completion_info_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, cvalue) == 16 ); C_ASSERT( FIELD_OFFSET(struct add_fd_completion_request, information) == 24 ); diff --git a/server/trace.c b/server/trace.c index 15ca4e7d71e..15afd7e3217 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4263,6 +4263,13 @@ static void dump_set_completion_info_request( const struct set_completion_info_r fprintf( stderr, ", chandle=%04x", req->chandle ); } +static void dump_replace_completion_info_request( const struct replace_completion_info_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + dump_uint64( ", ckey=", &req->ckey ); + fprintf( stderr, ", chandle=%04x", req->chandle ); +} + static void dump_add_fd_completion_request( const struct add_fd_completion_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4737,6 +4744,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_remove_completion_request, (dump_func)dump_query_completion_request, (dump_func)dump_set_completion_info_request, + (dump_func)dump_replace_completion_info_request, (dump_func)dump_add_fd_completion_request, (dump_func)dump_set_fd_completion_mode_request, (dump_func)dump_set_fd_disp_info_request, @@ -5020,6 +5028,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, NULL, + NULL, (dump_func)dump_get_window_layered_info_reply, NULL, (dump_func)dump_alloc_user_handle_reply, @@ -5293,6 +5302,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "remove_completion", "query_completion", "set_completion_info", + "replace_completion_info", "add_fd_completion", "set_fd_completion_mode", "set_fd_disp_info", -- 2.34.1

2 1