October 2022 - Wine-commits

Francois Gouget : testbot/LogUtils: Remove the unused $LogInfo->{Failures} field.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: tools Branch: master Commit: 34b71eecf88d54d4cf86d56dc6c53a780b259a15 URL: https://gitlab.winehq.org/winehq/tools/-/commit/34b71eecf88d54d4cf86d56dc6c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 25 15:04:24 2022 +0200 testbot/LogUtils: Remove the unused $LogInfo->{Failures} field. It was essentially redundant with the ErrCount field anyway, except that the latter includes the flaky failures. Also this field name could cause confusion with the per-MsgGroup Failures field used to track known failures. --- testbot/lib/WineTestBot/LogUtils.pm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a9c893a3..05af274c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -382,7 +382,6 @@ sub _AddExtra($$;$) $Error = "$Cur->{Dll}:$Cur->{Unit} $Error" if (defined $Cur); push @{$LogInfo->{Extra}}, $Error; - $LogInfo->{Failures}++; } sub _CheckUnit($$$$) @@ -472,8 +471,6 @@ sub _CloseTestUnit($$$) } } } - - $LogInfo->{Failures} += $Cur->{LineFailures}; } sub _AddReportError($$$$) @@ -516,9 +513,6 @@ The number of test units. =item TimeoutCount The number of test units that timed out. -=item Failures -The number of failed tests. - =item ErrCount, ErrGroupNames, ErrGroups, BadLog See ParseTaskLog() for details. @@ -539,7 +533,6 @@ sub ParseWineTestReport($$$) TestUnitCount => 0, TimeoutCount => 0, - Failures => undef, ErrGroupNames => [], ErrGroups => {}, @@ -750,7 +743,6 @@ sub ParseWineTestReport($$$) { # The done line will already be shown as a timeout (see JobDetails) # so record the failure but don't add an error message. - $LogInfo->{Failures}++; $Cur->{IsBroken} = 1; $LogInfo->{TimeoutCount}++; _AddReportError($LogInfo, $Cur, $LineNo, $&);

1 0

Francois Gouget : testbot: Allow tracking multiple message types, not just errors.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: tools Branch: master Commit: 41584035d6e400aa2cadce6ac8b1fd48d2061302 URL: https://gitlab.winehq.org/winehq/tools/-/commit/41584035d6e400aa2cadce6ac8b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 01:36:22 2020 +0200 testbot: Allow tracking multiple message types, not just errors. This can be used to track flaky failures and warnings separately from regular failures, while still distinguishing which are old / new. --- testbot/bin/WineRunBuild.pl | 4 +- testbot/bin/WineRunReconfig.pl | 4 +- testbot/bin/WineRunTask.pl | 6 +- testbot/bin/WineRunWineTest.pl | 12 +- testbot/bin/WineSendLog.pl | 37 ++--- testbot/lib/WineTestBot/LogUtils.pm | 300 ++++++++++++++++++++++-------------- testbot/tests/TestWTBS | 46 +++--- testbot/web/JobDetails.pl | 44 +++--- 8 files changed, 259 insertions(+), 194 deletions(-)

1 0

Francois Gouget : testbot: Add a message type for flaky failures.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: tools Branch: master Commit: 617f337d8616a94db3a7b37b829a538bab87a564 URL: https://gitlab.winehq.org/winehq/tools/-/commit/617f337d8616a94db3a7b37b829… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 7 16:19:19 2022 +0200 testbot: Add a message type for flaky failures. In the .errors files flaky failures are identified as 'k' messages (instead of 'e' for regular failures). Flaky failures are also identified as old or new based on their presence in the reference reports and shown accordingly on the JobDetails page (the corresponding CSS class names now systematically contain the message type and prefix it with "new" for new messages). Before this patch new flaky failures were flagged as regular new failures which caused some false positives. Now WineSendLog can identify flaky failures and not count them as new failures, thus fixing the false positives. --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- testbot/bin/WineSendLog.pl | 7 +++++-- testbot/lib/WineTestBot/LogUtils.pm | 24 ++++++++++++------------ testbot/web/JobDetails.pl | 16 +++++++++------- testbot/web/WineTestBot.css | 4 +++- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 85ba5df5..2eec9c73 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -562,8 +562,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); LogTaskError("$_\n") for (@$ErrMessages); - # $LogInfo->{eCount} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{eCount} || 0; + # The message counters can legitimately be undefined in case of a timeout + $TaskFailures += ($LogInfo->{eCount} || 0) + ($LogInfo->{kCount} || 0); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 6b49677c..985fdc2a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -578,8 +578,8 @@ foreach my $RptFileName (@$ReportNames) my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); LogTaskError("$_\n") for (@$ErrMessages); - # $LogInfo->{eCount} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{eCount} || 0; + # The message counters can legitimately be undefined in case of a timeout + $TaskFailures += ($LogInfo->{eCount} || 0) + ($LogInfo->{kCount} || 0); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); } diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 0246f89e..ab7b90c0 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -233,7 +233,8 @@ sub SendLog($) } $TaskInfo->{OldCount}++; } - elsif ($Group->{IsNew}->[$MsgIndex]) + elsif ($Group->{Types}->[$MsgIndex] eq "e" and + $Group->{IsNew}->[$MsgIndex]) { if (!$HasLogHeader) { @@ -248,7 +249,8 @@ sub SendLog($) push @New, "$Group->{Messages}->[$MsgIndex]\n"; $TaskInfo->{NewCount}++; } - else + elsif ($Group->{Types}->[$MsgIndex] eq "e" or + $Group->{Types}->[$MsgIndex] eq "k") # flaky => old failure { $TaskInfo->{OldCount}++; } @@ -403,6 +405,7 @@ EOF my $LineNo = $Group->{LineNos}->[$MsgIndex]; my $Bugs = $LogInfo->{Bugs}->{$LineNo}; my $Prefix = $Bugs ? join(" ", sort { $a <=> $b } @$Bugs) : + $Group->{Types}->[$MsgIndex] eq "k" ? "flk" : $Group->{IsNew}->[$MsgIndex] ? "new" : "old"; print $Sendmail "[$Prefix] $Group->{Messages}->[$MsgIndex]\n"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e7f147be..06751e78 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -497,9 +497,9 @@ sub _CloseTestUnit($$$) } } -sub _AddReportMsg($$$$) +sub _AddReportMsg($$$$$) { - my ($LogInfo, $Cur, $LineNo, $Line) = @_; + my ($LogInfo, $Cur, $LineNo, $Line, $Type) = @_; # Make the timeout messages more user-friendly my $ErrLine = $Line; @@ -513,7 +513,7 @@ sub _AddReportMsg($$$$) { $Cur->{Group} = _AddLogGroup($LogInfo, $Cur->{Dll}, $Cur->{GroupLineNo} || $LineNo); } - _AddLogMsg($LogInfo, $Cur->{Group}, $ErrLine, $LineNo, "e"); + _AddLogMsg($LogInfo, $Cur->{Group}, $ErrLine, $LineNo, $Type); } =pod @@ -589,7 +589,7 @@ sub ParseWineTestReport($$$) elsif ($InDlls == 1 and $Line =~ /^\s+\S+=(?:dll is native|load error \d+)$/) { - _AddReportMsg($LogInfo, $Cur, $LineNo, $Line); + _AddReportMsg($LogInfo, $Cur, $LineNo, $Line, "e"); $Cur->{LineFailures}++; } elsif ($Line =~ /^Test output:$/) @@ -626,7 +626,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); - _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'"); + _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'", "e"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -634,7 +634,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:marked flaky|succeeded inside flaky todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "flaky"); - _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'"); + _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'", "k"); $Cur->{LineFlaky}++; } elsif (($Cur->{Unit} ne "" and @@ -663,7 +663,7 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures}++; $LogInfo->{IsWineTest} = 1; - _AddReportMsg($LogInfo, $Cur, $LineNo, $Line); + _AddReportMsg($LogInfo, $Cur, $LineNo, $Line, "e"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -686,7 +686,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'"); + _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'", "e"); $Cur->{LineFailures}++; } } @@ -697,7 +697,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; - _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'"); + _AddReportMsg($LogInfo, $Cur, $LineNo, "$&$'", "e"); $Cur->{LineFailures}++; } } @@ -715,7 +715,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportMsg($LogInfo, $Cur, $LineNo, $&); + _AddReportMsg($LogInfo, $Cur, $LineNo, $&, "e"); $Cur->{LineFailures}++; } } @@ -769,7 +769,7 @@ sub ParseWineTestReport($$$) # so record the failure but don't add an error message. $Cur->{IsBroken} = 1; $LogInfo->{TimeoutCount}++; - _AddReportMsg($LogInfo, $Cur, $LineNo, $&); + _AddReportMsg($LogInfo, $Cur, $LineNo, $&, "e"); } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -1014,7 +1014,7 @@ sub LoadLogErrorsFromFh($$) $LogInfo->{BadLog} = "$LogInfo->{LineNo}: Got a $Type line with no group"; return $Line; } - elsif ($Type eq "e" or $Type eq "E") + elsif ($Type eq "e" or $Type eq "E" or $Type eq "k" or $Type eq "K") { _AddLogMsg($LogInfo, $LogInfo->{CurGroup}, $Value, $Property, $Type); } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index ce51ca74..eed9eb30 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -425,7 +425,9 @@ sub GenerateFullLog($$$$$) my $LineNo = $Group->{LineNos}->[$MsgIndex]; if ($LineNo) { - $ErrCategory{$LineNo} = $Group->{IsNew}->[$MsgIndex] ? "new" : "error"; + $ErrCategory{$LineNo} = ($Group->{IsNew}->[$MsgIndex] ? "new" : ""). + ($Group->{Types}->[$MsgIndex] eq "k" ? "flaky" : + "error"); $ErrFailures{$LineNo} = $Group->{Failures}->{$MsgIndex}; if ($ErrFailures{$LineNo}) @@ -438,7 +440,7 @@ sub GenerateFullLog($$$$$) } } $LogBugs{-2} ||= [$LineNo, "First failure"]; - if ($ErrCategory{$LineNo} eq "new" and !$ErrFailures{$LineNo}) + if ($ErrCategory{$LineNo} eq "newerror" and !$ErrFailures{$LineNo}) { $LogBugs{-1} ||= [$LineNo, "First untracked new failure"]; $LogBugs{10000000} = [$LineNo, "Last untracked new failure"]; @@ -522,7 +524,7 @@ sub GenerateFullLog($$$$$) } my $Line = $Group->{Messages}->[$MsgIndex]; - my $Category = $Group->{IsNew}->[$MsgIndex] ? "new" : "error"; + my $Category = $Group->{IsNew}->[$MsgIndex] ? "newerror" : "error"; my $Html = $self->escapeHTML($Line); if ($Group->{Failures}->{$MsgIndex}) { @@ -695,10 +697,10 @@ EOF foreach my $Line (@{$Group->{Messages}}) { my $Html = $self->escapeHTML($Line); - if ($Group->{IsNew}->[$MsgIndex]) - { - $Html = "<span class='log-new'>$Html</span>"; - } + my $Category = ($Group->{IsNew}->[$MsgIndex] ? "new" : ""). + ($Group->{Types}->[$MsgIndex] eq "k" ? "flaky" : + "error"); + $Html = "<span class='log-$Category'>$Html</span>"; my $FailureIds = $Group->{Failures}->{$MsgIndex}; if ($FailureIds) { diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index c40b8546..e686e6f5 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -402,10 +402,12 @@ pre .log-info { background-color: #d9ffcc; } .log-skip { color: blue; } .log-todo { color: #d08000; } +.log-flaky { color: magenta; } +.log-newflaky { color: magenta; font-weight: bold; } .log-error { color: red; } +.log-newerror { color: red; font-weight: bold; } .log-boterror { color: #cc0052; } .log-diag { color: #e56300; } -.log-new { color: red; font-weight: bold; } .bug-missing { color: red; font-weight: bold; } .bug-closed { color: red; }

1 0

Gabriel Ivăncescu : mshtml: Move the IDispatchEx interface out of basedoc.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: f852f1a6137d31e4537acc89ee4dd5a0bc79aa61 URL: https://gitlab.winehq.org/wine/wine/-/commit/f852f1a6137d31e4537acc89ee4dd5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 25 16:54:01 2022 +0300 mshtml: Move the IDispatchEx interface out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 5 +- dlls/mshtml/htmldoc.c | 177 +++++++++++++++++++------------------------ dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 10 +-- dlls/mshtml/oleobj.c | 153 +++++++++++++++++++++++++++++++++++-- 5 files changed, 229 insertions(+), 118 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Get rid of the outer_unk in basedoc.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 46d4d263ba3de8d96285c4ab065eaccdef36af70 URL: https://gitlab.winehq.org/wine/wine/-/commit/46d4d263ba3de8d96285c4ab065eac… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 25 16:54:02 2022 +0300 mshtml: Get rid of the outer_unk in basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 91 ++++++++++++++++--------------- dlls/mshtml/htmlnode.c | 8 +-- dlls/mshtml/htmlwindow.c | 6 +-- dlls/mshtml/mshtml_private.h | 18 +------ dlls/mshtml/mutation.c | 10 ++-- dlls/mshtml/nsevents.c | 4 +- dlls/mshtml/olecmd.c | 12 ++--- dlls/mshtml/oleobj.c | 126 +++++++++++++++++++++---------------------- dlls/mshtml/persist.c | 72 ++++++++++++------------- dlls/mshtml/script.c | 2 +- dlls/mshtml/service.c | 12 ++--- dlls/mshtml/view.c | 16 +++--- 12 files changed, 180 insertions(+), 197 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Get rid of the outer window in basedoc.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 155969dcc9e225234b02e44440d8e23e38b6bf49 URL: https://gitlab.winehq.org/wine/wine/-/commit/155969dcc9e225234b02e44440d8e2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 25 16:54:02 2022 +0300 mshtml: Get rid of the outer window in basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 20 ++++++++++---------- dlls/mshtml/htmlanchor.c | 6 +++--- dlls/mshtml/htmldoc.c | 44 ++++++++++++++++++++++---------------------- dlls/mshtml/htmlframe.c | 6 +++--- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/mutation.c | 6 +++--- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 10 +++++----- dlls/mshtml/olecmd.c | 10 +++++----- dlls/mshtml/oleobj.c | 32 ++++++++++++++++---------------- dlls/mshtml/persist.c | 34 +++++++++++++++++----------------- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/range.c | 2 +- dlls/mshtml/secmgr.c | 8 ++++---- 14 files changed, 94 insertions(+), 94 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Get rid of the HTMLDocument basedoc.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: b5f48369bb0ea2089ac0049638ab78e4ca83dcaa URL: https://gitlab.winehq.org/wine/wine/-/commit/b5f48369bb0ea2089ac0049638ab78… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 25 16:54:02 2022 +0300 mshtml: Get rid of the HTMLDocument basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc.c | 11 ++++--- dlls/mshtml/htmlelem.c | 3 +- dlls/mshtml/htmlwindow.c | 6 ++-- dlls/mshtml/mshtml_private.h | 9 ++---- dlls/mshtml/mutation.c | 8 ++--- dlls/mshtml/navigate.c | 6 ++-- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 10 +++---- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/olecmd.c | 14 ++++----- dlls/mshtml/oleobj.c | 69 ++++++++++++++++++++++---------------------- dlls/mshtml/persist.c | 32 ++++++++++---------- dlls/mshtml/pluginhost.c | 4 +-- dlls/mshtml/service.c | 2 +- 16 files changed, 87 insertions(+), 95 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add UiaGetUpdatedCache stub.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 2de6b5719e54f9879a550dd2f04740c858dd82be URL: https://gitlab.winehq.org/wine/wine/-/commit/2de6b5719e54f9879a550dd2f04740… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 16 12:29:30 2022 -0400 uiautomationcore: Add UiaGetUpdatedCache stub. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 391 +++++++++++++++++++++++++++- dlls/uiautomationcore/uia_client.c | 11 + dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 8 + 4 files changed, 409 insertions(+), 3 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement UiaGetUpdatedCache.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 272c4a59b0b72b89f5621ef32f008899f4cfceec URL: https://gitlab.winehq.org/wine/wine/-/commit/272c4a59b0b72b89f5621ef32f0088… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 24 10:54:20 2022 -0400 uiautomationcore: Implement UiaGetUpdatedCache. Implement UiaGetUpdatedCache for non-conditional, TreeScope_Element cache requests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 26 +++++++------- dlls/uiautomationcore/uia_client.c | 58 ++++++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 17 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index ae19fd4ce17..136f5a08dcf 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -6912,13 +6912,13 @@ static void test_UiaGetUpdatedCache(void) /* NULL arg tests. */ set_cache_request(&cache_req, NULL, TreeScope_Element, NULL, 0, NULL, 0, AutomationElementMode_Full); hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_None, NULL, &out_req, NULL); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = UiaGetUpdatedCache(node, NULL, NormalizeState_None, NULL, &out_req, &tree_struct); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = UiaGetUpdatedCache(NULL, &cache_req, NormalizeState_None, NULL, &out_req, &tree_struct); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* * Cache request with NULL view condition, doesn't matter with @@ -6929,17 +6929,15 @@ static void test_UiaGetUpdatedCache(void) add_provider_desc(&exp_node_desc[0], L"Main", L"Provider", TRUE); set_cache_request(&cache_req, NULL, TreeScope_Element, NULL, 0, NULL, 0, AutomationElementMode_Full); hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_None, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!out_req, "out_req == NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (out_req) - { - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); - ok_method_sequence(cache_req_seq1, "cache_req_seq1"); - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq1, "cache_req_seq1"); SafeArrayDestroy(out_req); SysFreeString(tree_struct); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index e16851e55e4..2bb418e8086 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1918,7 +1918,59 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cache_req, enum NormalizeState normalize_state, struct UiaCondition *normalize_cond, SAFEARRAY **out_req, BSTR *tree_struct) { - FIXME("(%p, %p, %u, %p, %p, %p): stub\n", huianode, cache_req, normalize_state, normalize_cond, out_req, - tree_struct); - return E_NOTIMPL; + struct uia_node *node = unsafe_impl_from_IWineUiaNode((IWineUiaNode *)huianode); + SAFEARRAYBOUND sabound[2]; + SAFEARRAY *sa; + LONG idx[2]; + HRESULT hr; + VARIANT v; + + TRACE("(%p, %p, %u, %p, %p, %p)\n", huianode, cache_req, normalize_state, normalize_cond, out_req, tree_struct); + + if (!node || !out_req || !tree_struct || !cache_req) + return E_INVALIDARG; + + *tree_struct = NULL; + *out_req = NULL; + + if (normalize_state != NormalizeState_None) + { + FIXME("Unsupported NormalizeState %d\n", normalize_state); + return E_NOTIMPL; + } + + if (cache_req->Scope != TreeScope_Element) + { + FIXME("Unsupported cache request scope %#x\n", cache_req->Scope); + return E_NOTIMPL; + } + + sabound[0].cElements = sabound[1].cElements = 1; + sabound[0].lLbound = sabound[1].lLbound = 0; + if (!(sa = SafeArrayCreate(VT_VARIANT, 2, sabound))) + { + WARN("Failed to create safearray\n"); + return E_FAIL; + } + + get_variant_for_node(huianode, &v); + idx[0] = idx[1] = 0; + + hr = SafeArrayPutElement(sa, idx, &v); + if (FAILED(hr)) + { + SafeArrayDestroy(sa); + return hr; + } + + /* + * AddRef huianode since we're returning a reference to the same node we + * passed in, rather than creating a new one. + */ + IWineUiaNode_AddRef(&node->IWineUiaNode_iface); + + *out_req = sa; + *tree_struct = SysAllocString(L"P)"); + + return S_OK; }

1 0

Connor McAdams : uiautomationcore: Add basic UiaCondition support to UiaGetUpdatedCache.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: d13d704f115417997f4fc1258585f24bfd84dd16 URL: https://gitlab.winehq.org/wine/wine/-/commit/d13d704f115417997f4fc1258585f2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 24 10:59:17 2022 -0400 uiautomationcore: Add basic UiaCondition support to UiaGetUpdatedCache. Add support for ConditionType_{True/False}. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 56 ++++++++++++------------ dlls/uiautomationcore/uia_client.c | 68 +++++++++++++++++++++++++++--- 2 files changed, 89 insertions(+), 35 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 136f5a08dcf..96c2c128906 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -6949,12 +6949,12 @@ static void test_UiaGetUpdatedCache(void) tree_struct = NULL; out_req = NULL; set_cache_request(&cache_req, (struct UiaCondition *)&UiaFalseCondition, TreeScope_Element, NULL, 0, NULL, 0, AutomationElementMode_Full); hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!out_req, "out_req != NULL\n"); + /* Empty tree structure string. */ - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (tree_struct) - ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + ok(!!tree_struct, "tree_struct == NULL\n"); + ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); SysFreeString(tree_struct); ok_method_sequence(cache_req_seq2, "cache_req_seq2"); @@ -6965,17 +6965,15 @@ static void test_UiaGetUpdatedCache(void) tree_struct = NULL; out_req = NULL; set_cache_request(&cache_req, (struct UiaCondition *)&UiaTrueCondition, TreeScope_Element, NULL, 0, NULL, 0, AutomationElementMode_Full); hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!out_req, "out_req == NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (out_req) - { - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); - ok_method_sequence(cache_req_seq1, "cache_req_seq1"); - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq1, "cache_req_seq1"); SafeArrayDestroy(out_req); SysFreeString(tree_struct); @@ -6987,12 +6985,12 @@ static void test_UiaGetUpdatedCache(void) set_cache_request(&cache_req, (struct UiaCondition *)&UiaTrueCondition, TreeScope_Element, NULL, 0, NULL, 0, AutomationElementMode_Full); tree_struct = NULL; out_req = NULL; hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_Custom, (struct UiaCondition *)&UiaFalseCondition, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!out_req, "out_req != NULL\n"); + /* Empty tree structure string. */ - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (tree_struct) - ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); + ok(!!tree_struct, "tree_struct == NULL\n"); + ok(!wcscmp(tree_struct, L""), "tree structure %s\n", debugstr_w(tree_struct)); SysFreeString(tree_struct); ok_method_sequence(cache_req_seq2, "cache_req_seq2"); @@ -7004,17 +7002,15 @@ static void test_UiaGetUpdatedCache(void) tree_struct = NULL; out_req = NULL; set_cache_request(&cache_req, (struct UiaCondition *)&UiaTrueCondition, TreeScope_Element, NULL, 0, NULL, 0, AutomationElementMode_Full); hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_Custom, (struct UiaCondition *)&UiaTrueCondition, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!!out_req, "out_req == NULL\n"); - todo_wine ok(!!tree_struct, "tree_struct == NULL\n"); - if (out_req) - { - exp_lbound[0] = exp_lbound[1] = 0; - exp_elems[0] = exp_elems[1] = 1; - test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); - ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); - ok_method_sequence(cache_req_seq1, "cache_req_seq1"); - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!out_req, "out_req == NULL\n"); + ok(!!tree_struct, "tree_struct == NULL\n"); + + exp_lbound[0] = exp_lbound[1] = 0; + exp_elems[0] = exp_elems[1] = 1; + test_cache_req_sa(out_req, exp_lbound, exp_elems, exp_node_desc); + ok(!wcscmp(tree_struct, L"P)"), "tree structure %s\n", debugstr_w(tree_struct)); + ok_method_sequence(cache_req_seq1, "cache_req_seq1"); SafeArrayDestroy(out_req); SysFreeString(tree_struct); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 2bb418e8086..12b53891dcd 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1912,6 +1912,37 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) uia_provider_callback = default_uia_provider_callback; } +static BOOL uia_condition_matched(HRESULT hr) +{ + if (hr == S_FALSE) + return FALSE; + else + return TRUE; +} + +static HRESULT uia_condition_check(HUIANODE node, struct UiaCondition *condition) +{ + switch (condition->ConditionType) + { + case ConditionType_True: + return S_OK; + + case ConditionType_False: + return S_FALSE; + + case ConditionType_Property: + case ConditionType_And: + case ConditionType_Or: + case ConditionType_Not: + FIXME("Unhandled condition type %d\n", condition->ConditionType); + return E_NOTIMPL; + + default: + WARN("Invalid condition type %d\n", condition->ConditionType); + return E_INVALIDARG; + } +} + /*********************************************************************** * UiaGetUpdatedCache (uiautomationcore.@) */ @@ -1919,6 +1950,7 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac struct UiaCondition *normalize_cond, SAFEARRAY **out_req, BSTR *tree_struct) { struct uia_node *node = unsafe_impl_from_IWineUiaNode((IWineUiaNode *)huianode); + struct UiaCondition *cond; SAFEARRAYBOUND sabound[2]; SAFEARRAY *sa; LONG idx[2]; @@ -1933,16 +1965,42 @@ HRESULT WINAPI UiaGetUpdatedCache(HUIANODE huianode, struct UiaCacheRequest *cac *tree_struct = NULL; *out_req = NULL; - if (normalize_state != NormalizeState_None) + if (cache_req->Scope != TreeScope_Element) { - FIXME("Unsupported NormalizeState %d\n", normalize_state); + FIXME("Unsupported cache request scope %#x\n", cache_req->Scope); return E_NOTIMPL; } - if (cache_req->Scope != TreeScope_Element) + switch (normalize_state) { - FIXME("Unsupported cache request scope %#x\n", cache_req->Scope); - return E_NOTIMPL; + case NormalizeState_None: + cond = NULL; + break; + + case NormalizeState_View: + cond = cache_req->pViewCondition; + break; + + case NormalizeState_Custom: + cond = normalize_cond; + break; + + default: + WARN("Invalid normalize_state %d\n", normalize_state); + return E_INVALIDARG; + } + + if (cond) + { + hr = uia_condition_check(huianode, cond); + if (FAILED(hr)) + return hr; + + if (!uia_condition_matched(hr)) + { + *tree_struct = SysAllocString(L""); + return S_OK; + } } sabound[0].cElements = sabound[1].cElements = 1;

1 0