- Wine-devel - list.winehq.org

[tools] testbot/Janitor: Load only the relevant tasks when deleting VMs.
by Francois Gouget 08 Jun '22

08 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index af1123aed..618c31d02 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -201,14 +201,14 @@ map { $DeletedVMs{$_} = 1 } @{$VMs->GetKeys()}; if (%DeletedVMs) { - foreach my $Task (@{CreateTasks($VMs)->GetItems()}) + my $Tasks = CreateTasks($VMs); + $Tasks->AddFilter("VMName", [keys %DeletedVMs]); + foreach my $Task (@{$Tasks->GetItems()}) { - if (exists $DeletedVMs{$Task->VM->Name}) - { - Trace "Keeping the ", $Task->VM->Name, " VM for task ", $Task->GetSlashKey(), "\n"; - delete $DeletedVMs{$Task->VM->Name}; - last if (!%DeletedVMs); - } + next if (!exists $DeletedVMs{$Task->VMName}); + Trace "Keeping the ", $Task->VMName, " VM for task ", $Task->GetSlashKey(), "\n"; + delete $DeletedVMs{$Task->VMName}; + last if (!%DeletedVMs); } foreach my $VMKey (keys %DeletedVMs) { -- 2.30.2

1 0

[tools] testbot/cgi: Standardize the case of JsQuote().
by Francois Gouget 08 Jun '22

08 Jun '22

This better matches the TestBot's naming standard, particularly ShQuote() and BatchQuote(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The lowercase prefix came from the nearby escapeHTML() method which should probably be renamed too. But it is used in more places and maybe it should also not be a method. So that change can wait. One could also argue that because JavaScript has two uppercase letters it should really be JSQuote(). But that would again make it somewhat unique. --- testbot/lib/ObjectModel/CGI/Page.pm | 4 ++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 406ca4ff8..1b9630cc2 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -142,14 +142,14 @@ sub escapeHTML($$) =pod =over 12 -=head1 C<jsQuote()> +=head1 C<JsQuote()> Quotes a string for JavaScript code. =back =cut -sub jsQuote($$) +sub JsQuote($$) { my ($self, $String) = @_; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index d68b97289..d6f33e2ca 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -374,7 +374,7 @@ sub GenerateErrorPopup($$) { print "<script type='text/javascript'>\n"; print "<!--\n"; - print "function ShowError() { alert(", $Page->jsQuote($ErrMessage), "); }\n"; + print "function ShowError() { alert(", $Page->JsQuote($ErrMessage), "); }\n"; my $ErrField = $Page->GetErrField(); if ($ErrField) { -- 2.30.2

1 0

[PATCH 0/6] MR207: UiaProviderFromIAccessible improvements.
by Connor McAdams (＠cmcadams) 08 Jun '22

08 Jun '22

Add support for get_accState and get_accRole in UI Automation, along with various other cleanups. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/207

3 7

Re: [PATCH v4 0/1] MR105: winegstreamer: reintroduce flushing for wg_parser
by zlice (＠zlice) 08 Jun '22

08 Jun '22

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 08 Jun '22

08 Jun '22

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 08 Jun '22

08 Jun '22

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 08 Jun '22

08 Jun '22

-- 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) 08 Jun '22

08 Jun '22

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) 08 Jun '22

08 Jun '22

-- 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) 08 Jun '22

08 Jun '22

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

4 8