wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

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: Fix the tasks failure count.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: tools Branch: master Commit: 818aebb2e41bbcec3cacd0723b59a9e867320732 URL: https://gitlab.winehq.org/winehq/tools/-/commit/818aebb2e41bbcec3cacd0723b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 24 19:00:59 2022 +0200 testbot: Fix the tasks failure count. TestFailures is supposed to count all failures, including the preexisting (aka old) and flaky ones. Checking whether any of these failures is new must be done by analyzing the content of the task's .errors files. --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 0641bb54..67ba3288 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->{Failures} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{Failures} || 0; + # $LogInfo->{ErrCount} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{ErrCount} || 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 62a7fc5b..d0e30d1c 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->{Failures} can legitimately be undefined in case of a timeout - $TaskFailures += $LogInfo->{Failures} || 0; + # $LogInfo->{ErrCount} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{ErrCount} || 0; my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg); }

1 0

Francois Gouget : testbot/web: Always use the same color for new failures.
by Alexandre Julliard 26 Oct '22

26 Oct '22

Module: tools Branch: master Commit: b60f6293ee66e74a6cf744aa4d9d3a33dd87a17c URL: https://gitlab.winehq.org/winehq/tools/-/commit/b60f6293ee66e74a6cf744aa4d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 18 16:08:48 2022 +0200 testbot/web: Always use the same color for new failures. --- testbot/web/JobDetails.pl | 4 ++-- testbot/web/WineTestBot.css | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 321d025e..ff0943e0 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -425,7 +425,7 @@ sub GenerateFullLog($$$$$) my $LineNo = $Group->{LineNos}->[$ErrIndex]; if ($LineNo) { - $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; + $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "new" : "error"; $ErrFailures{$LineNo} = $Group->{Failures}->{$ErrIndex}; if ($ErrFailures{$LineNo}) @@ -438,7 +438,7 @@ sub GenerateFullLog($$$$$) } } $LogBugs{-2} ||= [$LineNo, "First failure"]; - if ($ErrCategory{$LineNo} eq "fullnew" and !$ErrFailures{$LineNo}) + if ($ErrCategory{$LineNo} eq "new" and !$ErrFailures{$LineNo}) { $LogBugs{-1} ||= [$LineNo, "First untracked new failure"]; $LogBugs{10000000} = [$LineNo, "Last untracked new failure"]; diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index fd6acac8..c40b8546 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -405,8 +405,7 @@ pre .log-error { color: red; } .log-boterror { color: #cc0052; } .log-diag { color: #e56300; } -.log-new { color: #e56e00; font-weight: bold; } -.log-fullnew { color: red; font-weight: bold; } +.log-new { color: red; font-weight: bold; } .bug-missing { color: red; font-weight: bold; } .bug-closed { color: red; }

1 0

Connor McAdams : uiautomationcore: Add support for ConditionType_Not conditions.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 9967d214561be5b2e10f877cbdb9b97dd7ff24cb URL: https://gitlab.winehq.org/wine/wine/-/commit/9967d214561be5b2e10f877cbdb9b9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 24 12:34:25 2022 -0400 uiautomationcore: Add support for ConditionType_Not conditions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 31 +++++++++++++----------------- dlls/uiautomationcore/uia_client.c | 16 ++++++++++++++- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index c837e1093d7..32ae4cb9b5f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -7222,17 +7222,15 @@ static void test_UiaGetUpdatedCache(void) /* Equivalent to: if (!0) */ 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, NULL); - } + 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, NULL); SafeArrayDestroy(out_req); SysFreeString(tree_struct); @@ -7244,15 +7242,12 @@ static void test_UiaGetUpdatedCache(void) /* Equivalent to: if (!1) */ hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ok_method_sequence(cache_req_seq2, NULL); - + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!out_req, "out_req != NULL\n"); - 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, NULL); /* * ConditionType_Property tests. diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 12b53891dcd..3897b036e09 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1930,10 +1930,24 @@ static HRESULT uia_condition_check(HUIANODE node, struct UiaCondition *condition case ConditionType_False: return S_FALSE; + case ConditionType_Not: + { + struct UiaNotCondition *not_cond = (struct UiaNotCondition *)condition; + HRESULT hr; + + hr = uia_condition_check(node, not_cond->pConditions); + if (FAILED(hr)) + return hr; + + if (uia_condition_matched(hr)) + return S_FALSE; + else + return S_OK; + } + case ConditionType_Property: case ConditionType_And: case ConditionType_Or: - case ConditionType_Not: FIXME("Unhandled condition type %d\n", condition->ConditionType); return E_NOTIMPL;

1 0

Connor McAdams : uiautomationcore/tests: Add ConditionType_Property tests.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 94e0c663c3dd4d1b0b9903968ef8cecf9491f16c URL: https://gitlab.winehq.org/wine/wine/-/commit/94e0c663c3dd4d1b0b9903968ef8ce… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Oct 25 08:04:04 2022 -0400 uiautomationcore/tests: Add ConditionType_Property tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 203 +++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+)

1 0

Connor McAdams : uiautomationcore/tests: Add tests for boolean UIA ConditionTypes.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 65bca11b9511db10e8f7a2d386c3c56aacbaa81a URL: https://gitlab.winehq.org/wine/wine/-/commit/65bca11b9511db10e8f7a2d386c3c5… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Oct 25 07:55:08 2022 -0400 uiautomationcore/tests: Add tests for boolean UIA ConditionTypes. Add tests for ConditionType_Not, ConditionType_And, and ConditionType_Or. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 155 +++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 96c2c128906..8846cd89ed2 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -6732,6 +6732,20 @@ static void set_cache_request(struct UiaCacheRequest *req, struct UiaCondition * req->automationElementMode = elem_mode; } +static void set_and_or_condition(struct UiaAndOrCondition *cond, int cond_type, + struct UiaCondition **conds, int cond_count) +{ + cond->ConditionType = cond_type; + cond->ppConditions = conds; + cond->cConditions = cond_count; +} + +static void set_not_condition(struct UiaNotCondition *cond, struct UiaCondition *not_cond) +{ + cond->ConditionType = ConditionType_Not; + cond->pConditions = not_cond; +} + #define MAX_NODE_PROVIDERS 4 struct node_provider_desc { DWORD pid; @@ -6879,8 +6893,11 @@ static const struct UiaCondition UiaFalseCondition = { ConditionType_False }; static void test_UiaGetUpdatedCache(void) { struct node_provider_desc exp_node_desc[2]; + struct UiaAndOrCondition and_or_cond; LONG exp_lbound[2], exp_elems[2], i; struct UiaCacheRequest cache_req; + struct UiaCondition *cond_arr[2]; + struct UiaNotCondition not_cond; SAFEARRAY *out_req; BSTR tree_struct; HUIANODE node; @@ -7045,6 +7062,144 @@ static void test_UiaGetUpdatedCache(void) SafeArrayDestroy(out_req); SysFreeString(tree_struct); + /* + * ConditionType_And tests. + */ + for (i = 0; i < ARRAY_SIZE(exp_node_desc); i++) + init_node_provider_desc(&exp_node_desc[i], GetCurrentProcessId(), NULL); + add_provider_desc(&exp_node_desc[0], L"Main", L"Provider", TRUE); + cond_arr[0] = (struct UiaCondition *)&UiaTrueCondition; + cond_arr[1] = (struct UiaCondition *)&UiaTrueCondition; + set_and_or_condition(&and_or_cond, ConditionType_And, cond_arr, ARRAY_SIZE(cond_arr)); + set_cache_request(&cache_req, (struct UiaCondition *)&and_or_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (1 && 1) */ + 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, NULL); + } + + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + + cond_arr[0] = (struct UiaCondition *)&UiaTrueCondition; + cond_arr[1] = (struct UiaCondition *)&UiaFalseCondition; + set_and_or_condition(&and_or_cond, ConditionType_And, cond_arr, ARRAY_SIZE(cond_arr)); + set_cache_request(&cache_req, (struct UiaCondition *)&and_or_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (1 && 0) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ok_method_sequence(cache_req_seq2, NULL); + + ok(!out_req, "out_req != NULL\n"); + 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)); + SysFreeString(tree_struct); + + /* + * ConditionType_Or tests. + */ + cond_arr[0] = (struct UiaCondition *)&UiaTrueCondition; + cond_arr[1] = (struct UiaCondition *)&UiaFalseCondition; + set_and_or_condition(&and_or_cond, ConditionType_Or, cond_arr, ARRAY_SIZE(cond_arr)); + set_cache_request(&cache_req, (struct UiaCondition *)&and_or_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (1 || 0) */ + 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, NULL); + } + + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + + cond_arr[0] = (struct UiaCondition *)&UiaFalseCondition; + cond_arr[1] = (struct UiaCondition *)&UiaFalseCondition; + set_and_or_condition(&and_or_cond, ConditionType_Or, cond_arr, ARRAY_SIZE(cond_arr)); + set_cache_request(&cache_req, (struct UiaCondition *)&and_or_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (0 || 0) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ok_method_sequence(cache_req_seq2, NULL); + + ok(!out_req, "out_req != NULL\n"); + 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)); + SysFreeString(tree_struct); + + /* + * ConditionType_Not tests. + */ + set_not_condition(&not_cond, (struct UiaCondition *)&UiaFalseCondition); + set_cache_request(&cache_req, (struct UiaCondition *)&not_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (!0) */ + 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, NULL); + } + + SafeArrayDestroy(out_req); + SysFreeString(tree_struct); + + set_not_condition(&not_cond, (struct UiaCondition *)&UiaTrueCondition); + set_cache_request(&cache_req, (struct UiaCondition *)&not_cond, TreeScope_Element, NULL, 0, NULL, 0, + AutomationElementMode_Full); + tree_struct = NULL; out_req = NULL; + + /* Equivalent to: if (!1) */ + hr = UiaGetUpdatedCache(node, &cache_req, NormalizeState_View, NULL, &out_req, &tree_struct); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ok_method_sequence(cache_req_seq2, NULL); + + ok(!out_req, "out_req != NULL\n"); + 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)); + SysFreeString(tree_struct); + + ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref);

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

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 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

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

← Newer
1
...
8
9
10
11
12
13
14
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022