November 2022 - Wine-commits

Mohamad Al-Jaf : setx: Add stub program.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 82e8d6036fd26485db32f2f88ebb7d7b4f6b2f9a URL: https://gitlab.winehq.org/wine/wine/-/commit/82e8d6036fd26485db32f2f88ebb7d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Nov 7 02:34:49 2022 -0500 setx: Add stub program. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53755 --- configure | 2 ++ configure.ac | 1 + programs/setx/Makefile.in | 9 +++++++++ programs/setx/main.c | 33 +++++++++++++++++++++++++++++++++ programs/setx/version.rc | 27 +++++++++++++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/configure b/configure index ce217cb9fd2..e4b804f1525 100755 --- a/configure +++ b/configure @@ -1641,6 +1641,7 @@ enable_sdbinst enable_secedit enable_servicemodelreg enable_services +enable_setx enable_shutdown enable_spoolsv enable_start @@ -22342,6 +22343,7 @@ wine_fn_config_makefile programs/secedit enable_secedit wine_fn_config_makefile programs/servicemodelreg enable_servicemodelreg wine_fn_config_makefile programs/services enable_services wine_fn_config_makefile programs/services/tests enable_tests +wine_fn_config_makefile programs/setx enable_setx wine_fn_config_makefile programs/shutdown enable_shutdown wine_fn_config_makefile programs/spoolsv enable_spoolsv wine_fn_config_makefile programs/start enable_start diff --git a/configure.ac b/configure.ac index 2907dbd7d84..169299da237 100644 --- a/configure.ac +++ b/configure.ac @@ -3437,6 +3437,7 @@ WINE_CONFIG_MAKEFILE(programs/secedit) WINE_CONFIG_MAKEFILE(programs/servicemodelreg) WINE_CONFIG_MAKEFILE(programs/services) WINE_CONFIG_MAKEFILE(programs/services/tests) +WINE_CONFIG_MAKEFILE(programs/setx) WINE_CONFIG_MAKEFILE(programs/shutdown) WINE_CONFIG_MAKEFILE(programs/spoolsv) WINE_CONFIG_MAKEFILE(programs/start) diff --git a/programs/setx/Makefile.in b/programs/setx/Makefile.in new file mode 100644 index 00000000000..1a556abd511 --- /dev/null +++ b/programs/setx/Makefile.in @@ -0,0 +1,9 @@ +MODULE = setx.exe + +EXTRADLLFLAGS = -mconsole -municode + +C_SRCS = \ + main.c + +RC_SRCS = \ + version.rc diff --git a/programs/setx/main.c b/programs/setx/main.c new file mode 100644 index 00000000000..8b6ea45c76d --- /dev/null +++ b/programs/setx/main.c @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(setx); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/setx/version.rc b/programs/setx/version.rc new file mode 100644 index 00000000000..e8c6324aaac --- /dev/null +++ b/programs/setx/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine setx" +#define WINE_FILENAME_STR "setx.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 10,0,19041,1 +#define WINE_FILEVERSION_STR "10.0.19041.1" +#define WINE_PRODUCTVERSION 10,0,19041,1 +#define WINE_PRODUCTVERSION_STR "10.0.19041.1" + +#include "wine/wine_common_ver.rc"

1 0

Gabriel Ivăncescu : mshtml/tests: Handle broken localStorage on native.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: cb078982f4c6038b89057b47adbabf458d13507a URL: https://gitlab.winehq.org/wine/wine/-/commit/cb078982f4c6038b89057b47adbabf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 7 17:35:12 2022 +0200 mshtml/tests: Handle broken localStorage on native. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 20 +++++++++++++++++--- dlls/mshtml/tests/misc.c | 16 +++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index b53851d61bf..8175205b830 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -4024,12 +4024,19 @@ static void test_storage_events(const char *doc_str) ok(hres == S_OK, "Could not get IHTMLWindow6: %08lx\n", hres); IHTMLWindow2_Release(window); - hres = IHTMLWindow6_get_sessionStorage(window6, &session_storage[i]); - ok(hres == S_OK, "get_sessionStorage[%u] failed: %08lx\n", i, hres); - ok(session_storage[i] != NULL, "session_storage[%u] == NULL\n", i); hres = IHTMLWindow6_get_localStorage(window6, &local_storage[i]); + + /* w10pro64 testbot VM sometimes returns this for some reason */ + if(hres == WININET_E_INTERNAL_ERROR) { + win_skip("localStorage is buggy and not available, skipping storage events tests\n"); + goto done; + } + ok(hres == S_OK, "get_localStorage[%u] failed: %08lx\n", i, hres); ok(local_storage[i] != NULL, "local_storage[%u] == NULL\n", i); + hres = IHTMLWindow6_get_sessionStorage(window6, &session_storage[i]); + ok(hres == S_OK, "get_sessionStorage[%u] failed: %08lx\n", i, hres); + ok(session_storage[i] != NULL, "session_storage[%u] == NULL\n", i); hres = IHTMLDocument2_QueryInterface(doc[i], &IID_IHTMLDocument6, (void**)&doc6); if(SUCCEEDED(hres)) { @@ -4125,6 +4132,9 @@ static void test_storage_events(const char *doc_str) pump_msgs(&called_doc1_onstoragecommit); CHECK_CALLED(doc1_onstoragecommit); + for(i = 0; i < ARRAY_SIZE(local_storage); i++) + IHTMLStorage_Release(local_storage[i]); + /* session storage */ key = SysAllocString(L"foobar"); hres = IHTMLStorage_removeItem(session_storage[0], key); @@ -4184,6 +4194,10 @@ static void test_storage_events(const char *doc_str) CHECK_CALLED(doc1_onstorage); if(document_mode >= 9) CHECK_CALLED(window1_onstorage); + for(i = 0; i < ARRAY_SIZE(session_storage); i++) + IHTMLStorage_Release(session_storage[i]); + +done: set_client_site(doc[0], FALSE); set_client_site(doc[1], FALSE); IHTMLDocument2_Release(doc[0]); diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 5f38f9d45fb..e4703a3b646 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -161,8 +161,14 @@ static HRESULT get_localstorage(IHTMLDocument2 *doc, IHTMLStorage **storage) } hres = IHTMLWindow6_get_localStorage(window6, storage); - ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); - ok(*storage != NULL, "*storage == NULL\n"); + + /* w10pro64 testbot VM sometimes returns this for some reason */ + if(hres == WININET_E_INTERNAL_ERROR) + win_skip("localStorage is buggy and not available, skipping tests\n"); + else { + ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); + ok(*storage != NULL, "*storage == NULL\n"); + } IHTMLWindow6_Release(window6); return hres; @@ -206,7 +212,11 @@ static void test_HTMLStorage(void) doc2 = create_doc_from_url(L"http://www.codeweavers.com/"); hres = get_localstorage(doc, &storage); - ok(hres == S_OK, "got %08lx\n", hres); + if(hres != S_OK) { + IHTMLDocument2_Release(doc2); + IHTMLDocument2_Release(doc); + return; + } hres = get_localstorage(doc2, &storage2); ok(hres == S_OK, "got %08lx\n", hres);

1 0

Gabriel Ivăncescu : mshtml: Implement isContentEditable for HTML elements.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: ff4fde9e20fed6d75fd003f3c13dc17d39ba1bc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff4fde9e20fed6d75fd003f3c13dc1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 7 17:35:12 2022 +0200 mshtml: Implement isContentEditable for HTML elements. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8a45a354a04..4d92929b985 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4256,8 +4256,19 @@ static HRESULT WINAPI HTMLElement3_get_contentEditable(IHTMLElement3 *iface, BST static HRESULT WINAPI HTMLElement3_get_isContentEditable(IHTMLElement3 *iface, VARIANT_BOOL *p) { HTMLElement *This = impl_from_IHTMLElement3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + cpp_bool r; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->html_element) { + FIXME("non-HTML element\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLElement_GetIsContentEditable(This->html_element, &r); + *p = variant_bool(NS_SUCCEEDED(nsres) && r); + return S_OK; } static HRESULT WINAPI HTMLElement3_put_hideFocus(IHTMLElement3 *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6f4e8ed007b..70b047ccbe1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3945,6 +3945,7 @@ static void test_contenteditable(IUnknown *unk) IHTMLElement3 *elem3 = get_elem3_iface(unk); HRESULT hres; BSTR str, strDefault; + VARIANT_BOOL vbool; hres = IHTMLElement3_get_contentEditable(elem3, &strDefault); ok(hres == S_OK, "get_contentEditable failed: 0x%08lx\n", hres); @@ -3957,6 +3958,21 @@ static void test_contenteditable(IUnknown *unk) ok(hres == S_OK, "get_contentEditable failed: 0x%08lx\n", hres); ok(!lstrcmpW(str, L"true"), "Got %s, expected %s\n", wine_dbgstr_w(str), "true"); SysFreeString(str); + hres = IHTMLElement3_get_isContentEditable(elem3, &vbool); + ok(hres == S_OK, "get_isContentEditable failed: 0x%08lx\n", hres); + ok(vbool == VARIANT_TRUE, "Got %d, expected VARIANT_TRUE\n", vbool); + + str = SysAllocString(L"inherit"); + hres = IHTMLElement3_put_contentEditable(elem3, str); + ok(hres == S_OK, "put_contentEditable(%s) failed: 0x%08lx\n", wine_dbgstr_w(str), hres); + SysFreeString(str); + hres = IHTMLElement3_get_contentEditable(elem3, &str); + ok(hres == S_OK, "get_contentEditable failed: 0x%08lx\n", hres); + ok(!lstrcmpW(str, L"inherit"), "Got %s, expected %s\n", wine_dbgstr_w(str), "inherit"); + SysFreeString(str); + hres = IHTMLElement3_get_isContentEditable(elem3, &vbool); + ok(hres == S_OK, "get_isContentEditable failed: 0x%08lx\n", hres); + ok(vbool == VARIANT_FALSE, "Got %d, expected VARIANT_FALSE\n", vbool); /* Restore origin contentEditable */ hres = IHTMLElement3_put_contentEditable(elem3, strDefault);

1 0

Gabriel Ivăncescu : mshtml: Improve locale stub for KeyboardEvent.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 08957afe17a6828c618940f0bb0a9fcccce9c8b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/08957afe17a6828c618940f0bb0a9f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 7 17:35:12 2022 +0200 mshtml: Improve locale stub for KeyboardEvent. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 7 +++++-- dlls/mshtml/tests/events.js | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 59a8d50d40e..835e11c74aa 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2154,8 +2154,11 @@ static HRESULT WINAPI DOMKeyboardEvent_get_char(IDOMKeyboardEvent *iface, VARIAN static HRESULT WINAPI DOMKeyboardEvent_get_locale(IDOMKeyboardEvent *iface, BSTR *p) { DOMKeyboardEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) semi-stub\n", This, p); + + *p = SysAllocString(L""); + return *p ? S_OK : E_OUTOFMEMORY; } static const IDOMKeyboardEventVtbl DOMKeyboardEventVtbl = { diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 156330e984b..3b29798e9a1 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -760,6 +760,7 @@ sync_test("keyboard_event", function() { ok(e.location === 0, "location = " + e.location); ok(e.detail === 0, "detail = " + e.detail); ok(e.which === 0, "which = " + e.which); + ok(e.locale === "", "locale = " + e.locale); }); sync_test("custom_event", function() {

1 0

Gabriel Ivăncescu : mshtml: Return E_ABORT if wine-gecko's OnDataAvailable aborts the binding.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: c2d55cd24eee7acec8f704d8295790858bb040d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d55cd24eee7acec8f704d8295790… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 7 17:35:12 2022 +0200 mshtml: Return E_ABORT if wine-gecko's OnDataAvailable aborts the binding. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 6 ++++-- dlls/mshtml/nsembed.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3594cfe0a6c..66542fbd676 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1184,8 +1184,10 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, &This->nsstream->nsIInputStream_iface, This->bsc.read-This->nsstream->buf_size, This->nsstream->buf_size); - if(NS_FAILED(nsres)) - ERR("OnDataAvailable failed: %08lx\n", nsres); + if(NS_FAILED(nsres)) { + WARN("OnDataAvailable failed: %08lx\n", nsres); + return map_nsresult(nsres); + } if(This->nsstream->buf_size == sizeof(This->nsstream->buf)) { ERR("buffer is full\n"); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 67d40ca0085..0b16cd90306 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -911,6 +911,8 @@ HRESULT map_nsresult(nsresult nsres) return E_UNEXPECTED; case NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR: return 0x80700007; /* according to tests */ + case NS_BINDING_ABORTED: + return E_ABORT; } return E_FAIL; }

1 0

Gabriel Ivăncescu : mshtml: Don't include fragment in storage event's url prop.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: 176f5409b173d727520485530d512f832a4577c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/176f5409b173d727520485530d512f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 7 17:35:12 2022 +0200 mshtml: Don't include fragment in storage event's url prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 14 ++++++++++---- dlls/mshtml/tests/documentmode.js | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index bf93e28fdf6..d8ecf573b2b 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -235,7 +235,7 @@ struct send_storage_event_ctx { BSTR key; BSTR old_value; BSTR new_value; - const WCHAR *url; + BSTR url; }; static HRESULT push_storage_event_task(struct send_storage_event_ctx *ctx, HTMLInnerWindow *window, BOOL commit) @@ -324,11 +324,16 @@ static HRESULT send_storage_event(HTMLStorage *storage, BSTR key, BSTR old_value BSTR hostname = NULL; HRESULT hres = S_OK; + ctx.url = NULL; if(!window) goto done; - get_top_window(window->base.outer_window, &top_window); + if(window->base.outer_window->uri_nofrag) { + hres = IUri_GetDisplayUri(window->base.outer_window->uri_nofrag, &ctx.url); + if(hres != S_OK) + goto done; + } - ctx.url = window->base.outer_window->url; + get_top_window(window->base.outer_window, &top_window); ctx.key = key; ctx.old_value = old_value; ctx.new_value = new_value; @@ -351,9 +356,10 @@ static HRESULT send_storage_event(HTMLStorage *storage, BSTR key, BSTR old_value hres = push_storage_event_task(&ctx, window, TRUE); done: + SysFreeString(ctx.url); SysFreeString(hostname); SysFreeString(old_value); - return hres; + return FAILED(hres) ? hres : S_OK; } static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID riid, void **ppv) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index a0f170c73b4..92f30f8b7e9 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1468,7 +1468,7 @@ async_test("storage events", function() { ok(e.key === key, "key = " + e.key + ", expected " + key); ok(e.oldValue === oldValue, "oldValue = " + e.oldValue + ", expected " + oldValue); ok(e.newValue === newValue, "newValue = " + e.newValue + ", expected " + newValue); - s = (idx ? iframe.contentWindow : window)["location"]["href"]; + s = (idx ? iframe.contentWindow : window)["location"]["href"].split('#', 1)[0]; ok(e.url === s, "url = " + e.url + ", expected " + s); }

1 0

Francois Gouget : winetest: Follow the link on clicks anywhere in the cells.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: tools Branch: master Commit: 40748a90e2d474243c60150193224f51ab848642 URL: https://gitlab.winehq.org/winehq/tools/-/commit/40748a90e2d474243c601501932… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 2 16:44:06 2022 +0100 winetest: Follow the link on clicks anywhere in the cells. It's easier than hitting the (sometimes) single character in the middle of the cell to go to the results / build / test index page. --- winetest/build-index | 6 +++--- winetest/gather | 17 ++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 14f1ffa7..c6bc5a95 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -431,7 +431,7 @@ foreach my $build (@builds) $title .= ", $todos have todos" if ($todos); my $class = $errors ? ($successes ? "mixed" : "fail") . ($todos ? " also-todo" : "") : ($todos ? "todo" : "pass"); - printf OUT "<td class=\"result %s\"><a title=\"%s\" href=\"%s\">%u</a></td>", $class, $title, $href, $errors || $todos; + printf OUT "<td class=\"result %s\" onclick=\"location.href='%s'\"><a title=\"%s\" href=\"%s\">%u</a></td>", $class, $href, $title, $href, $errors || $todos; $total_runs++; $total_tests += $tests; $total_errors += $errors; @@ -443,8 +443,8 @@ foreach my $build (@builds) my $class = $total_errors ? "fail" : $total_todos ? "pass also-todo" : "pass"; my $title = sprintf "%u test runs, %u total unit tests, %u have errors", $total_runs, $total_tests, $total_errors; $title .= ", $total_todos have todos" if $total_todos; - printf OUT "\n <td> </td><td class=\"result %s\"><a title=\"%s\" href=\"%s\">%4.1f%%</a></td><td> </td>\n", - $class, $title, $build->{name}, $total_errors * 100 / $total_tests; + printf OUT "\n <td> </td><td class=\"result %s\" onclick=\"location.href='%s'\"><a title=\"%s\" href=\"%s\">%4.1f%%</a></td><td> </td>\n", + $class, $build->{name}, $title, $build->{name}, $total_errors * 100 / $total_tests; } else { diff --git a/winetest/gather b/winetest/gather index e822eec8..736f4ad8 100755 --- a/winetest/gather +++ b/winetest/gather @@ -762,14 +762,17 @@ sub singletest($$$) { $msg = $status2label{$status} || "unknown"; } $title = join(" | ", $prefix, $title); - printf OUT " <td class=\"%s\"><a %s %s>%s</a></td>\n", - $class, $href ? "href=\"$href\"" : "", - "title=\"$title\"", $msg; + printf OUT " <td class=\"%s\"%s><a%s title=\"%s\">%s</a></td>\n", + $class, $href ? " onclick=\"location.href='$href'\"" : "", + $href ? " href=\"$href\"" : "", $title, $msg; if ($group->{reports}) { - printf SUMMARY "%s %s <td class=\"%s\"><a %s %s>%s</a></td>\n", - $testname, $groupname, $class, $href ? "href=\"../$build/$href\"" : "", - "title=\"$title\"", $msg; + $href = "../$build/$href"; + printf SUMMARY "%s %s <td class=\"%s\"%s><a%s title=\"%s\">%s</a></td>\n", + $testname, $groupname, $class, + $href ? " onclick=\"location.href='$href'\"" : "", + $href ? " href=\"$href\"" : "", + $title, $msg; } } @@ -856,7 +859,7 @@ EOF my $source = $alltests{$testname}; my $class = get_result_class( $test_results{$testname}->{$group_name} ); my $title = get_result_title( $testname, $test_results{$testname}->{$group_name} ); - print OUT " <tr>\n <td class=\"test $class\">\n"; + print OUT " <tr>\n <td class=\"test $class\" onclick=\"location.href='../tests/$testname.html'\">\n"; print OUT " <a href=\"../tests/$testname.html\" name=\"$testname\" title=\"$title\">$testname</a></td><td> </td>\n"; if (defined $group) {

1 0

Francois Gouget : testbot/TestWTBS: Fix some failure count checks.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: tools Branch: master Commit: c291da53a3de9f5a1b8488c9d76aafff38f5186c URL: https://gitlab.winehq.org/winehq/tools/-/commit/c291da53a3de9f5a1b8488c9d76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 29 03:09:40 2022 +0200 testbot/TestWTBS: Fix some failure count checks. --- testbot/tests/TestWTBS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 935f9e13..06ea6a60 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -329,7 +329,7 @@ sub LoadTestInfo($) $TestInfo->{$TaskType}->{$Field} = $RawInfo->{$Entry}; $HasTestInfo = 1; } - elsif ($Entry !~ /^(?:CurGroup|ErrCount|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath|NewCount)$/) + elsif ($Entry !~ /^(?:CurGroup|eCount|eNew|MsgGroups|MsgGroupNames|LineNo|LogName|LogPath)$/) { fail("$FileName: $Entry is not a valid property name"); } @@ -343,8 +343,8 @@ sub LoadTestInfo($) push @{$ErrInfo->{MsgGroupNames}}, $GroupName; my $MsgGroup = $RawInfo->{MsgGroups}->{$RawGroupName}; $ErrInfo->{MsgGroups}->{$GroupName} = $MsgGroup; - $ErrInfo->{ErrCount} += @{$MsgGroup->{Messages}}; - $ErrInfo->{ErrNew} += $MsgGroup->{ErrNew} || 0; + $ErrInfo->{eCount} += @{$MsgGroup->{Messages}}; + $ErrInfo->{eNew} += $MsgGroup->{eNew} || 0; $HasTestInfo = 1; } else @@ -991,9 +991,9 @@ sub CheckTask($$$$) if (CheckValue($MissionInfo->{TestFailures})) { - ok(($LogInfo->{ErrCount} || 0) <= $MissionInfo->{TestFailures}, + ok(($LogInfo->{eCount} || 0) <= $MissionInfo->{TestFailures}, "Check Failures of $LogName in task ". TaskKeyStr($Task)) - or diag("report error count = ", ($LogInfo->{ErrCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); + or diag("report error count = ", ($LogInfo->{eCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); $ReportFailures += $MissionInfo->{TestFailures}; } else

1 0

Francois Gouget : testbot/TestWTBS: Fix the indentation of a line.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: tools Branch: master Commit: 6f205e94cb3d52f79efa00f899b926a9cceb02c7 URL: https://gitlab.winehq.org/winehq/tools/-/commit/6f205e94cb3d52f79efa00f899b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 3 03:04:13 2022 +0100 testbot/TestWTBS: Fix the indentation of a line. --- testbot/tests/TestWTBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 06ea6a60..f7d4fcfb 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1162,7 +1162,7 @@ sub CheckJobTree($;$) if (!$TestInfo and $OptJobInfoPath{$JobId}) { - $TestInfo = LoadTestInfo($OptJobInfoPath{$JobId}); + $TestInfo = LoadTestInfo($OptJobInfoPath{$JobId}); } my ($HasTask, $HasNewFailures);

1 0

Sebastián Aedo : netprofm: Implement network_GetNetworkConnections.
by Alexandre Julliard 07 Nov '22

07 Nov '22

Module: wine Branch: master Commit: d0923a2f729fc8d5e872e7882ef00bcd2ef4032f URL: https://gitlab.winehq.org/wine/wine/-/commit/d0923a2f729fc8d5e872e7882ef00b… Author: Sebastián Aedo <saedo(a)codeweavers.com> Date: Fri Nov 4 12:39:22 2022 -0300 netprofm: Implement network_GetNetworkConnections. Signed-off-by: Sebastián Aedo <saedo(a)codeweavers.com> --- dlls/netprofm/list.c | 52 ++++++++++++++++++++++++++++++++++++---------- dlls/netprofm/tests/list.c | 4 ++-- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index e22609dcaf6..db4f13f532e 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -94,6 +94,9 @@ struct sink_entry IUnknown *unk; }; +static HRESULT create_connections_enum( + struct list_manager *, IEnumNetworkConnections** ); + static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, struct list_manager, IConnectionPointContainer_iface); @@ -111,6 +114,12 @@ static inline struct connection_point *impl_from_IConnectionPoint( return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); } +static inline struct list_manager *impl_from_INetworkListManager( + INetworkListManager *iface ) +{ + return CONTAINING_RECORD( iface, struct list_manager, INetworkListManager_iface ); +} + static HRESULT WINAPI connection_point_QueryInterface( IConnectionPoint *iface, REFIID riid, @@ -432,12 +441,42 @@ static HRESULT WINAPI network_GetDomainType( return S_OK; } +static ULONG WINAPI connection_Release( + INetworkConnection *iface ); + static HRESULT WINAPI network_GetNetworkConnections( INetwork *iface, IEnumNetworkConnections **ppEnumNetworkConnection ) { - FIXME( "%p, %p\n", iface, ppEnumNetworkConnection ); - return E_NOTIMPL; + HRESULT hr; + INetworkListManager *network_list_mgr = NULL; + struct list_manager *mgr = NULL; + struct network *current_network = impl_from_INetwork( iface ); + + struct connection *connection, *next; + struct network *network; + + if (FAILED(hr = list_manager_create((void**)&network_list_mgr))) + return hr; + + mgr = impl_from_INetworkListManager(network_list_mgr); + + if (FAILED(hr = create_connections_enum(mgr, ppEnumNetworkConnection))) + return hr; + + TRACE("%p, %s\n", iface, debugstr_guid(&current_network->id)); + + LIST_FOR_EACH_ENTRY_SAFE(connection, next, &mgr->connections, struct connection, entry) + { + network = impl_from_INetwork(connection->network); + if (!IsEqualGUID(&network->id, &current_network->id)) + { + TRACE("Filtering %s\n", debugstr_guid(&network->id)); + list_remove(&connection->entry); + } + } + + return S_OK; } static HRESULT WINAPI network_GetTimeCreatedAndConnected( @@ -881,12 +920,6 @@ static HRESULT create_networks_enum( return S_OK; } -static inline struct list_manager *impl_from_INetworkListManager( - INetworkListManager *iface ) -{ - return CONTAINING_RECORD( iface, struct list_manager, INetworkListManager_iface ); -} - struct connections_enum { IEnumNetworkConnections IEnumNetworkConnections_iface; @@ -1057,9 +1090,6 @@ static HRESULT WINAPI connections_enum_Reset( return S_OK; } -static HRESULT create_connections_enum( - struct list_manager *, IEnumNetworkConnections** ); - static HRESULT WINAPI connections_enum_Clone( IEnumNetworkConnections *iface, IEnumNetworkConnections **ret ) { diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 6f46c125763..b58aef9bdec 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -98,7 +98,7 @@ static void test_INetwork( INetwork *network, INetworkConnection *conn ) conn_iter = NULL; hr = INetwork_GetNetworkConnections( network, &conn_iter ); - todo_wine ok( hr == S_OK, "got %08lx\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); is_connection_present = FALSE; if (conn_iter) @@ -120,7 +120,7 @@ static void test_INetwork( INetwork *network, INetworkConnection *conn ) IEnumNetworkConnections_Release( conn_iter ); } - todo_wine ok( is_connection_present, "connection was not present in network\n" ); + ok( is_connection_present, "connection was not present in network\n" ); } static void test_INetworkConnection( INetworkConnection *conn )

1 0